From nobody Mon Jan 30 13:05:40 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P57hh55TDz3cYPv; Mon, 30 Jan 2023 13:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P57hh3zxpz4PLL; Mon, 30 Jan 2023 13:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNoCRluiEBf+87JZWjN0c1mHY5wGdVsc0JK1gFDAsKk=; b=BGqo3OvibnM49mb/YPFuGHvbU1ZuDVVl/QgiBkJjekU4U6PxabeTCbZwdNWMwTfKCYL3oD 0lOy5OWbmoyrAoAfyjmnxvMcrNhe3yhQPuUPjAl7LdEw4lBCNIpR0z2H+TVKUTqJQxozpl InAX2vLjsRB5haEvXOLTkPlgMMWwwJ87677yPmg4l+rgXQMmaaee42LJsRHX/I2ATsCbIV ctuagQBwr5/MPMUNv9/4wvYo7KrYwyHNkYIQanbrpUa768qBLR7mAdA1XswapY+ds7RnMc zaT8TncGmD5oVhrqMni3HMHB3XL6udfJSzBohxWGG76/636mDcK60LdN1pWTFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675083940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lNoCRluiEBf+87JZWjN0c1mHY5wGdVsc0JK1gFDAsKk=; b=yygoB5yaWffRlNdW28JC53xEelaompGIpwJR2oU1oDgTEXWdqjQEMBH9wt2SMyKNFPpPop M75ZGLDOSYHRcXcqYQpPefPHbkZANp4wbAA5qX7mnwxOAAtkwPs7EXqYuhHwszTTAGZa7+ Sgvo+QTTF0ad2LzYQOXEswovqjgqzl8tG6PwI7QpUnKvr/srgavGCIppsfWUfdyvn9dV0w 9n/sSAgDVlkYU6GXTB16rU5ROnkp1tQZ1RfUBrzsK8J/I8U4SEQyKwvt3xvVcicc8Aq6qo ALO6Kn0ehUCG2XeXMByix7TAnkUHJGhvm+beLE++6cUNSBhxrvIPk/IT0UNRWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675083940; a=rsa-sha256; cv=none; b=pljup/9cVCr9WCrO7hOl3Km4/dPC1eXagHJhJGeqPKTaeXOvyh7ukiktuWuPYfbUI/y9gN cqM5SxeWJQNL+gxs1jLSKBH/N4nnm07eGiycuUJ2BOQEC1mxp4Nq9z6kCDIMHKWHVR1brd XY5YgKcPb5PDjNs4qsHPSz2ESNM3YeuQsr17pzNYoYHl6v9F01sZxUWl4XJfo9IdAWFvd8 LnXViuJVw2tURiU7o1dNXVnj84fRDfn1l+tdJtuPuSVdLvRv8Mu0NrcsEyjP8JowFQRoa1 zPSok0d3QyjxO+EZ2CtuEn224B/z7MRk0kdwEZDZ798tUP6Xxi/T/6RU4ctbIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P57hh35myz18JS; Mon, 30 Jan 2023 13:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30UD5ebU052486; Mon, 30 Jan 2023 13:05:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UD5e6j052485; Mon, 30 Jan 2023 13:05:40 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:05:40 GMT Message-Id: <202301301305.30UD5e6j052485@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: d925df56dd5e - main - devel/grpc: Update to 1.51.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d925df56dd5e89edab560f7102d1f977e8d406ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=d925df56dd5e89edab560f7102d1f977e8d406ed commit d925df56dd5e89edab560f7102d1f977e8d406ed Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:27:18 +0000 Commit: Po-Chuan Hsieh 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 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