diff options
| author | vanilla <vanilla@FreeBSD.org> | 2017-10-09 17:19:47 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2017-10-09 17:19:47 +0800 |
| commit | d621328a6a7ae987ffdb9ebf7c847de0bb7c439b (patch) | |
| tree | 20c0b4ee7ba0d39be7947198bddcd809bd76f485 /devel | |
| parent | dd4dde59f2da104f2fe7ce760e82a23048459165 (diff) | |
| download | freebsd-ports-gnome-d621328a6a7ae987ffdb9ebf7c847de0bb7c439b.tar.gz freebsd-ports-gnome-d621328a6a7ae987ffdb9ebf7c847de0bb7c439b.tar.zst freebsd-ports-gnome-d621328a6a7ae987ffdb9ebf7c847de0bb7c439b.zip | |
1: Update to 1.6.6.
2: Fix building when openssl < 1.0.2
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/grpc/Makefile | 4 | ||||
| -rw-r--r-- | devel/grpc/distinfo | 6 | ||||
| -rw-r--r-- | devel/grpc/files/patch-CMakeLists.txt | 2 | ||||
| -rw-r--r-- | devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c | 2 | ||||
| -rw-r--r-- | devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c | 17 |
5 files changed, 23 insertions, 8 deletions
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index b2665e556f4d..81df4dae81d4 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.6.5 +PORTVERSION= 1.6.6 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -26,7 +26,7 @@ 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="package" \ diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo index 01f53992cc13..2de074d87db0 100644 --- a/devel/grpc/distinfo +++ b/devel/grpc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1507083365 -SHA256 (grpc-grpc-v1.6.5_GH0.tar.gz) = 939e686dc5b6221f959b839df0987fa9eda08ba8d72530ff7946d7226c2cb5ea -SIZE (grpc-grpc-v1.6.5_GH0.tar.gz) = 4835696 +TIMESTAMP = 1507381124 +SHA256 (grpc-grpc-v1.6.6_GH0.tar.gz) = b97eaa0c8a63b0492dc94bdad621795b4815278e841f06b0c78d6bcbd4c8bdec +SIZE (grpc-grpc-v1.6.6_GH0.tar.gz) = 4835930 SHA256 (google-benchmark-v1.2.0_GH0.tar.gz) = 3dcc90c158838e2ac4a7ad06af9e28eb5877cf28252a81e55eb3c836757d3070 SIZE (google-benchmark-v1.2.0_GH0.tar.gz) = 102297 diff --git a/devel/grpc/files/patch-CMakeLists.txt b/devel/grpc/files/patch-CMakeLists.txt index b8fff522c5ee..b385b7942aa3 100644 --- a/devel/grpc/files/patch-CMakeLists.txt +++ b/devel/grpc/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2017-10-03 19:53:08 UTC +--- CMakeLists.txt.orig 2017-10-05 19:05:39 UTC +++ CMakeLists.txt @@ -156,7 +156,8 @@ if("${gRPC_CARES_PROVIDER}" STREQUAL "mo set(gRPC_INSTALL FALSE) diff --git a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c index 8aff7109a117..4bc740e2fe27 100644 --- a/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c +++ b/devel/grpc/files/patch-src_core_lib_security_credentials_jwt_jwt__verifier.c @@ -1,4 +1,4 @@ ---- 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.orig 2017-10-05 19:05:39 UTC +++ src/core/lib/security/credentials/jwt/jwt_verifier.c @@ -462,7 +462,7 @@ static BIGNUM *bignum_from_base64(grpc_e return result; diff --git a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c index 0cb7a125280d..e242cc52a169 100644 --- a/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c +++ b/devel/grpc/files/patch-src_core_tsi_ssl__transport__security.c @@ -1,4 +1,4 @@ ---- src/core/tsi/ssl_transport_security.c.orig 2017-10-03 19:53:08 UTC +--- src/core/tsi/ssl_transport_security.c.orig 2017-10-05 19:05:39 UTC +++ src/core/tsi/ssl_transport_security.c @@ -20,6 +20,7 @@ @@ -8,3 +8,18 @@ #include <limits.h> #include <string.h> +@@ -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 |