updpkg(main/libgrpc): update to 1.48.1

packages/libgrpc/CMakeLists.txt.diff

@@ -1,12 +0,0 @@
-diff -u -r ../cache/checkout-1.20.1/CMakeLists.txt ./CMakeLists.txt
---- ../cache/checkout-1.20.1/CMakeLists.txt	2019-05-05 19:34:14.719680525 +0000
-+++ ./CMakeLists.txt	2019-05-05 19:44:36.428274714 +0000
-@@ -206,7 +206,7 @@
-       COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE}
-       ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR}
-            --cpp_out=${_gRPC_PROTO_GENS_DIR}
--           --plugin=protoc-gen-grpc=${_gRPC_CPP_PLUGIN}
-+	   --plugin=protoc-gen-grpc=@PATH_TO_PLUGIN@
-            ${_protobuf_include_path}
-            ${REL_FIL}
-       DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin

packages/libgrpc/CMakeLists.txt.patch

@@ -2,15 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index f6de091a0c..d21e04a24d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -301,7 +301,7 @@ if(UNIX)
-   find_package(Threads)
-   set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m Threads::Threads)
-   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
--    set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} rt)
-+    set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES})
-   endif()
- endif()
- 
 @@ -1432,12 +1432,6 @@ target_link_libraries(gpr
    absl::strings
    absl::optional

packages/libgrpc/build.sh

@@ -3,14 +3,12 @@ TERMUX_PKG_DESCRIPTION="High performance, open source, general RPC framework tha
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_SRCURL=https://github.com/grpc/grpc.git
-TERMUX_PKG_VERSION=1.44.0
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_VERSION=1.48.1
 TERMUX_PKG_DEPENDS="ca-certificates, libc++, libre2, openssl, protobuf, c-ares, zlib"
 TERMUX_PKG_BREAKS="libgrpc-dev"
 TERMUX_PKG_REPLACES="libgrpc-dev"
 TERMUX_PKG_BUILD_DEPENDS="gflags, gflags-static, libprotobuf"
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_STRIP=$(command -v strip)
 -DGIT_EXECUTABLE=$(command -v git)
@@ -27,10 +25,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DProtobuf_PROTOC_LIBRARY=$TERMUX_PREFIX/lib/libprotoc.so
 "
 
-termux_step_post_get_source() {
-	termux_setup_protobuf
-}
-
 termux_step_host_build() {
 	termux_setup_cmake
 	termux_setup_ninja
@@ -52,9 +46,10 @@ termux_step_host_build() {
 }
 
 termux_step_pre_configure() {
+	termux_setup_protobuf
+	termux_setup_cmake
+	termux_setup_ninja
+
 	export PATH=$TERMUX_PKG_HOSTBUILD_DIR/bin:$PATH
-	sed "s|@PATH_TO_PLUGIN@|$TERMUX_PKG_HOSTBUILD_DIR/bin/grpc_cpp_plugin|g" \
-		$TERMUX_PKG_BUILDER_DIR/CMakeLists.txt.diff \
-		| patch -p1
 	export GRPC_CROSS_COMPILE=true
 }

packages/libgrpc/src-core-lib-security-security_connector-load_system_roots_linux.cc.patch

@@ -1,17 +0,0 @@
---- a/src/core/lib/security/security_connector/load_system_roots_linux.cc
-+++ b/src/core/lib/security/security_connector/load_system_roots_linux.cc
-@@ -52,12 +52,9 @@
- namespace {
- 
- const char* kLinuxCertFiles[] = {
--    "/etc/ssl/certs/ca-certificates.crt", "/etc/pki/tls/certs/ca-bundle.crt",
--    "/etc/ssl/ca-bundle.pem", "/etc/pki/tls/cacert.pem",
--    "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"};
-+    "@TERMUX_PREFIX@/etc/tls/cert.pem"};
- const char* kLinuxCertDirectories[] = {
--    "/etc/ssl/certs", "/system/etc/security/cacerts", "/usr/local/share/certs",
--    "/etc/pki/tls/certs", "/etc/openssl/certs"};
-+    "@TERMUX_PREFIX@/etc/tls/certs"};
- 
- grpc_slice GetSystemRootCerts() {
-   grpc_slice valid_bundle_slice = grpc_empty_slice();

packages/libgrpc/src-core-lib-security-security_connector-load_system_roots_supported.cc.patch

@@ -0,0 +1,20 @@
+--- ./src/core/lib/security/security_connector/load_system_roots_supported.cc.orig	2022-09-01 18:38:33.746608984 +0000
++++ ./src/core/lib/security/security_connector/load_system_roots_supported.cc	2022-09-01 18:39:43.052126864 +0000
+@@ -52,12 +52,12 @@
+ 
+ #if defined(GPR_LINUX) || defined(GPR_ANDROID)
+ const char* kCertFiles[] = {
+-    "/etc/ssl/certs/ca-certificates.crt", "/etc/pki/tls/certs/ca-bundle.crt",
+-    "/etc/ssl/ca-bundle.pem", "/etc/pki/tls/cacert.pem",
+-    "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"};
++    "@TERMUX_PREFIX@/etc/ssl/certs/ca-certificates.crt", "@TERMUX_PREFIX@/etc/pki/tls/certs/ca-bundle.crt",
++    "@TERMUX_PREFIX@/etc/ssl/ca-bundle.pem", "@TERMUX_PREFIX@/etc/pki/tls/cacert.pem",
++    "@TERMUX_PREFIX@/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"};
+ const char* kCertDirectories[] = {
+-    "/etc/ssl/certs", "/system/etc/security/cacerts", "/usr/local/share/certs",
+-    "/etc/pki/tls/certs", "/etc/openssl/certs"};
++    "@TERMUX_PREFIX@/etc/ssl/certs", "@TERMUX_PREFIX@/share/certs",
++    "@TERMUX_PREFIX@/etc/pki/tls/certs", "@TERMUX_PREFIX@/etc/openssl/certs"};
+ #elif defined(GPR_FREEBSD)  // endif GPR_LINUX || GPR_ANDROID
+ const char* kCertFiles[] = {"/etc/ssl/cert.pem",
+                             "/usr/local/share/certs/ca-root-nss.crt"};

packages/libgrpc/src-core-lib-security-security_connector-ssl_utils.cc.patch

@@ -5,7 +5,7 @@
  #elif defined(INSTALL_PREFIX)
  static const char* installed_roots_path =
 -    INSTALL_PREFIX "/usr/share/grpc/roots.pem";
-+    INSTALL_PREFIX "/share/grpc/roots.pem";
++    INSTALL_PREFIX "$TERMUX_PREFIX@/share/grpc/roots.pem";
  #else
 -static const char* installed_roots_path = "/usr/share/grpc/roots.pem";
 +static const char* installed_roots_path = "@TERMUX_PREFIX@/share/grpc/roots.pem";