Index: head/devel/py-grpcio/Makefile =================================================================== --- head/devel/py-grpcio/Makefile (revision 453085) +++ head/devel/py-grpcio/Makefile (revision 453086) @@ -1,32 +1,31 @@ # Created by: vanilla@ # $FreeBSD$ PORTNAME= grpcio -PORTVERSION= 1.6.3 +PORTVERSION= 1.7.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= vanilla@FreeBSD.org COMMENT= HTTP/2-based RPC framework 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}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= localbase:ldflags python USE_PYTHON= distutils CFLAGS+= -Ithird_party/boringssl/include LDFLAGS+= -lcares post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so .include Index: head/devel/py-grpcio/distinfo =================================================================== --- head/devel/py-grpcio/distinfo (revision 453085) +++ head/devel/py-grpcio/distinfo (revision 453086) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506586700 -SHA256 (grpcio-1.6.3.tar.gz) = e9662782c58bc21be26163b78136eaed091dfd45fac699cb711ee9eeeb7e2f9b -SIZE (grpcio-1.6.3.tar.gz) = 9964070 +TIMESTAMP = 1509152129 +SHA256 (grpcio-1.7.0.tar.gz) = 6662af1f07cf7a3d171a7f56afc2cfeff262a5f2c52d15ae5ea581d0c367aea8 +SIZE (grpcio-1.7.0.tar.gz) = 9999425 Index: head/devel/py-grpcio/files/patch-setup.py =================================================================== --- head/devel/py-grpcio/files/patch-setup.py (revision 453085) +++ head/devel/py-grpcio/files/patch-setup.py (revision 453086) @@ -1,30 +1,30 @@ ---- setup.py.orig 2017-09-27 21:43:56 UTC +--- setup.py.orig 2017-10-26 17:03:10 UTC +++ setup.py @@ -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'),) -CARES_INCLUDE = ( - os.path.join('third_party', 'cares'), - os.path.join('third_party', 'cares', 'cares'),) -if 'linux' in sys.platform: - CARES_INCLUDE += (os.path.join('third_party', 'cares', 'config_linux'),) -if 'darwin' in sys.platform: - CARES_INCLUDE += (os.path.join('third_party', 'cares', 'config_darwin'),) README = os.path.join(PYTHON_STEM, 'README.rst') # Ensure we're in the proper directory whether or not we're being used by pip. -@@ -141,12 +134,9 @@ CYTHON_EXTENSION_MODULE_NAMES = ('grpc._ +@@ -139,12 +132,9 @@ CYTHON_EXTENSION_MODULE_NAMES = ('grpc._ CYTHON_HELPER_C_FILES = () CORE_C_FILES = tuple(grpc_core_dependencies.CORE_SOURCE_FILES) --if "win32" in sys.platform and "64bit" in platform.architecture()[0]: +-if "win32" in sys.platform: - CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES) EXTENSION_INCLUDE_DIRECTORIES = ( - (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE + - CARES_INCLUDE) + (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE) EXTENSION_LIBRARIES = () if "linux" in sys.platform: Index: head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c =================================================================== --- head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c (revision 453085) +++ head/devel/py-grpcio/files/patch-src_core_tsi_ssl__transport__security.c (revision 453086) @@ -1,10 +1,10 @@ ---- src/core/tsi/ssl_transport_security.c.orig 2017-09-27 21:43:56 UTC +--- src/core/tsi/ssl_transport_security.c.orig 2017-10-26 17:03:10 UTC +++ src/core/tsi/ssl_transport_security.c @@ -20,6 +20,7 @@ #include +#include #include #include Index: head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py =================================================================== --- head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py (revision 453085) +++ head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py (revision 453086) @@ -1,64 +1,64 @@ ---- src/python/grpcio/grpc_core_dependencies.py.orig 2017-09-27 21:43:56 UTC +--- src/python/grpcio/grpc_core_dependencies.py.orig 2017-10-26 17:03:11 UTC +++ src/python/grpcio/grpc_core_dependencies.py -@@ -610,7 +610,6 @@ CORE_SOURCE_FILES = [ +@@ -616,7 +616,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 = [ +@@ -644,53 +643,4 @@ CORE_SOURCE_FILES = [ 'third_party/zlib/trees.c', 'third_party/zlib/uncompr.c', 'third_party/zlib/zutil.c', - 'third_party/cares/cares/ares__close_sockets.c', - 'third_party/cares/cares/ares__get_hostent.c', - 'third_party/cares/cares/ares__read_line.c', - 'third_party/cares/cares/ares__timeval.c', - 'third_party/cares/cares/ares_cancel.c', - 'third_party/cares/cares/ares_create_query.c', - 'third_party/cares/cares/ares_data.c', - 'third_party/cares/cares/ares_destroy.c', - 'third_party/cares/cares/ares_expand_name.c', - 'third_party/cares/cares/ares_expand_string.c', - 'third_party/cares/cares/ares_fds.c', - 'third_party/cares/cares/ares_free_hostent.c', - 'third_party/cares/cares/ares_free_string.c', - 'third_party/cares/cares/ares_getenv.c', - 'third_party/cares/cares/ares_gethostbyaddr.c', - 'third_party/cares/cares/ares_gethostbyname.c', - 'third_party/cares/cares/ares_getnameinfo.c', - 'third_party/cares/cares/ares_getopt.c', - 'third_party/cares/cares/ares_getsock.c', - 'third_party/cares/cares/ares_init.c', - 'third_party/cares/cares/ares_library_init.c', - 'third_party/cares/cares/ares_llist.c', - 'third_party/cares/cares/ares_mkquery.c', - 'third_party/cares/cares/ares_nowarn.c', - 'third_party/cares/cares/ares_options.c', - 'third_party/cares/cares/ares_parse_a_reply.c', - 'third_party/cares/cares/ares_parse_aaaa_reply.c', - 'third_party/cares/cares/ares_parse_mx_reply.c', - 'third_party/cares/cares/ares_parse_naptr_reply.c', - 'third_party/cares/cares/ares_parse_ns_reply.c', - 'third_party/cares/cares/ares_parse_ptr_reply.c', - 'third_party/cares/cares/ares_parse_soa_reply.c', - 'third_party/cares/cares/ares_parse_srv_reply.c', - 'third_party/cares/cares/ares_parse_txt_reply.c', - 'third_party/cares/cares/ares_platform.c', - 'third_party/cares/cares/ares_process.c', - 'third_party/cares/cares/ares_query.c', - 'third_party/cares/cares/ares_search.c', - 'third_party/cares/cares/ares_send.c', - 'third_party/cares/cares/ares_strcasecmp.c', - 'third_party/cares/cares/ares_strdup.c', - 'third_party/cares/cares/ares_strerror.c', - 'third_party/cares/cares/ares_timeout.c', - 'third_party/cares/cares/ares_version.c', - 'third_party/cares/cares/ares_writev.c', - 'third_party/cares/cares/bitncmp.c', - 'third_party/cares/cares/inet_net_pton.c', - 'third_party/cares/cares/inet_ntop.c', - 'third_party/cares/cares/windows_port.c', ] Index: head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.c =================================================================== --- head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.c (nonexistent) +++ head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.c (revision 453086) @@ -0,0 +1,45 @@ +--- third_party/boringssl/crypto/cpu-aarch64-linux.c.orig 2017-09-27 21:43:59 UTC ++++ third_party/boringssl/crypto/cpu-aarch64-linux.c +@@ -16,7 +16,42 @@ + + #if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP) + ++#if __has_include() + #include ++#elif defined(__FreeBSD__) ++#include ++#include ++#include ++#include ++#include ++ ++#ifndef AT_HWCAP ++#define AT_HWCAP 25 ++#endif ++ ++static unsigned long getauxval(unsigned long type) { ++ Elf_Auxinfo auxv[AT_COUNT]; ++ size_t len = sizeof(auxv); ++ int mib[] = { ++ CTL_KERN, ++ KERN_PROC, ++ KERN_PROC_AUXV, ++ getpid(), ++ }; ++ ++ if (sysctl(mib, nitems(mib), auxv, &len, NULL, 0) != -1) { ++ for (size_t i = 0; i < nitems(auxv); i++) ++ if ((unsigned long)auxv[i].a_type == type) ++ return auxv[i].a_un.a_val; ++ ++ errno = ENOENT; ++ } ++ return 0; ++} ++#else ++#define AT_HWCAP 16 ++#define getauxval(x) 0 ++#endif /* */ + + #include + Property changes on: head/devel/py-grpcio/files/patch-third__party_boringssl_crypto_cpu-aarch64-linux.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/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h =================================================================== --- head/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h (revision 453085) +++ head/devel/py-grpcio/files/patch-third__party_boringssl_include_openssl_base.h (revision 453086) @@ -1,12 +1,12 @@ ---- third_party/boringssl/include/openssl/base.h.orig 2017-09-27 21:43:59 UTC +--- third_party/boringssl/include/openssl/base.h.orig 2017-10-26 17:03:13 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++" { Index: head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt =================================================================== --- head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt (revision 453085) +++ head/devel/py-grpcio/files/patch-third__party_boringssl_ssl_CMakeLists.txt (revision 453086) @@ -1,10 +1,10 @@ ---- third_party/boringssl/ssl/CMakeLists.txt.orig 2017-09-28 08:26:07 UTC +--- third_party/boringssl/ssl/CMakeLists.txt.orig 2017-10-26 17:03:13 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