[grpc] Update to 1.48.0 (#25914)

* grpc: Update to 1.48.0

* grpc: Adjust line-ending of patches

* grpc: Change line ending of some patches back to CRLF

ports/grpc/00001-fix-uwp.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7a97604..4967c4f 100644
+index 25990a5d8a..4bec4e1e72 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -215,6 +215,9 @@ if(UNIX)
+@@ -219,6 +219,9 @@ if(UNIX)
  endif()
  if(WIN32)
    set(_gRPC_PLATFORM_WINDOWS ON)
@@ -11,8 +11,8 @@ index 7a97604..4967c4f 100644
 +  endif()
  endif()
  
-  # Use C99 standard
-@@ -259,6 +262,9 @@ if(MSVC)
+  # Use C11 standard
+@@ -263,6 +266,9 @@ if(MSVC)
    set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267")
    # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
    set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619")
@@ -21,8 +21,8 @@ index 7a97604..4967c4f 100644
 +  endif()
    # Silences thousands of trucation warnings
    set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503")
- endif()
-@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
+   # Tell MSVC to build grpc using utf-8
+@@ -430,6 +436,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
  #     ``.proto`` files
  #
  function(protobuf_generate_grpc_cpp)
@@ -33,7 +33,7 @@ index 7a97604..4967c4f 100644
    if(NOT ARGN)
      message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
      return()
-@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
+@@ -552,6 +562,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN)
    list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin)
  endif ()
  
@@ -41,16 +41,16 @@ index 7a97604..4967c4f 100644
  add_custom_target(plugins
    DEPENDS ${_gRPC_PLUGIN_LIST}
  )
-@@ -424,6 +435,7 @@ add_custom_target(tools_cxx
+@@ -567,6 +578,7 @@ add_custom_target(tools_cxx
  
  add_custom_target(tools
    DEPENDS tools_c tools_cxx)
 +endif()
  
- protobuf_generate_grpc_cpp(
-   src/proto/grpc/channelz/channelz.proto
+ protobuf_generate_grpc_cpp_with_import_path_correction(
+   src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto
 diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-index 5d2bdc1..e9870c2 100644
+index 5d2bdc14de..e9870c2656 100644
 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
 +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
 @@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; }

ports/grpc/00004-link-gdi32-on-windows.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14514b7..497470c 100644
+index 25990a5d8a..8a632d2289 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake)
- include(cmake/zlib.cmake)
+@@ -404,7 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds)
+ endif()
  
  if(WIN32)
 -  set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32)
 +  set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
  endif()
  
- # Create directory for generated .proto files
+ # Create directory for proto source files

ports/grpc/00009-use-system-upb.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7e591f083..e16e70a224 100644
+index 25990a5d8a..9a24f7c6cb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
@@ -12,16 +12,31 @@ index a7e591f083..e16e70a224 100644
  set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
  set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
  
-@@ -1369,7 +1372,7 @@ target_link_libraries(gpr
+@@ -1570,6 +1573,7 @@ target_link_libraries(gpr
    absl::synchronization
    absl::time
    absl::optional
--  upb
 +  ${_gRPC_UPB_LIBRARIES}
  )
  if(_gRPC_PLATFORM_ANDROID)
    target_link_libraries(gpr
-@@ -3957,6 +3960,7 @@ endif()
+@@ -2361,7 +2365,6 @@ target_link_libraries(grpc
+   gpr
+   ${_gRPC_SSL_LIBRARIES}
+   address_sorting
+-  upb
+ )
+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
+   target_link_libraries(grpc "-framework CoreFoundation")
+@@ -2927,7 +2930,6 @@ target_link_libraries(grpc_unsecure
+   absl::utility
+   gpr
+   address_sorting
+-  upb
+ )
+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
+   target_link_libraries(grpc_unsecure "-framework CoreFoundation")
+@@ -4181,6 +4183,7 @@ endif()
  
  endif()
  
@@ -29,7 +44,7 @@ index a7e591f083..e16e70a224 100644
  add_library(upb
    third_party/upb/third_party/utf8_range/naive.c
    third_party/upb/third_party/utf8_range/range2-neon.c
-@@ -4018,7 +4022,7 @@ if(gRPC_INSTALL)
+@@ -4242,7 +4245,7 @@ if(gRPC_INSTALL)
      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
    )
  endif()

ports/grpc/00011-fix-csharp_plugin.patch

@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae77375eae..ad8815d2f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1960,10 +1960,14 @@ endif()
- 
- if(gRPC_BUILD_CSHARP_EXT)
- 
--add_library(grpc_csharp_ext SHARED
-+add_library(grpc_csharp_ext
-   src/csharp/ext/grpc_csharp_ext.c
- )
- 
-+if (WIN32 AND BUILD_SHARED_LIBS)
-+    target_compile_definitions(grpc_csharp_ext PUBLIC GPR_WINDOWS)
-+endif()
-+
- set_target_properties(grpc_csharp_ext PROPERTIES
-   VERSION ${gRPC_CORE_VERSION}
-   SOVERSION ${gRPC_CORE_SOVERSION}
-@@ -1977,6 +1981,12 @@ if(WIN32 AND MSVC)
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb
-       DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL
-     )
-+
-+    install(TARGETS grpc_csharp_ext
-+      RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
-+      LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-+      ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
-+    )
-   endif()
- endif()
- 

ports/grpc/00012-fix-use-cxx17.patch

@@ -1,16 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c07732..54b4b23 100644
+index 25990a5d8a..ba8df92858 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -321,6 +321,11 @@ include(cmake/ssl.cmake)
- include(cmake/upb.cmake)
- include(cmake/xxhash.cmake)
+@@ -326,6 +326,11 @@ include(cmake/xxhash.cmake)
  include(cmake/zlib.cmake)
-+ 
+ include(cmake/download_archive.cmake)
+ 
 +if (ABSL_USE_CXX17)
 +    message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
 +    set(CMAKE_CXX_STANDARD 17)
 +endif()
- 
- if(WIN32)
-   set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
++
+ # Setup external proto library at third_party/envoy-api with 2 download URLs
+ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api)
+   # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api.

ports/grpc/00014-pkgconfig-upbdefs.patch

@@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 54b4b23..83fab3b 100644
+index 25990a5d8a..4c7831cba5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -17276,7 +17276,7 @@ generate_pkgconfig(
+@@ -20398,7 +20398,7 @@ generate_pkgconfig(
    "high performance general RPC framework"
    "${gRPC_CORE_VERSION}"
-   "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
+   "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant"
 -  "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
 +  "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz"
    ""

ports/grpc/00015-disable-download-archive.patch

@@ -0,0 +1,12 @@
+diff --git a/cmake/download_archive.cmake b/cmake/download_archive.cmake
+index 820aafafb7..a59b785c7e 100644
+--- a/cmake/download_archive.cmake
++++ b/cmake/download_archive.cmake
+@@ -19,6 +19,7 @@ file(MAKE_DIRECTORY ${_download_archive_TEMPORARY_DIR})
+ # Note that strip_prefix strips the directory path prefix of the extracted
+ # archive content, and it may strip multiple directories.
+ function(download_archive destination url hash strip_prefix)
++  return()
+   # Fetch and validate
+   set(_TEMPORARY_FILE ${_download_archive_TEMPORARY_DIR}/${strip_prefix}.tar.gz)
+   message(STATUS "Downloading from ${url}, if failed, please try configuring again")

ports/grpc/portfile.cmake

@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF v1.46.3
-    SHA512 e80322b65c6f8d64dc91bce9f612119191e8d329cac2fbc5da6dad9a2a7ccaa7a501470ed483e555c3ba596e8aff796fbda2747f09e9c4329aed3de4d9b6b666
+    REF v1.48.0
+    SHA512 558c659b325eb2f64f6caf78c0701eaaf3d9ae35f6d25ccd69b8995d5b82b98ca1a7ef9f497a0a1dab5914d2328c044c108373152426a15045d0c978b27f3503
     HEAD_REF master
     PATCHES
         00001-fix-uwp.patch
@@ -15,10 +15,10 @@ vcpkg_from_github(
         00004-link-gdi32-on-windows.patch
         00005-fix-uwp-error.patch
         00009-use-system-upb.patch
-        00011-fix-csharp_plugin.patch
         snprintf.patch
         00012-fix-use-cxx17.patch
         00014-pkgconfig-upbdefs.patch
+        00015-disable-download-archive.patch
 )
 
 if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)

ports/grpc/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "grpc",
-  "version-semver": "1.46.3",
-  "port-version": 1,
+  "version-semver": "1.48.0",
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "license": "Apache-2.0",

versions/baseline.json

@@ -2693,8 +2693,8 @@
       "port-version": 0
     },
     "grpc": {
-      "baseline": "1.46.3",
-      "port-version": 1
+      "baseline": "1.48.0",
+      "port-version": 0
     },
     "grppi": {
       "baseline": "0.4.0",

versions/g-/grpc.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef80a11383e8ff6bd068d50e620ea681cea3a22e",
+      "version-semver": "1.48.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7db8056216ec23b5d48a44eaab6581c3357c1389",
       "version-semver": "1.46.3",