Index: head/devel/grpc/Makefile =================================================================== --- head/devel/grpc/Makefile (revision 456206) +++ head/devel/grpc/Makefile (revision 456207) @@ -1,39 +1,38 @@ # Created by: vanilla@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.0 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 \ 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.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 456206) +++ head/devel/grpc/distinfo (revision 456207) @@ -1,5 +1,5 @@ -TIMESTAMP = 1512612110 -SHA256 (grpc-grpc-v1.7.3_GH0.tar.gz) = e31107f5ee6970525a2b48dd6392613a32d7eeb69c6151cde8f64272c179c866 -SIZE (grpc-grpc-v1.7.3_GH0.tar.gz) = 4728599 +TIMESTAMP = 1513174933 +SHA256 (grpc-grpc-v1.8.0_GH0.tar.gz) = 7d1c646c2012bdd0af275215c3fc882c598a1eb664c1012a49a81e4faf27a504 +SIZE (grpc-grpc-v1.8.0_GH0.tar.gz) = 4636987 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-src_core_lib_security_credentials_jwt_jwt__verifier.c =================================================================== --- head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c (revision 456206) +++ head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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) { Property changes on: head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c ___________________________________________________________________ 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-src_core_tsi_ssl__transport__security.c =================================================================== --- head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c (revision 456206) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c (nonexistent) @@ -1,25 +0,0 @@ ---- 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 Property changes on: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c ___________________________________________________________________ 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 456206) +++ head/devel/grpc/files/patch-CMakeLists.txt (revision 456207) @@ -1,108 +1,108 @@ ---- CMakeLists.txt.orig 2017-10-26 19:11:22 UTC +--- CMakeLists.txt.orig 2017-12-13 01:39:01 UTC +++ CMakeLists.txt @@ -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 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() -@@ -828,6 +829,7 @@ add_library(gpr - src/core/lib/support/tmpfile_windows.c - src/core/lib/support/wrap_memcpy.c +@@ -829,6 +830,7 @@ add_library(gpr + src/core/lib/support/tmpfile_windows.cc + src/core/lib/support/wrap_memcpy.cc ) +set_target_properties(gpr PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(gpr PROPERTIES COMPILE_PDB_NAME "gpr" -@@ -1220,6 +1222,7 @@ add_library(grpc - src/core/ext/filters/workarounds/workaround_utils.c - src/core/plugin_registry/grpc_plugin_registry.c +@@ -1209,6 +1211,7 @@ add_library(grpc + src/core/ext/filters/workarounds/workaround_utils.cc + src/core/plugin_registry/grpc_plugin_registry.cc ) +set_target_properties(grpc PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 1) if(WIN32 AND MSVC) set_target_properties(grpc PROPERTIES COMPILE_PDB_NAME "grpc" -@@ -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 +@@ -1523,6 +1526,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 ) +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" -@@ -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 +@@ -2390,6 +2394,7 @@ target_include_directories(grpc_unsecure + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/cares/cares + PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include ) +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" -@@ -2598,6 +2603,7 @@ add_library(grpc++ + target_link_libraries(grpc_unsecure + ${_gRPC_BASELIB_LIBRARIES} +@@ -2580,6 +2585,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++" -@@ -3097,6 +3103,7 @@ add_library(grpc++_cronet +@@ -3066,6 +3072,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" -@@ -3297,6 +3304,7 @@ add_library(grpc++_error_details +@@ -3266,6 +3273,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" -@@ -3423,6 +3431,7 @@ add_library(grpc++_reflection +@@ -3392,6 +3400,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" -@@ -3846,6 +3855,7 @@ add_library(grpc++_unsecure +@@ -3815,6 +3824,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" -@@ -4159,6 +4169,7 @@ add_library(grpc_plugin_support +@@ -4128,6 +4138,7 @@ add_library(grpc_plugin_support src/compiler/python_generator.cc src/compiler/ruby_generator.cc ) +set_target_properties(grpc_plugin_support PROPERTIES VERSION 2.0.0 SOVERSION 2) if(WIN32 AND MSVC) set_target_properties(grpc_plugin_support PROPERTIES COMPILE_PDB_NAME "grpc_plugin_support" -@@ -4668,6 +4679,7 @@ endif (gRPC_BUILD_TESTS) +@@ -4637,6 +4648,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" -@@ -10740,7 +10752,6 @@ add_executable(grpc_cpp_plugin +@@ -10696,7 +10708,6 @@ add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc ) - target_include_directories(grpc_cpp_plugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include Index: 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 (nonexistent) +++ head/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.cc (revision 456207) @@ -0,0 +1,11 @@ +--- src/core/lib/security/credentials/jwt/jwt_verifier.cc.orig 2017-12-13 01:39:01 UTC ++++ src/core/lib/security/credentials/jwt/jwt_verifier.cc +@@ -466,7 +466,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.cc ___________________________________________________________________ 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.cc =================================================================== --- head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc (nonexistent) +++ head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc (revision 456207) @@ -0,0 +1,26 @@ +--- src/core/tsi/ssl_transport_security.cc.orig 2017-12-13 01:39:01 UTC ++++ src/core/tsi/ssl_transport_security.cc +@@ -19,7 +19,7 @@ + #include "src/core/tsi/ssl_transport_security.h" + + #include +- ++#include + #include + #include + +@@ -56,11 +56,10 @@ extern "C" { + #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 Property changes on: head/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.cc ___________________________________________________________________ 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