Date: Fri, 23 Nov 2018 00:15:23 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485629 - in head/devel/grpc: . files Message-ID: <201811230015.wAN0FNRK021746@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Nov 23 00:15:23 2018 New Revision: 485629 URL: https://svnweb.freebsd.org/changeset/ports/485629 Log: Update to 1.15.1. Deleted: head/devel/grpc/files/patch-src_core_lib_gpr_arena.cc Modified: head/devel/grpc/Makefile head/devel/grpc/distinfo head/devel/grpc/files/patch-CMakeLists.txt head/devel/grpc/files/patch-cmake_cares.cmake head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc head/devel/grpc/pkg-plist Modified: head/devel/grpc/Makefile ============================================================================== --- head/devel/grpc/Makefile Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/Makefile Fri Nov 23 00:15:23 2018 (r485629) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.13.1 +PORTVERSION= 1.15.1 DISTVERSIONPREFIX= v PORTREVISION= 0 PORTEPOCH= 1 Modified: head/devel/grpc/distinfo ============================================================================== --- head/devel/grpc/distinfo Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/distinfo Fri Nov 23 00:15:23 2018 (r485629) @@ -1,5 +1,5 @@ -TIMESTAMP = 1531830492 -SHA256 (grpc-grpc-v1.13.1_GH0.tar.gz) = af0d41b5fab2797a3bd71bfe1b8c94e553b7c7317f87f664de26bafbf75677c4 -SIZE (grpc-grpc-v1.13.1_GH0.tar.gz) = 13757818 +TIMESTAMP = 1542928471 +SHA256 (grpc-grpc-v1.15.1_GH0.tar.gz) = 0186e800fbda420305c3489ddb28394059e1e6fc192a97fc7412d21b7306d82e +SIZE (grpc-grpc-v1.15.1_GH0.tar.gz) = 14084914 SHA256 (google-benchmark-v1.4.1_GH0.tar.gz) = f8e525db3c42efc9c7f3bc5176a8fa893a9a9920bbd08cef30fb56a51854d60d SIZE (google-benchmark-v1.4.1_GH0.tar.gz) = 126850 Modified: head/devel/grpc/files/patch-CMakeLists.txt ============================================================================== --- head/devel/grpc/files/patch-CMakeLists.txt Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/files/patch-CMakeLists.txt Fri Nov 23 00:15:23 2018 (r485629) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2018-04-13 18:08:11 UTC +--- CMakeLists.txt.orig 2018-09-24 23:51:30 UTC +++ CMakeLists.txt -@@ -664,6 +664,7 @@ add_library(address_sorting +@@ -686,6 +686,7 @@ add_library(address_sorting third_party/address_sorting/address_sorting_posix.c third_party/address_sorting/address_sorting_windows.c ) @@ -8,7 +8,7 @@ if(WIN32 AND MSVC) set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting" -@@ -784,6 +785,7 @@ add_library(gpr +@@ -809,6 +810,7 @@ add_library(gpr src/core/lib/profiling/basic_timers.cc src/core/lib/profiling/stap_timers.cc ) @@ -16,7 +16,7 @@ if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1211,6 +1213,7 @@ add_library(grpc +@@ -1248,6 +1250,7 @@ add_library(grpc src/core/ext/filters/workarounds/workaround_utils.cc src/core/plugin_registry/grpc_plugin_registry.cc ) @@ -24,15 +24,15 @@ if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1581,6 +1584,7 @@ add_library(grpc_cronet - src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc +@@ -1624,6 +1627,7 @@ add_library(grpc_cronet + src/core/tsi/transport_security_grpc.cc src/core/plugin_registry/grpc_cronet_plugin_registry.cc ) +set_target_properties(grpc_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -2509,6 +2513,7 @@ add_library(grpc_unsecure +@@ -2569,6 +2573,7 @@ add_library(grpc_unsecure src/core/ext/filters/workarounds/workaround_utils.cc src/core/plugin_registry/grpc_unsecure_plugin_registry.cc ) @@ -40,7 +40,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2722,6 +2727,7 @@ add_library(grpc++ +@@ -2785,6 +2790,7 @@ add_library(grpc++ src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -48,15 +48,15 @@ if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -3282,6 +3288,7 @@ add_library(grpc++_cronet - third_party/nanopb/pb_decode.c - third_party/nanopb/pb_encode.c +@@ -3351,6 +3357,7 @@ add_library(grpc++_cronet + src/core/ext/transport/chttp2/server/chttp2_server.cc + src/core/ext/filters/census/grpc_context.cc ) +set_target_properties(grpc++_cronet PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -3546,6 +3553,7 @@ add_library(grpc++_error_details +@@ -3620,6 +3627,7 @@ add_library(grpc++_error_details ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h src/cpp/util/error_details.cc ) @@ -64,7 +64,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3676,6 +3684,7 @@ add_library(grpc++_reflection +@@ -3752,6 +3760,7 @@ add_library(grpc++_reflection ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.pb.h ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h ) @@ -72,7 +72,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -4172,6 +4181,7 @@ add_library(grpc++_unsecure +@@ -4259,6 +4268,7 @@ add_library(grpc++_unsecure src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -80,7 +80,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -4549,6 +4559,7 @@ add_library(grpc_plugin_support +@@ -4643,6 +4653,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) @@ -88,7 +88,15 @@ if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -5061,6 +5072,7 @@ endif (gRPC_BUILD_TESTS) +@@ -4706,6 +4717,7 @@ add_library(grpcpp_channelz + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.pb.h + ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/channelz/channelz.grpc.pb.h + ) ++set_target_properties(grpcpp_channelz PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(grpcpp_channelz PROPERTIES COMPILE_PDB_NAME "grpcpp_channelz" +@@ -5246,6 +5258,7 @@ if (gRPC_BUILD_CSHARP_EXT) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) Modified: head/devel/grpc/files/patch-cmake_cares.cmake ============================================================================== --- head/devel/grpc/files/patch-cmake_cares.cmake Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/files/patch-cmake_cares.cmake Fri Nov 23 00:15:23 2018 (r485629) @@ -1,6 +1,6 @@ ---- cmake/cares.cmake.orig 2018-03-01 18:16:44 UTC +--- cmake/cares.cmake.orig 2018-09-24 23:51:30 UTC +++ cmake/cares.cmake -@@ -31,7 +31,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo +@@ -31,7 +31,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "module") endif() elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package") # Use "CONFIG" as there is no built-in cmake module for c-ares. 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 Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc Fri Nov 23 00:15:23 2018 (r485629) @@ -1,6 +1,6 @@ ---- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2018-04-13 18:08:11 UTC +--- 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 -@@ -466,7 +466,7 @@ static BIGNUM* bignum_from_base64(const +@@ -468,7 +468,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 Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/files/patch-src_core_tsi_alts_crypt_aes__gcm.cc Fri Nov 23 00:15:23 2018 (r485629) @@ -1,6 +1,6 @@ ---- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2018-04-16 04:55:21 UTC +--- src/core/tsi/alts/crypt/aes_gcm.cc.orig 2018-09-24 23:51:30 UTC +++ src/core/tsi/alts/crypt/aes_gcm.cc -@@ -185,7 +185,7 @@ static grpc_status_code aes_gcm_derive_aead_key(uint8_ +@@ -187,7 +187,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 Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc Fri Nov 23 00:15:23 2018 (r485629) @@ -1,7 +1,7 @@ ---- src/core/tsi/ssl_transport_security.cc.orig 2018-04-13 18:08:11 UTC +--- src/core/tsi/ssl_transport_security.cc.orig 2018-09-24 23:51:30 UTC +++ src/core/tsi/ssl_transport_security.cc -@@ -19,7 +19,7 @@ - #include <grpc/support/port_platform.h> +@@ -21,7 +21,7 @@ + #include "src/core/tsi/grpc_shadow_boringssl.h" #include "src/core/tsi/ssl_transport_security.h" - @@ -9,9 +9,9 @@ #include <limits.h> #include <string.h> -@@ -58,11 +58,10 @@ extern "C" { - #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND 16384 +@@ -61,11 +61,10 @@ extern "C" { #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024 + #define TSI_SSL_HANDSHAKER_OUTGOING_BUFFER_INITIAL_SIZE 1024 -/* Putting a macro like this and littering the source file with #if is really - bad practice. @@ -24,7 +24,7 @@ #endif /* TODO(jboeuf): I have not found a way to get this number dynamically from the -@@ -1547,7 +1546,7 @@ tsi_result tsi_create_ssl_client_handshaker_factory_wi +@@ -1676,7 +1675,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 Thu Nov 22 23:12:20 2018 (r485628) +++ head/devel/grpc/pkg-plist Fri Nov 23 00:15:23 2018 (r485629) @@ -107,6 +107,7 @@ include/grpc/impl/codegen/fork.h include/grpc/impl/codegen/gpr_slice.h include/grpc/impl/codegen/gpr_types.h include/grpc/impl/codegen/grpc_types.h +include/grpc/impl/codegen/log.h include/grpc/impl/codegen/port_platform.h include/grpc/impl/codegen/propagation_bits.h include/grpc/impl/codegen/slice.h @@ -144,6 +145,7 @@ include/grpcpp/client_context.h include/grpcpp/completion_queue.h include/grpcpp/create_channel.h include/grpcpp/create_channel_posix.h +include/grpcpp/ext/channelz_service_plugin.h include/grpcpp/ext/health_check_service_server_builder_option.h include/grpcpp/ext/proto_server_reflection_plugin.h include/grpcpp/generic/async_generic_service.h @@ -153,6 +155,7 @@ include/grpcpp/health_check_service_interface.h include/grpcpp/impl/call.h include/grpcpp/impl/channel_argument_option.h include/grpcpp/impl/client_unary_call.h +include/grpcpp/impl/codegen/async_generic_service.h include/grpcpp/impl/codegen/async_stream.h include/grpcpp/impl/codegen/async_unary_call.h include/grpcpp/impl/codegen/byte_buffer.h @@ -271,5 +274,8 @@ lib/libgrpc_plugin_support.so.2.0.0 lib/libgrpc_unsecure.so lib/libgrpc_unsecure.so.1 lib/libgrpc_unsecure.so.%%SOVERSION%% +lib/libgrpcpp_channelz.so +lib/libgrpcpp_channelz.so.1 +lib/libgrpcpp_channelz.so.%%SOVERSION%% libdata/pkgconfig/benchmark.pc %%DATADIR%%/roots.pem
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811230015.wAN0FNRK021746>