diff options
author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2018-04-15 02:00:36 +0000 |
---|---|---|
committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2018-04-15 02:00:36 +0000 |
commit | 332992a68bdae33f02b116350c4898eaba91a6f1 (patch) | |
tree | ee6c348f478cb294d247d3393b734797abf3cbb1 /devel/grpc | |
parent | 9ee06d2610a295f140f7354e28e76c5500e43374 (diff) | |
download | ports-332992a68bdae33f02b116350c4898eaba91a6f1.tar.gz ports-332992a68bdae33f02b116350c4898eaba91a6f1.zip |
Notes
Diffstat (limited to 'devel/grpc')
-rw-r--r-- | devel/grpc/Makefile | 2 | ||||
-rw-r--r-- | devel/grpc/distinfo | 6 | ||||
-rw-r--r-- | devel/grpc/files/patch-CMakeLists.txt | 32 | ||||
-rw-r--r-- | devel/grpc/files/patch-src_core_lib_gpr_arena.cc | 4 | ||||
-rw-r--r-- | devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc | 4 | ||||
-rw-r--r-- | devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc | 8 | ||||
-rw-r--r-- | devel/grpc/pkg-plist | 10 |
7 files changed, 35 insertions, 31 deletions
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 7cfad9f03dbe..66bd81b72692 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.10.1 +PORTVERSION= 1.11.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo index 49670cd98d55..2d23c72d9a48 100644 --- a/devel/grpc/distinfo +++ b/devel/grpc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1522984684 -SHA256 (grpc-grpc-v1.10.1_GH0.tar.gz) = 4f7aca656d1fa4586b1cf1980415601f7c198f89e691bf13429f9b46440ee250 -SIZE (grpc-grpc-v1.10.1_GH0.tar.gz) = 13161268 +TIMESTAMP = 1523718131 +SHA256 (grpc-grpc-v1.11.0_GH0.tar.gz) = df9bb06e89d0f904176d4df76f38031711fa369283e5c731da26032526e775f1 +SIZE (grpc-grpc-v1.11.0_GH0.tar.gz) = 13431990 SHA256 (google-benchmark-v1.4.0_GH0.tar.gz) = 616f252f37d61b15037e3c2ef956905baf9c9eecfeab400cb3ad25bae714e214 SIZE (google-benchmark-v1.4.0_GH0.tar.gz) = 125274 diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt index c890833e4e2c..ba104673b7bc 100644 --- a/devel/grpc/files/patch-CMakeLists.txt +++ b/devel/grpc/files/patch-CMakeLists.txt @@ -1,6 +1,14 @@ ---- CMakeLists.txt.orig 2018-03-01 18:16:44 UTC +--- CMakeLists.txt.orig 2018-04-13 18:08:11 UTC +++ CMakeLists.txt -@@ -666,6 +666,7 @@ add_library(gpr +@@ -664,6 +664,7 @@ add_library(address_sorting + third_party/address_sorting/address_sorting_posix.c + third_party/address_sorting/address_sorting_windows.c + ) ++set_target_properties(address_sorting PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) + + if(WIN32 AND MSVC) + set_target_properties(address_sorting PROPERTIES COMPILE_PDB_NAME "address_sorting" +@@ -784,6 +785,7 @@ add_library(gpr src/core/lib/profiling/basic_timers.cc src/core/lib/profiling/stap_timers.cc ) @@ -8,7 +16,7 @@ if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1032,6 +1033,7 @@ add_library(grpc +@@ -1211,6 +1213,7 @@ add_library(grpc src/core/ext/filters/workarounds/workaround_utils.cc src/core/plugin_registry/grpc_plugin_registry.cc ) @@ -16,7 +24,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1343,6 +1345,7 @@ add_library(grpc_cronet +@@ -1581,6 +1584,7 @@ add_library(grpc_cronet src/core/ext/filters/load_reporting/server_load_reporting_plugin.cc src/core/plugin_registry/grpc_cronet_plugin_registry.cc ) @@ -24,7 +32,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_cronet PROPERTIES COMPILE_PDB_NAME "grpc_cronet" -@@ -2220,6 +2223,7 @@ add_library(grpc_unsecure +@@ -2509,6 +2513,7 @@ add_library(grpc_unsecure src/core/ext/filters/workarounds/workaround_utils.cc src/core/plugin_registry/grpc_unsecure_plugin_registry.cc ) @@ -32,7 +40,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2429,6 +2433,7 @@ add_library(grpc++ +@@ -2722,6 +2727,7 @@ add_library(grpc++ src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -40,7 +48,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -2969,6 +2974,7 @@ add_library(grpc++_cronet +@@ -3282,6 +3288,7 @@ add_library(grpc++_cronet third_party/nanopb/pb_decode.c third_party/nanopb/pb_encode.c ) @@ -48,7 +56,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_cronet PROPERTIES COMPILE_PDB_NAME "grpc++_cronet" -@@ -3231,6 +3237,7 @@ add_library(grpc++_error_details +@@ -3546,6 +3553,7 @@ add_library(grpc++_error_details ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h src/cpp/util/error_details.cc ) @@ -56,7 +64,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3355,6 +3362,7 @@ add_library(grpc++_reflection +@@ -3676,6 +3684,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 ) @@ -64,7 +72,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -3834,6 +3842,7 @@ add_library(grpc++_unsecure +@@ -4172,6 +4181,7 @@ add_library(grpc++_unsecure src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) @@ -72,7 +80,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -4206,6 +4215,7 @@ add_library(grpc_plugin_support +@@ -4549,6 +4559,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) @@ -80,7 +88,7 @@ if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4700,6 +4710,7 @@ endif (gRPC_BUILD_TESTS) +@@ -5061,6 +5072,7 @@ endif (gRPC_BUILD_TESTS) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) diff --git a/devel/grpc/files/patch-src_core_lib_gpr_arena.cc b/devel/grpc/files/patch-src_core_lib_gpr_arena.cc index da383493a27e..81bf4d2cfd93 100644 --- a/devel/grpc/files/patch-src_core_lib_gpr_arena.cc +++ b/devel/grpc/files/patch-src_core_lib_gpr_arena.cc @@ -1,6 +1,6 @@ ---- src/core/lib/gpr/arena.cc.orig 2018-03-02 14:59:20 UTC +--- src/core/lib/gpr/arena.cc.orig 2018-04-13 18:08:11 UTC +++ src/core/lib/gpr/arena.cc -@@ -83,7 +83,7 @@ void* gpr_arena_alloc(gpr_arena* arena, +@@ -128,7 +128,7 @@ void* gpr_arena_alloc(gpr_arena* arena, ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(zone)) + next_z_size)); next_z->size_begin = z->size_end; next_z->size_end = z->size_end + next_z_size; diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc index f7d4c973b988..86738c86fe5b 100644 --- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc +++ b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc @@ -1,6 +1,6 @@ ---- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2018-02-01 19:36:08 UTC +--- 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 -@@ -463,7 +463,7 @@ static BIGNUM* bignum_from_base64(const +@@ -466,7 +466,7 @@ static BIGNUM* bignum_from_base64(const return result; } diff --git a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc index e97fe356d668..135ecb7d9057 100644 --- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc +++ b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc @@ -1,15 +1,15 @@ ---- src/core/tsi/ssl_transport_security.cc.orig 2017-12-13 01:39:01 UTC +--- src/core/tsi/ssl_transport_security.cc.orig 2018-04-13 18:08:11 UTC +++ src/core/tsi/ssl_transport_security.cc @@ -19,7 +19,7 @@ - #include "src/core/tsi/ssl_transport_security.h" - #include <grpc/support/port_platform.h> + + #include "src/core/tsi/ssl_transport_security.h" - +#include <sys/socket.h> #include <limits.h> #include <string.h> -@@ -56,11 +56,10 @@ extern "C" { +@@ -58,11 +58,10 @@ extern "C" { #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND 16384 #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024 diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist index 6c0f57d456fe..989120890beb 100644 --- a/devel/grpc/pkg-plist +++ b/devel/grpc/pkg-plist @@ -1,17 +1,10 @@ -bin/check_epollexclusive -bin/gen_hpack_tables -bin/gen_legal_metadata_characters -bin/gen_percent_encoding_tables bin/grpc_cpp_plugin -bin/grpc_create_jwt bin/grpc_csharp_plugin bin/grpc_node_plugin bin/grpc_objective_c_plugin bin/grpc_php_plugin -bin/grpc_print_google_default_creds_token bin/grpc_python_plugin bin/grpc_ruby_plugin -bin/grpc_verify_jwt include/benchmark/benchmark.h include/grpc++/alarm.h include/grpc++/channel.h @@ -232,6 +225,9 @@ lib/cmake/grpc/gRPCConfig.cmake lib/cmake/grpc/gRPCConfigVersion.cmake lib/cmake/grpc/gRPCTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/grpc/gRPCTargets.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 |