CVS commit: pkgsrc/net/grpc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec 26 23:48:22 UTC 2024

Modified Files:
        pkgsrc/net/grpc: Makefile PLIST distinfo
        pkgsrc/net/grpc/patches:
            patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h
Removed Files:
        pkgsrc/net/grpc/patches: patch-cmake_protobuf.cmake
            patch-src_core_lib_gprpp_posix_directory__reader.cc

Log Message:
grpc: updated to 1.68.2

1.68.2

C++

[CI] Added a gRPC_BUILD_TESTS guard to third_party protos

1.68.1

Core

[xDS RBAC] Support string_match in HeaderMatcher

1.68.0

Core

[XdsClient][Backport] Add missing authority to XdsClient metrics scope
[Release] Bump core version in preparation for 1.68 Branch Cut.
[ConfigFetcher] Set HTTP2 error to NO_ERROR to do graceful GOAWAYs.
[ruby] reduce INFO log for server CQ pluck registration to DEBUG.
[EventEngine] Enable the PosixEventEngine client experiment.
[chttp2_server] Fix race between connection starting and it being orphaned.
[Chttp2Server] Fix race between connection manager updates and handshake.
[xds] Fix XdsClient race between ResourceDoesNotExist timer and receiving resources.

C++

[Build] Minimum version of MSVC is now 2022.
[Build] Bumped the minimum version of cmake.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/grpc/PLIST
cvs rdiff -u -r1.98 -r1.99 pkgsrc/net/grpc/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/grpc/patches/patch-cmake_protobuf.cmake
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/grpc/patches/patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/grpc/patches/patch-src_core_lib_gprpp_posix_directory__reader.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.103 pkgsrc/net/grpc/Makefile:1.104
--- pkgsrc/net/grpc/Makefile:1.103      Tue Oct 29 08:31:23 2024
+++ pkgsrc/net/grpc/Makefile    Thu Dec 26 23:48:22 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2024/10/29 08:31:23 adam Exp $
+# $NetBSD: Makefile,v 1.104 2024/12/26 23:48:22 adam Exp $
 
-DISTNAME=      grpc-1.67.1
+DISTNAME=      grpc-1.68.2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -10,9 +10,9 @@ HOMEPAGE=     https://grpc.io/
 COMMENT=       High performance, open-source universal RPC framework
 LICENSE=       apache-2.0
 
+USE_CXX_FEATURES=      c++14
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
-USE_CXX_FEATURES=      c++14
 
 CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=ON
 # use cmake's find_package() to locate a pre-installed dependency
@@ -24,17 +24,15 @@ CMAKE_CONFIGURE_ARGS+=      -DgRPC_RE2_PROVID
 CMAKE_CONFIGURE_ARGS+= -DgRPC_SSL_PROVIDER=package
 CMAKE_CONFIGURE_ARGS+= -DgRPC_ZLIB_PROVIDER=package
 
-SUBST_CLASSES+=                vars
-SUBST_STAGE.vars=      pre-configure
-SUBST_FILES.vars=      cmake/protobuf.cmake
-SUBST_VARS.vars=       BUILDLINK_PREFIX.protobuf
-
 # This should be included in the distfile, but it's not,
 # so CMakeFile.txt will try to download it.
 CENSUS_VER=            0.3.0
 CENSUS_DIST=           opencensus-proto-${CENSUS_VER}.tar.gz
 SITES.${CENSUS_DIST}=  -${MASTER_SITE_GITHUB:=census-instrumentation/opencensus-proto/archive/}/v${CENSUS_VER}.tar.gz
 
+ENVOY_DIST=            envoy-api-f8b75d1efa92bbf534596a013d9ca5873f79dd30..tar.gz
+SITES.${ENVOY_DIST}=   -${MASTER_SITE_GITHUB:=envoyproxy/data-plane-api/}
+
 DISTFILES=     ${DEFAULT_DISTFILES} ${CENSUS_DIST}
 
 PKGCONFIG_OVERRIDE=    cmake/pkg-config-template.pc.in

Index: pkgsrc/net/grpc/PLIST
diff -u pkgsrc/net/grpc/PLIST:1.49 pkgsrc/net/grpc/PLIST:1.50
--- pkgsrc/net/grpc/PLIST:1.49  Wed Oct 16 08:39:25 2024
+++ pkgsrc/net/grpc/PLIST       Thu Dec 26 23:48:22 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2024/10/16 08:39:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.50 2024/12/26 23:48:22 adam Exp $
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
@@ -164,7 +164,6 @@ include/grpcpp/channel.h
 include/grpcpp/client_context.h
 include/grpcpp/completion_queue.h
 include/grpcpp/create_channel.h
-include/grpcpp/create_channel_binder.h
 include/grpcpp/create_channel_posix.h
 include/grpcpp/ext/call_metric_recorder.h
 include/grpcpp/ext/channelz_service_plugin.h
@@ -260,8 +259,6 @@ include/grpcpp/security/audit_logging.h
 include/grpcpp/security/auth_context.h
 include/grpcpp/security/auth_metadata_processor.h
 include/grpcpp/security/authorization_policy_provider.h
-include/grpcpp/security/binder_credentials.h
-include/grpcpp/security/binder_security_policy.h
 include/grpcpp/security/credentials.h
 include/grpcpp/security/server_credentials.h
 include/grpcpp/security/tls_certificate_provider.h
@@ -311,64 +308,64 @@ lib/cmake/grpc/modules/Findre2.cmake
 lib/cmake/grpc/modules/Findsystemd.cmake
 lib/libaddress_sorting.so
 lib/libaddress_sorting.so.44
-lib/libaddress_sorting.so.44.0.0
+lib/libaddress_sorting.so.44.1.1
 lib/libgpr.so
 lib/libgpr.so.44
-lib/libgpr.so.44.0.0
+lib/libgpr.so.44.1.1
 lib/libgrpc++.so
 lib/libgrpc++.so.${PKGVERSION}
-lib/libgrpc++.so.1.67
+lib/libgrpc++.so.1.68
 lib/libgrpc++_alts.so
 lib/libgrpc++_alts.so.${PKGVERSION}
-lib/libgrpc++_alts.so.1.67
+lib/libgrpc++_alts.so.1.68
 lib/libgrpc++_error_details.so
 lib/libgrpc++_error_details.so.${PKGVERSION}
-lib/libgrpc++_error_details.so.1.67
+lib/libgrpc++_error_details.so.1.68
 lib/libgrpc++_reflection.so
 lib/libgrpc++_reflection.so.${PKGVERSION}
-lib/libgrpc++_reflection.so.1.67
+lib/libgrpc++_reflection.so.1.68
 lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.${PKGVERSION}
-lib/libgrpc++_unsecure.so.1.67
+lib/libgrpc++_unsecure.so.1.68
 lib/libgrpc.so
 lib/libgrpc.so.44
-lib/libgrpc.so.44.0.0
+lib/libgrpc.so.44.1.1
 lib/libgrpc_authorization_provider.so
 lib/libgrpc_authorization_provider.so.${PKGVERSION}
-lib/libgrpc_authorization_provider.so.1.67
+lib/libgrpc_authorization_provider.so.1.68
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.${PKGVERSION}
-lib/libgrpc_plugin_support.so.1.67
+lib/libgrpc_plugin_support.so.1.68
 lib/libgrpc_unsecure.so
 lib/libgrpc_unsecure.so.44
-lib/libgrpc_unsecure.so.44.0.0
+lib/libgrpc_unsecure.so.44.1.1
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.${PKGVERSION}
-lib/libgrpcpp_channelz.so.1.67
+lib/libgrpcpp_channelz.so.1.68
 lib/libupb_base_lib.so
 lib/libupb_base_lib.so.44
-lib/libupb_base_lib.so.44.0.0
+lib/libupb_base_lib.so.44.1.1
 lib/libupb_json_lib.so
 lib/libupb_json_lib.so.44
-lib/libupb_json_lib.so.44.0.0
+lib/libupb_json_lib.so.44.1.1
 lib/libupb_mem_lib.so
 lib/libupb_mem_lib.so.44
-lib/libupb_mem_lib.so.44.0.0
+lib/libupb_mem_lib.so.44.1.1
 lib/libupb_message_lib.so
 lib/libupb_message_lib.so.44
-lib/libupb_message_lib.so.44.0.0
+lib/libupb_message_lib.so.44.1.1
 lib/libupb_mini_descriptor_lib.so
 lib/libupb_mini_descriptor_lib.so.44
-lib/libupb_mini_descriptor_lib.so.44.0.0
+lib/libupb_mini_descriptor_lib.so.44.1.1
 lib/libupb_textformat_lib.so
 lib/libupb_textformat_lib.so.44
-lib/libupb_textformat_lib.so.44.0.0
+lib/libupb_textformat_lib.so.44.1.1
 lib/libupb_wire_lib.so
 lib/libupb_wire_lib.so.44
-lib/libupb_wire_lib.so.44.0.0
+lib/libupb_wire_lib.so.44.1.1
 lib/libutf8_range_lib.so
 lib/libutf8_range_lib.so.44
-lib/libutf8_range_lib.so.44.0.0
+lib/libutf8_range_lib.so.44.1.1
 lib/pkgconfig/gpr.pc
 lib/pkgconfig/grpc++.pc
 lib/pkgconfig/grpc++_unsecure.pc

Index: pkgsrc/net/grpc/distinfo
diff -u pkgsrc/net/grpc/distinfo:1.98 pkgsrc/net/grpc/distinfo:1.99
--- pkgsrc/net/grpc/distinfo:1.98       Tue Oct 29 08:31:23 2024
+++ pkgsrc/net/grpc/distinfo    Thu Dec 26 23:48:22 2024
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.98 2024/10/29 08:31:23 adam Exp $
+$NetBSD: distinfo,v 1.99 2024/12/26 23:48:22 adam Exp $
 
-BLAKE2s (grpc-1.67.1.tar.gz) = 572e721a1db4ea0d10a59bee11267f35401b4399670710f26231476047e9df66
-SHA512 (grpc-1.67.1.tar.gz) = 4f9b63278590be282b5578ec6c5f607f11046fdac3e62b5bf9054f664971312efee621e1fd3a086eaf978d41f4cd83bab7f2947c9e6189dc30bcb69263f481dc
-Size (grpc-1.67.1.tar.gz) = 17317252 bytes
+BLAKE2s (grpc-1.68.2.tar.gz) = cfefb15ea32186b32a45988a7fe8a8173a824758990b6cf7686fb155deb1e028
+SHA512 (grpc-1.68.2.tar.gz) = 8f595429afc86e8ef7e1ba7d8b9fb579e9e334f822a4a26ab2cbd0ab13bcb421afaab21febffd023fbd688cfa2b8be834f9047aa70e6561bc181ba6737892304
+Size (grpc-1.68.2.tar.gz) = 17320704 bytes
 BLAKE2s (opencensus-proto-0.3.0.tar.gz) = be3ce863226f4aa422d9faa997fe29f9bb1743c0e804af3c5fad3c170e60ba42
 SHA512 (opencensus-proto-0.3.0.tar.gz) = 39231a495dfdccfc8267d1e6af2ac624feea611a8691c10ec570de2194b352e4a9c3b0ce1606414fb98e5d77c66873bed4a9e56512efa12b267b8a91e0c5851e
 Size (opencensus-proto-0.3.0.tar.gz) = 163404 bytes
 SHA1 (patch-CMakeLists.txt) = 49c2fccf5b1d73a4eea666d7a60820d1913b7eb8
-SHA1 (patch-cmake_protobuf.cmake) = 7aa6563b03dce5a07115f98c7d9bef62ef24e0f4
 SHA1 (patch-include_grpc_event__engine_port.h) = ee0937d5ec59d2f0a462a64145fc63ef68564c17
-SHA1 (patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h) = 75c50a6e275de0e47feb0cfa0f0976078025caba
-SHA1 (patch-src_core_lib_gprpp_posix_directory__reader.cc) = dc581f675f031aea9579732fef3830918bb96636
+SHA1 (patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h) = 916a46f3f9e338877a46ea21cd8c6fe5a00ad64e

Index: pkgsrc/net/grpc/patches/patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h
diff -u pkgsrc/net/grpc/patches/patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h:1.1 pkgsrc/net/grpc/patches/patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h:1.2
--- pkgsrc/net/grpc/patches/patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h:1.1        Sat Feb  3 20:02:03 2024
+++ pkgsrc/net/grpc/patches/patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h    Thu Dec 26 23:48:22 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h,v 1.1 2024/02/03 20:02:03 adam Exp $
+$NetBSD: patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h,v 1.2 2024/12/26 23:48:22 adam Exp $
 
 Fix error: no member named 'StrCat' in namespace 'absl'.
 
---- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h.orig       2024-02-03 19:48:36.455664126 +0000
+--- src/core/lib/event_engine/cf_engine/cfstream_endpoint.h.orig       2024-11-14 22:30:21.000000000 +0000
 +++ src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
-@@ -21,6 +21,7 @@
- 
+@@ -22,6 +22,7 @@
  #include <CoreFoundation/CoreFoundation.h>
+ #include <grpc/event_engine/event_engine.h>
  
 +#include "absl/strings/str_cat.h"
  #include "absl/strings/str_format.h"
- 
- #include <grpc/event_engine/event_engine.h>
+ #include "src/core/lib/address_utils/sockaddr_utils.h"
+ #include "src/core/lib/event_engine/cf_engine/cf_engine.h"