Index: head/devel/grpc/Makefile =================================================================== --- head/devel/grpc/Makefile (revision 453438) +++ head/devel/grpc/Makefile (revision 453439) @@ -1,38 +1,38 @@ # Created by: vanilla@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.6.7 +PORTVERSION= 1.7.0 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= vanilla@FreeBSD.org COMMENT= HTTP/2-based RPC framework LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go:lang/go \ yasm:devel/yasm LIB_DEPENDS= libgflags.so:devel/gflags \ libprotobuf.so:devel/protobuf \ libcares.so:dns/c-ares USES= cmake localbase:ldflags perl5 pkgconfig ssl USE_GITHUB= yes -GH_TUPLE= google:benchmark:v1.2.0:benchmark/third_party/benchmark +GH_TUPLE= google:benchmark:v1.3.0: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 \ -DBUILD_SHARED_LIBS=ON .include Index: head/devel/grpc/distinfo =================================================================== --- head/devel/grpc/distinfo (revision 453438) +++ head/devel/grpc/distinfo (revision 453439) @@ -1,5 +1,5 @@ -TIMESTAMP = 1508735707 -SHA256 (grpc-grpc-v1.6.7_GH0.tar.gz) = 0ed08e406eb3ecb1ab88b1eb183c7c51a996dae8fa79a0e6fbb9561c9098bf96 -SIZE (grpc-grpc-v1.6.7_GH0.tar.gz) = 4835956 -SHA256 (google-benchmark-v1.2.0_GH0.tar.gz) = 3dcc90c158838e2ac4a7ad06af9e28eb5877cf28252a81e55eb3c836757d3070 -SIZE (google-benchmark-v1.2.0_GH0.tar.gz) = 102297 +TIMESTAMP = 1509758803 +SHA256 (grpc-grpc-v1.7.0_GH0.tar.gz) = eddbef9b16eafe1760aadc3c94507a433a9f8de4f82a53c7d68a950fbb866a73 +SIZE (grpc-grpc-v1.7.0_GH0.tar.gz) = 4724700 +SHA256 (google-benchmark-v1.3.0_GH0.tar.gz) = f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d +SIZE (google-benchmark-v1.3.0_GH0.tar.gz) = 105485 Index: head/devel/grpc/files/patch-CMakeLists.txt =================================================================== --- head/devel/grpc/files/patch-CMakeLists.txt (revision 453438) +++ head/devel/grpc/files/patch-CMakeLists.txt (revision 453439) @@ -1,119 +1,100 @@ ---- CMakeLists.txt.orig 2017-10-05 19:05:39 UTC +--- CMakeLists.txt.orig 2017-10-26 19:11:22 UTC +++ CMakeLists.txt -@@ -156,7 +156,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo +@@ -144,7 +144,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo set(gRPC_INSTALL FALSE) endif() elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package") -- find_package(c-ares CONFIG) +- find_package(c-ares REQUIRED CONFIG) + find_package(PkgConfig REQUIRED) + pkg_search_module(CARES REQUIRED libcares) if(TARGET c-ares::cares) set(_gRPC_CARES_LIBRARIES c-ares::cares) endif() -@@ -188,9 +189,6 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL - if(TARGET libprotoc) - set(_gRPC_PROTOBUF_PROTOC_LIBRARIES libprotoc) - endif() -- if(TARGET protoc) -- set(_gRPC_PROTOBUF_PROTOC protoc) -- endif() - else() - message(WARNING "gRPC_PROTOBUF_PROVIDER is \"module\" but PROTOBUF_ROOT_DIR is wrong") - endif() -@@ -339,7 +337,7 @@ function(protobuf_generate_grpc_cpp) - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}_mock.grpc.pb.h" - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.cc" - "${_gRPC_PROTO_GENS_DIR}/${RELFIL_WE}.pb.h" -- COMMAND $ -+ COMMAND protoc - ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} - --cpp_out=${_gRPC_PROTO_GENS_DIR} - --plugin=protoc-gen-grpc=$ -@@ -818,6 +816,7 @@ add_library(gpr +@@ -828,6 +829,7 @@ add_library(gpr src/core/lib/support/tmpfile_windows.c src/core/lib/support/wrap_memcpy.c ) +set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1206,6 +1205,7 @@ add_library(grpc +@@ -1220,6 +1222,7 @@ add_library(grpc src/core/ext/filters/workarounds/workaround_utils.c src/core/plugin_registry/grpc_plugin_registry.c ) +set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -1512,6 +1512,7 @@ add_library(grpc_cronet - src/core/ext/filters/load_reporting/load_reporting_filter.c +@@ -1533,6 +1536,7 @@ add_library(grpc_cronet + src/core/ext/filters/load_reporting/server_load_reporting_plugin.c src/core/plugin_registry/grpc_cronet_plugin_registry.c ) +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" -@@ -2344,6 +2345,7 @@ add_library(grpc_unsecure +@@ -2383,6 +2387,7 @@ add_library(grpc_unsecure src/core/ext/filters/workarounds/workaround_utils.c src/core/plugin_registry/grpc_unsecure_plugin_registry.c ) +set_target_properties(grpc_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_unsecure" -@@ -2561,6 +2563,7 @@ add_library(grpc++ +@@ -2598,6 +2603,7 @@ add_library(grpc++ src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) +set_target_properties(grpc++ PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc++ PROPERTIES COMPILE_PDB_NAME "grpc++" -@@ -2991,6 +2994,7 @@ add_library(grpc++_cronet +@@ -3097,6 +3103,7 @@ add_library(grpc++_cronet third_party/nanopb/pb_decode.c third_party/nanopb/pb_encode.c ) +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" -@@ -3187,6 +3191,7 @@ add_library(grpc++_error_details +@@ -3297,6 +3304,7 @@ add_library(grpc++_error_details ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/status/status.grpc.pb.h src/cpp/util/error_details.cc ) +set_target_properties(grpc++_error_details PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc++_error_details PROPERTIES COMPILE_PDB_NAME "grpc++_error_details" -@@ -3317,6 +3322,7 @@ add_library(grpc++_reflection +@@ -3423,6 +3431,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 ) +set_target_properties(grpc++_reflection PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc++_reflection PROPERTIES COMPILE_PDB_NAME "grpc++_reflection" -@@ -3740,6 +3746,7 @@ add_library(grpc++_unsecure +@@ -3846,6 +3855,7 @@ add_library(grpc++_unsecure src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) +set_target_properties(grpc++_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc++_unsecure PROPERTIES COMPILE_PDB_NAME "grpc++_unsecure" -@@ -4053,6 +4060,7 @@ add_library(grpc_plugin_support +@@ -4159,6 +4169,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) +set_target_properties(grpc_plugin_support PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4577,6 +4585,7 @@ endif (gRPC_BUILD_TESTS) +@@ -4668,6 +4679,7 @@ endif (gRPC_BUILD_TESTS) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) +set_target_properties(grpc_csharp_ext PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" Index: head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c =================================================================== --- head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c (revision 453438) +++ head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c (revision 453439) @@ -1,11 +1,11 @@ ---- src/core/lib/security/credentials/jwt/jwt_verifier.c.orig 2017-10-05 19:05:39 UTC +--- src/core/lib/security/credentials/jwt/jwt_verifier.c.orig 2017-10-26 19:11:22 UTC +++ src/core/lib/security/credentials/jwt/jwt_verifier.c @@ -462,7 +462,7 @@ static BIGNUM *bignum_from_base64(grpc_e return result; } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) // Provide compatibility across OpenSSL 1.02 and 1.1. static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) { Index: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c =================================================================== --- head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c (revision 453438) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c (revision 453439) @@ -1,25 +1,25 @@ ---- src/core/tsi/ssl_transport_security.c.orig 2017-10-05 19:05:39 UTC +--- src/core/tsi/ssl_transport_security.c.orig 2017-10-26 19:11:22 UTC +++ src/core/tsi/ssl_transport_security.c @@ -20,6 +20,7 @@ #include +#include #include #include @@ -54,11 +55,10 @@ #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_UPPER_BOUND 16384 #define TSI_SSL_MAX_PROTECTED_FRAME_SIZE_LOWER_BOUND 1024 -/* Putting a macro like this and littering the source file with #if is really - bad practice. - TODO(jboeuf): refactor all the #if / #endif in a separate module. */ -#ifndef TSI_OPENSSL_ALPN_SUPPORT +#if OPENSSL_VERSION_NUMBER >= 0x10002000L #define TSI_OPENSSL_ALPN_SUPPORT 1 +#else +#define TSI_OPENSSL_ALPN_SUPPORT 0 #endif /* TODO(jboeuf): I have not found a way to get this number dynamically from the Index: head/devel/grpc/pkg-plist =================================================================== --- head/devel/grpc/pkg-plist (revision 453438) +++ head/devel/grpc/pkg-plist (revision 453439) @@ -1,198 +1,204 @@ 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/benchmark/benchmark_api.h include/benchmark/reporter.h include/grpc++/alarm.h include/grpc++/channel.h include/grpc++/client_context.h include/grpc++/completion_queue.h include/grpc++/create_channel.h include/grpc++/create_channel_posix.h include/grpc++/ext/health_check_service_server_builder_option.h include/grpc++/ext/proto_server_reflection_plugin.h include/grpc++/generic/async_generic_service.h include/grpc++/generic/generic_stub.h include/grpc++/grpc++.h include/grpc++/health_check_service_interface.h include/grpc++/impl/call.h include/grpc++/impl/channel_argument_option.h include/grpc++/impl/client_unary_call.h include/grpc++/impl/codegen/async_stream.h include/grpc++/impl/codegen/async_unary_call.h +include/grpc++/impl/codegen/byte_buffer.h include/grpc++/impl/codegen/call.h include/grpc++/impl/codegen/call_hook.h include/grpc++/impl/codegen/channel_interface.h include/grpc++/impl/codegen/client_context.h include/grpc++/impl/codegen/client_unary_call.h include/grpc++/impl/codegen/completion_queue.h include/grpc++/impl/codegen/completion_queue_tag.h include/grpc++/impl/codegen/config.h include/grpc++/impl/codegen/config_protobuf.h include/grpc++/impl/codegen/core_codegen.h include/grpc++/impl/codegen/core_codegen_interface.h include/grpc++/impl/codegen/create_auth_context.h include/grpc++/impl/codegen/grpc_library.h include/grpc++/impl/codegen/metadata_map.h include/grpc++/impl/codegen/method_handler_impl.h include/grpc++/impl/codegen/proto_utils.h include/grpc++/impl/codegen/rpc_method.h include/grpc++/impl/codegen/rpc_service_method.h include/grpc++/impl/codegen/security/auth_context.h include/grpc++/impl/codegen/serialization_traits.h include/grpc++/impl/codegen/server_context.h include/grpc++/impl/codegen/server_interface.h include/grpc++/impl/codegen/service_type.h include/grpc++/impl/codegen/slice.h include/grpc++/impl/codegen/status.h include/grpc++/impl/codegen/status_code_enum.h include/grpc++/impl/codegen/string_ref.h include/grpc++/impl/codegen/stub_options.h include/grpc++/impl/codegen/sync_stream.h include/grpc++/impl/codegen/time.h include/grpc++/impl/grpc_library.h include/grpc++/impl/method_handler_impl.h include/grpc++/impl/rpc_method.h include/grpc++/impl/rpc_service_method.h include/grpc++/impl/serialization_traits.h include/grpc++/impl/server_builder_option.h include/grpc++/impl/server_builder_plugin.h include/grpc++/impl/server_initializer.h include/grpc++/impl/service_type.h include/grpc++/resource_quota.h include/grpc++/security/auth_context.h include/grpc++/security/auth_metadata_processor.h include/grpc++/security/credentials.h include/grpc++/security/server_credentials.h include/grpc++/server.h include/grpc++/server_builder.h include/grpc++/server_context.h include/grpc++/server_posix.h include/grpc++/support/async_stream.h include/grpc++/support/async_unary_call.h include/grpc++/support/byte_buffer.h include/grpc++/support/channel_arguments.h include/grpc++/support/config.h include/grpc++/support/error_details.h include/grpc++/support/slice.h include/grpc++/support/status.h include/grpc++/support/status_code_enum.h include/grpc++/support/string_ref.h include/grpc++/support/stub_options.h include/grpc++/support/sync_stream.h include/grpc++/support/time.h include/grpc/byte_buffer.h include/grpc/byte_buffer_reader.h 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 include/grpc/impl/codegen/atm.h include/grpc/impl/codegen/atm_gcc_atomic.h include/grpc/impl/codegen/atm_gcc_sync.h include/grpc/impl/codegen/atm_windows.h +include/grpc/impl/codegen/byte_buffer.h include/grpc/impl/codegen/byte_buffer_reader.h include/grpc/impl/codegen/compression_types.h include/grpc/impl/codegen/connectivity_state.h include/grpc/impl/codegen/exec_ctx_fwd.h +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/port_platform.h 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_custom.h include/grpc/impl/codegen/sync_generic.h include/grpc/impl/codegen/sync_posix.h include/grpc/impl/codegen/sync_windows.h include/grpc/load_reporting.h include/grpc/slice.h include/grpc/slice_buffer.h include/grpc/status.h include/grpc/support/alloc.h include/grpc/support/atm.h include/grpc/support/atm_gcc_atomic.h include/grpc/support/atm_gcc_sync.h include/grpc/support/atm_windows.h include/grpc/support/avl.h include/grpc/support/cmdline.h include/grpc/support/cpu.h include/grpc/support/histogram.h include/grpc/support/host_port.h include/grpc/support/log.h include/grpc/support/log_windows.h include/grpc/support/port_platform.h include/grpc/support/string_util.h include/grpc/support/subprocess.h include/grpc/support/sync.h +include/grpc/support/sync_custom.h include/grpc/support/sync_generic.h include/grpc/support/sync_posix.h include/grpc/support/sync_windows.h include/grpc/support/thd.h include/grpc/support/time.h include/grpc/support/tls.h include/grpc/support/tls_gcc.h include/grpc/support/tls_msvc.h include/grpc/support/tls_pthread.h include/grpc/support/useful.h include/grpc/support/workaround_list.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/libbenchmark.so lib/libbenchmark.so.0 lib/libbenchmark.so.0.0.0 lib/libgpr.so lib/libgpr.so.1 lib/libgpr.so.%%SOVERSION%% 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++_error_details.so lib/libgrpc++_error_details.so.1 lib/libgrpc++_error_details.so.%%SOVERSION%% lib/libgrpc++_reflection.so lib/libgrpc++_reflection.so.1 lib/libgrpc++_reflection.so.%%SOVERSION%% lib/libgrpc++_unsecure.so lib/libgrpc++_unsecure.so.1 lib/libgrpc++_unsecure.so.%%SOVERSION%% 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_plugin_support.so lib/libgrpc_plugin_support.so.1 lib/libgrpc_plugin_support.so.%%SOVERSION%% lib/libgrpc_unsecure.so lib/libgrpc_unsecure.so.1 lib/libgrpc_unsecure.so.%%SOVERSION%%