Received: by mail.netbsd.org (Postfix, from userid 605) id 0041F84EBC; Wed, 19 Oct 2022 14:25:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3054684D2C for ; Wed, 19 Oct 2022 14:25:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ln6xxQfetDEq for ; Wed, 19 Oct 2022 14:25:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1B62284CF9 for ; Wed, 19 Oct 2022 14:25:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 14B02FA90; Wed, 19 Oct 2022 14:25:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1666189521224790" MIME-Version: 1.0 Date: Wed, 19 Oct 2022 14:25:21 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20221019142521.14B02FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1666189521224790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Oct 19 14:25:20 UTC 2022 Modified Files: pkgsrc/chat/gajim: Makefile pkgsrc/chat/matrix-synapse: Makefile pkgsrc/devel/py-trio: Makefile pkgsrc/devel/py-uvloop: Makefile pkgsrc/net/dnc: Makefile pkgsrc/net/mitmproxy: Makefile pkgsrc/net/py-foolscap: Makefile pkgsrc/net/py-gcs-oauth2-boto-plugin: Makefile pkgsrc/net/py-gsutil: Makefile pkgsrc/net/py-impacket: Makefile pkgsrc/net/py-pyftpdlib: Makefile pkgsrc/net/py-twisted: Makefile pkgsrc/security/py-acme: Makefile pkgsrc/security/py-certbot-nginx: Makefile pkgsrc/security/py-josepy: Makefile pkgsrc/security/py-ndg_httpsclient: Makefile pkgsrc/security/py-service_identity: Makefile pkgsrc/security/py-yubikey-manager: Makefile pkgsrc/www/py-cheroot: Makefile pkgsrc/www/py-scrapy: Makefile pkgsrc/www/py-urllib3: Makefile Log Message: fighting a losing battle against the py-cryptography rustification, part 5 Convert py-OpenSSL users to versioned_dependencies.mk To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 pkgsrc/chat/gajim/Makefile cvs rdiff -u -r1.61 -r1.62 pkgsrc/chat/matrix-synapse/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-trio/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/py-uvloop/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/dnc/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/net/mitmproxy/Makefile cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/py-foolscap/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-gcs-oauth2-boto-plugin/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/py-gsutil/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/py-impacket/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-pyftpdlib/Makefile cvs rdiff -u -r1.51 -r1.52 pkgsrc/net/py-twisted/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/py-acme/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/py-certbot-nginx/Makefile cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/py-josepy/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/py-ndg_httpsclient/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-service_identity/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/py-yubikey-manager/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/py-cheroot/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/py-scrapy/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/py-urllib3/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1666189521224790 Content-Disposition: inline Content-Length: 23559 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/gajim/Makefile diff -u pkgsrc/chat/gajim/Makefile:1.65 pkgsrc/chat/gajim/Makefile:1.66 --- pkgsrc/chat/gajim/Makefile:1.65 Thu Aug 11 05:08:06 2022 +++ pkgsrc/chat/gajim/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2022/08/11 05:08:06 gutteridge Exp $ +# $NetBSD: Makefile,v 1.66 2022/10/19 14:25:18 nia Exp $ DISTNAME= gajim-1.3.3 PKGREVISION= 2 @@ -26,7 +26,6 @@ DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9 DEPENDS+= ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring DEPENDS+= ${PYPKGPREFIX}-nbxmpp>=2.0.1:../../chat/py-nbxmpp DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging -DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-precis-i18n-[0-9]*:../../textproc/py-precis-i18n DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 @@ -40,5 +39,7 @@ DEPENDS+= ${PYPKGPREFIX}-pyobjc-framewor .include "../../devel/gettext-tools/msgfmt-desktop.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../x11/gtk3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/chat/matrix-synapse/Makefile diff -u pkgsrc/chat/matrix-synapse/Makefile:1.61 pkgsrc/chat/matrix-synapse/Makefile:1.62 --- pkgsrc/chat/matrix-synapse/Makefile:1.61 Thu Oct 6 13:57:53 2022 +++ pkgsrc/chat/matrix-synapse/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2022/10/06 13:57:53 gdt Exp $ +# $NetBSD: Makefile,v 1.62 2022/10/19 14:25:18 nia Exp $ DISTNAME= matrix-synapse-1.67.0 CATEGORIES= chat @@ -35,7 +35,6 @@ DEPENDS+= ${PYPKGPREFIX}-matrix-common>= DEPENDS+= ${PYPKGPREFIX}-msgpack>=0.5.2:../../devel/py-msgpack DEPENDS+= ${PYPKGPREFIX}-nacl>=1.2.1:../../security/py-nacl DEPENDS+= ${PYPKGPREFIX}-netaddr>=0.7.18:../../net/py-netaddr -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-phonenumbers>=8.2.0:../../textproc/py-phonenumbers DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow DEPENDS+= ${PYPKGPREFIX}-prometheus_client>=0.4.0:../../net/py-prometheus_client @@ -108,4 +107,6 @@ do-test: .include "../../lang/python/application.mk" .include "../../lang/python/wheel.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-trio/Makefile diff -u pkgsrc/devel/py-trio/Makefile:1.5 pkgsrc/devel/py-trio/Makefile:1.6 --- pkgsrc/devel/py-trio/Makefile:1.5 Thu Jun 9 15:53:27 2022 +++ pkgsrc/devel/py-trio/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/06/09 15:53:27 adam Exp $ +# $NetBSD: Makefile,v 1.6 2022/10/19 14:25:18 nia Exp $ DISTNAME= trio-0.21.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-idna>=2.10:../. DEPENDS+= ${PYPKGPREFIX}-outcome>=1.1.0:../../devel/py-outcome DEPENDS+= ${PYPKGPREFIX}-sniffio>=1.2.0:../../misc/py-sniffio DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.2.2:../../devel/py-sortedcontainers -TEST_DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL TEST_DEPENDS+= ${PYPKGPREFIX}-astor>=0.8.1:../../devel/py-astor TEST_DEPENDS+= ${PYPKGPREFIX}-jedi-[0-9]*:../../editors/py-jedi TEST_DEPENDS+= ${PYPKGPREFIX}-pylint-[0-9]*:../../devel/py-pylint @@ -32,4 +31,6 @@ do-test: cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL:test +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/py-uvloop/Makefile diff -u pkgsrc/devel/py-uvloop/Makefile:1.29 pkgsrc/devel/py-uvloop/Makefile:1.30 --- pkgsrc/devel/py-uvloop/Makefile:1.29 Fri Sep 16 13:00:15 2022 +++ pkgsrc/devel/py-uvloop/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2022/09/16 13:00:15 adam Exp $ +# $NetBSD: Makefile,v 1.30 2022/10/19 14:25:18 nia Exp $ DISTNAME= uvloop-0.17.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,11 +11,12 @@ COMMENT= Fast implementation of asyncio LICENSE= mit AND apache-2.0 DEPENDS+= libuv>=1.43.0:../../devel/libuv -TEST_DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL TEST_DEPENDS+= ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../devel/libuv/buildlink3.mk" .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL:test +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/dnc/Makefile diff -u pkgsrc/net/dnc/Makefile:1.5 pkgsrc/net/dnc/Makefile:1.6 --- pkgsrc/net/dnc/Makefile:1.5 Sun Sep 11 16:46:59 2022 +++ pkgsrc/net/dnc/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/09/11 16:46:59 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2022/10/19 14:25:18 nia Exp $ DISTNAME= dnc-0.2.0 PKGREVISION= 1 @@ -15,7 +15,6 @@ LICENSE= 2-clause-bsd USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns -DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-prettytable-[0-9]*:../../textproc/py-prettytable PYTHON_VERSIONS_INCOMPATIBLE= 27 @@ -33,4 +32,6 @@ do-install: ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../lang/python/application.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/mitmproxy/Makefile diff -u pkgsrc/net/mitmproxy/Makefile:1.41 pkgsrc/net/mitmproxy/Makefile:1.42 --- pkgsrc/net/mitmproxy/Makefile:1.41 Fri Jul 8 12:57:26 2022 +++ pkgsrc/net/mitmproxy/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2022/07/08 12:57:26 leot Exp $ +# $NetBSD: Makefile,v 1.42 2022/10/19 14:25:18 nia Exp $ DISTNAME= mitmproxy-8.1.1 CATEGORIES= net @@ -10,7 +10,6 @@ HOMEPAGE= https://mitmproxy.org/ COMMENT= Interactive console program for inspecting and editing traffic flows LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=21.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-asgiref>=3.2.10:../../www/py-asgiref DEPENDS+= ${PYPKGPREFIX}-blinker>=1.4:../../devel/py-blinker DEPENDS+= ${PYPKGPREFIX}-brotli>=1.0:../../archivers/py-brotli @@ -53,4 +52,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38 .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-foolscap/Makefile diff -u pkgsrc/net/py-foolscap/Makefile:1.40 pkgsrc/net/py-foolscap/Makefile:1.41 --- pkgsrc/net/py-foolscap/Makefile:1.40 Sun Sep 11 16:49:01 2022 +++ pkgsrc/net/py-foolscap/Makefile Wed Oct 19 14:25:18 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2022/09/11 16:49:01 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2022/10/19 14:25:18 nia Exp $ DISTNAME= foolscap-21.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ HOMEPAGE= https://foolscap.lothar.com/tr COMMENT= RPC protocol for Twisted LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface @@ -35,4 +34,6 @@ post-install: ${DESTDIR}${PREFIX}/share/doc/py-foolscap .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-gcs-oauth2-boto-plugin/Makefile diff -u pkgsrc/net/py-gcs-oauth2-boto-plugin/Makefile:1.8 pkgsrc/net/py-gcs-oauth2-boto-plugin/Makefile:1.9 --- pkgsrc/net/py-gcs-oauth2-boto-plugin/Makefile:1.8 Thu Jan 27 23:49:41 2022 +++ pkgsrc/net/py-gcs-oauth2-boto-plugin/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/01/27 23:49:41 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2022/10/19 14:25:19 nia Exp $ DISTNAME= gcs-oauth2-boto-plugin-3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-boto>=2.29.1:.. DEPENDS+= ${PYPKGPREFIX}-google-reauth>=0.1.0:../../security/py-google-reauth DEPENDS+= ${PYPKGPREFIX}-httplib2>=0.18:../../www/py-httplib2 DEPENDS+= ${PYPKGPREFIX}-oauth2client>=2.2.0:../../security/py-oauth2client -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-retry_decorator>=1.0.0:../../devel/py-retry_decorator DEPENDS+= ${PYPKGPREFIX}-rsa>=4.7.2:../../security/py-rsa DEPENDS+= ${PYPKGPREFIX}-six>=1.12.0:../../lang/py-six @@ -26,4 +25,6 @@ USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-rsa .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-gsutil/Makefile diff -u pkgsrc/net/py-gsutil/Makefile:1.16 pkgsrc/net/py-gsutil/Makefile:1.17 --- pkgsrc/net/py-gsutil/Makefile:1.16 Wed Jan 5 15:41:16 2022 +++ pkgsrc/net/py-gsutil/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2022/01/05 15:41:16 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2022/10/19 14:25:19 nia Exp $ DISTNAME= gsutil-4.68 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://cloud.google.com/stora COMMENT= Command line tool for interacting with cloud storage services LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-argcomplete>=1.9.4:../../devel/py-argcomplete DEPENDS+= ${PYPKGPREFIX}-crcmod>=1.7:../../security/py-crcmod DEPENDS+= ${PYPKGPREFIX}-fasteners>=0.14.1:../../devel/py-fasteners @@ -45,4 +44,6 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-impacket/Makefile diff -u pkgsrc/net/py-impacket/Makefile:1.10 pkgsrc/net/py-impacket/Makefile:1.11 --- pkgsrc/net/py-impacket/Makefile:1.10 Fri Apr 29 11:56:44 2022 +++ pkgsrc/net/py-impacket/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2022/04/29 11:56:44 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2022/10/19 14:25:19 nia Exp $ DISTNAME= impacket-0.9.24 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://www.secureauth.com/lab COMMENT= Collection of Python classes for working with network protocols LICENSE= apache-1.1 -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.16.2:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-asn1>=0.2.3:../../security/py-asn1 DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome @@ -68,4 +67,6 @@ ticketer wmiexec wmipersist wmiquery .endfor .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-pyftpdlib/Makefile diff -u pkgsrc/net/py-pyftpdlib/Makefile:1.6 pkgsrc/net/py-pyftpdlib/Makefile:1.7 --- pkgsrc/net/py-pyftpdlib/Makefile:1.6 Fri Oct 14 09:54:20 2022 +++ pkgsrc/net/py-pyftpdlib/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/10/14 09:54:20 adam Exp $ +# $NetBSD: Makefile,v 1.7 2022/10/19 14:25:19 nia Exp $ DISTNAME= pyftpdlib-1.5.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/giampaolo/p COMMENT= Very fast asynchronous FTP server library LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock TEST_DEPENDS+= ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil TEST_DEPENDS+= ${PYPKGPREFIX}-pysendfile-[0-9]*:../../net/py-pysendfile @@ -24,4 +23,6 @@ post-install: ${MV} ftpbench ftpbench-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-twisted/Makefile diff -u pkgsrc/net/py-twisted/Makefile:1.51 pkgsrc/net/py-twisted/Makefile:1.52 --- pkgsrc/net/py-twisted/Makefile:1.51 Wed Aug 10 08:59:35 2022 +++ pkgsrc/net/py-twisted/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2022/08/10 08:59:35 adam Exp $ +# $NetBSD: Makefile,v 1.52 2022/10/19 14:25:19 nia Exp $ .include "../../net/py-twisted/Makefile.common" @@ -13,8 +13,6 @@ DEPENDS+= ${PYPKGPREFIX}-hamcrest>=1.9.0 DEPENDS+= ${PYPKGPREFIX}-hyperlink>=17.1.1:../../www/py-hyperlink DEPENDS+= ${PYPKGPREFIX}-incremental>=21.3.0:../../devel/py-incremental DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.6.5:../../devel/py-typing-extensions -# TLS -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=16.0.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity DEPENDS+= ${PYPKGPREFIX}-idna>=2.4:../../www/py-idna @@ -35,4 +33,6 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-acme/Makefile diff -u pkgsrc/security/py-acme/Makefile:1.30 pkgsrc/security/py-acme/Makefile:1.31 --- pkgsrc/security/py-acme/Makefile:1.30 Wed Oct 19 13:56:32 2022 +++ pkgsrc/security/py-acme/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2022/10/19 13:56:32 nia Exp $ +# $NetBSD: Makefile,v 1.31 2022/10/19 14:25:19 nia Exp $ .include "../../security/py-certbot/Makefile.common" @@ -7,7 +7,6 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=a/acme COMMENT= ACME protocol implementation in Python -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=17.5.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-josepy>=1.13.0:../../security/py-josepy DEPENDS+= ${PYPKGPREFIX}-pytz>=2019.3:../../time/py-pytz DEPENDS+= ${PYPKGPREFIX}-requests>=2.20.0:../../devel/py-requests @@ -19,5 +18,6 @@ TEST_DEPENDS+= ${PYPKGPREFIX}-typing-ext .include "../../lang/python/egg.mk" PYTHON_VERSIONED_DEPENDENCIES+= cryptography +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-certbot-nginx/Makefile diff -u pkgsrc/security/py-certbot-nginx/Makefile:1.20 pkgsrc/security/py-certbot-nginx/Makefile:1.21 --- pkgsrc/security/py-certbot-nginx/Makefile:1.20 Thu Mar 17 12:23:33 2022 +++ pkgsrc/security/py-certbot-nginx/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2022/03/17 12:23:33 adam Exp $ +# $NetBSD: Makefile,v 1.21 2022/10/19 14:25:19 nia Exp $ .include "../../security/py-certbot/Makefile.common" @@ -7,7 +7,6 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=c/cert COMMENT= Nginx plugin for Certbot -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=17.3.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme DEPENDS+= ${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.2.1:../../devel/py-pyparsing @@ -21,4 +20,6 @@ SUBST_FILES.paths= certbot_nginx/_intern SUBST_VARS.paths= PKG_SYSCONFDIR .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-josepy/Makefile diff -u pkgsrc/security/py-josepy/Makefile:1.18 pkgsrc/security/py-josepy/Makefile:1.19 --- pkgsrc/security/py-josepy/Makefile:1.18 Wed Oct 19 13:56:33 2022 +++ pkgsrc/security/py-josepy/Makefile Wed Oct 19 14:25:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2022/10/19 13:56:33 nia Exp $ +# $NetBSD: Makefile,v 1.19 2022/10/19 14:25:19 nia Exp $ DISTNAME= josepy-1.13.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= https://github.com/certbot/jos COMMENT= JOSE protocol implementation in Python using cryptography LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-setuptools>=1.0:../../devel/py-setuptools TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.0:../../devel/py-coverage TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 @@ -33,5 +32,6 @@ do-test: .include "../../lang/python/egg.mk" PYTHON_VERSIONED_DEPENDENCIES+= cryptography +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-ndg_httpsclient/Makefile diff -u pkgsrc/security/py-ndg_httpsclient/Makefile:1.8 pkgsrc/security/py-ndg_httpsclient/Makefile:1.9 --- pkgsrc/security/py-ndg_httpsclient/Makefile:1.8 Sun Sep 11 16:53:08 2022 +++ pkgsrc/security/py-ndg_httpsclient/Makefile Wed Oct 19 14:25:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/09/11 16:53:08 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2022/10/19 14:25:20 nia Exp $ DISTNAME= ndg_httpsclient-0.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,11 +13,12 @@ COMMENT= HTTPS client implementation for LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-asn1>=0.1.4:../../security/py-asn1 -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL PYTHON_VERSIONS_INCOMPATIBLE= 27 USE_PKG_RESOURCES= yes .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-service_identity/Makefile diff -u pkgsrc/security/py-service_identity/Makefile:1.9 pkgsrc/security/py-service_identity/Makefile:1.10 --- pkgsrc/security/py-service_identity/Makefile:1.9 Sun Sep 11 18:12:04 2022 +++ pkgsrc/security/py-service_identity/Makefile Wed Oct 19 14:25:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2022/09/11 18:12:04 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2022/10/19 14:25:20 nia Exp $ DISTNAME= service_identity-18.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,6 @@ HOMEPAGE= https://pypi.python.org/pypi/s COMMENT= Service identity verification for pyOpenSSL LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.12:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-asn1-modules-[0-9]*:../../security/py-asn1-modules DEPENDS+= ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs DEPENDS+= ${PYPKGPREFIX}-characteristic>=14.0.0:../../devel/py-characteristic @@ -20,4 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-idna-[0-9]*:../ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/py-yubikey-manager/Makefile diff -u pkgsrc/security/py-yubikey-manager/Makefile:1.6 pkgsrc/security/py-yubikey-manager/Makefile:1.7 --- pkgsrc/security/py-yubikey-manager/Makefile:1.6 Wed Oct 19 13:56:33 2022 +++ pkgsrc/security/py-yubikey-manager/Makefile Wed Oct 19 14:25:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2022/10/19 13:56:33 nia Exp $ +# $NetBSD: Makefile,v 1.7 2022/10/19 14:25:20 nia Exp $ .include "../../security/ykman/version.mk" @@ -15,7 +15,6 @@ HOMEPAGE= https://developers.yubico.com/ COMMENT= Yubico YubiKey manager library LICENSE= 2-clause-bsd -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-click>=0:../../devel/py-click DEPENDS+= ${PYPKGPREFIX}-fido2>=0:../../security/py-fido2 DEPENDS+= ${PYPKGPREFIX}-scard>=0:../../devel/py-scard @@ -33,5 +32,6 @@ post-install: .include "../../lang/python/egg.mk" .include "../../security/ykpers/buildlink3.mk" PYTHON_VERSIONED_DEPENDENCIES+= cryptography +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-cheroot/Makefile diff -u pkgsrc/www/py-cheroot/Makefile:1.32 pkgsrc/www/py-cheroot/Makefile:1.33 --- pkgsrc/www/py-cheroot/Makefile:1.32 Thu Oct 13 16:24:20 2022 +++ pkgsrc/www/py-cheroot/Makefile Wed Oct 19 14:25:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2022/10/13 16:24:20 adam Exp $ +# $NetBSD: Makefile,v 1.33 2022/10/19 14:25:20 nia Exp $ DISTNAME= cheroot-6.5.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,6 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-more-itertools-[0-9]*:../../devel/py-more-itertools BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=7.0.0:../../devel/py-setuptools_scm -TEST_DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.5.3:../../devel/py-coverage TEST_DEPENDS+= ${PYPKGPREFIX}-ddt-[0-9]*:../../devel/py-ddt TEST_DEPENDS+= ${PYPKGPREFIX}-portend-[0-9]*:../../net/py-portend @@ -42,4 +41,6 @@ do-test: cd ${WRKSRC} && py.test-${PYVERSSUFFIX} .include "../../lang/python/egg.mk" +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL:test +.include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-scrapy/Makefile diff -u pkgsrc/www/py-scrapy/Makefile:1.15 pkgsrc/www/py-scrapy/Makefile:1.16 --- pkgsrc/www/py-scrapy/Makefile:1.15 Wed Oct 19 13:56:34 2022 +++ pkgsrc/www/py-scrapy/Makefile Wed Oct 19 14:25:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2022/10/19 13:56:34 nia Exp $ +# $NetBSD: Makefile,v 1.16 2022/10/19 14:25:20 nia Exp $ DISTNAME= Scrapy-2.4.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -11,7 +11,6 @@ HOMEPAGE= https://scrapy.org/ COMMENT= High-level Web Crawling and Web Scraping framework LICENSE= modified-bsd -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=16.2.0:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=4.1.3:../../devel/py-ZopeInterface DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.9.1:../../textproc/py-cssselect DEPENDS+= ${PYPKGPREFIX}-itemloaders>=1.0.1:../../textproc/py-itemloaders @@ -37,5 +36,6 @@ post-install: .include "../../lang/python/egg.mk" PYTHON_VERSIONED_DEPENDENCIES+= cryptography +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/py-urllib3/Makefile diff -u pkgsrc/www/py-urllib3/Makefile:1.41 pkgsrc/www/py-urllib3/Makefile:1.42 --- pkgsrc/www/py-urllib3/Makefile:1.41 Wed Oct 19 13:56:34 2022 +++ pkgsrc/www/py-urllib3/Makefile Wed Oct 19 14:25:20 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2022/10/19 13:56:34 nia Exp $ +# $NetBSD: Makefile,v 1.42 2022/10/19 14:25:20 nia Exp $ DISTNAME= urllib3-1.26.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= https://urllib3.readthedocs.io COMMENT= HTTP library with thread-safe connection pooling LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-Socks>=1.6.0:../../net/py-Socks DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi DEPENDS+= ${PYPKGPREFIX}-idna>=2.0.0:../../www/py-idna @@ -27,5 +26,6 @@ USE_LANGUAGES= # none .include "../../lang/python/egg.mk" PYTHON_VERSIONED_DEPENDENCIES+= cryptography +PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL .include "../../lang/python/versioned_dependencies.mk" .include "../../mk/bsd.pkg.mk" --_----------=_1666189521224790--