pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/net
Module Name: pkgsrc
Committed By: wiz
Date: Thu Nov 2 12:46:45 UTC 2023
Modified Files:
pkgsrc/net/grpc: Makefile PLIST distinfo
pkgsrc/net/grpc/patches:
patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc
pkgsrc/net/py-grpcio: Makefile PLIST distinfo
pkgsrc/net/py-grpcio-testing: Makefile PLIST distinfo
pkgsrc/net/py-grpcio-tools: Makefile PLIST distinfo
pkgsrc/net/py-grpcio-tools/patches: patch-setup.py
pkgsrc/net/py-grpcio/patches: patch-setup.py
Log Message:
*grpc*: update to 1.59.2
Lots of changes.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/grpc/PLIST
cvs rdiff -u -r1.71 -r1.72 pkgsrc/net/grpc/distinfo
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc
cvs rdiff -u -r1.60 -r1.61 pkgsrc/net/py-grpcio/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/py-grpcio/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/net/py-grpcio/distinfo
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/py-grpcio-testing/Makefile \
pkgsrc/net/py-grpcio-testing/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-grpcio-testing/PLIST
cvs rdiff -u -r1.54 -r1.55 pkgsrc/net/py-grpcio-tools/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-grpcio-tools/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/py-grpcio-tools/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-grpcio-tools/patches/patch-setup.py
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/py-grpcio/patches/patch-setup.py
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.77 pkgsrc/net/grpc/Makefile:1.78
--- pkgsrc/net/grpc/Makefile:1.77 Thu Nov 2 12:20:05 2023
+++ pkgsrc/net/grpc/Makefile Thu Nov 2 12:46:44 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2023/11/02 12:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2023/11/02 12:46:44 wiz Exp $
-DISTNAME= grpc-1.54.3
-PKGREVISION= 3
+DISTNAME= grpc-1.59.2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=grpc/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -12,7 +11,6 @@ COMMENT= High performance, open-source u
LICENSE= apache-2.0
USE_LANGUAGES+= c c++
-USE_TOOLS+= pkg-config
USE_CXX_FEATURES+= c++14
@@ -21,7 +19,6 @@ CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
CMAKE_ARGS+= -DgRPC_ABSL_PROVIDER=package
CMAKE_ARGS+= -DgRPC_BENCHMARK_PROVIDER=package
CMAKE_ARGS+= -DgRPC_CARES_PROVIDER=package
-CMAKE_ARGS+= -DgRPC_GFLAGS_PROVIDER=package
CMAKE_ARGS+= -DgRPC_PROTOBUF_PROVIDER=package
CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package
CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package
@@ -45,7 +42,6 @@ post-extract:
.include "../../devel/abseil/buildlink3.mk"
.include "../../devel/cmake/build.mk"
.include "../../devel/gflags/buildlink3.mk"
-BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.5
.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/re2/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
Index: pkgsrc/net/grpc/PLIST
diff -u pkgsrc/net/grpc/PLIST:1.39 pkgsrc/net/grpc/PLIST:1.40
--- pkgsrc/net/grpc/PLIST:1.39 Thu Apr 27 06:31:11 2023
+++ pkgsrc/net/grpc/PLIST Thu Nov 2 12:46:44 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2023/04/27 06:31:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.40 2023/11/02 12:46:44 wiz Exp $
bin/grpc_cpp_plugin
bin/grpc_csharp_plugin
bin/grpc_node_plugin
@@ -97,9 +97,11 @@ include/grpc/event_engine/slice.h
include/grpc/event_engine/slice_buffer.h
include/grpc/fork.h
include/grpc/grpc.h
+include/grpc/grpc_audit_logging.h
include/grpc/grpc_posix.h
include/grpc/grpc_security.h
include/grpc/grpc_security_constants.h
+include/grpc/impl/channel_arg_names.h
include/grpc/impl/codegen/atm.h
include/grpc/impl/codegen/atm_gcc_atomic.h
include/grpc/impl/codegen/atm_gcc_sync.h
@@ -137,6 +139,7 @@ include/grpc/support/atm_gcc_atomic.h
include/grpc/support/atm_gcc_sync.h
include/grpc/support/atm_windows.h
include/grpc/support/cpu.h
+include/grpc/support/json.h
include/grpc/support/log.h
include/grpc/support/log_windows.h
include/grpc/support/port_platform.h
@@ -243,6 +246,7 @@ include/grpcpp/impl/sync.h
include/grpcpp/resource_quota.h
include/grpcpp/security/alts_context.h
include/grpcpp/security/alts_util.h
+include/grpcpp/security/audit_logging.h
include/grpcpp/security/auth_context.h
include/grpcpp/security/auth_metadata_processor.h
include/grpcpp/security/authorization_policy_provider.h
@@ -294,44 +298,56 @@ lib/cmake/grpc/modules/Findc-ares.cmake
lib/cmake/grpc/modules/Findre2.cmake
lib/cmake/grpc/modules/Findsystemd.cmake
lib/libaddress_sorting.so
-lib/libaddress_sorting.so.31
-lib/libaddress_sorting.so.31.0.0
+lib/libaddress_sorting.so.36
+lib/libaddress_sorting.so.36.0.0
lib/libgpr.so
-lib/libgpr.so.31
-lib/libgpr.so.31.0.0
+lib/libgpr.so.36
+lib/libgpr.so.36.0.0
lib/libgrpc++.so
-lib/libgrpc++.so.1.54
+lib/libgrpc++.so.1.59
lib/libgrpc++.so.${PKGVERSION}
lib/libgrpc++_alts.so
-lib/libgrpc++_alts.so.1.54
+lib/libgrpc++_alts.so.1.59
lib/libgrpc++_alts.so.${PKGVERSION}
lib/libgrpc++_error_details.so
-lib/libgrpc++_error_details.so.1.54
+lib/libgrpc++_error_details.so.1.59
lib/libgrpc++_error_details.so.${PKGVERSION}
lib/libgrpc++_reflection.so
-lib/libgrpc++_reflection.so.1.54
+lib/libgrpc++_reflection.so.1.59
lib/libgrpc++_reflection.so.${PKGVERSION}
lib/libgrpc++_unsecure.so
-lib/libgrpc++_unsecure.so.1.54
+lib/libgrpc++_unsecure.so.1.59
lib/libgrpc++_unsecure.so.${PKGVERSION}
lib/libgrpc.so
-lib/libgrpc.so.31
-lib/libgrpc.so.31.0.0
+lib/libgrpc.so.36
+lib/libgrpc.so.36.0.0
lib/libgrpc_authorization_provider.so
-lib/libgrpc_authorization_provider.so.1.54
+lib/libgrpc_authorization_provider.so.1.59
lib/libgrpc_authorization_provider.so.${PKGVERSION}
lib/libgrpc_plugin_support.so
-lib/libgrpc_plugin_support.so.1.54
+lib/libgrpc_plugin_support.so.1.59
lib/libgrpc_plugin_support.so.${PKGVERSION}
lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.31
-lib/libgrpc_unsecure.so.31.0.0
+lib/libgrpc_unsecure.so.36
+lib/libgrpc_unsecure.so.36.0.0
lib/libgrpcpp_channelz.so
-lib/libgrpcpp_channelz.so.1.54
+lib/libgrpcpp_channelz.so.1.59
lib/libgrpcpp_channelz.so.${PKGVERSION}
lib/libupb.so
-lib/libupb.so.31
-lib/libupb.so.31.0.0
+lib/libupb.so.36
+lib/libupb.so.36.0.0
+lib/libupb_collections_lib.so
+lib/libupb_collections_lib.so.36
+lib/libupb_collections_lib.so.36.0.0
+lib/libupb_json_lib.so
+lib/libupb_json_lib.so.36
+lib/libupb_json_lib.so.36.0.0
+lib/libupb_textformat_lib.so
+lib/libupb_textformat_lib.so.36
+lib/libupb_textformat_lib.so.36.0.0
+lib/libutf8_range_lib.so
+lib/libutf8_range_lib.so.36
+lib/libutf8_range_lib.so.36.0.0
lib/pkgconfig/gpr.pc
lib/pkgconfig/grpc++.pc
lib/pkgconfig/grpc++_unsecure.pc
Index: pkgsrc/net/grpc/distinfo
diff -u pkgsrc/net/grpc/distinfo:1.71 pkgsrc/net/grpc/distinfo:1.72
--- pkgsrc/net/grpc/distinfo:1.71 Thu Aug 3 18:58:48 2023
+++ pkgsrc/net/grpc/distinfo Thu Nov 2 12:46:44 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.71 2023/08/03 18:58:48 adam Exp $
+$NetBSD: distinfo,v 1.72 2023/11/02 12:46:44 wiz Exp $
-BLAKE2s (grpc-1.54.3.tar.gz) = 0d7aa963086126c3cb8d1ee5d038ad536dc041632e040b5437b1a1d006f5e71e
-SHA512 (grpc-1.54.3.tar.gz) = 320db48567ca08a56e5f548976d2d741ae5f2b9804b0a776728d12690dc53e7eab24dba24930874b070c57072d129d6bb65ea8aee58b587e426ddf799272e186
-Size (grpc-1.54.3.tar.gz) = 8914754 bytes
+BLAKE2s (grpc-1.59.2.tar.gz) = a90691a251c4147e9191ad4b33a1097ac2a6672b524be143b68f592c62945fc1
+SHA512 (grpc-1.59.2.tar.gz) = bb8173bb073a54a6cc7691bad079b1c091b14de9b8eff5b84aecf60d6b10f2fd24772eb60e26a650549c4b4e50da08e0ecddd0d951119f828073843aaf2620bf
+Size (grpc-1.59.2.tar.gz) = 17583092 bytes
BLAKE2s (opencensus-proto-0.3.0.tar.gz) = be3ce863226f4aa422d9faa997fe29f9bb1743c0e804af3c5fad3c170e60ba42
SHA512 (opencensus-proto-0.3.0.tar.gz) = 39231a495dfdccfc8267d1e6af2ac624feea611a8691c10ec570de2194b352e4a9c3b0ce1606414fb98e5d77c66873bed4a9e56512efa12b267b8a91e0c5851e
Size (opencensus-proto-0.3.0.tar.gz) = 163404 bytes
SHA1 (patch-CMakeLists.txt) = e3ec7dd3fdc01ac7b7afaa8abdac0dfb47bb5317
-SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = 0aa7fcadae98d1dd5229f0a695cffc1e9c1e8164
+SHA1 (patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc) = c02acb4e334f0280e6565cafcb376d4e934fa501
SHA1 (patch-src_core_lib_iomgr_port.h) = 81e474c608595b5b2defdd04e8c52a63485e7d06
Index: pkgsrc/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc
diff -u pkgsrc/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc:1.4
pkgsrc/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc:1.5
--- pkgsrc/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc:1.4 Wed Oct 6 10:58:30 2021
+++ pkgsrc/net/grpc/patches/patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc Thu Nov 2 12:46:44 2023
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc,v 1.4 2021/10/06 10:58:30 adam Exp $
+$NetBSD: patch-src_core_ext_filters_client__channel_resolver_dns_c__ares_grpc__ares__ev__driver__posix.cc,v 1.5 2023/11/02 12:46:44 wiz Exp $
Add SunOS support.
---- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc.orig 2021-09-25 02:33:41.000000000 +0000
+--- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc.orig 2023-10-30 17:33:54.000000000 +0000
+++ src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
@@ -22,6 +22,11 @@
+ #if GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
- #include <string.h>
- #include <sys/ioctl.h>
+ // IWYU pragma: no_include <ares_build.h>
+#ifdef __sun
+#include <sys/filio.h>
+#include <unistd.h>
+#include <stropts.h>
+#endif
- #include <ares.h>
-
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
Index: pkgsrc/net/py-grpcio/Makefile
diff -u pkgsrc/net/py-grpcio/Makefile:1.60 pkgsrc/net/py-grpcio/Makefile:1.61
--- pkgsrc/net/py-grpcio/Makefile:1.60 Thu Nov 2 12:20:05 2023
+++ pkgsrc/net/py-grpcio/Makefile Thu Nov 2 12:46:44 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2023/11/02 12:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2023/11/02 12:46:44 wiz Exp $
-DISTNAME= grpcio-1.54.3
+DISTNAME= grpcio-1.59.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 2
CATEGORIES= net python
MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio/}
@@ -11,7 +10,8 @@ HOMEPAGE= https://grpc.io/
COMMENT= HTTP/2-based RPC framework
LICENSE= apache-2.0
-DEPENDS+= ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -24,5 +24,5 @@ USE_TOOLS+= gmake pkg-config
.include "../../net/grpc/buildlink3.mk"
.include "../../net/libcares/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-grpcio/PLIST
diff -u pkgsrc/net/py-grpcio/PLIST:1.11 pkgsrc/net/py-grpcio/PLIST:1.12
--- pkgsrc/net/py-grpcio/PLIST:1.11 Sun Dec 4 17:59:08 2022
+++ pkgsrc/net/py-grpcio/PLIST Thu Nov 2 12:46:44 2023
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2022/12/04 17:59:08 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.12 2023/11/02 12:46:44 wiz Exp $
${PYSITELIB}/grpc/__init__.py
${PYSITELIB}/grpc/__init__.pyc
${PYSITELIB}/grpc/__init__.pyo
@@ -33,6 +28,9 @@ ${PYSITELIB}/grpc/_grpcio_metadata.pyo
${PYSITELIB}/grpc/_interceptor.py
${PYSITELIB}/grpc/_interceptor.pyc
${PYSITELIB}/grpc/_interceptor.pyo
+${PYSITELIB}/grpc/_observability.py
+${PYSITELIB}/grpc/_observability.pyc
+${PYSITELIB}/grpc/_observability.pyo
${PYSITELIB}/grpc/_plugin_wrapping.py
${PYSITELIB}/grpc/_plugin_wrapping.pyc
${PYSITELIB}/grpc/_plugin_wrapping.pyo
@@ -171,3 +169,8 @@ ${PYSITELIB}/grpc/framework/interfaces/f
${PYSITELIB}/grpc/framework/interfaces/face/utilities.py
${PYSITELIB}/grpc/framework/interfaces/face/utilities.pyc
${PYSITELIB}/grpc/framework/interfaces/face/utilities.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
Index: pkgsrc/net/py-grpcio/distinfo
diff -u pkgsrc/net/py-grpcio/distinfo:1.53 pkgsrc/net/py-grpcio/distinfo:1.54
--- pkgsrc/net/py-grpcio/distinfo:1.53 Thu Aug 3 18:58:48 2023
+++ pkgsrc/net/py-grpcio/distinfo Thu Nov 2 12:46:44 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.53 2023/08/03 18:58:48 adam Exp $
+$NetBSD: distinfo,v 1.54 2023/11/02 12:46:44 wiz Exp $
-BLAKE2s (grpcio-1.54.3.tar.gz) = 0fd00ef37b7cb87b35f10821d90f47bfa50fa9611cdd99da42661e904537da37
-SHA512 (grpcio-1.54.3.tar.gz) = 1e0dab66f656c48492ba998bd8427868b6fc00c7986063eefadd01128613bff42fd6b8a8b1da6a82c05fc33b4978c374eaff2e13ef5518e072ae5b1e147d718b
-Size (grpcio-1.54.3.tar.gz) = 23451504 bytes
-SHA1 (patch-setup.py) = daa9a82bb23a34b6702abdb9c44f87529f11b328
+BLAKE2s (grpcio-1.59.2.tar.gz) = 454f0a82bf648c6acd6124704759d244418e64860daba223d6dd756112d608b6
+SHA512 (grpcio-1.59.2.tar.gz) = 3092cdecac3b5b0569a621654560ee95ae1be10ff43371d8c3f6fa0f0abce022fe76b1dd6a77f3a9aa4d1b03bbbd65fbc07dcd593950befcfc24f7f905dc041a
+Size (grpcio-1.59.2.tar.gz) = 24849789 bytes
+SHA1 (patch-setup.py) = c069957e57dc1bf0f3d09caa518f3b19e6057146
SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a
Index: pkgsrc/net/py-grpcio-testing/Makefile
diff -u pkgsrc/net/py-grpcio-testing/Makefile:1.40 pkgsrc/net/py-grpcio-testing/Makefile:1.41
--- pkgsrc/net/py-grpcio-testing/Makefile:1.40 Thu Aug 3 18:58:48 2023
+++ pkgsrc/net/py-grpcio-testing/Makefile Thu Nov 2 12:46:45 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2023/08/03 18:58:48 adam Exp $
+# $NetBSD: Makefile,v 1.41 2023/11/02 12:46:45 wiz Exp $
-DISTNAME= grpcio-testing-1.54.3
+DISTNAME= grpcio-testing-1.59.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= net python
MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-testing/}
@@ -10,6 +10,8 @@ HOMEPAGE= https://grpc.io/
COMMENT= gRPC Python testing package
LICENSE= apache-2.0
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
DEPENDS+= ${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio
DEPENDS+= ${PYPKGPREFIX}-protobuf>=4.21.6:../../devel/py-protobuf
@@ -17,5 +19,5 @@ USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 27
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-grpcio-testing/distinfo
diff -u pkgsrc/net/py-grpcio-testing/distinfo:1.40 pkgsrc/net/py-grpcio-testing/distinfo:1.41
--- pkgsrc/net/py-grpcio-testing/distinfo:1.40 Thu Aug 3 18:58:48 2023
+++ pkgsrc/net/py-grpcio-testing/distinfo Thu Nov 2 12:46:45 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.40 2023/08/03 18:58:48 adam Exp $
+$NetBSD: distinfo,v 1.41 2023/11/02 12:46:45 wiz Exp $
-BLAKE2s (grpcio-testing-1.54.3.tar.gz) = 89dc477bc197b9396678e84176ddcd1918882c4c11c15d7938874cfecd225bcc
-SHA512 (grpcio-testing-1.54.3.tar.gz) = a2e3d9202cd427370b9470b61275c11f65ea38f0939cb9480c3a6f8266388cdecbecf6c87eba7816930918b5581636b446b820687e1957bec6a8040dfce3da38
-Size (grpcio-testing-1.54.3.tar.gz) = 22390 bytes
+BLAKE2s (grpcio-testing-1.59.2.tar.gz) = 811bcb0ce6beef33221281377b7ecacbcdf869e57f6fd2f176bda8dac05e2665
+SHA512 (grpcio-testing-1.59.2.tar.gz) = 3f1e6a25cacc4b51be30665ee85403d9b2404404a2ee0813252dadda2b958e48286b6abd1f3630315df554f656555186a2d381bd053131ae40b198d5cba94e3f
+Size (grpcio-testing-1.59.2.tar.gz) = 22477 bytes
Index: pkgsrc/net/py-grpcio-testing/PLIST
diff -u pkgsrc/net/py-grpcio-testing/PLIST:1.1 pkgsrc/net/py-grpcio-testing/PLIST:1.2
--- pkgsrc/net/py-grpcio-testing/PLIST:1.1 Fri Jan 3 08:21:37 2020
+++ pkgsrc/net/py-grpcio-testing/PLIST Thu Nov 2 12:46:45 2023
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/03 08:21:37 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2023/11/02 12:46:45 wiz Exp $
${PYSITELIB}/grpc_testing/__init__.py
${PYSITELIB}/grpc_testing/__init__.pyc
${PYSITELIB}/grpc_testing/__init__.pyo
@@ -55,3 +50,8 @@ ${PYSITELIB}/grpc_testing/_server/_servi
${PYSITELIB}/grpc_testing/_time.py
${PYSITELIB}/grpc_testing/_time.pyc
${PYSITELIB}/grpc_testing/_time.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
Index: pkgsrc/net/py-grpcio-tools/Makefile
diff -u pkgsrc/net/py-grpcio-tools/Makefile:1.54 pkgsrc/net/py-grpcio-tools/Makefile:1.55
--- pkgsrc/net/py-grpcio-tools/Makefile:1.54 Thu Nov 2 12:20:05 2023
+++ pkgsrc/net/py-grpcio-tools/Makefile Thu Nov 2 12:46:45 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2023/11/02 12:20:05 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2023/11/02 12:46:45 wiz Exp $
-DISTNAME= grpcio-tools-1.54.3
+DISTNAME= grpcio-tools-1.59.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
CATEGORIES= net python
MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-tools/}
@@ -11,6 +10,8 @@ HOMEPAGE= https://grpc.io/
COMMENT= Protobuf code generator for gRPC
LICENSE= apache-2.0
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
DEPENDS+= ${PYPKGPREFIX}-grpcio>=${PKGVERSION_NOREV}:../../net/py-grpcio
DEPENDS+= ${PYPKGPREFIX}-protobuf>=4.21.6:../../devel/py-protobuf
@@ -22,6 +23,6 @@ MAKE_ENV+= GRPC_PYTHON_LDFLAGS="-lprotoc
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../devel/protobuf/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-grpcio-tools/PLIST
diff -u pkgsrc/net/py-grpcio-tools/PLIST:1.1 pkgsrc/net/py-grpcio-tools/PLIST:1.2
--- pkgsrc/net/py-grpcio-tools/PLIST:1.1 Sat Apr 28 01:24:36 2018
+++ pkgsrc/net/py-grpcio-tools/PLIST Thu Nov 2 12:46:45 2023
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/04/28 01:24:36 minskim Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.2 2023/11/02 12:46:45 wiz Exp $
${PYSITELIB}/grpc_tools/__init__.py
${PYSITELIB}/grpc_tools/__init__.pyc
${PYSITELIB}/grpc_tools/__init__.pyo
@@ -26,3 +21,7 @@ ${PYSITELIB}/grpc_tools/command.pyo
${PYSITELIB}/grpc_tools/protoc.py
${PYSITELIB}/grpc_tools/protoc.pyc
${PYSITELIB}/grpc_tools/protoc.pyo
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
Index: pkgsrc/net/py-grpcio-tools/distinfo
diff -u pkgsrc/net/py-grpcio-tools/distinfo:1.49 pkgsrc/net/py-grpcio-tools/distinfo:1.50
--- pkgsrc/net/py-grpcio-tools/distinfo:1.49 Thu Aug 3 18:58:49 2023
+++ pkgsrc/net/py-grpcio-tools/distinfo Thu Nov 2 12:46:45 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.49 2023/08/03 18:58:49 adam Exp $
+$NetBSD: distinfo,v 1.50 2023/11/02 12:46:45 wiz Exp $
-BLAKE2s (grpcio-tools-1.54.3.tar.gz) = 0a2407d25264c1b7ec89119cca4dee9f1217c816f2f109b2a66ddaf324dbf2ed
-SHA512 (grpcio-tools-1.54.3.tar.gz) = 2c63236eb58f70e7fadd2b658f97c40c453858cff265c75445f6e3bb102cb8885ca4aebf3f32afd823a38d0b3567a8425470f0808aa29aa22fdb20c251dd029e
-Size (grpcio-tools-1.54.3.tar.gz) = 2259691 bytes
-SHA1 (patch-setup.py) = 06a38bbe07d81f36431e9e5e417703074577e00d
+BLAKE2s (grpcio-tools-1.59.2.tar.gz) = 258442793447c4f23c7bec8b0c4918ceab3bb30914228ca55bbfa19289c38b55
+SHA512 (grpcio-tools-1.59.2.tar.gz) = ac103d30d05fe0e26dc7bc493cfe9a9d5ded02f863ba54d805237b0641141be3f5dfcc78505057a0be44e82f56b20e69adc56ce6b2181da6f7245764e671919d
+Size (grpcio-tools-1.59.2.tar.gz) = 4622666 bytes
+SHA1 (patch-setup.py) = e1a89937a346971a1bba446d11e7a66d4cdded11
Index: pkgsrc/net/py-grpcio-tools/patches/patch-setup.py
diff -u pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.6 pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.7
--- pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.6 Thu Apr 27 06:31:12 2023
+++ pkgsrc/net/py-grpcio-tools/patches/patch-setup.py Thu Nov 2 12:46:45 2023
@@ -1,54 +1,58 @@
-$NetBSD: patch-setup.py,v 1.6 2023/04/27 06:31:12 wiz Exp $
+$NetBSD: patch-setup.py,v 1.7 2023/11/02 12:46:45 wiz Exp $
Use pthread on FreeBSD.
Use external protobuf.
---- setup.py.orig 2023-04-13 00:50:54.000000000 +0000
+--- setup.py.orig 2023-10-30 18:02:42.000000000 +0000
+++ setup.py
-@@ -175,7 +175,7 @@ if EXTRA_ENV_LINK_ARGS is None:
- if "darwin" in sys.platform:
- EXTRA_ENV_LINK_ARGS += ' -Wl,-exported_symbol,_{}'.format(
- _EXT_INIT_SYMBOL)
+@@ -185,7 +185,7 @@ if EXTRA_ENV_LINK_ARGS is None:
+ EXTRA_ENV_LINK_ARGS += " -Wl,-exported_symbol,_{}".format(
+ _EXT_INIT_SYMBOL
+ )
- if "linux" in sys.platform or "darwin" in sys.platform:
+ if "linux" in sys.platform or "darwin" in sys.platform or "freebsd" in sys.platform:
- EXTRA_ENV_LINK_ARGS += ' -lpthread'
+ EXTRA_ENV_LINK_ARGS += " -lpthread"
if check_linker_need_libatomic():
- EXTRA_ENV_LINK_ARGS += ' -latomic'
-@@ -191,11 +191,9 @@ EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_
+ EXTRA_ENV_LINK_ARGS += " -latomic"
+@@ -196,13 +196,9 @@ EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_
if BUILD_WITH_STATIC_LIBSTDCXX:
- EXTRA_LINK_ARGS.append('-static-libstdc++')
+ EXTRA_LINK_ARGS.append("-static-libstdc++")
-CC_FILES = [os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES]
PROTO_FILES = [
os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES
]
--CC_INCLUDE = os.path.normpath(protoc_lib_deps.CC_INCLUDE)
+-CC_INCLUDES = [
+- os.path.normpath(include_dir) for include_dir in protoc_lib_deps.CC_INCLUDES
+-]
PROTO_INCLUDE = os.path.normpath(protoc_lib_deps.PROTO_INCLUDE)
- GRPC_PYTHON_TOOLS_PACKAGE = 'grpc_tools'
-@@ -206,7 +204,7 @@ if "win32" in sys.platform:
- DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),)
- if '64bit' in platform.architecture()[0]:
- DEFINE_MACROS += (('MS_WIN64', 1),)
+ GRPC_PYTHON_TOOLS_PACKAGE = "grpc_tools"
+@@ -217,7 +213,7 @@ if "win32" in sys.platform:
+ )
+ if "64bit" in platform.architecture()[0]:
+ DEFINE_MACROS += (("MS_WIN64", 1),)
-elif "linux" in sys.platform or "darwin" in sys.platform:
+elif "linux" in sys.platform or "darwin" in sys.platform or "freebsd" in sys.platform:
- DEFINE_MACROS += (('HAVE_PTHREAD', 1),)
+ DEFINE_MACROS += (("HAVE_PTHREAD", 1),)
- # By default, Python3 distutils enforces compatibility of
-@@ -254,7 +252,7 @@ def extension_modules():
- os.path.join('grpc_tools', 'main.cc'),
- os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc'),
- os.path.join('grpc_root', 'src', 'compiler', 'proto_parser_helper.cc')
-- ] + [os.path.join(CC_INCLUDE, cc_file) for cc_file in CC_FILES]
+ # By default, Python3 setuptools(distutils) enforces compatibility of
+@@ -271,7 +267,7 @@ def extension_modules():
+ os.path.join("grpc_tools", "main.cc"),
+ os.path.join("grpc_root", "src", "compiler", "python_generator.cc"),
+ os.path.join("grpc_root", "src", "compiler", "proto_parser_helper.cc"),
+- ] + CC_FILES
+ ]
- plugin_ext = extension.Extension(
- name='grpc_tools._protoc_compiler',
-@@ -263,7 +261,6 @@ def extension_modules():
- '.',
- 'grpc_root',
- os.path.join('grpc_root', 'include'),
-- CC_INCLUDE,
- ],
- language='c++',
+ plugin_ext = Extension(
+ name="grpc_tools._protoc_compiler",
+@@ -280,8 +276,7 @@ def extension_modules():
+ ".",
+ "grpc_root",
+ os.path.join("grpc_root", "include"),
+- ]
+- + CC_INCLUDES,
++ ],
+ language="c++",
define_macros=list(DEFINE_MACROS),
+ extra_compile_args=list(EXTRA_COMPILE_ARGS),
Index: pkgsrc/net/py-grpcio/patches/patch-setup.py
diff -u pkgsrc/net/py-grpcio/patches/patch-setup.py:1.15 pkgsrc/net/py-grpcio/patches/patch-setup.py:1.16
--- pkgsrc/net/py-grpcio/patches/patch-setup.py:1.15 Thu Aug 3 18:58:48 2023
+++ pkgsrc/net/py-grpcio/patches/patch-setup.py Thu Nov 2 12:46:44 2023
@@ -1,60 +1,60 @@
-$NetBSD: patch-setup.py,v 1.15 2023/08/03 18:58:48 adam Exp $
+$NetBSD: patch-setup.py,v 1.16 2023/11/02 12:46:44 wiz Exp $
Fix libatomic detection.
Use dependencies in pkgsrc.
---- setup.py.orig 2023-08-01 19:15:12.000000000 +0000
+--- setup.py.orig 2023-10-30 18:02:41.000000000 +0000
+++ setup.py
-@@ -315,32 +315,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
- UPBDEFS_GRPC_GENERATED_INCLUDE +
- XXHASH_INCLUDE + ZLIB_INCLUDE)
+@@ -350,33 +350,7 @@ EXTENSION_INCLUDE_DIRECTORIES = (
+ + ZLIB_INCLUDE
+ )
-EXTENSION_LIBRARIES = ()
-if "linux" in sys.platform:
-- EXTENSION_LIBRARIES += ('rt',)
+- EXTENSION_LIBRARIES += ("rt",)
-if not "win32" in sys.platform:
-- EXTENSION_LIBRARIES += ('m',)
+- EXTENSION_LIBRARIES += ("m",)
-if "win32" in sys.platform:
- EXTENSION_LIBRARIES += (
-- 'advapi32',
-- 'bcrypt',
-- 'dbghelp',
-- 'ws2_32',
+- "advapi32",
+- "bcrypt",
+- "dbghelp",
+- "ws2_32",
- )
-if BUILD_WITH_SYSTEM_OPENSSL:
- EXTENSION_LIBRARIES += (
-- 'ssl',
-- 'crypto',
+- "ssl",
+- "crypto",
- )
-if BUILD_WITH_SYSTEM_ZLIB:
-- EXTENSION_LIBRARIES += ('z',)
+- EXTENSION_LIBRARIES += ("z",)
-if BUILD_WITH_SYSTEM_CARES:
-- EXTENSION_LIBRARIES += ('cares',)
+- EXTENSION_LIBRARIES += ("cares",)
-if BUILD_WITH_SYSTEM_RE2:
-- EXTENSION_LIBRARIES += ('re2',)
+- EXTENSION_LIBRARIES += ("re2",)
-if BUILD_WITH_SYSTEM_ABSL:
- EXTENSION_LIBRARIES += tuple(
-- lib.stem[3:] for lib in pathlib.Path('/usr').glob('lib*/libabsl_*.so'))
+- lib.stem[3:] for lib in pathlib.Path("/usr").glob("lib*/libabsl_*.so")
+- )
+EXTENSION_LIBRARIES = ('grpc',)
- DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
+ DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
asm_files = []
-@@ -443,7 +418,7 @@ def cython_extensions_and_necessity():
+@@ -494,7 +468,7 @@ def cython_extensions_and_necessity():
]
- config = os.environ.get('CONFIG', 'opt')
- prefix = 'libs/' + config + '/'
+ config = os.environ.get("CONFIG", "opt")
+ prefix = "libs/" + config + "/"
- if USE_PREBUILT_GRPC_CORE:
+ if False:
extra_objects = [
- prefix + 'libares.a', prefix + 'libboringssl.a',
- prefix + 'libgpr.a', prefix + 'libgrpc.a'
-@@ -455,8 +430,7 @@ def cython_extensions_and_necessity():
- extensions = [
- _extension.Extension(
- name=module_name,
-- sources=([module_file] + list(CYTHON_HELPER_C_FILES) +
-- core_c_files + asm_files),
-+ sources=[module_file] + list(CYTHON_HELPER_C_FILES),
+ prefix + "libares.a",
+ prefix + "libboringssl.a",
+@@ -511,8 +485,6 @@ def cython_extensions_and_necessity():
+ sources=(
+ [module_file]
+ + list(CYTHON_HELPER_C_FILES)
+- + core_c_files
+- + asm_files
+ ),
include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
libraries=list(EXTENSION_LIBRARIES),
- define_macros=list(DEFINE_MACROS),
Home |
Main Index |
Thread Index |
Old Index