backport patches for OpenSSL 3 support

recipe/meta.yaml

@@ -39,6 +39,9 @@ source:
       - patches/0012-link-grpc-_unsecure-to-grpc.patch                           # [win]
       # unbreak CMake integration
       - patches/0013-don-t-use-find_dependency-for-protobuf.patch
+      # backport grpc/grpc#31256 & grpc/grpc#34131
+      - patches/0014-OpenSSL-Support-for-OpenSSL-3-31256.patch
+      - patches/0015-Testing-Disable-failing-OpenSSL-Test-34131.patch
   - git_url: https://github.com/google/benchmark.git
     git_rev: 015d1a091af6937488242b70121858bce8fd40e9
     folder: third_party/benchmark

recipe/patches/0001-windows-ssl-lib-names.patch

@@ -1,7 +1,7 @@
-From 66a5eeb35da6b7b13fb66e69eb7ac9a9a02f2ecd Mon Sep 17 00:00:00 2001
+From 2a1c3cd2cbc0f7438b08910056be8c633b7d2c61 Mon Sep 17 00:00:00 2001
 From: Jonathan Helmus <jjhelmus@gmail.com>
 Date: Mon, 17 Feb 2020 15:45:06 -0600
-Subject: [PATCH 01/13] windows ssl lib names
+Subject: [PATCH 01/15] windows ssl lib names
 
 Co-Authored-By: Julien Schueller <schueller@phimeca.com>
 Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>

recipe/patches/0002-fix-win-setup-cmds.patch

@@ -1,7 +1,7 @@
-From 7600b353d5a6c41539a135852da8aefc25419e4e Mon Sep 17 00:00:00 2001
+From 9357685865f98f3a0b6c9cfbafc58497bbd79213 Mon Sep 17 00:00:00 2001
 From: Mike Sarahan <msarahan@gmail.com>
 Date: Tue, 18 Feb 2020 13:53:05 -0600
-Subject: [PATCH 02/13] fix win setup cmds
+Subject: [PATCH 02/15] fix win setup cmds
 
 Co-Authored-By: Julien Schueller <schueller@phimeca.com>
 Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>

recipe/patches/0003-Link-against-grpc.patch

@@ -1,7 +1,7 @@
-From e09806f3cf436544fb739215a5ba6c6c6139261b Mon Sep 17 00:00:00 2001
+From 2fccd9b300634cb6844dd9c91ac45c2466b26069 Mon Sep 17 00:00:00 2001
 From: Marius van Niekerk <marius.v.niekerk@gmail.com>
 Date: Mon, 13 Jun 2022 17:13:07 -0400
-Subject: [PATCH 03/13] Link against grpc
+Subject: [PATCH 03/15] Link against grpc
 
 ---
  setup.py | 10 ++++++++++

recipe/patches/0004-force-protoc-executable.patch

@@ -1,7 +1,7 @@
-From d9dcb0db1cfa77022023a7044b46808623a5f5c6 Mon Sep 17 00:00:00 2001
+From ae5afd005e89615a8ad5d2065b7b974f9ac261a9 Mon Sep 17 00:00:00 2001
 From: "Uwe L. Korn" <uwe.korn@quantco.com>
 Date: Fri, 11 Sep 2020 14:20:04 +0200
-Subject: [PATCH 04/13] force protoc executable
+Subject: [PATCH 04/15] force protoc executable
 
 ---
  cmake/protobuf.cmake | 17 ++---------------

recipe/patches/0005-switch-to-C-17-for-grpcio.patch

@@ -1,7 +1,7 @@
-From c606e0456cecf92098889859d0a27434329dab13 Mon Sep 17 00:00:00 2001
+From b49d9e16749265cb3a7611a1b9f43e4967cf9a5b Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sat, 3 Sep 2022 19:23:15 +0200
-Subject: [PATCH 05/13] switch to C++17 for grpcio
+Subject: [PATCH 05/15] switch to C++17 for grpcio
 
 ---
  setup.py | 7 ++++---

recipe/patches/0006-fix-abseil-setup.patch

@@ -1,7 +1,7 @@
-From e565c478a802dfd5e6bc4e9659614416d5a0e70b Mon Sep 17 00:00:00 2001
+From d625e157ff1375628d9e1d8473e4a2d22884898a Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 4 Sep 2022 14:34:52 +0200
-Subject: [PATCH 06/13] fix abseil setup
+Subject: [PATCH 06/15] fix abseil setup
 
 ---
  setup.py | 15 +++++++++++----

recipe/patches/0007-mark-linkage-of-c-ares-re2-zlib-as-private.patch

@@ -1,7 +1,7 @@
-From cd6c126aafc47f492387e72be77380dcd1ec8b8f Mon Sep 17 00:00:00 2001
+From dbc83253344b9edc5cd060636bf4c8e4816c05e7 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Tue, 23 Aug 2022 11:45:20 +0200
-Subject: [PATCH 07/13] mark linkage of c-ares/re2/zlib as private
+Subject: [PATCH 07/15] mark linkage of c-ares/re2/zlib as private
 
 See also: https://github.com/grpc/grpc/issues/30838
 
@@ -11,7 +11,7 @@ Co-Authored-By: Mark Harfouche <mark.harfouche@gmail.com>
  1 file changed, 53 insertions(+), 47 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed9e1cbda7..f5fb749ac9 100644
+index a4fe00fdb1..e5e4ea62a9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -2479,32 +2479,35 @@ target_include_directories(grpc

recipe/patches/0008-add-GPR-GRPC-GRPCXX-UBP-_DLL-mechanism-for-missing-s.patch

@@ -1,7 +1,7 @@
-From 38b92376b5ef5453c058e2bbb54aa623f8254fc4 Mon Sep 17 00:00:00 2001
+From e172eb17c4a3b2d156c50a78575e2df5b5443832 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 22 Oct 2022 01:21:56 -0500
-Subject: [PATCH 08/13] add {GPR,GRPC,GRPCXX,UBP}_DLL mechanism for missing
+Subject: [PATCH 08/15] add {GPR,GRPC,GRPCXX,UBP}_DLL mechanism for missing
  symbols on windows
 
 Co-Authored-By: "H. Vetinari" <h.vetinari@gmx.com>
@@ -22,7 +22,7 @@ Co-Authored-By: "H. Vetinari" <h.vetinari@gmx.com>
  13 files changed, 106 insertions(+), 12 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5fb749ac9..531718fd4d 100644
+index e5e4ea62a9..b43e3b9a69 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1576,6 +1576,11 @@ if(WIN32 AND MSVC)

recipe/patches/0009-fix-support_enabled-for-windows.patch

@@ -1,7 +1,7 @@
-From b1737d3d0dab5437e5e69ff5f06006b6a750b9fd Mon Sep 17 00:00:00 2001
+From 8ea954583dde6b4f78fb73347385c831c28db34f Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
 Date: Sat, 22 Oct 2022 02:21:08 -0500
-Subject: [PATCH 09/13] fix support_enabled for windows
+Subject: [PATCH 09/15] fix support_enabled for windows
 
 ---
  src/core/lib/gprpp/fork.cc | 12 ++++++++++++

recipe/patches/0010-Fix-data-with-thread-storage-duration-may-not-have-d.patch

@@ -1,7 +1,7 @@
-From 7933c84ff62a1dd4b9bb51b89d9f1c41a9299c40 Mon Sep 17 00:00:00 2001
+From b3c1ee107d7770170f8e6b3ea48759eef0361c9f Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Mon, 8 May 2023 11:31:09 +1100
-Subject: [PATCH 10/13] Fix `data with thread storage duration may not have dll
+Subject: [PATCH 10/15] Fix `data with thread storage duration may not have dll
  interface`
 
 Windows needs a workaround.

recipe/patches/0011-put-some-grpc-experimental-classes-needed-by-arrow-i.patch

@@ -1,7 +1,7 @@
-From 554180d652000b9bf5e473f4c16c96e4103ebb52 Mon Sep 17 00:00:00 2001
+From e0bff5ae140f3a1d1544449750581a5f7f16b1ee Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Fri, 9 Jun 2023 17:03:08 +1100
-Subject: [PATCH 11/13] put some grpc::experimental classes needed by arrow in
+Subject: [PATCH 11/15] put some grpc::experimental classes needed by arrow in
  DLL
 
 also provide implementation for destructor of CertificateProviderInterface;

recipe/patches/0012-link-grpc-_unsecure-to-grpc.patch

@@ -1,15 +1,15 @@
-From c08728f11c50f0cfeeec27357231c19806162846 Mon Sep 17 00:00:00 2001
+From 4175e0583ca228d0fa1b3bbb2a75a2d399cfc3c4 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Fri, 9 Jun 2023 20:11:22 +1100
-Subject: [PATCH 12/13] link grpc++_unsecure to grpc++
+Subject: [PATCH 12/15] link grpc++_unsecure to grpc++
 
 which is where CertificateProviderInterface etc. live
 ---
  CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 531718fd4d..1550f38ae7 100644
+index b43e3b9a69..836fb1daa7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -4169,6 +4169,7 @@ target_link_libraries(grpc++_unsecure

recipe/patches/0013-don-t-use-find_dependency-for-protobuf.patch

@@ -1,7 +1,7 @@
-From d13281f271ae22a0b09588a3a22787380dae13fb Mon Sep 17 00:00:00 2001
+From d2d0de52783482f10f8aa597449e35251873c656 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Fri, 9 Jun 2023 22:16:09 +1100
-Subject: [PATCH 13/13] don't use find_dependency for protobuf
+Subject: [PATCH 13/15] don't use find_dependency for protobuf
 
 ---
  cmake/protobuf.cmake | 2 +-