From ccccc60a83a9ee91b8991b9609635a39219ae618 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:05:11 +0000
Subject: [PATCH 1/4] updated v1.83.0

---
 recipe/meta.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 0f88a7e1..f571dbfd 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.82.1" %}
+{% set version = "1.83.0" %}
 
 # core package & vendored libs use different version scheme than CPP libs, see
 # top of https://github.com/grpc/grpc/blob/v{{ version }}/CMakeLists.txt
@@ -19,7 +19,7 @@ package:
 
 source:
   - url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
-    sha256: d74186d8fa221cc7f07ec2db970098302559f73612f6cf340cfe754848c4fc29
+    sha256: 90d453393a9d41215df546103b10b33b9566df79cdf6f49dc67f6c4d044d090d
     patches:
       - patches/0001-windows-ssl-lib-names.patch
       - patches/0002-fix-win-setup-cmds.patch

From 97dbca4c30d7b1eeb608944dc2c964f24df6aff7 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:07:10 +0000
Subject: [PATCH 2/4] MNT: Re-rendered with conda-smithy 2026.6.14 and
 conda-forge-pinning 2026.07.22.19.40.5

---
 .ci_support/linux_64_.yaml        | 2 +-
 .ci_support/linux_aarch64_.yaml   | 2 +-
 .ci_support/linux_ppc64le_.yaml   | 2 +-
 .github/workflows/conda-build.yml | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
index ae1bbbed..a1e7b1aa 100644
--- a/.ci_support/linux_64_.yaml
+++ b/.ci_support/linux_64_.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '14'
 docker_image:
-- quay.io/condaforge/linux-anvil-x86_64:alma9
+- quay.io/condaforge/linux-anvil-x86_64:alma10
 libabseil:
 - '20260526'
 libgrpc:
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
index 8e2606bf..58eaf9a7 100644
--- a/.ci_support/linux_aarch64_.yaml
+++ b/.ci_support/linux_aarch64_.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '14'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64:alma9
+- quay.io/condaforge/linux-anvil-aarch64:alma10
 libabseil:
 - '20260526'
 libgrpc:
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
index 470d1bfe..cd540e65 100644
--- a/.ci_support/linux_ppc64le_.yaml
+++ b/.ci_support/linux_ppc64le_.yaml
@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '14'
 docker_image:
-- quay.io/condaforge/linux-anvil-x86_64:alma9
+- quay.io/condaforge/linux-anvil-x86_64:alma10
 libabseil:
 - '20260526'
 libgrpc:
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
index f8b1efab..2765cb5b 100644
--- a/.github/workflows/conda-build.yml
+++ b/.github/workflows/conda-build.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         include:
           - CONFIG: linux_64_
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
             STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             build_workspace_dir: build_artifacts
@@ -35,7 +35,7 @@ jobs:
             runs_on: ['ubuntu-latest']
             tools_install_dir: ~/miniforge3
           - CONFIG: linux_aarch64_
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma9
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64:alma10
             STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             build_workspace_dir: build_artifacts
@@ -47,7 +47,7 @@ jobs:
             runs_on: ['ubuntu-24.04-arm']
             tools_install_dir: ~/miniforge3
           - CONFIG: linux_ppc64le_
-            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma10
             STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             build_workspace_dir: build_artifacts

From 6bf0c884712e913d3c7d2322c1ac905ed5d82953 Mon Sep 17 00:00:00 2001
From: Julien Jerphanion <git@jjerphan.xyz>
Date: Mon, 27 Jul 2026 14:54:33 +0200
Subject: [PATCH 3/4] Rebase patches

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
---
 .../patches/0001-windows-ssl-lib-names.patch  |  12 +-
 recipe/patches/0002-fix-win-setup-cmds.patch  |  10 +-
 .../0003-Link-against-grpc-and-abseil.patch   |  16 +-
 .../0004-force-protoc-executable.patch        |  10 +-
 ...inkages-of-grpc-_unsecure-as-private.patch |  14 +-
 ...-set-_DLL_EXPORTS-when-building-and-.patch |  20 +-
 ...ing-linkages-for-gRPC_BUILD_TESTS-ON.patch |  32 ++-
 ...-add-enable_testing-so-tests-get-run.patch |  10 +-
 ...nd-utf8_range-use-protobuf-s-version.patch |  36 ++--
 ...ildtests_cxx-target-to-end2end-tests.patch | 140 +++++++++-----
 .../0011-build-grpcio-tools-from-source.patch |  18 +-
 ...ol-explosion-with-autogenerated-expo.patch |  14 +-
 ...e-GRPC_DLL-instances-where-necessary.patch | 182 +++++++++---------
 .../0014-use-protobuf-s-libutf8_range.patch   |  12 +-
 .../patches/0015-disable-grpc-_unsecure.patch |  46 +++--
 ...alize_absl-into-separate-cython-modu.patch |  48 ++---
 ...texLock-pointer-deprecation-warnings.patch |  19 +-
 ...tex-Lock-Unlock-deprecation-warnings.patch |  28 ++-
 18 files changed, 348 insertions(+), 319 deletions(-)

diff --git a/recipe/patches/0001-windows-ssl-lib-names.patch b/recipe/patches/0001-windows-ssl-lib-names.patch
index e418c63e..eb5edcb4 100644
--- a/recipe/patches/0001-windows-ssl-lib-names.patch
+++ b/recipe/patches/0001-windows-ssl-lib-names.patch
@@ -7,14 +7,12 @@ Co-Authored-By: Julien Schueller <schueller@phimeca.com>
 Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
 Co-Authored-By: Marius van Niekerk <marius.v.niekerk@gmail.com>
 ---
- setup.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index 28860ecf65..7f46c442b9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -381,10 +381,10 @@ if "win32" in sys.platform:
+diff --git c/setup.py i/setup.py
+index 7662934..9838d83 100644
+--- c/setup.py
++++ i/setup.py
+@@ -390,10 +390,10 @@ if "win32" in sys.platform:
          "ws2_32",
      )
  if BUILD_WITH_SYSTEM_OPENSSL:
diff --git a/recipe/patches/0002-fix-win-setup-cmds.patch b/recipe/patches/0002-fix-win-setup-cmds.patch
index 71457998..2abbace3 100644
--- a/recipe/patches/0002-fix-win-setup-cmds.patch
+++ b/recipe/patches/0002-fix-win-setup-cmds.patch
@@ -8,13 +8,11 @@ Co-Authored-By: Nicholas Bollweg <nick.bollweg@gmail.com>
 Co-Authored-By: Marius van Niekerk <marius.v.niekerk@gmail.com>
 Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
 ---
- setup.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index 7f46c442b9..d8e9bc256d 100644
---- a/setup.py
-+++ b/setup.py
+diff --git c/setup.py i/setup.py
+index 9838d83..888e684 100644
+--- c/setup.py
++++ i/setup.py
 @@ -201,6 +201,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
  
  
diff --git a/recipe/patches/0003-Link-against-grpc-and-abseil.patch b/recipe/patches/0003-Link-against-grpc-and-abseil.patch
index db224144..22232769 100644
--- a/recipe/patches/0003-Link-against-grpc-and-abseil.patch
+++ b/recipe/patches/0003-Link-against-grpc-and-abseil.patch
@@ -5,13 +5,11 @@ Subject: [PATCH 03/18] Link against grpc and abseil
 
 Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
 ---
- setup.py | 24 +++++++++++++++++++-----
- 1 file changed, 19 insertions(+), 5 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index d8e9bc256d..dbd69dc50e 100644
---- a/setup.py
-+++ b/setup.py
+diff --git c/setup.py i/setup.py
+index 888e684..f6e1716 100644
+--- c/setup.py
++++ i/setup.py
 @@ -172,6 +172,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
      "GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False"
  )
@@ -21,7 +19,7 @@ index d8e9bc256d..dbd69dc50e 100644
  # For local development use only: This skips building gRPC Core and its
  # dependencies, including protobuf and boringssl. This allows "incremental"
  # compilation by first building gRPC Core using make, then building only the
-@@ -392,10 +394,20 @@ if BUILD_WITH_SYSTEM_CARES:
+@@ -401,10 +403,20 @@ if BUILD_WITH_SYSTEM_CARES:
  if BUILD_WITH_SYSTEM_RE2:
      EXTENSION_LIBRARIES += ("re2",)
  if BUILD_WITH_SYSTEM_ABSL:
@@ -46,7 +44,7 @@ index d8e9bc256d..dbd69dc50e 100644
  
  DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
  asm_files = []
-@@ -507,6 +519,9 @@ def cython_extensions_and_necessity():
+@@ -512,6 +524,9 @@ def cython_extensions_and_necessity():
              prefix + "libgrpc.a",
          ]
          core_c_files = []
@@ -56,7 +54,7 @@ index d8e9bc256d..dbd69dc50e 100644
      else:
          core_c_files = list(CORE_C_FILES)
          extra_objects = []
-@@ -518,7 +533,6 @@ def cython_extensions_and_necessity():
+@@ -523,7 +538,6 @@ def cython_extensions_and_necessity():
                  + list(GRPCIO_CC_SRCS)
                  + core_c_files
                  + asm_files
diff --git a/recipe/patches/0004-force-protoc-executable.patch b/recipe/patches/0004-force-protoc-executable.patch
index 05901eaf..94845d29 100644
--- a/recipe/patches/0004-force-protoc-executable.patch
+++ b/recipe/patches/0004-force-protoc-executable.patch
@@ -7,10 +7,12 @@ Subject: [PATCH 04/18] force protoc executable
  cmake/protobuf.cmake | 17 ++---------------
  1 file changed, 2 insertions(+), 15 deletions(-)
 
-diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
-index ad80ca6e46..7bae8d95bd 100644
---- a/cmake/protobuf.cmake
-+++ b/cmake/protobuf.cmake
+---
+
+diff --git c/cmake/protobuf.cmake i/cmake/protobuf.cmake
+index ad80ca6..7bae8d9 100644
+--- c/cmake/protobuf.cmake
++++ i/cmake/protobuf.cmake
 @@ -70,21 +70,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
      endif()
      # Well-known proto files are expected to be in the Protobuf include directory.
diff --git a/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch b/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch
index 46969471..1b310c70 100644
--- a/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch
+++ b/recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch
@@ -9,14 +9,12 @@ See also: https://github.com/grpc/grpc/issues/30838
 
 Co-Authored-By: Mark Harfouche <mark.harfouche@gmail.com>
 ---
- CMakeLists.txt | 106 +++++++++++++++++++++++++++----------------------
- 1 file changed, 58 insertions(+), 48 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 27bb372c2e..46cdc6d35f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3182,34 +3182,39 @@ target_include_directories(grpc
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 6499b7c..e3a591e 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -3189,34 +3189,39 @@ target_include_directories(grpc
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc
@@ -82,7 +80,7 @@ index 27bb372c2e..46cdc6d35f 100644
  endif()
  
  foreach(_hdr
-@@ -3924,31 +3929,36 @@ target_include_directories(grpc_unsecure
+@@ -3932,31 +3937,36 @@ target_include_directories(grpc_unsecure
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc_unsecure
diff --git a/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch b/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch
index 7fe3c9d2..2dabfd28 100644
--- a/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch
+++ b/recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch
@@ -5,14 +5,12 @@ Subject: [PATCH 06/18] for main targets, set *_DLL_EXPORTS when building and
  *_DLL_IMPORTS in interface
 
 ---
- CMakeLists.txt | 36 ++++++++++--------------------------
- 1 file changed, 10 insertions(+), 26 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46cdc6d35f..7972c30b19 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2125,10 +2125,8 @@ if(WIN32 AND MSVC)
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index e3a591e..44c5b7f 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -2129,10 +2129,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -25,7 +23,7 @@ index 46cdc6d35f..7972c30b19 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb
-@@ -3155,11 +3153,8 @@ if(WIN32 AND MSVC)
+@@ -3162,11 +3160,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -39,7 +37,7 @@ index 46cdc6d35f..7972c30b19 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb
-@@ -3902,11 +3897,8 @@ if(WIN32 AND MSVC)
+@@ -3910,11 +3905,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -53,7 +51,7 @@ index 46cdc6d35f..7972c30b19 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb
-@@ -5018,12 +5010,8 @@ if(WIN32 AND MSVC)
+@@ -5026,12 +5018,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -68,7 +66,7 @@ index 46cdc6d35f..7972c30b19 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb
-@@ -5767,12 +5755,8 @@ if(WIN32 AND MSVC)
+@@ -5775,12 +5763,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
diff --git a/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch b/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch
index 409bc7dc..ac75fa1d 100644
--- a/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch
+++ b/recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch
@@ -10,14 +10,12 @@ is not missing in some other library's link interface, this is the right place.
 
 For some tests, re2 and c-ares have just been forgotten as dependencies.
 ---
- CMakeLists.txt | 11 +++++++++++
- 1 file changed, 11 insertions(+)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7972c30b19..ce9fa4c402 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3345,6 +3345,7 @@ target_link_libraries(grpc_test_util
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 44c5b7f..ef81114 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -3352,6 +3352,7 @@ target_link_libraries(grpc_test_util
    ${_gRPC_ALLTARGETS_LIBRARIES}
    absl::failure_signal_handler
    absl::stacktrace
@@ -25,7 +23,7 @@ index 7972c30b19..ce9fa4c402 100644
    absl::symbolize
    absl::log_initialize
    grpc
-@@ -3419,6 +3420,7 @@ target_link_libraries(grpc_test_util_unsecure
+@@ -3426,6 +3427,7 @@ target_link_libraries(grpc_test_util_unsecure
    ${_gRPC_ALLTARGETS_LIBRARIES}
    absl::failure_signal_handler
    absl::stacktrace
@@ -33,7 +31,7 @@ index 7972c30b19..ce9fa4c402 100644
    absl::symbolize
    absl::log_initialize
    grpc_unsecure
-@@ -8713,6 +8715,7 @@ target_include_directories(authorization_matchers_test
+@@ -8721,6 +8723,7 @@ target_include_directories(authorization_matchers_test
  )
  
  target_link_libraries(authorization_matchers_test
@@ -41,7 +39,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -19567,6 +19570,7 @@ target_include_directories(grpc_authorization_engine_test
+@@ -19590,6 +19593,7 @@ target_include_directories(grpc_authorization_engine_test
  )
  
  target_link_libraries(grpc_authorization_engine_test
@@ -49,7 +47,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -21833,6 +21837,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -21898,6 +21902,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
    )
  
    target_link_libraries(httpcli_test
@@ -57,7 +55,7 @@ index 7972c30b19..ce9fa4c402 100644
      ${_gRPC_ALLTARGETS_LIBRARIES}
      gtest
      grpc++_test_util
-@@ -25092,6 +25097,7 @@ target_include_directories(matchers_test
+@@ -25157,6 +25162,7 @@ target_include_directories(matchers_test
  )
  
  target_link_libraries(matchers_test
@@ -65,7 +63,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -30726,6 +30732,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
+@@ -30792,6 +30798,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
  )
  
  target_link_libraries(resolve_address_using_ares_resolver_test
@@ -73,7 +71,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -30814,6 +30821,7 @@ target_include_directories(resolve_address_using_native_resolver_test
+@@ -30880,6 +30887,7 @@ target_include_directories(resolve_address_using_native_resolver_test
  )
  
  target_link_libraries(resolve_address_using_native_resolver_test
@@ -81,7 +79,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -41964,6 +41972,7 @@ target_include_directories(xds_common_types_test
+@@ -42397,6 +42405,7 @@ target_include_directories(xds_common_types_test
  )
  
  target_link_libraries(xds_common_types_test
@@ -89,7 +87,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    absl::fixed_array
-@@ -43192,6 +43201,7 @@ target_include_directories(xds_credentials_test
+@@ -43625,6 +43634,7 @@ target_include_directories(xds_credentials_test
  )
  
  target_link_libraries(xds_credentials_test
@@ -97,7 +95,7 @@ index 7972c30b19..ce9fa4c402 100644
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -48378,6 +48388,7 @@ target_include_directories(xds_listener_resource_type_test
+@@ -48811,6 +48821,7 @@ target_include_directories(xds_listener_resource_type_test
  )
  
  target_link_libraries(xds_listener_resource_type_test
diff --git a/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch b/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch
index 23f15d1d..006cc33e 100644
--- a/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch
+++ b/recipe/patches/0008-add-enable_testing-so-tests-get-run.patch
@@ -7,10 +7,12 @@ Subject: [PATCH 08/18] add enable_testing so tests get run
  CMakeLists.txt | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ce9fa4c402..60e0b95f8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+---
+
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index ef81114..eb3c02d 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
 @@ -51,6 +51,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF)
  option(gRPC_BUILD_CODEGEN "Build codegen" ON)
  option(gRPC_DOWNLOAD_ARCHIVES "Download archives for empty 3rd party directories" ON)
diff --git a/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch b/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch
index 338fe13e..25992364 100644
--- a/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch
+++ b/recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch
@@ -8,10 +8,12 @@ Subject: [PATCH 09/18] unvendor upb and utf8_range, use protobuf's version
  cmake/upb.cmake |   4 +-
  2 files changed, 16 insertions(+), 777 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 60e0b95f8a..8b4b1cce9d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+---
+
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index eb3c02d..98d90f2 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
 @@ -354,11 +354,15 @@ else()
    set(_gRPC_CORE_NOSTDCXX_FLAGS "")
  endif()
@@ -29,7 +31,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
      find_library(LIBRT rt)
      if(LIBRT)
-@@ -3185,8 +3189,6 @@ target_link_libraries(grpc
+@@ -3192,8 +3196,6 @@ target_link_libraries(grpc
    PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES}
    # vendored libs
    PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES}
@@ -38,7 +40,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    # external dependencies used within grpc
    PRIVATE ${_gRPC_CARES_LIBRARIES}
    PRIVATE ${_gRPC_RE2_LIBRARIES}
-@@ -3931,7 +3933,6 @@ target_link_libraries(grpc_unsecure
+@@ -3939,7 +3941,6 @@ target_link_libraries(grpc_unsecure
    PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES}
    # vendored libs
    PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES}
@@ -46,7 +48,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    # external dependencies used within grpc
    PRIVATE ${_gRPC_ZLIB_LIBRARIES}
    PRIVATE ${_gRPC_CARES_LIBRARIES}
-@@ -4101,765 +4102,6 @@ target_link_libraries(gtest
+@@ -4109,765 +4110,6 @@ target_link_libraries(gtest
  
  endif()
  
@@ -812,7 +814,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
  if(gRPC_BUILD_TESTS)
  
  if(gRPC_BUILD_CODEGEN)
-@@ -6374,7 +5616,6 @@ target_include_directories(grpc_authorization_provider
+@@ -6382,7 +5624,6 @@ target_include_directories(grpc_authorization_provider
  )
  target_link_libraries(grpc_authorization_provider
    ${_gRPC_ALLTARGETS_LIBRARIES}
@@ -820,7 +822,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ZLIB_LIBRARIES}
    absl::no_destructor
-@@ -55492,8 +54733,8 @@ generate_pkgconfig(
+@@ -55967,8 +55208,8 @@ generate_pkgconfig(
    "${gRPC_CORE_VERSION}"
    "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr"
    "libcares openssl re2 zlib"
@@ -831,7 +833,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    "grpc.pc")
  
  # grpc_unsecure .pc file
-@@ -55503,8 +54744,8 @@ generate_pkgconfig(
+@@ -55978,8 +55219,8 @@ generate_pkgconfig(
    "${gRPC_CORE_VERSION}"
    "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_synchronization absl_time absl_type_traits absl_utility gpr"
    "libcares zlib"
@@ -842,7 +844,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    "grpc_unsecure.pc")
  
  # grpc++ .pc file
-@@ -55514,8 +54755,8 @@ generate_pkgconfig(
+@@ -55989,8 +55230,8 @@ generate_pkgconfig(
    "${gRPC_CPP_VERSION}"
    "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_charset absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc"
    "libcares openssl re2 zlib"
@@ -853,7 +855,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    "grpc++.pc")
  
  # grpc++_unsecure .pc file
-@@ -55525,8 +54766,8 @@ generate_pkgconfig(
+@@ -56000,8 +55241,8 @@ generate_pkgconfig(
    "${gRPC_CPP_VERSION}"
    "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_charset absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc_unsecure"
    "libcares zlib"
@@ -864,7 +866,7 @@ index 60e0b95f8a..8b4b1cce9d 100644
    "grpc++_unsecure.pc")
  
  if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
-@@ -55537,7 +54778,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
+@@ -56012,7 +55253,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
      "${gRPC_CPP_VERSION}"
      "absl_absl_check absl_absl_log absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_bits absl_btree absl_charset absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_dynamic_annotations absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_layout absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_node_hash_map absl_optional absl_prefetch absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_string_view absl_strings absl_strings_internal absl_synchronization absl_time absl_type_traits absl_utility gpr grpc grpc++ opentelemetry_api"
      "libcares openssl re2 zlib"
@@ -874,10 +876,10 @@ index 60e0b95f8a..8b4b1cce9d 100644
 +    "-laddress_sorting"
      "grpcpp_otel_plugin.pc")
  endif()
-diff --git a/cmake/upb.cmake b/cmake/upb.cmake
-index 9156e5f48f..e6fa81932d 100644
---- a/cmake/upb.cmake
-+++ b/cmake/upb.cmake
+diff --git c/cmake/upb.cmake i/cmake/upb.cmake
+index 9156e5f..e6fa819 100644
+--- c/cmake/upb.cmake
++++ i/cmake/upb.cmake
 @@ -12,9 +12,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
diff --git a/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch b/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch
index 2d66f9c7..b7bff6c2 100644
--- a/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch
+++ b/recipe/patches/0010-reduce-buildtests_cxx-target-to-end2end-tests.patch
@@ -77,13 +77,11 @@ to compile, compare with the timings below.
 2025-08-08T11:22:34.6749979Z [7901/8027] Creating library symlink third_party/benchmark/src/libbenchmark_main.so.1 third_party/benchmark/src/libbenchmark_main.so
 ```
 ---
- CMakeLists.txt | 784 +++----------------------------------------------
- 1 file changed, 46 insertions(+), 738 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b4b1cce9d..5b089f177f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 98d90f2..6937ac9 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
 @@ -47,11 +47,12 @@ set(gRPC_INSTALL_SHAREDIR "share/grpc" CACHE STRING "Installation directory for
  set(gRPC_BUILD_MSVC_MP_COUNT 0 CACHE STRING "The maximum number of processes for MSVC /MP option")
  
@@ -187,12 +185,12 @@ index 8b4b1cce9d..5b089f177f 100644
 -  add_dependencies(buildtests_cxx call_filters_test)
 -  add_dependencies(buildtests_cxx call_finalization_test)
 -  add_dependencies(buildtests_cxx call_state_test)
--  add_dependencies(buildtests_cxx call_tracer_test)
 -  add_dependencies(buildtests_cxx call_utils_test)
 -  add_dependencies(buildtests_cxx cancel_ares_query_test)
 -  add_dependencies(buildtests_cxx cancel_callback_test)
 -  add_dependencies(buildtests_cxx cds_test)
 -  add_dependencies(buildtests_cxx cel_authorization_engine_test)
+-  add_dependencies(buildtests_cxx cert_selection_offload_test)
 -  add_dependencies(buildtests_cxx certificate_provider_registry_test)
 -  add_dependencies(buildtests_cxx certificate_provider_store_test)
 -  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
@@ -282,7 +280,7 @@ index 8b4b1cce9d..5b089f177f 100644
    if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
      add_dependencies(buildtests_cxx end2end_chaotic_good_no_logging_test)
    endif()
-@@ -1463,561 +1306,26 @@ if(gRPC_BUILD_TESTS)
+@@ -1463,565 +1306,26 @@ if(gRPC_BUILD_TESTS)
    add_dependencies(buildtests_cxx end2end_test)
    add_dependencies(buildtests_cxx end2end_vrpc_no_logging_test)
    add_dependencies(buildtests_cxx end2end_vrpc_test)
@@ -354,6 +352,7 @@ index 8b4b1cce9d..5b089f177f 100644
 -  add_dependencies(buildtests_cxx grpc_ipv6_loopback_available_test)
 -  add_dependencies(buildtests_cxx grpc_tls_certificate_distributor_test)
 -  add_dependencies(buildtests_cxx grpc_tls_certificate_provider_test)
+-  add_dependencies(buildtests_cxx grpc_tls_certificate_selector_test)
 -  add_dependencies(buildtests_cxx grpc_tls_certificate_verifier_test)
 -  add_dependencies(buildtests_cxx grpc_tls_credentials_options_comparator_test)
 -  add_dependencies(buildtests_cxx grpc_tls_credentials_options_test)
@@ -627,6 +626,7 @@ index 8b4b1cce9d..5b089f177f 100644
 -  endif()
 -  add_dependencies(buildtests_cxx spiffe_utils_test)
 -  add_dependencies(buildtests_cxx spinlock_test)
+-  add_dependencies(buildtests_cxx ssl_telemetry_utils_test)
 -  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
 -    add_dependencies(buildtests_cxx ssl_transport_security_test)
 -  endif()
@@ -735,6 +735,7 @@ index 8b4b1cce9d..5b089f177f 100644
 -  add_dependencies(buildtests_cxx uri_test)
 -  add_dependencies(buildtests_cxx useful_test)
 -  add_dependencies(buildtests_cxx uuid_v4_test)
+-  add_dependencies(buildtests_cxx v3_bridge_test)
 -  add_dependencies(buildtests_cxx validation_errors_test)
 -  add_dependencies(buildtests_cxx varint_test)
 -  add_dependencies(buildtests_cxx wait_for_callback_test)
@@ -835,6 +836,7 @@ index 8b4b1cce9d..5b089f177f 100644
 -    add_dependencies(buildtests_cxx xds_security_spiffe_end2end_test)
 -  endif()
 -  add_dependencies(buildtests_cxx xds_stats_watcher_test)
+-  add_dependencies(buildtests_cxx xds_transport_grpc_test)
 -  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
 -    add_dependencies(buildtests_cxx xds_wrr_end2end_test)
 -  endif()
@@ -844,7 +846,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
    add_custom_target(buildtests
      DEPENDS buildtests_c buildtests_cxx)
-@@ -3286,7 +2594,7 @@ if(gRPC_INSTALL)
+@@ -3293,7 +2597,7 @@ if(gRPC_INSTALL)
    )
  endif()
  
@@ -853,7 +855,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_library(grpc_test_util
    test/core/event_engine/test_init.cc
-@@ -4028,7 +3336,7 @@ if(gRPC_INSTALL)
+@@ -4036,7 +3340,7 @@ if(gRPC_INSTALL)
    )
  endif()
  
@@ -862,7 +864,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_library(gtest
    third_party/googletest/googlemock/src/gmock-cardinalities.cc
-@@ -4754,7 +4062,7 @@ if(gRPC_INSTALL)
+@@ -4762,7 +4066,7 @@ if(gRPC_INSTALL)
  endif()
  
  endif()
@@ -871,7 +873,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_library(grpc++_test
    src/cpp/client/channel_test_peer.cc
-@@ -4827,7 +4135,7 @@ foreach(_hdr
+@@ -4835,7 +4139,7 @@ foreach(_hdr
  endforeach()
  
  endif()
@@ -880,7 +882,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_library(grpc++_test_config
    test/cpp/util/test_config_cc.cc
-@@ -4879,7 +4187,7 @@ target_link_libraries(grpc++_test_config
+@@ -4887,7 +4191,7 @@ target_link_libraries(grpc++_test_config
  
  
  endif()
@@ -889,7 +891,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_library(grpc++_test_util
    src/core/util/subprocess_posix.cc
-@@ -6269,7 +5577,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -6277,7 +5581,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -898,7 +900,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(admin_services_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/cel/expr/checked.pb.cc
-@@ -7760,7 +7068,7 @@ target_link_libraries(arena_test
+@@ -7768,7 +7072,7 @@ target_link_libraries(arena_test
  
  
  endif()
@@ -907,7 +909,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(async_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc
-@@ -11801,7 +11109,7 @@ target_link_libraries(client_authority_filter_test
+@@ -11824,7 +11128,7 @@ target_link_libraries(client_authority_filter_test
  
  
  endif()
@@ -916,7 +918,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(client_callback_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -12038,7 +11346,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -12061,7 +11365,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -925,7 +927,16 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(client_initial_metadata_outstanding_token_test
    test/core/transport/client_initial_metadata_outstanding_token_test.cc
-@@ -12153,7 +11461,7 @@ target_link_libraries(client_interceptors_end2end_test
+@@ -12103,7 +11407,7 @@ target_link_libraries(client_initial_metadata_outstanding_token_test
+ 
+ 
+ endif()
+-if(gRPC_BUILD_TESTS)
++if(gRPC_CF_TESTS)
+ 
+ add_executable(client_interceptors_end2end_test
+   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
+@@ -12176,7 +11480,7 @@ target_link_libraries(client_interceptors_end2end_test
  
  
  endif()
@@ -934,7 +945,7 @@ index 8b4b1cce9d..5b089f177f 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(client_lb_end2end_test
-@@ -12910,7 +12218,7 @@ target_link_libraries(connectivity_state_test
+@@ -12933,7 +12237,7 @@ target_link_libraries(connectivity_state_test
  
  
  endif()
@@ -943,7 +954,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(context_allocator_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -13829,7 +13137,7 @@ target_link_libraries(duplicate_header_bad_client_test
+@@ -13852,7 +13156,7 @@ target_link_libraries(duplicate_header_bad_client_test
  
  
  endif()
@@ -952,7 +963,7 @@ index 8b4b1cce9d..5b089f177f 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(end2end_chaotic_good_no_logging_test
-@@ -13934,7 +13242,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -13957,7 +13261,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -961,7 +972,7 @@ index 8b4b1cce9d..5b089f177f 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(end2end_chaotic_good_test
-@@ -14128,7 +13436,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -14151,7 +13455,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -970,7 +981,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_http2_no_logging_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -14231,7 +13539,7 @@ target_link_libraries(end2end_http2_no_logging_test
+@@ -14254,7 +13558,7 @@ target_link_libraries(end2end_http2_no_logging_test
  
  
  endif()
@@ -979,7 +990,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_http2_security_no_logging_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -14334,7 +13642,7 @@ target_link_libraries(end2end_http2_security_no_logging_test
+@@ -14357,7 +13661,7 @@ target_link_libraries(end2end_http2_security_no_logging_test
  
  
  endif()
@@ -988,7 +999,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_http2_security_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -14526,7 +13834,7 @@ target_link_libraries(end2end_http2_security_test
+@@ -14549,7 +13853,7 @@ target_link_libraries(end2end_http2_security_test
  
  
  endif()
@@ -997,7 +1008,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_http2_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -14718,7 +14026,7 @@ target_link_libraries(end2end_http2_test
+@@ -14741,7 +14045,7 @@ target_link_libraries(end2end_http2_test
  
  
  endif()
@@ -1006,7 +1017,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_inproc_no_logging_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -14821,7 +14129,7 @@ target_link_libraries(end2end_inproc_no_logging_test
+@@ -14844,7 +14148,7 @@ target_link_libraries(end2end_inproc_no_logging_test
  
  
  endif()
@@ -1015,7 +1026,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_inproc_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -15013,7 +14321,7 @@ target_link_libraries(end2end_inproc_test
+@@ -15036,7 +14340,7 @@ target_link_libraries(end2end_inproc_test
  
  
  endif()
@@ -1024,7 +1035,25 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_ph2_no_logging_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -15411,7 +14719,7 @@ target_link_libraries(end2end_posix_no_logging_test
+@@ -15139,7 +14443,7 @@ target_link_libraries(end2end_ph2_no_logging_test
+ 
+ 
+ endif()
+-if(gRPC_BUILD_TESTS)
++if(gRPC_CF_TESTS)
+ 
+ add_executable(end2end_ph2_test
+   ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
+@@ -15331,7 +14635,7 @@ target_link_libraries(end2end_ph2_test
+ 
+ 
+ endif()
+-if(gRPC_BUILD_TESTS)
++if(gRPC_CF_TESTS)
+ 
+ add_executable(end2end_posix_no_logging_test
+   ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
+@@ -15434,7 +14738,7 @@ target_link_libraries(end2end_posix_no_logging_test
  
  
  endif()
@@ -1033,7 +1062,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_posix_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -15603,7 +14911,7 @@ target_link_libraries(end2end_posix_test
+@@ -15626,7 +14930,7 @@ target_link_libraries(end2end_posix_test
  
  
  endif()
@@ -1042,7 +1071,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc
-@@ -15680,7 +14988,7 @@ target_link_libraries(end2end_test
+@@ -15703,7 +15007,7 @@ target_link_libraries(end2end_test
  
  
  endif()
@@ -1051,7 +1080,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_vrpc_no_logging_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -15784,7 +15092,7 @@ target_link_libraries(end2end_vrpc_no_logging_test
+@@ -15807,7 +15111,7 @@ target_link_libraries(end2end_vrpc_no_logging_test
  
  
  endif()
@@ -1060,7 +1089,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(end2end_vrpc_test
    ${_gRPC_PROTO_GENS_DIR}/src/core/ext/transport/chaotic_good/chaotic_good_frame.pb.cc
-@@ -18363,7 +17671,7 @@ target_link_libraries(gcp_authentication_filter_test
+@@ -18386,7 +17690,7 @@ target_link_libraries(gcp_authentication_filter_test
  
  
  endif()
@@ -1069,7 +1098,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(generic_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc
-@@ -18866,7 +18174,7 @@ target_link_libraries(grpc_authorization_policy_provider_test
+@@ -18889,7 +18193,7 @@ target_link_libraries(grpc_authorization_policy_provider_test
  
  
  endif()
@@ -1078,7 +1107,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(grpc_authz_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -19876,7 +19184,7 @@ target_link_libraries(grpclb_api_test
+@@ -19941,7 +19245,7 @@ target_link_libraries(grpclb_api_test
  
  
  endif()
@@ -1087,7 +1116,7 @@ index 8b4b1cce9d..5b089f177f 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(grpclb_end2end_test
-@@ -20366,7 +19674,7 @@ target_link_libraries(headers_bad_client_test
+@@ -20431,7 +19735,7 @@ target_link_libraries(headers_bad_client_test
  
  
  endif()
@@ -1096,7 +1125,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(health_service_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/health/v1/health.pb.cc
-@@ -21138,7 +20446,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -21203,7 +20507,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -1105,7 +1134,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(hybrid_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc
-@@ -24436,7 +23744,7 @@ target_link_libraries(memory_quota_test
+@@ -24501,7 +23805,7 @@ target_link_libraries(memory_quota_test
  
  
  endif()
@@ -1114,7 +1143,16 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(memory_usage_test
    src/core/lib/debug/trace.cc
-@@ -25485,7 +24793,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -24556,7 +23860,7 @@ target_link_libraries(memory_usage_test
+ 
+ 
+ endif()
+-if(gRPC_BUILD_TESTS)
++if(gRPC_CF_TESTS)
+ 
+ add_executable(message_allocator_end2end_test
+   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
+@@ -25550,7 +24854,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -1123,7 +1161,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(orca_service_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_service.pb.cc
-@@ -26962,7 +26270,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -27027,7 +26331,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -1132,7 +1170,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(port_sharing_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -29364,7 +28672,7 @@ target_link_libraries(random_early_detection_test
+@@ -29430,7 +28734,7 @@ target_link_libraries(random_early_detection_test
  
  
  endif()
@@ -1141,7 +1179,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(raw_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc
-@@ -30075,7 +29383,7 @@ target_link_libraries(resolve_address_using_native_resolver_test
+@@ -30141,7 +29445,7 @@ target_link_libraries(resolve_address_using_native_resolver_test
  
  
  endif()
@@ -1150,7 +1188,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(resource_quota_end2end_stress_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -30392,7 +29700,7 @@ target_link_libraries(ring_hash_test
+@@ -30458,7 +29762,7 @@ target_link_libraries(ring_hash_test
  
  
  endif()
@@ -1159,7 +1197,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(rls_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/lookup/v1/rls.pb.cc
-@@ -31402,7 +30710,7 @@ target_link_libraries(server_early_return_test
+@@ -31468,7 +30772,7 @@ target_link_libraries(server_early_return_test
  
  
  endif()
@@ -1168,7 +1206,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(server_interceptors_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -31680,7 +30988,7 @@ target_link_libraries(server_test
+@@ -31746,7 +31050,7 @@ target_link_libraries(server_test
  
  
  endif()
@@ -1177,7 +1215,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(service_config_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc
-@@ -31798,7 +31106,7 @@ target_link_libraries(service_config_test
+@@ -31864,7 +31168,7 @@ target_link_libraries(service_config_test
  
  
  endif()
@@ -1186,7 +1224,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(session_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -32453,7 +31761,7 @@ target_link_libraries(sorted_pack_test
+@@ -32519,7 +31823,7 @@ target_link_libraries(sorted_pack_test
  
  
  endif()
@@ -1195,7 +1233,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(spiffe_bundle_map_end2end_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -34228,7 +33536,7 @@ target_link_libraries(test_core_credentials_transport_ssl_ssl_credentials_test
+@@ -34336,7 +33640,7 @@ target_link_libraries(test_core_credentials_transport_ssl_ssl_credentials_test
  
  
  endif()
@@ -1204,7 +1242,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(test_core_credentials_transport_tls_tls_credentials_test
    test/core/credentials/transport/tls/tls_credentials_test.cc
-@@ -34807,7 +34115,7 @@ target_link_libraries(test_cpp_client_credentials_test
+@@ -34915,7 +34219,7 @@ target_link_libraries(test_cpp_client_credentials_test
  
  
  endif()
@@ -1213,7 +1251,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(test_cpp_end2end_ssl_credentials_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -34879,7 +34187,7 @@ target_link_libraries(test_cpp_end2end_ssl_credentials_test
+@@ -34987,7 +34291,7 @@ target_link_libraries(test_cpp_end2end_ssl_credentials_test
  
  
  endif()
@@ -1222,7 +1260,7 @@ index 8b4b1cce9d..5b089f177f 100644
  
  add_executable(test_cpp_end2end_tls_credentials_test
    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-@@ -35875,7 +35183,7 @@ target_link_libraries(tls_key_export_test
+@@ -35983,7 +35287,7 @@ target_link_libraries(tls_key_export_test
  
  
  endif()
diff --git a/recipe/patches/0011-build-grpcio-tools-from-source.patch b/recipe/patches/0011-build-grpcio-tools-from-source.patch
index faa5993f..67a134d3 100644
--- a/recipe/patches/0011-build-grpcio-tools-from-source.patch
+++ b/recipe/patches/0011-build-grpcio-tools-from-source.patch
@@ -8,10 +8,12 @@ Subject: [PATCH 11/18] build grpcio-tools from source
  tools/distrib/python/grpcio_tools/setup.py    | 49 ++++++++++++++-----
  2 files changed, 51 insertions(+), 28 deletions(-)
 
-diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
-index 8a42929c90..40ec0fc61d 100644
---- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
-+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+---
+
+diff --git c/tools/distrib/python/grpcio_tools/protoc_lib_deps.py i/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+index dface2f..b9cc2df 100644
+--- c/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
++++ i/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
 @@ -387,21 +387,21 @@ CC_FILES=[
  ]
  
@@ -49,10 +51,10 @@ index 8a42929c90..40ec0fc61d 100644
  ]
  
  CC_INCLUDES=[
-diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py
-index f0d759dafb..32b5a4c92a 100644
---- a/tools/distrib/python/grpcio_tools/setup.py
-+++ b/tools/distrib/python/grpcio_tools/setup.py
+diff --git c/tools/distrib/python/grpcio_tools/setup.py i/tools/distrib/python/grpcio_tools/setup.py
+index 2cd129e..36e418f 100644
+--- c/tools/distrib/python/grpcio_tools/setup.py
++++ i/tools/distrib/python/grpcio_tools/setup.py
 @@ -15,6 +15,7 @@
  import errno
  import os
diff --git a/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch b/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch
index 733809f3..a1bdd0dd 100644
--- a/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch
+++ b/recipe/patches/0012-reduce-grpc-symbol-explosion-with-autogenerated-expo.patch
@@ -34,14 +34,12 @@ filter as aggressively as possible (e.g. lambdas), because our main goal is to g
 limit, and indeed, we end up <25k, and we don't want to remove symbols over-zealously if some
 other consumers end up linking to them.
 ---
- CMakeLists.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b089f177f..64088d2a54 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2457,6 +2457,30 @@ add_library(grpc
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 6937ac9..50b0289 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -2460,6 +2460,30 @@ add_library(grpc
    src/core/xds/xds_client/xds_client.cc
  )
  
@@ -72,7 +70,7 @@ index 5b089f177f..64088d2a54 100644
  target_compile_features(grpc PUBLIC cxx_std_17)
  
  set_target_properties(grpc PROPERTIES
-@@ -3201,6 +3225,30 @@ add_library(grpc_unsecure
+@@ -3205,6 +3229,30 @@ add_library(grpc_unsecure
    ${gRPC_ADDITIONAL_DLL_SRC}
  )
  
diff --git a/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch b/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch
index d36c0f6f..b6c53608 100644
--- a/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch
+++ b/recipe/patches/0013-update-GRPC_DLL-instances-where-necessary.patch
@@ -28,10 +28,12 @@ Subject: [PATCH 13/18] update GRPC_DLL instances where necessary
  src/core/util/time.h                                 |  4 ++--
  22 files changed, 34 insertions(+), 34 deletions(-)
 
-diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h
-index 47bdc8f7d7..db7442832c 100644
---- a/include/grpc/event_engine/event_engine.h
-+++ b/include/grpc/event_engine/event_engine.h
+---
+
+diff --git c/include/grpc/event_engine/event_engine.h i/include/grpc/event_engine/event_engine.h
+index 47bdc8f..db74428 100644
+--- c/include/grpc/event_engine/event_engine.h
++++ i/include/grpc/event_engine/event_engine.h
 @@ -148,7 +148,7 @@ class EventEngine : public std::enable_shared_from_this<EventEngine>,
    /// Returned by \a Connect, and can be passed to \a CancelConnect.
    struct ConnectionHandle {
@@ -41,10 +43,10 @@ index 47bdc8f7d7..db7442832c 100644
    };
    /// Thin wrapper around a platform-specific sockaddr type. A sockaddr struct
    /// exists on all platforms that gRPC supports.
-diff --git a/src/core/config/core_configuration.h b/src/core/config/core_configuration.h
-index a169f3efc2..64ec1c6964 100644
---- a/src/core/config/core_configuration.h
-+++ b/src/core/config/core_configuration.h
+diff --git c/src/core/config/core_configuration.h i/src/core/config/core_configuration.h
+index a169f3e..64ec1c6 100644
+--- c/src/core/config/core_configuration.h
++++ i/src/core/config/core_configuration.h
 @@ -40,7 +40,7 @@ namespace grpc_core {
  
  // Global singleton that stores library configuration - factories, etc...
@@ -54,10 +56,10 @@ index a169f3efc2..64ec1c6964 100644
   public:
    CoreConfiguration(const CoreConfiguration&) = delete;
    CoreConfiguration& operator=(const CoreConfiguration&) = delete;
-diff --git a/src/core/credentials/call/json_util.h b/src/core/credentials/call/json_util.h
-index da7ff0a771..d1f6a52fdf 100644
---- a/src/core/credentials/call/json_util.h
-+++ b/src/core/credentials/call/json_util.h
+diff --git c/src/core/credentials/call/json_util.h i/src/core/credentials/call/json_util.h
+index da7ff0a..d1f6a52 100644
+--- c/src/core/credentials/call/json_util.h
++++ i/src/core/credentials/call/json_util.h
 @@ -31,7 +31,7 @@
  #define GRPC_AUTH_JSON_TYPE_EXTERNAL_ACCOUNT "external_account"
  
@@ -67,10 +69,10 @@ index da7ff0a771..d1f6a52fdf 100644
                                            const char* prop_name,
                                            grpc_error_handle* error);
  
-diff --git a/src/core/credentials/transport/tls/spiffe_utils.h b/src/core/credentials/transport/tls/spiffe_utils.h
-index 9bf4b6dd59..f4cdb63489 100644
---- a/src/core/credentials/transport/tls/spiffe_utils.h
-+++ b/src/core/credentials/transport/tls/spiffe_utils.h
+diff --git c/src/core/credentials/transport/tls/spiffe_utils.h i/src/core/credentials/transport/tls/spiffe_utils.h
+index 9bf4b6d..f4cdb63 100644
+--- c/src/core/credentials/transport/tls/spiffe_utils.h
++++ i/src/core/credentials/transport/tls/spiffe_utils.h
 @@ -80,7 +80,7 @@ class SpiffeBundleKey final {
  // https://github.com/spiffe/spiffe/blob/main/standards/SPIFFE_Trust_Domain_and_Bundle.md#3-spiffe-bundles
  // https://github.com/grpc/proposal/blob/master/A87-mtls-spiffe-support.md
@@ -89,10 +91,10 @@ index 9bf4b6dd59..f4cdb63489 100644
   public:
    static const JsonLoaderInterface* JsonLoader(const JsonArgs&);
    void JsonPostLoad(const Json& json, const JsonArgs&,
-diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h
-index d1416b76dd..8880edc9c4 100644
---- a/src/core/ext/transport/chttp2/server/chttp2_server.h
-+++ b/src/core/ext/transport/chttp2/server/chttp2_server.h
+diff --git c/src/core/ext/transport/chttp2/server/chttp2_server.h i/src/core/ext/transport/chttp2/server/chttp2_server.h
+index d1416b7..8880edc 100644
+--- c/src/core/ext/transport/chttp2/server/chttp2_server.h
++++ i/src/core/ext/transport/chttp2/server/chttp2_server.h
 @@ -243,7 +243,7 @@ class PassiveListenerImpl final : public PassiveListener {
        std::unique_ptr<grpc_event_engine::experimental::EventEngine::Endpoint>
            endpoint) override ABSL_LOCKS_EXCLUDED(mu_);
@@ -102,10 +104,10 @@ index d1416b76dd..8880edc9c4 100644
        ABSL_LOCKS_EXCLUDED(mu_);
  
    void ListenerDestroyed() ABSL_LOCKS_EXCLUDED(mu_);
-diff --git a/src/core/ext/transport/inproc/inproc_transport.h b/src/core/ext/transport/inproc/inproc_transport.h
-index 05030d6e40..b1a9fe8e9a 100644
---- a/src/core/ext/transport/inproc/inproc_transport.h
-+++ b/src/core/ext/transport/inproc/inproc_transport.h
+diff --git c/src/core/ext/transport/inproc/inproc_transport.h i/src/core/ext/transport/inproc/inproc_transport.h
+index 05030d6..b1a9fe8 100644
+--- c/src/core/ext/transport/inproc/inproc_transport.h
++++ i/src/core/ext/transport/inproc/inproc_transport.h
 @@ -21,7 +21,7 @@
  #include "src/core/lib/debug/trace.h"
  #include "src/core/lib/transport/transport.h"
@@ -115,10 +117,10 @@ index 05030d6e40..b1a9fe8e9a 100644
                                           const grpc_channel_args* args,
                                           void* reserved);
  
-diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h
-index 6450a9fa6a..727e938df4 100644
---- a/src/core/lib/channel/channel_args.h
-+++ b/src/core/lib/channel/channel_args.h
+diff --git c/src/core/lib/channel/channel_args.h i/src/core/lib/channel/channel_args.h
+index 6450a9f..727e938 100644
+--- c/src/core/lib/channel/channel_args.h
++++ i/src/core/lib/channel/channel_args.h
 @@ -419,12 +419,12 @@ class ChannelArgs {
    using CPtr =
        std::unique_ptr<const grpc_channel_args, ChannelArgs::ChannelArgsDeleter>;
@@ -138,10 +140,10 @@ index 6450a9fa6a..727e938df4 100644
  
    static ChannelArgs FromC(const grpc_channel_args* args);
    static ChannelArgs FromC(const grpc_channel_args& args) {
-diff --git a/src/core/lib/debug/trace_flags.h b/src/core/lib/debug/trace_flags.h
-index 362f44ab25..a2be3f6080 100644
---- a/src/core/lib/debug/trace_flags.h
-+++ b/src/core/lib/debug/trace_flags.h
+diff --git c/src/core/lib/debug/trace_flags.h i/src/core/lib/debug/trace_flags.h
+index 362f44a..a2be3f6 100644
+--- c/src/core/lib/debug/trace_flags.h
++++ i/src/core/lib/debug/trace_flags.h
 @@ -50,7 +50,7 @@ extern DebugOnlyTraceFlag work_serializer_trace;
  extern DebugOnlyTraceFlag ztrace_trace;
  extern TraceFlag api_trace;
@@ -151,10 +153,10 @@ index 362f44ab25..a2be3f6080 100644
  extern TraceFlag backend_metric_filter_trace;
  extern TraceFlag bdp_estimator_trace;
  extern TraceFlag call_trace;
-diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h
-index e74f7c6b71..8262e87816 100644
---- a/src/core/lib/experiments/config.h
-+++ b/src/core/lib/experiments/config.h
+diff --git c/src/core/lib/experiments/config.h i/src/core/lib/experiments/config.h
+index e74f7c6..8262e87 100644
+--- c/src/core/lib/experiments/config.h
++++ i/src/core/lib/experiments/config.h
 @@ -64,7 +64,7 @@ class ExperimentFlags {
    static void TestOnlyClear();
  
@@ -173,10 +175,10 @@ index e74f7c6b71..8262e87816 100644
  };
  
  // Return true if experiment \a experiment_id is enabled.
-diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h
-index 77fb0d3731..049738860b 100644
---- a/src/core/lib/iomgr/endpoint.h
-+++ b/src/core/lib/iomgr/endpoint.h
+diff --git c/src/core/lib/iomgr/endpoint.h i/src/core/lib/iomgr/endpoint.h
+index 77fb0d3..0497388 100644
+--- c/src/core/lib/iomgr/endpoint.h
++++ i/src/core/lib/iomgr/endpoint.h
 @@ -87,7 +87,7 @@ void grpc_endpoint_write(
  
  // Causes any pending and future read/write callbacks to run immediately with
@@ -186,10 +188,10 @@ index 77fb0d3731..049738860b 100644
  
  // Add an endpoint to a pollset or pollset_set, so that when the pollset is
  // polled, events from this endpoint are considered
-diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h
-index 280471fae8..506c6e3682 100644
---- a/src/core/lib/iomgr/iomgr.h
-+++ b/src/core/lib/iomgr/iomgr.h
+diff --git c/src/core/lib/iomgr/iomgr.h i/src/core/lib/iomgr/iomgr.h
+index 280471f..506c6e3 100644
+--- c/src/core/lib/iomgr/iomgr.h
++++ i/src/core/lib/iomgr/iomgr.h
 @@ -42,7 +42,7 @@ void grpc_iomgr_shutdown_background_closure();
  // Returns true if polling engine runs in the background, false otherwise.
  // Currently only 'epollbg' runs in the background.
@@ -199,10 +201,10 @@ index 280471fae8..506c6e3682 100644
  
  /// Returns true if the caller is a worker thread for any background poller.
  bool grpc_iomgr_is_any_background_poller_thread();
-diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h
-index 9ce180b345..17f484660c 100644
---- a/src/core/lib/iomgr/socket_mutator.h
-+++ b/src/core/lib/iomgr/socket_mutator.h
+diff --git c/src/core/lib/iomgr/socket_mutator.h i/src/core/lib/iomgr/socket_mutator.h
+index 9ce180b..17f4846 100644
+--- c/src/core/lib/iomgr/socket_mutator.h
++++ i/src/core/lib/iomgr/socket_mutator.h
 @@ -67,7 +67,7 @@ void grpc_socket_mutator_init(grpc_socket_mutator* mutator,
                                const grpc_socket_mutator_vtable* vtable);
  
@@ -212,10 +214,10 @@ index 9ce180b345..17f484660c 100644
  
  /// Perform the file descriptor mutation operation of \a mutator on \a fd
  bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator* mutator, int fd,
-diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
-index 9de57809a5..9f63417587 100644
---- a/src/core/lib/promise/activity.h
-+++ b/src/core/lib/promise/activity.h
+diff --git c/src/core/lib/promise/activity.h i/src/core/lib/promise/activity.h
+index 9de5780..9f63417 100644
+--- c/src/core/lib/promise/activity.h
++++ i/src/core/lib/promise/activity.h
 @@ -75,7 +75,7 @@ struct Unwakeable final : public Wakeable {
    void Wakeup(WakeupMask) override {}
    void WakeupAsync(WakeupMask) override {}
@@ -225,10 +227,10 @@ index 9de57809a5..9f63417587 100644
  };
  static Unwakeable* unwakeable() {
    return NoDestructSingleton<Unwakeable>::Get();
-diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h
-index 35a0514089..98bd1e68c1 100644
---- a/src/core/lib/resource_quota/thread_quota.h
-+++ b/src/core/lib/resource_quota/thread_quota.h
+diff --git c/src/core/lib/resource_quota/thread_quota.h i/src/core/lib/resource_quota/thread_quota.h
+index 35a0514..98bd1e6 100644
+--- c/src/core/lib/resource_quota/thread_quota.h
++++ i/src/core/lib/resource_quota/thread_quota.h
 @@ -45,7 +45,7 @@ class ThreadQuota : public RefCounted<ThreadQuota> {
    bool Reserve(size_t num_threads);
  
@@ -238,11 +240,11 @@ index 35a0514089..98bd1e68c1 100644
  
   private:
    Mutex mu_;
-diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h
-index 348b2f71b2..ae19026c3c 100644
---- a/src/core/lib/surface/call.h
-+++ b/src/core/lib/surface/call.h
-@@ -325,9 +325,9 @@ grpc_compression_algorithm grpc_call_compression_for_level(
+diff --git c/src/core/lib/surface/call.h i/src/core/lib/surface/call.h
+index c0b0433..967b4ae 100644
+--- c/src/core/lib/surface/call.h
++++ i/src/core/lib/surface/call.h
+@@ -327,9 +327,9 @@ grpc_compression_algorithm grpc_call_compression_for_level(
  // Did this client call receive a trailers-only response
  // TODO(markdroth): This is currently available only to the C++ API.
  //                  Move to surface API if requested by other languages.
@@ -254,10 +256,10 @@ index 348b2f71b2..ae19026c3c 100644
 +GRPC_DLL absl::string_view grpc_call_server_authority(const grpc_call* call);
  
  #endif  // GRPC_SRC_CORE_LIB_SURFACE_CALL_H
-diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h
-index d99c7a248c..d68ce75f8c 100644
---- a/src/core/lib/surface/completion_queue.h
-+++ b/src/core/lib/surface/completion_queue.h
+diff --git c/src/core/lib/surface/completion_queue.h i/src/core/lib/surface/completion_queue.h
+index d99c7a2..d68ce75 100644
+--- c/src/core/lib/surface/completion_queue.h
++++ i/src/core/lib/surface/completion_queue.h
 @@ -55,8 +55,8 @@ void grpc_cq_internal_unref(grpc_completion_queue* cq, const char* reason,
  #define GRPC_CQ_INTERNAL_UNREF(cq, reason) \
    grpc_cq_internal_unref(cq, reason, __FILE__, __LINE__)
@@ -283,10 +285,10 @@ index d99c7a248c..d68ce75f8c 100644
                      grpc_error_handle error,
                      void (*done)(void* done_arg, grpc_cq_completion* storage),
                      void* done_arg, grpc_cq_completion* storage,
-diff --git a/src/core/transport/auth_context.h b/src/core/transport/auth_context.h
-index 33c6dc6057..22a61a1a99 100644
---- a/src/core/transport/auth_context.h
-+++ b/src/core/transport/auth_context.h
+diff --git c/src/core/transport/auth_context.h i/src/core/transport/auth_context.h
+index 33c6dc6..22a61a1 100644
+--- c/src/core/transport/auth_context.h
++++ i/src/core/transport/auth_context.h
 @@ -49,7 +49,7 @@ struct grpc_auth_property_array {
    size_t capacity = 0;
  };
@@ -296,11 +298,11 @@ index 33c6dc6057..22a61a1a99 100644
  
  #define GRPC_AUTH_CONTEXT_ARG "grpc.auth_context"
  
-diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h
-index 7626a4313e..cddc0f9ddc 100644
---- a/src/core/tsi/ssl_transport_security.h
-+++ b/src/core/tsi/ssl_transport_security.h
-@@ -461,7 +461,7 @@ tsi_result tsi_ssl_get_cert_chain_contents(STACK_OF(X509) * peer_chain,
+diff --git c/src/core/tsi/ssl_transport_security.h i/src/core/tsi/ssl_transport_security.h
+index f0159ba..e940176 100644
+--- c/src/core/tsi/ssl_transport_security.h
++++ i/src/core/tsi/ssl_transport_security.h
+@@ -477,7 +477,7 @@ tsi_result tsi_ssl_get_cert_chain_contents(STACK_OF(X509) * peer_chain,
                                             tsi_peer_property* property);
  
  namespace tsi {
@@ -309,10 +311,10 @@ index 7626a4313e..cddc0f9ddc 100644
  }  // namespace tsi
  
  #endif  // GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
-diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc
-index d422cbb26a..795e355b57 100644
---- a/src/core/util/json/json_reader.cc
-+++ b/src/core/util/json/json_reader.cc
+diff --git c/src/core/util/json/json_reader.cc i/src/core/util/json/json_reader.cc
+index d422cbb..795e355 100644
+--- c/src/core/util/json/json_reader.cc
++++ i/src/core/util/json/json_reader.cc
 @@ -942,7 +942,7 @@ absl::StatusOr<Json> JsonReader::Parse(absl::string_view input) {
  
  }  // namespace
@@ -322,10 +324,10 @@ index d422cbb26a..795e355b57 100644
    return JsonReader::Parse(json_str);
  }
  
-diff --git a/src/core/util/json/json_reader.h b/src/core/util/json/json_reader.h
-index 7ba5220a5e..c92f9c2d7c 100644
---- a/src/core/util/json/json_reader.h
-+++ b/src/core/util/json/json_reader.h
+diff --git c/src/core/util/json/json_reader.h i/src/core/util/json/json_reader.h
+index 7ba5220..c92f9c2 100644
+--- c/src/core/util/json/json_reader.h
++++ i/src/core/util/json/json_reader.h
 @@ -26,7 +26,7 @@
  namespace grpc_core {
  
@@ -335,10 +337,10 @@ index 7ba5220a5e..c92f9c2d7c 100644
  
  }  // namespace grpc_core
  
-diff --git a/src/core/util/load_file.h b/src/core/util/load_file.h
-index 26163f5100..8efaf085e6 100644
---- a/src/core/util/load_file.h
-+++ b/src/core/util/load_file.h
+diff --git c/src/core/util/load_file.h i/src/core/util/load_file.h
+index 26163f5..8efaf08 100644
+--- c/src/core/util/load_file.h
++++ i/src/core/util/load_file.h
 @@ -26,7 +26,7 @@ namespace grpc_core {
  
  // Loads the content of a file into a slice. add_null_terminator will add a NULL
@@ -348,10 +350,10 @@ index 26163f5100..8efaf085e6 100644
                                 bool add_null_terminator);
  }  // namespace grpc_core
  
-diff --git a/src/core/util/time.h b/src/core/util/time.h
-index 1de2b4ff99..209f23af56 100644
---- a/src/core/util/time.h
-+++ b/src/core/util/time.h
+diff --git c/src/core/util/time.h i/src/core/util/time.h
+index 1de2b4f..209f23a 100644
+--- c/src/core/util/time.h
++++ i/src/core/util/time.h
 @@ -104,7 +104,7 @@ class Timestamp {
    constexpr Timestamp() = default;
    // Constructs a Timestamp from a gpr_timespec.
diff --git a/recipe/patches/0014-use-protobuf-s-libutf8_range.patch b/recipe/patches/0014-use-protobuf-s-libutf8_range.patch
index 22f75dec..198f657b 100644
--- a/recipe/patches/0014-use-protobuf-s-libutf8_range.patch
+++ b/recipe/patches/0014-use-protobuf-s-libutf8_range.patch
@@ -7,11 +7,13 @@ Subject: [PATCH 14/18] use protobuf's libutf8_range
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64088d2a54..65b5e0a6ab 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5105,7 +5105,7 @@ target_include_directories(grpc_plugin_support
+---
+
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 50b0289..8bcb70d 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -5109,7 +5109,7 @@ target_include_directories(grpc_plugin_support
  )
  target_link_libraries(grpc_plugin_support
    ${_gRPC_ALLTARGETS_LIBRARIES}
diff --git a/recipe/patches/0015-disable-grpc-_unsecure.patch b/recipe/patches/0015-disable-grpc-_unsecure.patch
index 8ddc5849..6005a4ab 100644
--- a/recipe/patches/0015-disable-grpc-_unsecure.patch
+++ b/recipe/patches/0015-disable-grpc-_unsecure.patch
@@ -15,14 +15,12 @@ and the symbol in question (`IsRootCertInfoEmpty`) is in a file (`src/core/tsi/s
 that is explicitly excluded from `grpc_unsecure`, because that's one of the files that depends on openssl,
 the avoidance of which is the entire point of `grpc_unsecure`.
 ---
- CMakeLists.txt | 28 ++++++++++++++++++----------
- 1 file changed, 18 insertions(+), 10 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 65b5e0a6ab..0832c74900 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2694,7 +2694,7 @@ endif()
+diff --git c/CMakeLists.txt i/CMakeLists.txt
+index 8bcb70d..60b417c 100644
+--- c/CMakeLists.txt
++++ i/CMakeLists.txt
+@@ -2697,7 +2697,7 @@ endif()
  
  
  endif()
@@ -31,7 +29,7 @@ index 65b5e0a6ab..0832c74900 100644
  
  add_library(grpc_test_util_unsecure
    test/core/event_engine/test_init.cc
-@@ -2770,6 +2770,7 @@ endif()
+@@ -2773,6 +2773,7 @@ endif()
  
  endif()
  
@@ -39,7 +37,7 @@ index 65b5e0a6ab..0832c74900 100644
  add_library(grpc_unsecure
    src/core/call/call_arena_allocator.cc
    src/core/call/call_filters.cc
-@@ -3315,6 +3316,7 @@ target_link_libraries(grpc_unsecure
+@@ -3319,6 +3320,7 @@ target_link_libraries(grpc_unsecure
  if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
    target_link_libraries(grpc_unsecure PUBLIC "-framework CoreFoundation")
  endif()
@@ -47,7 +45,7 @@ index 65b5e0a6ab..0832c74900 100644
  
  foreach(_hdr
    include/grpc/byte_buffer.h
-@@ -3375,7 +3377,7 @@ foreach(_hdr
+@@ -3379,7 +3381,7 @@ foreach(_hdr
  endforeach()
  
  
@@ -56,7 +54,7 @@ index 65b5e0a6ab..0832c74900 100644
    install(TARGETS grpc_unsecure EXPORT gRPCTargets
      RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
      BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
-@@ -4300,6 +4302,7 @@ target_link_libraries(grpc++_test_util
+@@ -4304,6 +4306,7 @@ target_link_libraries(grpc++_test_util
  
  endif()
  
@@ -64,7 +62,7 @@ index 65b5e0a6ab..0832c74900 100644
  add_library(grpc++_unsecure
    src/core/client_channel/virtual_channel.cc
    src/cpp/client/call_context_registry.cc
-@@ -4395,6 +4398,7 @@ target_link_libraries(grpc++_unsecure
+@@ -4399,6 +4402,7 @@ target_link_libraries(grpc++_unsecure
    grpc_unsecure
    ${_gRPC_PROTOBUF_LIBRARIES}
  )
@@ -72,7 +70,7 @@ index 65b5e0a6ab..0832c74900 100644
  
  foreach(_hdr
    include/grpc++/alarm.h
-@@ -4617,7 +4621,7 @@ foreach(_hdr
+@@ -4621,7 +4625,7 @@ foreach(_hdr
  endforeach()
  
  
@@ -81,7 +79,7 @@ index 65b5e0a6ab..0832c74900 100644
    install(TARGETS grpc++_unsecure EXPORT gRPCTargets
      RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
      BUNDLE DESTINATION  ${gRPC_INSTALL_BINDIR}
-@@ -5573,7 +5577,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -5577,7 +5581,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -90,7 +88,7 @@ index 65b5e0a6ab..0832c74900 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(address_sorting_test_unsecure
-@@ -6204,7 +6208,7 @@ target_link_libraries(admin_services_end2end_test
+@@ -6208,7 +6212,7 @@ target_link_libraries(admin_services_end2end_test
  
  
  endif()
@@ -99,7 +97,7 @@ index 65b5e0a6ab..0832c74900 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(alarm_test
-@@ -16756,7 +16760,7 @@ target_link_libraries(filter_fusion_test
+@@ -16775,7 +16779,7 @@ target_link_libraries(filter_fusion_test
  
  
  endif()
@@ -108,7 +106,7 @@ index 65b5e0a6ab..0832c74900 100644
  
  add_executable(filter_test_test
    ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.cc
-@@ -25687,7 +25691,7 @@ target_link_libraries(parser_test
+@@ -25748,7 +25752,7 @@ target_link_libraries(parser_test
  
  
  endif()
@@ -117,7 +115,7 @@ index 65b5e0a6ab..0832c74900 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(party_mpsc_test
-@@ -25731,7 +25735,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -25792,7 +25796,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -126,7 +124,7 @@ index 65b5e0a6ab..0832c74900 100644
  
  add_executable(party_test
    test/core/promise/party_test.cc
-@@ -30369,7 +30373,7 @@ target_link_libraries(server_builder_plugin_test
+@@ -30431,7 +30435,7 @@ target_link_libraries(server_builder_plugin_test
  
  
  endif()
@@ -135,7 +133,7 @@ index 65b5e0a6ab..0832c74900 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(server_builder_test
-@@ -30444,7 +30448,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -30506,7 +30510,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
  endif()
  endif()
@@ -144,7 +142,7 @@ index 65b5e0a6ab..0832c74900 100644
  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
  
    add_executable(server_builder_with_socket_mutator_test
-@@ -54093,6 +54097,7 @@ generate_pkgconfig(
+@@ -54564,6 +54568,7 @@ generate_pkgconfig(
    "-laddress_sorting"
    "grpc.pc")
  
@@ -152,7 +150,7 @@ index 65b5e0a6ab..0832c74900 100644
  # grpc_unsecure .pc file
  generate_pkgconfig(
    "gRPC unsecure"
-@@ -54103,6 +54108,7 @@ generate_pkgconfig(
+@@ -54574,6 +54579,7 @@ generate_pkgconfig(
    "-lgrpc_unsecure -lupb"
    "-laddress_sorting"
    "grpc_unsecure.pc")
@@ -160,7 +158,7 @@ index 65b5e0a6ab..0832c74900 100644
  
  # grpc++ .pc file
  generate_pkgconfig(
-@@ -54115,6 +54121,7 @@ generate_pkgconfig(
+@@ -54586,6 +54592,7 @@ generate_pkgconfig(
    "-laddress_sorting"
    "grpc++.pc")
  
@@ -168,7 +166,7 @@ index 65b5e0a6ab..0832c74900 100644
  # grpc++_unsecure .pc file
  generate_pkgconfig(
    "gRPC++ unsecure"
-@@ -54125,6 +54132,7 @@ generate_pkgconfig(
+@@ -54596,6 +54603,7 @@ generate_pkgconfig(
    "-lgrpc++_unsecure -lupb"
    "-laddress_sorting"
    "grpc++_unsecure.pc")
diff --git a/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch b/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
index f97492f1..00d6d191 100644
--- a/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
+++ b/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
@@ -14,11 +14,13 @@ Subject: [PATCH 16/18] break out _initialize_absl into separate cython module
  rename src/python/grpcio/grpc/_cython/{_cygrpc/absl.pxd.pxi => cygrpc_absl_init.pxd} (100%)
  rename src/python/grpcio/grpc/_cython/{_cygrpc/absl.pyx.pxi => cygrpc_absl_init.pyx} (98%)
 
-diff --git a/setup.py b/setup.py
-index dbd69dc50e..ed32051472 100644
---- a/setup.py
-+++ b/setup.py
-@@ -308,7 +308,7 @@ if BUILD_WITH_STATIC_LIBSTDCXX:
+---
+
+diff --git c/setup.py i/setup.py
+index f6e1716..c0cc546 100644
+--- c/setup.py
++++ i/setup.py
+@@ -317,7 +317,7 @@ if BUILD_WITH_STATIC_LIBSTDCXX:
  
  CYTHON_EXTENSION_PACKAGE_NAMES = ()
  
@@ -27,7 +29,7 @@ index dbd69dc50e..ed32051472 100644
  
  GRPCIO_CC_SRCS = ()
  
-@@ -534,6 +534,7 @@ def cython_extensions_and_necessity():
+@@ -539,6 +539,7 @@ def cython_extensions_and_necessity():
                  + core_c_files
                  + asm_files
              ),
@@ -35,10 +37,10 @@ index dbd69dc50e..ed32051472 100644
              include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
              libraries=list(EXTENSION_LIBRARIES),
              define_macros=list(DEFINE_MACROS),
-diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py
-index efee8bcfcb..3d872c73dc 100644
---- a/src/python/grpcio/grpc/__init__.py
-+++ b/src/python/grpcio/grpc/__init__.py
+diff --git c/src/python/grpcio/grpc/__init__.py i/src/python/grpcio/grpc/__init__.py
+index efee8bc..3d872c7 100644
+--- c/src/python/grpcio/grpc/__init__.py
++++ i/src/python/grpcio/grpc/__init__.py
 @@ -21,6 +21,9 @@ import sys
  import typing
  from typing import Any, Protocol
@@ -49,10 +51,10 @@ index efee8bcfcb..3d872c73dc 100644
  from grpc import _compression
  from grpc._cython import cygrpc as _cygrpc
  from grpc._runtime_protos import protos
-diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pxd b/src/python/grpcio/grpc/_cython/cygrpc.pxd
-index 2cf29d0816..38d5500ae4 100644
---- a/src/python/grpcio/grpc/_cython/cygrpc.pxd
-+++ b/src/python/grpcio/grpc/_cython/cygrpc.pxd
+diff --git c/src/python/grpcio/grpc/_cython/cygrpc.pxd i/src/python/grpcio/grpc/_cython/cygrpc.pxd
+index 2cf29d0..38d5500 100644
+--- c/src/python/grpcio/grpc/_cython/cygrpc.pxd
++++ i/src/python/grpcio/grpc/_cython/cygrpc.pxd
 @@ -17,8 +17,6 @@ cimport cpython
  
  include "_cygrpc/grpc.pxi"
@@ -62,10 +64,10 @@ index 2cf29d0816..38d5500ae4 100644
  include "_cygrpc/arguments.pxd.pxi"
  include "_cygrpc/call.pxd.pxi"
  include "_cygrpc/channel.pxd.pxi"
-diff --git a/src/python/grpcio/grpc/_cython/cygrpc.pyx b/src/python/grpcio/grpc/_cython/cygrpc.pyx
-index b3acae4aa3..79cd0f878d 100644
---- a/src/python/grpcio/grpc/_cython/cygrpc.pyx
-+++ b/src/python/grpcio/grpc/_cython/cygrpc.pyx
+diff --git c/src/python/grpcio/grpc/_cython/cygrpc.pyx i/src/python/grpcio/grpc/_cython/cygrpc.pyx
+index b3acae4..79cd0f8 100644
+--- c/src/python/grpcio/grpc/_cython/cygrpc.pyx
++++ i/src/python/grpcio/grpc/_cython/cygrpc.pyx
 @@ -37,7 +37,6 @@ _LOGGER = logging.getLogger(__name__)
  # TODO(atash): figure out why the coverage tool gets confused about the Cython
  # coverage plugin when the following files don't have a '.pxi' suffix.
@@ -74,17 +76,17 @@ index b3acae4aa3..79cd0f878d 100644
  include "_cygrpc/arguments.pyx.pxi"
  include "_cygrpc/call.pyx.pxi"
  include "_cygrpc/channel.pyx.pxi"
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/absl.pxd.pxi b/src/python/grpcio/grpc/_cython/cygrpc_absl_init.pxd
+diff --git c/src/python/grpcio/grpc/_cython/_cygrpc/absl.pxd.pxi i/src/python/grpcio/grpc/_cython/cygrpc_absl_init.pxd
 similarity index 100%
 rename from src/python/grpcio/grpc/_cython/_cygrpc/absl.pxd.pxi
 rename to src/python/grpcio/grpc/_cython/cygrpc_absl_init.pxd
-diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/absl.pyx.pxi b/src/python/grpcio/grpc/_cython/cygrpc_absl_init.pyx
+diff --git c/src/python/grpcio/grpc/_cython/_cygrpc/absl.pyx.pxi i/src/python/grpcio/grpc/_cython/cygrpc_absl_init.pyx
 similarity index 98%
 rename from src/python/grpcio/grpc/_cython/_cygrpc/absl.pyx.pxi
 rename to src/python/grpcio/grpc/_cython/cygrpc_absl_init.pyx
-index f38a8f5b57..859bd062f1 100644
---- a/src/python/grpcio/grpc/_cython/_cygrpc/absl.pyx.pxi
-+++ b/src/python/grpcio/grpc/_cython/cygrpc_absl_init.pyx
+index f38a8f5..859bd06 100644
+--- c/src/python/grpcio/grpc/_cython/_cygrpc/absl.pyx.pxi
++++ i/src/python/grpcio/grpc/_cython/cygrpc_absl_init.pyx
 @@ -12,6 +12,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
diff --git a/recipe/patches/0017-silence-absl-MutexLock-pointer-deprecation-warnings.patch b/recipe/patches/0017-silence-absl-MutexLock-pointer-deprecation-warnings.patch
index 9866a89e..8808ca1d 100644
--- a/recipe/patches/0017-silence-absl-MutexLock-pointer-deprecation-warnings.patch
+++ b/recipe/patches/0017-silence-absl-MutexLock-pointer-deprecation-warnings.patch
@@ -10,14 +10,11 @@ places, which spams -Wdeprecated-declarations during test builds.
 Provide thin grpc_core/grpc::internal wrappers that accept Mutex* but
 delegate to absl's reference-taking constructors.
 ---
- include/grpcpp/impl/sync.h | 33 +++++++++++++++++++++++++++++++--
- src/core/util/sync.h       | 33 +++++++++++++++++++++++++++++++--
- 2 files changed, 62 insertions(+), 4 deletions(-)
 
-diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h
-index dcd4dcd1e8..66001ec63e 100644
---- a/include/grpcpp/impl/sync.h
-+++ b/include/grpcpp/impl/sync.h
+diff --git c/include/grpcpp/impl/sync.h i/include/grpcpp/impl/sync.h
+index dcd4dcd..66001ec 100644
+--- c/include/grpcpp/impl/sync.h
++++ i/include/grpcpp/impl/sync.h
 @@ -48,10 +48,39 @@ namespace internal {
  #ifdef GPR_ABSEIL_SYNC
  
@@ -60,10 +57,10 @@ index dcd4dcd1e8..66001ec63e 100644
  #else
  
  class ABSL_LOCKABLE Mutex {
-diff --git a/src/core/util/sync.h b/src/core/util/sync.h
-index 77d1a54206..33c7c13a73 100644
---- a/src/core/util/sync.h
-+++ b/src/core/util/sync.h
+diff --git c/src/core/util/sync.h i/src/core/util/sync.h
+index 77d1a54..33c7c13 100644
+--- c/src/core/util/sync.h
++++ i/src/core/util/sync.h
 @@ -44,10 +44,39 @@ namespace grpc_core {
  #ifdef GPR_ABSEIL_SYNC
  
diff --git a/recipe/patches/0018-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch b/recipe/patches/0018-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch
index 5f77883b..42d20fe7 100644
--- a/recipe/patches/0018-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch
+++ b/recipe/patches/0018-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch
@@ -12,15 +12,11 @@ Provide a thin grpc_core/grpc::internal Mutex wrapper that forwards the
 legacy names to the standard methods, and use the standard methods in the
 gpr_mu compatibility layer.
 ---
- include/grpcpp/impl/sync.h   | 11 ++++++++++-
- src/core/util/sync.h         | 14 +++++++++++++-
- src/core/util/sync_abseil.cc |  6 +++---
- 3 files changed, 26 insertions(+), 5 deletions(-)
 
-diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h
-index 66001ec63e..148ccc3d14 100644
---- a/include/grpcpp/impl/sync.h
-+++ b/include/grpcpp/impl/sync.h
+diff --git c/include/grpcpp/impl/sync.h i/include/grpcpp/impl/sync.h
+index 66001ec..148ccc3 100644
+--- c/include/grpcpp/impl/sync.h
++++ i/include/grpcpp/impl/sync.h
 @@ -47,7 +47,16 @@ namespace internal {
  
  #ifdef GPR_ABSEIL_SYNC
@@ -39,10 +35,10 @@ index 66001ec63e..148ccc3d14 100644
  using CondVar = absl::CondVar;
  
  // absl deprecated MutexLock(Mutex*) in favor of MutexLock(Mutex&), but grpc
-diff --git a/src/core/util/sync.h b/src/core/util/sync.h
-index 33c7c13a73..2d8d8ab136 100644
---- a/src/core/util/sync.h
-+++ b/src/core/util/sync.h
+diff --git c/src/core/util/sync.h i/src/core/util/sync.h
+index 33c7c13..2d8d8ab 100644
+--- c/src/core/util/sync.h
++++ i/src/core/util/sync.h
 @@ -43,7 +43,19 @@ namespace grpc_core {
  
  #ifdef GPR_ABSEIL_SYNC
@@ -64,10 +60,10 @@ index 33c7c13a73..2d8d8ab136 100644
  using CondVar = absl::CondVar;
  
  // absl deprecated MutexLock(Mutex*) in favor of MutexLock(Mutex&), but grpc
-diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc
-index d1cd7f71a3..8a38a24497 100644
---- a/src/core/util/sync_abseil.cc
-+++ b/src/core/util/sync_abseil.cc
+diff --git c/src/core/util/sync_abseil.cc i/src/core/util/sync_abseil.cc
+index d1cd7f7..8a38a24 100644
+--- c/src/core/util/sync_abseil.cc
++++ i/src/core/util/sync_abseil.cc
 @@ -43,15 +43,15 @@ void gpr_mu_destroy(gpr_mu* mu) {
  }
  

From 0dfa694d8d047557e7c51fadeb68552b7512c7ae Mon Sep 17 00:00:00 2001
From: Julien Jerphanion <git@jjerphan.xyz>
Date: Tue, 28 Jul 2026 10:11:11 +0200
Subject: [PATCH 4/4] patch: fix macOS import of `cygrpc_absl_init`

Export `_PyInit_cygrpc_absl_init` so the second Cython extension
is not stripped by `-Wl,-exported_symbol,_PyInit_cygrpc`.

Signed-off-by: Julien Jerphanion <git@jjerphan.xyz>
---
 ...alize_absl-into-separate-cython-modu.patch | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch b/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
index 00d6d191..1dfa10df 100644
--- a/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
+++ b/recipe/patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
@@ -1,26 +1,32 @@
-From 9506087de3c749a0b081eb8518eba341ac4d9e98 Mon Sep 17 00:00:00 2001
+From adbba1992ae39845ed8dd969b5f9adf73e04420c Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sat, 21 Feb 2026 14:29:28 +1100
 Subject: [PATCH 16/18] break out _initialize_absl into separate cython module
 
 ---
- setup.py                                                       | 3 ++-
- src/python/grpcio/grpc/__init__.py                             | 3 +++
- src/python/grpcio/grpc/_cython/cygrpc.pxd                      | 2 --
- src/python/grpcio/grpc/_cython/cygrpc.pyx                      | 1 -
- .../_cython/{_cygrpc/absl.pxd.pxi => cygrpc_absl_init.pxd}     | 0
- .../_cython/{_cygrpc/absl.pyx.pxi => cygrpc_absl_init.pyx}     | 1 +
- 6 files changed, 6 insertions(+), 4 deletions(-)
+ setup.py                                                      | 4 +++-
+ src/python/grpcio/grpc/__init__.py                            | 3 +++
+ src/python/grpcio/grpc/_cython/cygrpc.pxd                     | 2 --
+ src/python/grpcio/grpc/_cython/cygrpc.pyx                     | 1 -
+ .../_cython/{_cygrpc/absl.pxd.pxi => cygrpc_absl_init.pxd}    | 0
+ .../_cython/{_cygrpc/absl.pyx.pxi => cygrpc_absl_init.pyx}    | 1 +
+ 6 files changed, 7 insertions(+), 4 deletions(-)
  rename src/python/grpcio/grpc/_cython/{_cygrpc/absl.pxd.pxi => cygrpc_absl_init.pxd} (100%)
  rename src/python/grpcio/grpc/_cython/{_cygrpc/absl.pyx.pxi => cygrpc_absl_init.pyx} (98%)
 
----
-
 diff --git c/setup.py i/setup.py
-index f6e1716..c0cc546 100644
+index f6e1716..8f2bd6c 100644
 --- c/setup.py
 +++ i/setup.py
-@@ -317,7 +317,7 @@ if BUILD_WITH_STATIC_LIBSTDCXX:
+@@ -308,6 +308,7 @@ if EXTRA_ENV_LINK_ARGS is None:
+ if "darwin" in sys.platform:
+     EXTRA_ENV_LINK_ARGS += " -framework CoreFoundation"
+     EXTRA_ENV_LINK_ARGS += " -Wl,-exported_symbol,_PyInit_cygrpc"
++    EXTRA_ENV_LINK_ARGS += " -Wl,-exported_symbol,_PyInit_cygrpc_absl_init"
+ 
+ EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS)
+ EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS)
+@@ -317,7 +318,7 @@ if BUILD_WITH_STATIC_LIBSTDCXX:
  
  CYTHON_EXTENSION_PACKAGE_NAMES = ()
  
@@ -29,7 +35,7 @@ index f6e1716..c0cc546 100644
  
  GRPCIO_CC_SRCS = ()
  
-@@ -539,6 +539,7 @@ def cython_extensions_and_necessity():
+@@ -539,6 +540,7 @@ def cython_extensions_and_necessity():
                  + core_c_files
                  + asm_files
              ),
@@ -95,3 +101,6 @@ index f38a8f5..859bd06 100644
  
  cdef bint _disable_absl_init_log = os.environ.get("GRPC_PYTHON_DISABLE_ABSL_INIT_LOG", "") in {"1", "t", "true", "y", "yes"}
  
+-- 
+2.55.0
+