svn commit: r560402 - in head: devel/grpc devel/grpc/files net/rubygem-grpc/files
Joseph Mingrone
jrm at FreeBSD.org
Tue Jan 5 15:07:49 UTC 2021
Author: jrm
Date: Tue Jan 5 15:07:47 2021
New Revision: 560402
URL: https://svnweb.freebsd.org/changeset/ports/560402
Log:
devel/grpc: Update to version 1.34.0
https://github.com/grpc/grpc/releases/
Submitted by: sunpoet (patch fixes)
Approved by: mfechner, sunpoet, yuri
Differential Revision: https://reviews.freebsd.org/D27752
Deleted:
head/devel/grpc/files/patch-CMakeLists.txt
head/devel/grpc/files/patch-cmake_cares.cmake
head/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_rb__call__credentials.c
Modified:
head/devel/grpc/Makefile (contents, props changed)
head/devel/grpc/distinfo (contents, props changed)
head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc (contents, props changed)
head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc (contents, props changed)
head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc (contents, props changed)
head/devel/grpc/pkg-plist (contents, props changed)
Modified: head/devel/grpc/Makefile
==============================================================================
--- head/devel/grpc/Makefile Tue Jan 5 14:51:21 2021 (r560401)
+++ head/devel/grpc/Makefile Tue Jan 5 15:07:47 2021 (r560402)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= grpc
-PORTVERSION= 1.22.0
+PORTVERSION= 1.34.0
DISTVERSIONPREFIX= v
-PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= devel
@@ -14,28 +13,28 @@ COMMENT= HTTP/2-based RPC framework
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= yasm:devel/yasm
-LIB_DEPENDS= libgflags.so:devel/gflags \
+LIB_DEPENDS= libabsl_base.so:devel/abseil \
+ libbenchmark.so:devel/benchmark \
+ libcares.so:dns/c-ares \
+ libgflags.so:devel/gflags \
libprotobuf.so:devel/protobuf \
- libcares.so:dns/c-ares
+ libre2.so:devel/re2
-USES= cmake go:no_targets localbase:ldflags perl5 pkgconfig ssl
-
+USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig ssl
USE_GITHUB= yes
-GH_TUPLE= google:benchmark:v1.4.1:benchmark/third_party/benchmark
USE_LDCONFIG= yes
-USE_PERL5= build
-PLIST_SUB+= SOVERSION=${PORTVERSION}
-LDFLAGS+= -lcares
-CMAKE_ARGS= -DgRPC_ZLIB_PROVIDER:STRING="package" \
- -DgRPC_PROTOBUF_PROVIDER:STRING="package" \
- -DgRPC_GFLAGS_PROVIDER:STRING="package" \
- -DgRPC_SSL_PROVIDER:STRING="package" \
- -DgRPC_CARES_PROVIDER:STRING="package" \
- -DgRPC_BENCHMARK_PROVIDER:STRING="module" \
- -DBENCHMARK_USE_LIBCXX=ON \
- -DBENCHMARK_ENABLE_TESTING=OFF \
- -DBUILD_SHARED_LIBS=ON
+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 \
+ -DgRPC_ZLIB_PROVIDER=package
+CMAKE_ON= BUILD_SHARED_LIBS
+
+PLIST_SUB= PORTVERSION=${PORTVERSION}
.include <bsd.port.mk>
Modified: head/devel/grpc/distinfo
==============================================================================
--- head/devel/grpc/distinfo Tue Jan 5 14:51:21 2021 (r560401)
+++ head/devel/grpc/distinfo Tue Jan 5 15:07:47 2021 (r560402)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1562093080
-SHA256 (grpc-grpc-v1.22.0_GH0.tar.gz) = 11ac793c562143d52fd440f6549588712badc79211cdc8c509b183cb69bddad8
-SIZE (grpc-grpc-v1.22.0_GH0.tar.gz) = 15082718
-SHA256 (google-benchmark-v1.4.1_GH0.tar.gz) = f8e525db3c42efc9c7f3bc5176a8fa893a9a9920bbd08cef30fb56a51854d60d
-SIZE (google-benchmark-v1.4.1_GH0.tar.gz) = 126850
+TIMESTAMP = 1609277768
+SHA256 (grpc-grpc-v1.34.0_GH0.tar.gz) = 7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39
+SIZE (grpc-grpc-v1.34.0_GH0.tar.gz) = 7723327
Modified: head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc
==============================================================================
--- head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc Tue Jan 5 14:51:21 2021 (r560401)
+++ head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc Tue Jan 5 15:07:47 2021 (r560402)
@@ -1,6 +1,6 @@
---- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2018-09-24 23:51:30 UTC
+--- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2020-12-01 19:24:28 UTC
+++ src/core/lib/security/credentials/jwt/jwt_verifier.cc
-@@ -468,7 +468,7 @@ static BIGNUM* bignum_from_base64(const char* b64) {
+@@ -472,7 +472,7 @@ static BIGNUM* bignum_from_base64(const char* b64) {
return result;
}
Modified: head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc
==============================================================================
--- head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc Tue Jan 5 14:51:21 2021 (r560401)
+++ head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc Tue Jan 5 15:07:47 2021 (r560402)
@@ -1,6 +1,6 @@
---- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2018-09-24 23:51:30 UTC
+--- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2020-12-01 19:24:28 UTC
+++ src/core/tsi/alts/crypt/aes_gcm.cc
-@@ -187,7 +187,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_
+@@ -185,7 +185,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_
const uint8_t* kdf_counter) {
unsigned char buf[EVP_MAX_MD_SIZE];
unsigned char ctr = 1;
Modified: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc
==============================================================================
--- head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc Tue Jan 5 14:51:21 2021 (r560401)
+++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc Tue Jan 5 15:07:47 2021 (r560402)
@@ -1,7 +1,7 @@
---- src/core/tsi/ssl_transport_security.cc.orig 2018-09-24 23:51:30 UTC
+--- src/core/tsi/ssl_transport_security.cc.orig 2020-12-01 19:24:28 UTC
+++ src/core/tsi/ssl_transport_security.cc
-@@ -21,7 +21,7 @@
- #include "src/core/tsi/grpc_shadow_boringssl.h"
+@@ -19,7 +19,7 @@
+ #include <grpc/support/port_platform.h>
#include "src/core/tsi/ssl_transport_security.h"
-
@@ -9,7 +9,7 @@
#include <limits.h>
#include <string.h>
-@@ -61,11 +61,10 @@ extern "C" {
+@@ -70,11 +70,10 @@ extern "C" {
#define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024
#define TSI_SSL_HANDSHAKER_OUTGOING_BUFFER_INITIAL_SIZE 1024
@@ -24,7 +24,7 @@
#endif
/* TODO(jboeuf): I have not found a way to get this number dynamically from the
-@@ -1676,7 +1675,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory_wi
+@@ -1930,7 +1929,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory_wi
options->cipher_suites);
if (result != TSI_OK) break;
Modified: head/devel/grpc/pkg-plist
==============================================================================
--- head/devel/grpc/pkg-plist Tue Jan 5 14:51:21 2021 (r560401)
+++ head/devel/grpc/pkg-plist Tue Jan 5 15:07:47 2021 (r560402)
@@ -5,7 +5,6 @@ bin/grpc_objective_c_plugin
bin/grpc_php_plugin
bin/grpc_python_plugin
bin/grpc_ruby_plugin
-include/benchmark/benchmark.h
include/grpc++/alarm.h
include/grpc++/channel.h
include/grpc++/client_context.h
@@ -91,7 +90,6 @@ include/grpc/census.h
include/grpc/compression.h
include/grpc/fork.h
include/grpc/grpc.h
-include/grpc/grpc_cronet.h
include/grpc/grpc_posix.h
include/grpc/grpc_security.h
include/grpc/grpc_security_constants.h
@@ -113,6 +111,7 @@ include/grpc/impl/codegen/propagation_bits.h
include/grpc/impl/codegen/slice.h
include/grpc/impl/codegen/status.h
include/grpc/impl/codegen/sync.h
+include/grpc/impl/codegen/sync_abseil.h
include/grpc/impl/codegen/sync_custom.h
include/grpc/impl/codegen/sync_generic.h
include/grpc/impl/codegen/sync_posix.h
@@ -132,6 +131,7 @@ include/grpc/support/log_windows.h
include/grpc/support/port_platform.h
include/grpc/support/string_util.h
include/grpc/support/sync.h
+include/grpc/support/sync_abseil.h
include/grpc/support/sync_custom.h
include/grpc/support/sync_generic.h
include/grpc/support/sync_posix.h
@@ -140,26 +140,18 @@ include/grpc/support/thd_id.h
include/grpc/support/time.h
include/grpc/support/workaround_list.h
include/grpcpp/alarm.h
-include/grpcpp/alarm_impl.h
include/grpcpp/channel.h
-include/grpcpp/channel_impl.h
include/grpcpp/client_context.h
include/grpcpp/completion_queue.h
include/grpcpp/create_channel.h
-include/grpcpp/create_channel_impl.h
include/grpcpp/create_channel_posix.h
-include/grpcpp/create_channel_posix_impl.h
include/grpcpp/ext/channelz_service_plugin.h
-include/grpcpp/ext/channelz_service_plugin_impl.h
include/grpcpp/ext/health_check_service_server_builder_option.h
include/grpcpp/ext/proto_server_reflection_plugin.h
-include/grpcpp/ext/proto_server_reflection_plugin_impl.h
include/grpcpp/generic/async_generic_service.h
include/grpcpp/generic/generic_stub.h
-include/grpcpp/generic/generic_stub_impl.h
include/grpcpp/grpcpp.h
include/grpcpp/health_check_service_interface.h
-include/grpcpp/health_check_service_interface_impl.h
include/grpcpp/impl/call.h
include/grpcpp/impl/channel_argument_option.h
include/grpcpp/impl/client_unary_call.h
@@ -175,24 +167,23 @@ include/grpcpp/impl/codegen/callback_common.h
include/grpcpp/impl/codegen/channel_interface.h
include/grpcpp/impl/codegen/client_callback.h
include/grpcpp/impl/codegen/client_context.h
-include/grpcpp/impl/codegen/client_context_impl.h
include/grpcpp/impl/codegen/client_interceptor.h
include/grpcpp/impl/codegen/client_unary_call.h
include/grpcpp/impl/codegen/completion_queue.h
-include/grpcpp/impl/codegen/completion_queue_impl.h
include/grpcpp/impl/codegen/completion_queue_tag.h
include/grpcpp/impl/codegen/config.h
include/grpcpp/impl/codegen/config_protobuf.h
include/grpcpp/impl/codegen/core_codegen.h
include/grpcpp/impl/codegen/core_codegen_interface.h
include/grpcpp/impl/codegen/create_auth_context.h
+include/grpcpp/impl/codegen/delegating_channel.h
include/grpcpp/impl/codegen/grpc_library.h
include/grpcpp/impl/codegen/intercepted_channel.h
include/grpcpp/impl/codegen/interceptor.h
include/grpcpp/impl/codegen/interceptor_common.h
include/grpcpp/impl/codegen/message_allocator.h
include/grpcpp/impl/codegen/metadata_map.h
-include/grpcpp/impl/codegen/method_handler_impl.h
+include/grpcpp/impl/codegen/method_handler.h
include/grpcpp/impl/codegen/proto_buffer_reader.h
include/grpcpp/impl/codegen/proto_buffer_writer.h
include/grpcpp/impl/codegen/proto_utils.h
@@ -201,8 +192,8 @@ include/grpcpp/impl/codegen/rpc_service_method.h
include/grpcpp/impl/codegen/security/auth_context.h
include/grpcpp/impl/codegen/serialization_traits.h
include/grpcpp/impl/codegen/server_callback.h
+include/grpcpp/impl/codegen/server_callback_handlers.h
include/grpcpp/impl/codegen/server_context.h
-include/grpcpp/impl/codegen/server_context_impl.h
include/grpcpp/impl/codegen/server_interceptor.h
include/grpcpp/impl/codegen/server_interface.h
include/grpcpp/impl/codegen/service_type.h
@@ -220,39 +211,33 @@ include/grpcpp/impl/rpc_method.h
include/grpcpp/impl/rpc_service_method.h
include/grpcpp/impl/serialization_traits.h
include/grpcpp/impl/server_builder_option.h
-include/grpcpp/impl/server_builder_option_impl.h
include/grpcpp/impl/server_builder_plugin.h
include/grpcpp/impl/server_initializer.h
-include/grpcpp/impl/server_initializer_impl.h
include/grpcpp/impl/service_type.h
include/grpcpp/resource_quota.h
-include/grpcpp/resource_quota_impl.h
+include/grpcpp/security/alts_context.h
+include/grpcpp/security/alts_util.h
include/grpcpp/security/auth_context.h
include/grpcpp/security/auth_metadata_processor.h
-include/grpcpp/security/auth_metadata_processor_impl.h
include/grpcpp/security/credentials.h
-include/grpcpp/security/credentials_impl.h
include/grpcpp/security/server_credentials.h
-include/grpcpp/security/server_credentials_impl.h
+include/grpcpp/security/tls_certificate_provider.h
+include/grpcpp/security/tls_credentials_options.h
include/grpcpp/server.h
include/grpcpp/server_builder.h
-include/grpcpp/server_builder_impl.h
include/grpcpp/server_context.h
-include/grpcpp/server_impl.h
include/grpcpp/server_posix.h
-include/grpcpp/server_posix_impl.h
include/grpcpp/support/async_stream.h
include/grpcpp/support/async_unary_call.h
include/grpcpp/support/byte_buffer.h
include/grpcpp/support/channel_arguments.h
-include/grpcpp/support/channel_arguments_impl.h
include/grpcpp/support/client_callback.h
include/grpcpp/support/client_interceptor.h
include/grpcpp/support/config.h
include/grpcpp/support/error_details.h
-include/grpcpp/support/error_details_impl.h
include/grpcpp/support/interceptor.h
include/grpcpp/support/message_allocator.h
+include/grpcpp/support/method_handler.h
include/grpcpp/support/proto_buffer_reader.h
include/grpcpp/support/proto_buffer_writer.h
include/grpcpp/support/server_callback.h
@@ -265,56 +250,51 @@ include/grpcpp/support/stub_options.h
include/grpcpp/support/sync_stream.h
include/grpcpp/support/time.h
include/grpcpp/support/validate_service_config.h
-lib/cmake/benchmark/benchmarkConfig.cmake
-lib/cmake/benchmark/benchmarkConfigVersion.cmake
-lib/cmake/benchmark/benchmarkTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/benchmark/benchmarkTargets.cmake
lib/cmake/grpc/gRPCConfig.cmake
lib/cmake/grpc/gRPCConfigVersion.cmake
lib/cmake/grpc/gRPCTargets-%%CMAKE_BUILD_TYPE%%.cmake
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.1
-lib/libaddress_sorting.so.%%SOVERSION%%
-lib/libbenchmark.so
-lib/libbenchmark.so.0
-lib/libbenchmark.so.0.0.0
-lib/libbenchmark_main.so
-lib/libbenchmark_main.so.0
-lib/libbenchmark_main.so.0.0.0
+lib/libaddress_sorting.so.14
+lib/libaddress_sorting.so.14.0.0
lib/libgpr.so
-lib/libgpr.so.1
-lib/libgpr.so.%%SOVERSION%%
+lib/libgpr.so.14
+lib/libgpr.so.14.0.0
lib/libgrpc++.so
lib/libgrpc++.so.1
-lib/libgrpc++.so.%%SOVERSION%%
-lib/libgrpc++_cronet.so
-lib/libgrpc++_cronet.so.1
-lib/libgrpc++_cronet.so.%%SOVERSION%%
+lib/libgrpc++.so.%%PORTVERSION%%
+lib/libgrpc++_alts.so
+lib/libgrpc++_alts.so.1
+lib/libgrpc++_alts.so.%%PORTVERSION%%
lib/libgrpc++_error_details.so
lib/libgrpc++_error_details.so.1
-lib/libgrpc++_error_details.so.%%SOVERSION%%
+lib/libgrpc++_error_details.so.%%PORTVERSION%%
lib/libgrpc++_reflection.so
lib/libgrpc++_reflection.so.1
-lib/libgrpc++_reflection.so.%%SOVERSION%%
+lib/libgrpc++_reflection.so.%%PORTVERSION%%
lib/libgrpc++_unsecure.so
+lib/libgrpc++_unsecure.so.1
+lib/libgrpc++_unsecure.so.%%PORTVERSION%%
lib/libgrpc.so
-lib/libgrpc.so.1
-lib/libgrpc.so.%%SOVERSION%%
-lib/libgrpc_cronet.so
-lib/libgrpc_cronet.so.1
-lib/libgrpc_cronet.so.%%SOVERSION%%
-lib/libgrpc_csharp_ext.so
-lib/libgrpc_csharp_ext.so.1
-lib/libgrpc_csharp_ext.so.%%SOVERSION%%
+lib/libgrpc.so.14
+lib/libgrpc.so.14.0.0
lib/libgrpc_plugin_support.so
-lib/libgrpc_plugin_support.so.2
-lib/libgrpc_plugin_support.so.2.0.0
+lib/libgrpc_plugin_support.so.1
+lib/libgrpc_plugin_support.so.%%PORTVERSION%%
lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.1
-lib/libgrpc_unsecure.so.%%SOVERSION%%
+lib/libgrpc_unsecure.so.14
+lib/libgrpc_unsecure.so.14.0.0
lib/libgrpcpp_channelz.so
lib/libgrpcpp_channelz.so.1
-lib/libgrpcpp_channelz.so.%%SOVERSION%%
-libdata/pkgconfig/benchmark.pc
+lib/libgrpcpp_channelz.so.%%PORTVERSION%%
+lib/libupb.so
+lib/libupb.so.14
+lib/libupb.so.14.0.0
+libdata/pkgconfig/gpr.pc
+libdata/pkgconfig/grpc++.pc
+libdata/pkgconfig/grpc++_unsecure.pc
+libdata/pkgconfig/grpc.pc
+libdata/pkgconfig/grpc_unsecure.pc
%%DATADIR%%/roots.pem
More information about the svn-ports-head
mailing list