Index: head/devel/grpc/Makefile =================================================================== --- head/devel/grpc/Makefile (revision 451347) +++ head/devel/grpc/Makefile (revision 451348) @@ -1,39 +1,38 @@ # Created by: vanilla@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.4.5 +PORTVERSION= 1.6.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= vanilla@FreeBSD.org COMMENT= HTTP/2-based RPC framework LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= go:lang/go +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:boringssl:ba2d3df:boringssl/third_party/boringssl \ - google:benchmark:v1.2.0:benchmark/third_party/benchmark - -USES= cmake localbase:ldflags perl5 pkgconfig +GH_TUPLE= google:benchmark:v1.2.0:benchmark/third_party/benchmark USE_LDCONFIG= yes USE_PERL5= build PLIST_SUB+= SOVERSION=${PORTVERSION} LDFLAGS+= -lcares -CMAKE_ARGS= -DgRPC_ZLIB_PROVIDER:STRING="package" \ + +CMAKE_ARGS= -DgRPC_ZLIB_PROVIDER:STRING="package" \ -DgRPC_PROTOBUF_PROVIDER:STRING="package" \ -DgRPC_GFLAGS_PROVIDER:STRING="package" \ - -DgRPC_SSL_PROVIDER:STRING="module" \ + -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 451347) +++ head/devel/grpc/distinfo (revision 451348) @@ -1,7 +1,5 @@ -TIMESTAMP = 1502460528 -SHA256 (grpc-grpc-v1.4.5_GH0.tar.gz) = 39545c6e3d5a41c6cdd42ef7ff8288bc58bacf47b791ed324268cdfa999db9df -SIZE (grpc-grpc-v1.4.5_GH0.tar.gz) = 4834127 -SHA256 (google-boringssl-ba2d3df_GH0.tar.gz) = 2dca8694f422c90a083493c1cbfd43e8f70f77a79f9ffda1131998af14d59ff4 -SIZE (google-boringssl-ba2d3df_GH0.tar.gz) = 13152379 +TIMESTAMP = 1507083365 +SHA256 (grpc-grpc-v1.6.5_GH0.tar.gz) = 939e686dc5b6221f959b839df0987fa9eda08ba8d72530ff7946d7226c2cb5ea +SIZE (grpc-grpc-v1.6.5_GH0.tar.gz) = 4835696 SHA256 (google-benchmark-v1.2.0_GH0.tar.gz) = 3dcc90c158838e2ac4a7ad06af9e28eb5877cf28252a81e55eb3c836757d3070 SIZE (google-benchmark-v1.2.0_GH0.tar.gz) = 102297 Index: head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt =================================================================== --- head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt (revision 451347) +++ head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt (nonexistent) @@ -1,67 +0,0 @@ ---- third_party/boringssl/crypto/CMakeLists.txt.orig 2017-08-08 09:40:29 UTC -+++ third_party/boringssl/crypto/CMakeLists.txt -@@ -212,64 +212,3 @@ SET_TARGET_PROPERTIES(crypto PROPERTIES - if(NOT MSVC AND NOT ANDROID) - target_link_libraries(crypto pthread) - endif() -- --# TODO(davidben): Convert the remaining tests to GTest. --add_executable( -- crypto_test -- -- asn1/asn1_test.cc -- base64/base64_test.cc -- bio/bio_test.cc -- bytestring/bytestring_test.cc -- chacha/chacha_test.cc -- cipher_extra/aead_test.cc -- cipher_extra/cipher_test.cc -- cmac/cmac_test.cc -- compiler_test.cc -- constant_time_test.cc -- curve25519/ed25519_test.cc -- curve25519/spake25519_test.cc -- curve25519/x25519_test.cc -- ecdh/ecdh_test.cc -- dh/dh_test.cc -- digest_extra/digest_test.cc -- dsa/dsa_test.cc -- err/err_test.cc -- evp/evp_extra_test.cc -- evp/evp_test.cc -- evp/pbkdf_test.cc -- evp/scrypt_test.cc -- fipsmodule/aes/aes_test.cc -- fipsmodule/bn/bn_test.cc -- fipsmodule/ec/ec_test.cc -- fipsmodule/ec/p256-x86_64_test.cc -- fipsmodule/ecdsa/ecdsa_test.cc -- fipsmodule/modes/gcm_test.cc -- fipsmodule/rand/ctrdrbg_test.cc -- hkdf/hkdf_test.cc -- hmac_extra/hmac_test.cc -- lhash/lhash_test.cc -- obj/obj_test.cc -- pkcs7/pkcs7_test.cc -- pkcs8/pkcs8_test.cc -- pkcs8/pkcs12_test.cc -- poly1305/poly1305_test.cc -- pool/pool_test.cc -- refcount_test.cc -- rsa_extra/rsa_test.cc -- test/file_test_gtest.cc -- thread_test.cc -- x509/x509_test.cc -- x509v3/tab_test.cc -- x509v3/v3name_test.cc -- -- $ -- $ -- $ --) -- --target_link_libraries(crypto_test crypto gtest) --if (WIN32) -- target_link_libraries(crypto_test ws2_32) --endif() --add_dependencies(all_tests crypto_test) Property changes on: head/devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/grpc/files/patch-CMakeLists.txt =================================================================== --- head/devel/grpc/files/patch-CMakeLists.txt (revision 451347) +++ head/devel/grpc/files/patch-CMakeLists.txt (revision 451348) @@ -1,314 +1,119 @@ ---- CMakeLists.txt.orig 2017-08-05 03:36:13 UTC +--- CMakeLists.txt.orig 2017-10-03 19:53:08 UTC +++ CMakeLists.txt -@@ -150,7 +150,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo - message(WARNING "gRPC_CARES_PROVIDER is \"module\" but CARES_ROOT_DIR is wrong") +@@ -156,7 +156,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo + set(gRPC_INSTALL FALSE) endif() elseif("${gRPC_CARES_PROVIDER}" STREQUAL "package") -- find_package(CARES) +- find_package(c-ares CONFIG) + find_package(PkgConfig REQUIRED) + pkg_search_module(CARES REQUIRED libcares) - if(TARGET CARES::CARES) - set(_gRPC_CARES_LIBRARIES CARES::CARES) + if(TARGET c-ares::cares) + set(_gRPC_CARES_LIBRARIES c-ares::cares) endif() -@@ -177,24 +178,14 @@ if("${gRPC_PROTOBUF_PROVIDER}" STREQUAL +@@ -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() - elseif("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "package") -- find_package(protobuf CONFIG) -- if(protobuf_FOUND) -- if(TARGET protobuf::${_gRPC_PROTOBUF_LIBRARY_NAME}) -- set(_gRPC_PROTOBUF_LIBRARIES protobuf::${_gRPC_PROTOBUF_LIBRARY_NAME}) -- endif() -- if(TARGET protobuf::libprotoc) -- set(_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc) -- endif() -- if(TARGET protobuf::protoc) -- set(_gRPC_PROTOBUF_PROTOC protobuf::protoc) -- endif() -+ find_library(LIBPROTOBUF protobuf) -+ if(LIBPROTOBUF) -+ set(_gRPC_PROTOBUF_LIBRARIES protobuf) -+ set(_gRPC_PROTOBUF_PROTOC_LIBRARIES protoc) - set(_gRPC_FIND_PROTOBUF "if(NOT protobuf_FOUND)\n find_package(protobuf CONFIG)\nendif()") - else() - find_package(Protobuf MODULE) -@@ -319,7 +310,7 @@ function(protobuf_generate_grpc_cpp) +@@ -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 ${_gRPC_PROTOBUF_PROTOC} +- COMMAND $ + COMMAND protoc ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} --cpp_out=${_gRPC_PROTO_GENS_DIR} --plugin=protoc-gen-grpc=$ -@@ -793,6 +784,7 @@ add_library(gpr +@@ -818,6 +816,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" -@@ -885,6 +877,7 @@ if (gRPC_BUILD_TESTS) - add_library(gpr_test_util - test/core/util/test_config.c - ) -+set_target_properties(gpr_test_util PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(gpr_test_util PROPERTIES COMPILE_PDB_NAME "gpr_test_util" -@@ -1172,6 +1165,7 @@ add_library(grpc +@@ -1206,6 +1205,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" -@@ -1473,6 +1467,7 @@ add_library(grpc_cronet +@@ -1512,6 +1512,7 @@ add_library(grpc_cronet src/core/ext/filters/load_reporting/load_reporting_filter.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" -@@ -1709,6 +1704,7 @@ add_library(grpc_test_util - src/core/lib/transport/transport_op_string.c - src/core/lib/debug/trace.c - ) -+set_target_properties(grpc_test_util PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_test_util PROPERTIES COMPILE_PDB_NAME "grpc_test_util" -@@ -1803,6 +1799,7 @@ add_library(grpc_test_util_unsecure - test/core/util/slice_splitter.c - test/core/util/trickle_endpoint.c - ) -+set_target_properties(grpc_test_util_unsecure PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_test_util_unsecure PROPERTIES COMPILE_PDB_NAME "grpc_test_util_unsecure" -@@ -2064,6 +2061,7 @@ add_library(grpc_unsecure +@@ -2344,6 +2345,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" -@@ -2152,6 +2150,7 @@ if (gRPC_BUILD_TESTS) - add_library(reconnect_server - test/core/util/reconnect_server.c - ) -+set_target_properties(reconnect_server PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(reconnect_server PROPERTIES COMPILE_PDB_NAME "reconnect_server" -@@ -2196,6 +2195,7 @@ if (gRPC_BUILD_TESTS) - add_library(test_tcp_server - test/core/util/test_tcp_server.c - ) -+set_target_properties(test_tcp_server PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(test_tcp_server PROPERTIES COMPILE_PDB_NAME "test_tcp_server" -@@ -2282,6 +2282,7 @@ add_library(grpc++ - third_party/nanopb/pb_encode.c +@@ -2561,6 +2563,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++" -@@ -2671,6 +2672,7 @@ add_library(grpc++_cronet - src/core/ext/census/trace_context.c - src/core/ext/census/tracing.c +@@ -2991,6 +2994,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" -@@ -2841,6 +2843,7 @@ add_library(grpc++_error_details +@@ -3187,6 +3191,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" -@@ -2908,6 +2911,7 @@ add_library(grpc++_proto_reflection_desc +@@ -3317,6 +3322,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++_proto_reflection_desc_db PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_proto_reflection_desc_db PROPERTIES COMPILE_PDB_NAME "grpc++_proto_reflection_desc_db" -@@ -2970,6 +2974,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" -@@ -3032,6 +3037,7 @@ if (gRPC_BUILD_TESTS) - add_library(grpc++_test_config - test/cpp/util/test_config_cc.cc - ) -+set_target_properties(grpc++_test_config PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_test_config PROPERTIES COMPILE_PDB_NAME "grpc++_test_config" -@@ -3100,6 +3106,7 @@ add_library(grpc++_test_util - test/cpp/util/test_credentials_provider.cc +@@ -3740,6 +3746,7 @@ add_library(grpc++_unsecure + src/cpp/util/time_cc.cc src/cpp/codegen/codegen_init.cc ) -+set_target_properties(grpc++_test_util PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc++_test_util PROPERTIES COMPILE_PDB_NAME "grpc++_test_util" -@@ -3255,6 +3262,7 @@ add_library(grpc++_unsecure - third_party/nanopb/pb_encode.c - 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" -@@ -3409,6 +3417,7 @@ if (gRPC_BUILD_TESTS) - add_library(grpc_benchmark - test/cpp/microbenchmarks/helpers.cc - ) -+set_target_properties(grpc_benchmark PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_benchmark PROPERTIES COMPILE_PDB_NAME "grpc_benchmark" -@@ -3467,6 +3476,7 @@ add_library(grpc_cli_libs - ${_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_cli_libs PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(grpc_cli_libs PROPERTIES COMPILE_PDB_NAME "grpc_cli_libs" -@@ -3531,6 +3541,7 @@ add_library(grpc_plugin_support +@@ -4053,6 +4060,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" -@@ -3602,6 +3613,7 @@ add_library(http2_client_main - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h - test/cpp/interop/http2_client.cc - ) -+set_target_properties(http2_client_main PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(http2_client_main PROPERTIES COMPILE_PDB_NAME "http2_client_main" -@@ -3665,6 +3677,7 @@ add_library(interop_client_helper - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h - test/cpp/interop/client_helper.cc - ) -+set_target_properties(interop_client_helper PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(interop_client_helper PROPERTIES COMPILE_PDB_NAME "interop_client_helper" -@@ -3731,6 +3744,7 @@ add_library(interop_client_main - test/cpp/interop/client.cc - test/cpp/interop/interop_client.cc - ) -+set_target_properties(interop_client_main PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(interop_client_main PROPERTIES COMPILE_PDB_NAME "interop_client_main" -@@ -3793,6 +3807,7 @@ if (gRPC_BUILD_TESTS) - add_library(interop_server_helper - test/cpp/interop/server_helper.cc - ) -+set_target_properties(interop_server_helper PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(interop_server_helper PROPERTIES COMPILE_PDB_NAME "interop_server_helper" -@@ -3855,6 +3870,7 @@ add_library(interop_server_lib - ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h - test/cpp/interop/interop_server.cc - ) -+set_target_properties(interop_server_lib PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(interop_server_lib PROPERTIES COMPILE_PDB_NAME "interop_server_lib" -@@ -3917,6 +3933,7 @@ if (gRPC_BUILD_TESTS) - add_library(interop_server_main - test/cpp/interop/interop_server_bootstrap.cc - ) -+set_target_properties(interop_server_main PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(interop_server_main PROPERTIES COMPILE_PDB_NAME "interop_server_main" -@@ -3992,6 +4009,7 @@ add_library(qps - test/cpp/qps/server_sync.cc - test/cpp/qps/usage_timer.cc - ) -+set_target_properties(qps PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(qps PROPERTIES COMPILE_PDB_NAME "qps" -@@ -4054,6 +4072,7 @@ endif (gRPC_BUILD_TESTS) +@@ -4577,6 +4585,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" -@@ -4151,6 +4170,7 @@ add_library(ares - third_party/cares/cares/inet_ntop.c - third_party/cares/cares/windows_port.c - ) -+set_target_properties(ares PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(ares PROPERTIES COMPILE_PDB_NAME "ares" -@@ -4191,6 +4211,7 @@ if (gRPC_BUILD_TESTS) - add_library(bad_client_test - test/core/bad_client/bad_client.c - ) -+set_target_properties(bad_client_test PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(bad_client_test PROPERTIES COMPILE_PDB_NAME "bad_client_test" -@@ -4234,6 +4255,7 @@ if (gRPC_BUILD_TESTS) - add_library(bad_ssl_test_server - test/core/bad_ssl/server_common.c - ) -+set_target_properties(bad_ssl_test_server PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(bad_ssl_test_server PROPERTIES COMPILE_PDB_NAME "bad_ssl_test_server" -@@ -4332,6 +4354,7 @@ add_library(end2end_tests - test/core/end2end/tests/write_buffering.c - test/core/end2end/tests/write_buffering_at_end.c - ) -+set_target_properties(end2end_tests PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(end2end_tests PROPERTIES COMPILE_PDB_NAME "end2end_tests" -@@ -4430,6 +4453,7 @@ add_library(end2end_nosec_tests - test/core/end2end/tests/write_buffering.c - test/core/end2end/tests/write_buffering_at_end.c - ) -+set_target_properties(end2end_nosec_tests PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) - - if(WIN32 AND MSVC) - set_target_properties(end2end_nosec_tests PROPERTIES COMPILE_PDB_NAME "end2end_nosec_tests" 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 (nonexistent) +++ head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c (revision 451348) @@ -0,0 +1,11 @@ +--- src/core/lib/security/credentials/jwt/jwt_verifier.c.orig 2017-10-06 04:31:53 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) { Property changes on: head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 451347) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c (revision 451348) @@ -1,10 +1,10 @@ ---- src/core/tsi/ssl_transport_security.c.orig 2017-08-05 03:36:13 UTC +--- src/core/tsi/ssl_transport_security.c.orig 2017-10-03 19:53:08 UTC +++ src/core/tsi/ssl_transport_security.c -@@ -35,6 +35,7 @@ +@@ -20,6 +20,7 @@ #include +#include #include #include Index: head/devel/grpc/pkg-plist =================================================================== --- head/devel/grpc/pkg-plist (revision 451347) +++ head/devel/grpc/pkg-plist (revision 451348) @@ -1,196 +1,198 @@ 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/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/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_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/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_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_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/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%%