git: d925df56dd5e - main - devel/grpc: Update to 1.51.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 30 Jan 2023 13:05:40 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d925df56dd5e89edab560f7102d1f977e8d406ed

commit d925df56dd5e89edab560f7102d1f977e8d406ed
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-01-30 12:27:18 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-01-30 12:59:01 +0000

    devel/grpc: Update to 1.51.1
    
    - Update CONFLICTS_INSTALL
    - Bump PORTREVISION of dependent ports for shlib change
    
    Changes:        https://github.com/grpc/grpc/releases
---
 devel/grpc/Makefile                  | 10 ++++------
 devel/grpc/distinfo                  | 14 +++++++-------
 devel/grpc/files/extra-patch-openssl |  8 ++++----
 devel/grpc/pkg-plist                 | 24 ++++++++++++++----------
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 07fb0d8c87c2..fb5bac6eaedf 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	grpc
-PORTVERSION=	1.50.1
+PORTVERSION=	1.51.1
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	devel
@@ -16,21 +16,19 @@ BUILD_DEPENDS=	${LOCALBASE}/include/xxhash.h:devel/xxhash
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libbenchmark.so:devel/benchmark \
 		libcares.so:dns/c-ares \
-		libgflags.so:devel/gflags \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl
 
 USE_GITHUB=	yes
-GH_TUPLE=	census-instrumentation:opencensus-proto:v0.3.0:census_instrumentation_opencensus_proto/third_party/opencensus-proto/src \
-		cncf:xds:1e77728:cncf_xds/third_party/xds
+GH_TUPLE=	census-instrumentation:opencensus-proto:v0.4.1:census_instrumentation_opencensus_proto/third_party/opencensus-proto/src \
+		cncf:xds:46e39c7:cncf_xds/third_party/xds
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 \
 		-DgRPC_ABSL_PROVIDER=package \
 		-DgRPC_BENCHMARK_PROVIDER=package \
 		-DgRPC_CARES_PROVIDER=package \
-		-DgRPC_GFLAGS_PROVIDER=package \
 		-DgRPC_PROTOBUF_PROVIDER=package \
 		-DgRPC_RE2_PROVIDER=package \
 		-DgRPC_SSL_PROVIDER=package \
@@ -44,7 +42,7 @@ USE_LDCONFIG=	yes
 PLIST_SUB=	SHLIB_MAJOR=${PORTVERSION:R} \
 		SHLIB_MINOR=${PORTVERSION:E}
 
-CONFLICTS_INSTALL=	grpc130 grpc134 grpc142
+CONFLICTS_INSTALL=	grpc[0-9][0-9][0-9]
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index 3f9072f8f124..d74dc976b473 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1669057520
-SHA256 (grpc-grpc-v1.50.1_GH0.tar.gz) = fb1ed98eb3555877d55eb2b948caca44bc8601c6704896594de81558639709ef
-SIZE (grpc-grpc-v1.50.1_GH0.tar.gz) = 8434595
-SHA256 (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0
-SIZE (census-instrumentation-opencensus-proto-v0.3.0_GH0.tar.gz) = 163404
-SHA256 (cncf-xds-1e77728_GH0.tar.gz) = 6d1ca5e2641488aa69e9ea11dd3547afaaf43d01108cb8618db1f164f2532042
-SIZE (cncf-xds-1e77728_GH0.tar.gz) = 103444
+TIMESTAMP = 1674306306
+SHA256 (grpc-grpc-v1.51.1_GH0.tar.gz) = b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229
+SIZE (grpc-grpc-v1.51.1_GH0.tar.gz) = 8550112
+SHA256 (census-instrumentation-opencensus-proto-v0.4.1_GH0.tar.gz) = e3d89f7f9ed84c9b6eee818c2e9306950519402bf803698b15c310b77ca2f0f3
+SIZE (census-instrumentation-opencensus-proto-v0.4.1_GH0.tar.gz) = 164379
+SHA256 (cncf-xds-46e39c7_GH0.tar.gz) = f49388ea0b3798e25b9cdca2982246a5beca7a32be56cf9ef7c7f3bd02ff36ca
+SIZE (cncf-xds-46e39c7_GH0.tar.gz) = 103751
diff --git a/devel/grpc/files/extra-patch-openssl b/devel/grpc/files/extra-patch-openssl
index 60b296e06ecd..e4be36fac303 100644
--- a/devel/grpc/files/extra-patch-openssl
+++ b/devel/grpc/files/extra-patch-openssl
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2022-09-14 01:34:30 UTC
+--- CMakeLists.txt.orig	2022-11-22 23:31:21 UTC
 +++ CMakeLists.txt
-@@ -21945,7 +21945,7 @@ generate_pkgconfig(
+@@ -23185,7 +23185,7 @@ generate_pkgconfig(
    "gRPC"
    "high performance general RPC framework"
    "${gRPC_CORE_VERSION}"
--  "gpr openssl absl_any_invocable 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"
-+  "gpr absl_any_invocable 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"
+-  "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cleanup 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"
++  "gpr absl_any_invocable absl_base absl_bind_front absl_cleanup 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"
    ""
    "grpc.pc")
diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
index 5bc5e250aaf8..7ba3b9fd7345 100644
--- a/devel/grpc/pkg-plist
+++ b/devel/grpc/pkg-plist
@@ -164,8 +164,10 @@ include/grpcpp/grpcpp.h
 include/grpcpp/health_check_service_interface.h
 include/grpcpp/impl/call.h
 include/grpcpp/impl/call_hook.h
+include/grpcpp/impl/call_op_set.h
 include/grpcpp/impl/call_op_set_interface.h
 include/grpcpp/impl/channel_argument_option.h
+include/grpcpp/impl/channel_interface.h
 include/grpcpp/impl/client_unary_call.h
 include/grpcpp/impl/codegen/async_generic_service.h
 include/grpcpp/impl/codegen/async_stream.h
@@ -247,6 +249,7 @@ include/grpcpp/server_posix.h
 include/grpcpp/support/async_stream.h
 include/grpcpp/support/async_unary_call.h
 include/grpcpp/support/byte_buffer.h
+include/grpcpp/support/callback_common.h
 include/grpcpp/support/channel_arguments.h
 include/grpcpp/support/client_callback.h
 include/grpcpp/support/client_interceptor.h
@@ -267,6 +270,7 @@ include/grpcpp/support/stub_options.h
 include/grpcpp/support/sync_stream.h
 include/grpcpp/support/time.h
 include/grpcpp/support/validate_service_config.h
+include/grpcpp/version_info.h
 include/grpcpp/xds_server_builder.h
 lib/cmake/grpc/gRPCConfig.cmake
 lib/cmake/grpc/gRPCConfigVersion.cmake
@@ -275,11 +279,11 @@ lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/cmake/grpc/modules/Findre2.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.28
-lib/libaddress_sorting.so.28.0.0
+lib/libaddress_sorting.so.29
+lib/libaddress_sorting.so.29.0.0
 lib/libgpr.so
-lib/libgpr.so.28
-lib/libgpr.so.28.0.0
+lib/libgpr.so.29
+lib/libgpr.so.29.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.%%SHLIB_MAJOR%%
 lib/libgrpc++.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
@@ -296,20 +300,20 @@ lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%
 lib/libgrpc++_unsecure.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 lib/libgrpc.so
-lib/libgrpc.so.28
-lib/libgrpc.so.28.0.0
+lib/libgrpc.so.29
+lib/libgrpc.so.29.0.0
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%
 lib/libgrpc_plugin_support.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.28
-lib/libgrpc_unsecure.so.28.0.0
+lib/libgrpc_unsecure.so.29
+lib/libgrpc_unsecure.so.29.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%
 lib/libgrpcpp_channelz.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 lib/libupb.so
-lib/libupb.so.28
-lib/libupb.so.28.0.0
+lib/libupb.so.29
+lib/libupb.so.29.0.0
 libdata/pkgconfig/gpr.pc
 libdata/pkgconfig/grpc++.pc
 libdata/pkgconfig/grpc++_unsecure.pc