diff --git a/devel/py-grpcio/Makefile b/devel/py-grpcio/Makefile index fb8d9334e540..6ff1bd76d111 100644 --- a/devel/py-grpcio/Makefile +++ b/devel/py-grpcio/Makefile @@ -1,32 +1,32 @@ # Created by: vanilla@ PORTNAME= grpcio -PORTVERSION= 1.43.0 +PORTVERSION= 1.46.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= vanilla@FreeBSD.org COMMENT= HTTP/2-based RPC framework LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libcares.so:dns/c-ares USES= compiler:c++11-lib localbase:ldflags python:3.6+ ssl USE_PYTHON= autoplist cython distutils MAKE_ENV+= GRPC_PYTHON_BUILD_SYSTEM_CARES=true \ GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true \ GRPC_PYTHON_BUILD_SYSTEM_ZLIB=true LDFLAGS+= -lcares post-patch: @${RM} ${WRKSRC}/src/python/grpcio/grpc/_cython/cygrpc.cpp post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc*.so ${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR}/\(.*\)/grpcio/grpc/_cython/cygrpc${PYTHON_EXT_SUFFIX}.so|${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc${PYTHON_EXT_SUFFIX}.so|g' ${_PYTHONPKGLIST} .include diff --git a/devel/py-grpcio/distinfo b/devel/py-grpcio/distinfo index e98a54f62c16..40ed6ada87ce 100644 --- a/devel/py-grpcio/distinfo +++ b/devel/py-grpcio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639897263 -SHA256 (grpcio-1.43.0.tar.gz) = 735d9a437c262ab039d02defddcb9f8f545d7009ae61c0114e19dda3843febe5 -SIZE (grpcio-1.43.0.tar.gz) = 21461955 +TIMESTAMP = 1652842181 +SHA256 (grpcio-1.46.0.tar.gz) = ef37ff444d248ff8ea5e175a7807ce19e324831bc00d466169191cd9aad0ee36 +SIZE (grpcio-1.46.0.tar.gz) = 21845658 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 deleted file mode 100644 index 8bf5e225e1e4..000000000000 --- a/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py +++ /dev/null @@ -1,59 +0,0 @@ ---- src/python/grpcio/grpc_core_dependencies.py.orig 2020-08-05 07:00:06 UTC -+++ src/python/grpcio/grpc_core_dependencies.py -@@ -793,56 +793,6 @@ CORE_SOURCE_FILES = [ - 'third_party/boringssl-with-bazel/src/ssl/tls13_server.cc', - 'third_party/boringssl-with-bazel/src/ssl/tls_method.cc', - 'third_party/boringssl-with-bazel/src/ssl/tls_record.cc', -- '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_strsplit.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', - 'third_party/re2/re2/bitstate.cc', - 'third_party/re2/re2/compile.cc', - 'third_party/re2/re2/dfa.cc', diff --git a/devel/py-grpcio/files/patch-third__party_abseil-cpp_absl_debugging_internal_vdso__support.cc b/devel/py-grpcio/files/patch-third__party_abseil-cpp_absl_debugging_internal_vdso__support.cc new file mode 100644 index 000000000000..8acb0683512f --- /dev/null +++ b/devel/py-grpcio/files/patch-third__party_abseil-cpp_absl_debugging_internal_vdso__support.cc @@ -0,0 +1,12 @@ +--- third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc.orig 2022-05-18 05:37:03 UTC ++++ third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc +@@ -51,7 +51,9 @@ + #endif + + #if defined(__FreeBSD__) ++#if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64 + using Elf64_auxv_t = Elf64_Auxinfo; ++#endif + using Elf32_auxv_t = Elf32_Auxinfo; + #endif + diff --git a/devel/py-grpcio/files/patch-third__party_boringssl-with-bazel_src_include_openssl_base.h b/devel/py-grpcio/files/patch-third__party_boringssl-with-bazel_src_include_openssl_base.h index b2fabf99467f..c500bed72df1 100644 --- a/devel/py-grpcio/files/patch-third__party_boringssl-with-bazel_src_include_openssl_base.h +++ b/devel/py-grpcio/files/patch-third__party_boringssl-with-bazel_src_include_openssl_base.h @@ -1,12 +1,12 @@ ---- third_party/boringssl-with-bazel/src/include/openssl/base.h.orig 2020-06-22 21:42:43 UTC +--- third_party/boringssl-with-bazel/src/include/openssl/base.h.orig 2022-05-03 21:27:37 UTC +++ third_party/boringssl-with-bazel/src/include/openssl/base.h -@@ -462,9 +462,6 @@ typedef void *OPENSSL_BLOCK; +@@ -483,9 +483,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)