Update to 1.6.3.

7 files changed, 45 insertions, 15 deletions

diff --git a/devel/py-grpcio/Makefile b/devel/py-grpcio/Makefile
index 3007e6ad47f3..883b6bd00bba 100644
--- a/devel/py-grpcio/Makefile
+++ b/devel/py-grpcio/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpcio
-PORTVERSION=	1.4.0
+PORTVERSION=	1.6.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,17 +14,17 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}enum34>1:devel/py-enum34 \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf
+		${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}futures>=3:devel/py-futures
 LIB_DEPENDS=	libcares.so:dns/c-ares
 
 BROKEN_aarch64=		fails to compile: cpu-aarch64-linux.c: fatal error: 'sys/auxv.h' file not found
 BROKEN_powerpc64=	fails to compile: cpu-ppc64le.c: 'AT_HWCAP2' undeclared
 
-USES=		python
+USES=		localbase:ldflags python
 USE_PYTHON=	distutils
-CFLAGS+=	-Ithird_party/boringssl/include \
-		-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lcares
+CFLAGS+=	-Ithird_party/boringssl/include
+LDFLAGS+=	-lcares
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so
diff --git a/devel/py-grpcio/distinfo b/devel/py-grpcio/distinfo
index b16fd157c865..a4647a6b873f 100644
--- a/devel/py-grpcio/distinfo
+++ b/devel/py-grpcio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498115398
-SHA256 (grpcio-1.4.0.tar.gz) = a3a213a4c24b5c572b386d752e3b74a3f1b8fa5d03c07b6166fa39f3a6cdef34
-SIZE (grpcio-1.4.0.tar.gz) = 9095819
+TIMESTAMP = 1506586700
+SHA256 (grpcio-1.6.3.tar.gz) = e9662782c58bc21be26163b78136eaed091dfd45fac699cb711ee9eeeb7e2f9b
+SIZE (grpcio-1.6.3.tar.gz) = 9964070
diff --git a/devel/py-grpcio/files/patch-setup.py b/devel/py-grpcio/files/patch-setup.py
index 10058a169567..06cb2a2a0845 100644
--- a/devel/py-grpcio/files/patch-setup.py
+++ b/devel/py-grpcio/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2017-04-27 21:44:50 UTC
+--- setup.py.orig	2017-09-27 21:43:56 UTC
 +++ setup.py
-@@ -52,13 +52,6 @@ PYTHON_STEM = os.path.join('src', 'pytho
+@@ -37,13 +37,6 @@ PYTHON_STEM = os.path.join('src', 'pytho
  CORE_INCLUDE = ('include', '.',)
  BORINGSSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
  ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
diff --git a/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c b/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c
index c9670459e03d..985c74360bda 100644
--- a/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c
+++ b/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c
@@ -1,6 +1,6 @@
---- src/core/tsi/ssl_transport_security.c.orig	2017-04-27 21:44:51 UTC
+--- src/core/tsi/ssl_transport_security.c.orig	2017-09-27 21:43:56 UTC
 +++ src/core/tsi/ssl_transport_security.c
-@@ -35,6 +35,7 @@
+@@ -20,6 +20,7 @@
  
  #include <grpc/support/port_platform.h>
  
diff --git a/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py b/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py
index 1e95b029742b..cfb043e2243d 100644
--- a/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py
+++ b/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py
@@ -1,6 +1,14 @@
---- src/python/grpcio/grpc_core_dependencies.py.orig	2017-04-27 21:44:50 UTC
+--- src/python/grpcio/grpc_core_dependencies.py.orig	2017-09-27 21:43:56 UTC
 +++ src/python/grpcio/grpc_core_dependencies.py
-@@ -630,53 +630,4 @@ CORE_SOURCE_FILES = [
+@@ -610,7 +610,6 @@ CORE_SOURCE_FILES = [
+   'third_party/boringssl/ssl/ssl_file.c',
+   'third_party/boringssl/ssl/ssl_lib.c',
+   'third_party/boringssl/ssl/ssl_privkey.c',
+-  'third_party/boringssl/ssl/ssl_privkey_cc.cc',
+   'third_party/boringssl/ssl/ssl_session.c',
+   'third_party/boringssl/ssl/ssl_stat.c',
+   'third_party/boringssl/ssl/ssl_transcript.c',
+@@ -638,53 +637,4 @@ CORE_SOURCE_FILES = [
    'third_party/zlib/trees.c',
    'third_party/zlib/uncompr.c',
    'third_party/zlib/zutil.c',
diff --git a/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h b/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h
new file mode 100644
index 000000000000..ff5745dfcb55
--- /dev/null
+++ b/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h
@@ -0,0 +1,12 @@
+--- third_party/boringssl/include/openssl/base.h.orig	2017-09-27 21:43:59 UTC
++++ third_party/boringssl/include/openssl/base.h
+@@ -328,9 +328,6 @@ typedef void *OPENSSL_BLOCK;
+ // MSVC doesn't set __cplusplus to 201103 to indicate C++11 support (see
+ // https://connect.microsoft.com/VisualStudio/feedback/details/763051/a-value-of-predefined-macro-cplusplus-is-still-199711l)
+ // so MSVC is just assumed to support C++11.
+-#if !defined(BORINGSSL_NO_CXX) && __cplusplus < 201103L && !defined(_MSC_VER)
+-#define BORINGSSL_NO_CXX
+-#endif
+ 
+ #if !defined(BORINGSSL_NO_CXX)
+ extern "C++" {
diff --git a/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt b/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt
new file mode 100644
index 000000000000..7e470912c816
--- /dev/null
+++ b/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- third_party/boringssl/ssl/CMakeLists.txt.orig	2017-09-28 08:26:07 UTC
++++ third_party/boringssl/ssl/CMakeLists.txt
+@@ -25,7 +25,6 @@ add_library(
+   ssl_file.c
+   ssl_lib.c
+   ssl_privkey.c
+-  ssl_privkey_cc.cc
+   ssl_session.c
+   ssl_stat.c
+   ssl_transcript.c