grpc-cpp v1.81.1

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.81.0" %}
+{% set version = "1.81.1" %}
 
 # 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: 41b695614b26652ff9e97ce50cfd4a6c7a3d45a9fe598d1454407746499bbf2c
+    sha256: 48ae0d05f87206112d9e9144a923191ee1e482141a70686ec58dc86d0b40fddc
     patches:
       - patches/0001-windows-ssl-lib-names.patch
       - patches/0002-fix-win-setup-cmds.patch
@@ -50,6 +50,10 @@ source:
       - patches/0016-break-out-_initialize_absl-into-separate-cython-modu.patch
       # backport https://github.com/grpc/grpc/pull/41910
       - patches/0017-fix-double-metric-registration-across-shared-librari.patch
+      # silence absl::MutexLock(Mutex*) deprecation warnings on newer abseil
+      - patches/0018-silence-absl-MutexLock-pointer-deprecation-warnings.patch
+      # silence absl::Mutex::Lock()/Unlock() deprecation warnings on newer abseil
+      - patches/0019-silence-absl-Mutex-Lock-Unlock-deprecation-warnings.patch
 
   {% if build_platform == target_platform and not win %}
   - folder: third_party/benchmark

recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch

@@ -13,10 +13,10 @@ Co-Authored-By: Mark Harfouche <mark.harfouche@gmail.com>
  1 file changed, 58 insertions(+), 48 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c72bd40..cd53f12 100644
+index 6825714..691f64f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3173,34 +3173,39 @@ target_include_directories(grpc
+@@ -3174,34 +3174,39 @@ target_include_directories(grpc
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc
@@ -82,7 +82,7 @@ index c72bd40..cd53f12 100644
  endif()
 
  foreach(_hdr
-@@ -3914,31 +3919,36 @@ target_include_directories(grpc_unsecure
+@@ -3915,31 +3920,36 @@ target_include_directories(grpc_unsecure
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc_unsecure

recipe/patches/0006-for-main-targets-set-_DLL_EXPORTS-when-building-and-.patch

@@ -9,10 +9,10 @@ Subject: [PATCH 06/17] for main targets, set *_DLL_EXPORTS when building and
  1 file changed, 10 insertions(+), 26 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd53f12..9c800b1 100644
+index 691f64f..aaec62d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2118,10 +2118,8 @@ if(WIN32 AND MSVC)
+@@ -2119,10 +2119,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -25,7 +25,7 @@ index cd53f12..9c800b1 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gpr.pdb
-@@ -3146,11 +3144,8 @@ if(WIN32 AND MSVC)
+@@ -3147,11 +3145,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -39,7 +39,7 @@ index cd53f12..9c800b1 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc.pdb
-@@ -3892,11 +3887,8 @@ if(WIN32 AND MSVC)
+@@ -3893,11 +3888,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -53,7 +53,7 @@ index cd53f12..9c800b1 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_unsecure.pdb
-@@ -5007,12 +4999,8 @@ if(WIN32 AND MSVC)
+@@ -5008,12 +5000,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)
@@ -68,7 +68,7 @@ index cd53f12..9c800b1 100644
    endif()
    if(gRPC_INSTALL)
      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc++.pdb
-@@ -5755,12 +5743,8 @@ if(WIN32 AND MSVC)
+@@ -5756,12 +5744,8 @@ if(WIN32 AND MSVC)
      COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
    if(BUILD_SHARED_LIBS)

recipe/patches/0007-add-missing-linkages-for-gRPC_BUILD_TESTS-ON.patch

@@ -14,90 +14,90 @@ For some tests, re2 and c-ares have just been forgotten as dependencies.
  1 file changed, 11 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c800b1..b9ee9cc 100644
+index aaec62d..616885f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3336,6 +3336,7 @@ target_link_libraries(grpc_test_util
+@@ -3337,6 +3337,7 @@ target_link_libraries(grpc_test_util
    ${_gRPC_ALLTARGETS_LIBRARIES}
    absl::failure_signal_handler
    absl::stacktrace
 +  absl::statusor
    absl::symbolize
    absl::log_initialize
    grpc
-@@ -3410,6 +3411,7 @@ target_link_libraries(grpc_test_util_unsecure
+@@ -3411,6 +3412,7 @@ target_link_libraries(grpc_test_util_unsecure
    ${_gRPC_ALLTARGETS_LIBRARIES}
    absl::failure_signal_handler
    absl::stacktrace
 +  absl::statusor
    absl::symbolize
    absl::log_initialize
    grpc_unsecure
-@@ -8697,6 +8699,7 @@ target_include_directories(authorization_matchers_test
+@@ -8698,6 +8700,7 @@ target_include_directories(authorization_matchers_test
  )
 
  target_link_libraries(authorization_matchers_test
 +  ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -19207,6 +19210,7 @@ target_include_directories(grpc_authorization_engine_test
+@@ -19208,6 +19211,7 @@ target_include_directories(grpc_authorization_engine_test
  )
 
  target_link_libraries(grpc_authorization_engine_test
 +  ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -21476,6 +21480,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+@@ -21477,6 +21481,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
    )
 
    target_link_libraries(httpcli_test
 +    ${_gRPC_CARES_LIBRARIES}
      ${_gRPC_ALLTARGETS_LIBRARIES}
      gtest
      grpc++_test_util
-@@ -24783,6 +24788,7 @@ target_include_directories(matchers_test
+@@ -24784,6 +24789,7 @@ target_include_directories(matchers_test
  )
 
  target_link_libraries(matchers_test
 +  ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -30271,6 +30277,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
+@@ -30272,6 +30278,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
  )
 
  target_link_libraries(resolve_address_using_ares_resolver_test
 +  ${_gRPC_CARES_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -30359,6 +30366,7 @@ target_include_directories(resolve_address_using_native_resolver_test
+@@ -30360,6 +30367,7 @@ target_include_directories(resolve_address_using_native_resolver_test
  )
 
  target_link_libraries(resolve_address_using_native_resolver_test
 +  ${_gRPC_CARES_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -41393,6 +41401,7 @@ target_include_directories(xds_common_types_test
+@@ -41436,6 +41444,7 @@ target_include_directories(xds_common_types_test
  )
 
  target_link_libraries(xds_common_types_test
 +  ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    absl::fixed_array
-@@ -42622,6 +42631,7 @@ target_include_directories(xds_credentials_test
+@@ -42665,6 +42674,7 @@ target_include_directories(xds_credentials_test
  )
 
  target_link_libraries(xds_credentials_test
 +  ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ALLTARGETS_LIBRARIES}
    gtest
    grpc_test_util
-@@ -47809,6 +47819,7 @@ target_include_directories(xds_listener_resource_type_test
+@@ -47852,6 +47862,7 @@ target_include_directories(xds_listener_resource_type_test
  )
 
  target_link_libraries(xds_listener_resource_type_test

recipe/patches/0008-add-enable_testing-so-tests-get-run.patch

@@ -8,7 +8,7 @@ Subject: [PATCH 08/17] add enable_testing so tests get run
  1 file changed, 4 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b9ee9cc..df0b7af 100644
+index 616885f..c2975ee 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -51,6 +51,10 @@ option(gRPC_BUILD_TESTS "Build tests" OFF)

recipe/patches/0009-unvendor-upb-and-utf8_range-use-protobuf-s-version.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 09/17] unvendor upb and utf8_range, use protobuf's version
  2 files changed, 16 insertions(+), 684 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df0b7af..b8e930b 100644
+index c2975ee..8b170fb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -354,11 +354,15 @@ else()
@@ -29,7 +29,7 @@ index df0b7af..b8e930b 100644
    if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
      find_library(LIBRT rt)
      if(LIBRT)
-@@ -3176,8 +3180,6 @@ target_link_libraries(grpc
+@@ -3177,8 +3181,6 @@ target_link_libraries(grpc
    PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES}
    # vendored libs
    PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES}
@@ -38,15 +38,15 @@ index df0b7af..b8e930b 100644
    # external dependencies used within grpc
    PRIVATE ${_gRPC_CARES_LIBRARIES}
    PRIVATE ${_gRPC_RE2_LIBRARIES}
-@@ -3921,7 +3923,6 @@ target_link_libraries(grpc_unsecure
+@@ -3922,7 +3924,6 @@ target_link_libraries(grpc_unsecure
    PRIVATE ${_gRPC_ALLTARGETS_LIBRARIES}
    # vendored libs
    PRIVATE ${_gRPC_ADDRESS_SORTING_LIBRARIES}
 -  upb_textformat_lib
    # external dependencies used within grpc
    PRIVATE ${_gRPC_ZLIB_LIBRARIES}
    PRIVATE ${_gRPC_CARES_LIBRARIES}
-@@ -4091,763 +4092,6 @@ target_link_libraries(gtest
+@@ -4092,763 +4093,6 @@ target_link_libraries(gtest
 
  endif()
 
@@ -810,15 +810,15 @@ index df0b7af..b8e930b 100644
 
  if(gRPC_BUILD_TESTS)
 
-@@ -6361,7 +5605,6 @@ target_include_directories(grpc_authorization_provider
+@@ -6362,7 +5606,6 @@ target_include_directories(grpc_authorization_provider
  )
  target_link_libraries(grpc_authorization_provider
    ${_gRPC_ALLTARGETS_LIBRARIES}
 -  upb_textformat_lib
    ${_gRPC_RE2_LIBRARIES}
    ${_gRPC_ZLIB_LIBRARIES}
    absl::no_destructor
-@@ -54925,8 +54168,8 @@ generate_pkgconfig(
+@@ -54968,8 +54211,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"
@@ -829,7 +829,7 @@ index df0b7af..b8e930b 100644
    "grpc.pc")
 
  # grpc_unsecure .pc file
-@@ -54936,8 +54179,8 @@ generate_pkgconfig(
+@@ -54979,8 +54222,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"
@@ -840,7 +840,7 @@ index df0b7af..b8e930b 100644
    "grpc_unsecure.pc")
 
  # grpc++ .pc file
-@@ -54947,8 +54190,8 @@ generate_pkgconfig(
+@@ -54990,8 +54233,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_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"
@@ -851,7 +851,7 @@ index df0b7af..b8e930b 100644
    "grpc++.pc")
 
  # grpc++_unsecure .pc file
-@@ -54958,8 +54201,8 @@ generate_pkgconfig(
+@@ -55001,8 +54244,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_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"
@@ -862,7 +862,7 @@ index df0b7af..b8e930b 100644
    "grpc++_unsecure.pc")
 
  if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
-@@ -54970,7 +54213,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN)
+@@ -55013,7 +54256,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_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"