[grpc] Update to v1.32.0 (#14111)

6 files changed, 217 insertions, 216 deletions

diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch
index ad890cf00..ac1d1ae58 100644
--- a/ports/grpc/00005-fix-uwp-error.patch
+++ b/ports/grpc/00005-fix-uwp-error.patch
@@ -1,34 +1,34 @@
-diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
-index 0dacbfef3e..310bf1de1b 100644
---- a/src/core/lib/slice/slice.cc
-+++ b/src/core/lib/slice/slice.cc
-@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
-                                         size_t len) {
-   uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
-   grpc_slice slice;
-+  memset(&slice, 0, sizeof(grpc_slice));
-   if (len <= sizeof(slice.data.inlined.bytes)) {
-     slice.refcount = nullptr;
-     slice.data.inlined.length = len;
-@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {
- }
- 
- grpc_slice grpc_slice_from_cpp_string(std::string str) {
--  grpc_slice slice;
-+  grpc_slice slice = { 0 };
-   if (str.size() <= sizeof(slice.data.inlined.bytes)) {
-     slice.refcount = nullptr;
-     slice.data.inlined.length = str.size();
-diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
-index cab0cd56c4..2c88fd625b 100644
---- a/src/core/lib/surface/server.cc
-+++ b/src/core/lib/surface/server.cc
-@@ -1301,7 +1301,7 @@ grpc_call_error queue_call_request(grpc_server* server, size_t cq_idx,
-               GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));
-     return GRPC_CALL_OK;
-   }
--  RequestMatcherInterface* rm;
-+  RequestMatcherInterface* rm = nullptr;
-   switch (rc->type) {
-     case RequestedCallType::BATCH_CALL:
-       rm = server->unregistered_request_matcher.get();
+diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc

+index 0dacbfe..0743a1b 100644

+--- a/src/core/lib/slice/slice.cc

++++ b/src/core/lib/slice/slice.cc

+@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,

+                                         size_t len) {

+   uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());

+   grpc_slice slice;

++  memset(&slice, 0, sizeof(grpc_slice));

+   if (len <= sizeof(slice.data.inlined.bytes)) {

+     slice.refcount = nullptr;

+     slice.data.inlined.length = len;

+@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr<char> p) {

+ }

+ 

+ grpc_slice grpc_slice_from_cpp_string(std::string str) {

+-  grpc_slice slice;

++  grpc_slice slice = { 0 };

+   if (str.size() <= sizeof(slice.data.inlined.bytes)) {

+     slice.refcount = nullptr;

+     slice.data.inlined.length = str.size();

+diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc

+index c945515..3fd9797 100644

+--- a/src/core/lib/surface/server.cc

++++ b/src/core/lib/surface/server.cc

+@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) {

+              GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown"));

+     return GRPC_CALL_OK;

+   }

+-  RequestMatcherInterface* rm;

++  RequestMatcherInterface* rm = nullptr;

+   switch (rc->type) {

+     case RequestedCall::Type::BATCH_CALL:

+       rm = unregistered_request_matcher_.get();

diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch
index 0c8c90cf6..117c8c010 100644
--- a/ports/grpc/00009-use-system-upb.patch
+++ b/ports/grpc/00009-use-system-upb.patch
@@ -1,139 +1,140 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a337149f1f..6baab5d37b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
- set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library")
- set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
- 
-+set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
-+set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
-+
- set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
- set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
- 
-@@ -1807,7 +1810,6 @@ target_link_libraries(grpc
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   gpr
-   address_sorting
--  upb
-   absl::optional
-   absl::strings
-   absl::inlined_vector
-@@ -1887,7 +1889,6 @@ target_link_libraries(grpc_csharp_ext
-   grpc
-   gpr
-   address_sorting
--  upb
- )
- 
- 
-@@ -2409,7 +2410,6 @@ target_link_libraries(grpc_unsecure
-   ${_gRPC_ALLTARGETS_LIBRARIES}
-   gpr
-   address_sorting
--  upb
-   absl::optional
-   absl::strings
-   absl::inlined_vector
-@@ -2606,7 +2606,6 @@ target_link_libraries(grpc++
-   grpc
-   gpr
-   address_sorting
--  upb
- )
- 
- foreach(_hdr
-@@ -2876,7 +2875,6 @@ target_link_libraries(grpc++_alts
-   grpc
-   gpr
-   address_sorting
--  upb
- )
- 
- foreach(_hdr
-@@ -2945,7 +2943,6 @@ target_link_libraries(grpc++_error_details
-   grpc
-   gpr
-   address_sorting
--  upb
- )
- 
- foreach(_hdr
-@@ -3019,7 +3016,6 @@ target_link_libraries(grpc++_reflection
-   grpc
-   gpr
-   address_sorting
--  upb
- )
- 
- foreach(_hdr
-@@ -3300,7 +3296,6 @@ target_link_libraries(grpc++_unsecure
-   grpc_unsecure
-   gpr
-   address_sorting
--  upb
- )
- 
- foreach(_hdr
-@@ -3642,7 +3637,6 @@ target_link_libraries(grpcpp_channelz
-   grpc
-   gpr
-   address_sorting
--  upb
- )
- 
- foreach(_hdr
-@@ -3669,6 +3663,7 @@ endif()
- 
- endif()
- 
-+if (gRPC_UPB_PROVIDER STREQUAL "module")
- add_library(upb
-   third_party/upb/upb/decode.c
-   third_party/upb/upb/encode.c
-@@ -3719,7 +3714,7 @@ if(gRPC_INSTALL)
-     ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-   )
- endif()
--
-+endif()
- 
- 
- add_executable(check_epollexclusive
-diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
-index 3623f4aa5e..df6ced560e 100644
---- a/cmake/gRPCConfig.cmake.in
-+++ b/cmake/gRPCConfig.cmake.in
-@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
- @_gRPC_FIND_CARES@
- @_gRPC_FIND_ABSL@
- @_gRPC_FIND_RE2@
-+@_gRPC_FIND_UPB@
- 
- # Targets
- include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
-diff --git a/cmake/upb.cmake b/cmake/upb.cmake
-index 2c0ab84e67..07dd613a78 100644
---- a/cmake/upb.cmake
-+++ b/cmake/upb.cmake
-@@ -12,9 +12,18 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
-+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
-+if (gRPC_UPB_PROVIDER STREQUAL "module")
- set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
- 
- set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
--set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
- 
- set(_gRPC_UPB_LIBRARIES upb)
-+
-+elseif(gRPC_UPB_PROVIDER STREQUAL "package")
-+    find_package(upb CONFIG REQUIRED)
-+    set(_gRPC_UPB_LIBRARIES upb::upb)
-+    set(_gRPC_UPB_INCLUDE_DIR)
-+    set(upb ${_gRPC_UPB_LIBRARIES})
-+    set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")
-+endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index e3fe299..4bae849 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")

+ set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library")

+ set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")

+ 

++set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")

++set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")

++

+ set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")

+ set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")

+ 

+@@ -1891,7 +1894,6 @@ target_link_libraries(grpc

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+   address_sorting

+-  upb

+   absl::optional

+   absl::strings

+   absl::status

+@@ -1973,7 +1975,6 @@ target_link_libraries(grpc_csharp_ext

+   grpc

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ 

+@@ -2503,7 +2504,6 @@ target_link_libraries(grpc_unsecure

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   gpr

+   address_sorting

+-  upb

+   absl::optional

+   absl::strings

+   absl::status

+@@ -2701,7 +2701,6 @@ target_link_libraries(grpc++

+   grpc

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ foreach(_hdr

+@@ -2963,7 +2962,6 @@ target_link_libraries(grpc++_alts

+   grpc

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ foreach(_hdr

+@@ -3032,7 +3030,6 @@ target_link_libraries(grpc++_error_details

+   grpc

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ foreach(_hdr

+@@ -3105,7 +3102,6 @@ target_link_libraries(grpc++_reflection

+   grpc

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ foreach(_hdr

+@@ -3386,7 +3382,6 @@ target_link_libraries(grpc++_unsecure

+   grpc_unsecure

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ foreach(_hdr

+@@ -3720,7 +3715,6 @@ target_link_libraries(grpcpp_channelz

+   grpc

+   gpr

+   address_sorting

+-  upb

+ )

+ 

+ foreach(_hdr

+@@ -3747,6 +3741,7 @@ endif()

+ 

+ endif()

+ 

++if (gRPC_UPB_PROVIDER STREQUAL "module")

+ add_library(upb

+   third_party/upb/upb/decode.c

+   third_party/upb/upb/encode.c

+@@ -3798,7 +3793,7 @@ if(gRPC_INSTALL)

+   )

+ endif()

+ 

+-

++endif()

+ 

+ add_executable(check_epollexclusive

+   test/build/check_epollexclusive.c

+diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in

+index 3623f4a..df6ced5 100644

+--- a/cmake/gRPCConfig.cmake.in

++++ b/cmake/gRPCConfig.cmake.in

+@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)

+ @_gRPC_FIND_CARES@

+ @_gRPC_FIND_ABSL@

+ @_gRPC_FIND_RE2@

++@_gRPC_FIND_UPB@

+ 

+ # Targets

+ include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)

+diff --git a/cmake/upb.cmake b/cmake/upb.cmake

+index f2a0e50..ecce7ba 100644

+--- a/cmake/upb.cmake

++++ b/cmake/upb.cmake

+@@ -12,9 +12,20 @@

+ # See the License for the specific language governing permissions and

+ # limitations under the License.

+ 

++set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")

++if (gRPC_UPB_PROVIDER STREQUAL "module")

++

+ set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)

+ 

+ set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")

+ set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")

+ 

+ set(_gRPC_UPB_LIBRARIES upb)

++

++elseif(gRPC_UPB_PROVIDER STREQUAL "package")

++    find_package(upb CONFIG REQUIRED)

++    set(_gRPC_UPB_LIBRARIES upb::upb)

++    set(_gRPC_UPB_INCLUDE_DIR)

++    set(upb ${_gRPC_UPB_LIBRARIES})

++    set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n  find_package(upb CONFIG REQUIRED)\nendif()")

++endif()

diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch
index 8940cd2d6..b3d5a107c 100644
--- a/ports/grpc/00010-add-feature-absl-sync.patch
+++ b/ports/grpc/00010-add-feature-absl-sync.patch
@@ -1,34 +1,34 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6baab5d37b..48bc6cf0de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1813,6 +1813,8 @@ target_link_libraries(grpc
-   absl::optional
-   absl::strings
-   absl::inlined_vector
-+  absl::time
-+  absl::synchronization
- )
- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
-   target_link_libraries(grpc "-framework CoreFoundation")
-@@ -2413,6 +2415,8 @@ target_link_libraries(grpc_unsecure
-   absl::optional
-   absl::strings
-   absl::inlined_vector
-+  absl::time
-+  absl::synchronization
- )
- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
-   target_link_libraries(grpc_unsecure "-framework CoreFoundation")
-diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
-index 078d495417..b6f50bd14c 100644
---- a/cmake/abseil-cpp.cmake
-+++ b/cmake/abseil-cpp.cmake
-@@ -37,4 +37,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")
-   # Use "CONFIG" as there is no built-in cmake module for absl.
-   find_package(absl REQUIRED CONFIG)
-   set(_gRPC_FIND_ABSL "if(NOT absl_FOUND)\n  find_package(absl CONFIG)\nendif()")
-+  if (gRPC_ABSL_SYNC_ENABLE)
-+    add_definitions(-DGPR_ABSEIL_SYNC=1)
-+  endif()
- endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 4bae849..a23fdf3 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -1899,6 +1899,8 @@ target_link_libraries(grpc

+   absl::status

+   absl::inlined_vector

+   absl::flat_hash_set

++  absl::time

++  absl::synchronization

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc "-framework CoreFoundation")

+@@ -2508,6 +2510,8 @@ target_link_libraries(grpc_unsecure

+   absl::strings

+   absl::status

+   absl::inlined_vector

++  absl::time

++  absl::synchronization

+ )

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc_unsecure "-framework CoreFoundation")

+diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake

+index 078d495..b6f50bd 100644

+--- a/cmake/abseil-cpp.cmake

++++ b/cmake/abseil-cpp.cmake

+@@ -37,4 +37,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")

+   # Use "CONFIG" as there is no built-in cmake module for absl.

+   find_package(absl REQUIRED CONFIG)

+   set(_gRPC_FIND_ABSL "if(NOT absl_FOUND)\n  find_package(absl CONFIG)\nendif()")

++  if (gRPC_ABSL_SYNC_ENABLE)

++    add_definitions(-DGPR_ABSEIL_SYNC=1)

++  endif()

+ endif()

diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch
index 67450425b..d4d38f1f1 100644
--- a/ports/grpc/00011-fix-csharp_plugin.patch
+++ b/ports/grpc/00011-fix-csharp_plugin.patch
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 48bc6cf0de..399aff7d1e 100644

+index a23fdf3..df4128a 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

-@@ -1854,10 +1854,14 @@ endif()

+@@ -1940,10 +1940,14 @@ endif()

  

  if(gRPC_BUILD_CSHARP_EXT)

  

 -add_library(grpc_csharp_ext SHARED

-+add_library(grpc_csharp_ext

++add_library(grpc_csharp_ext 

    src/csharp/ext/grpc_csharp_ext.c

  )

  

@@ -18,7 +18,7 @@ index 48bc6cf0de..399aff7d1e 100644
  set_target_properties(grpc_csharp_ext PROPERTIES

    VERSION ${gRPC_CORE_VERSION}

    SOVERSION ${gRPC_CORE_SOVERSION}

-@@ -1871,6 +1875,12 @@ if(WIN32 AND MSVC)

+@@ -1957,6 +1961,12 @@ if(WIN32 AND MSVC)

      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb

        DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL

      )

diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index 95f05177d..af0f6a32c 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,5 +1,5 @@
 Source: grpc
-Version: 1.31.1
+Version: 1.31.2
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2
 Homepage: https://github.com/grpc/grpc
 Description: An RPC library and framework
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 79e344b54..2c122f79e 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF 7d7e4567625db7cfebf8969a225948097a3f9f89 #v1.31.1
-    SHA512 a348b8779f533c53b99c052264e0a008121087267bcf836fb2310819ab384effdc0996df031f407ee4bf8bb0cb37a81e061e65ab24ab7011ce6400de3808f5a4
+    REF 414bb8322de2411eee1f4e841ff29d887bec7884 # v1.32.0
+    SHA512 a4fb0c926622c15a878fa475ecd670b076d1238332d174a5fb0aa987789d54a1d605ea6d4a7c705addf3c429e8b3b646e0f1f611715e84196a7fb958e1ff5945
     HEAD_REF master
     PATCHES
         00001-fix-uwp.patch
@@ -69,8 +69,6 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH)
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/gRPC TARGET_PATH share/gRPC)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
 if (gRPC_BUILD_CODEGEN)
     vcpkg_copy_tools(
         AUTO_CLEAN
@@ -90,3 +88,5 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file