pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc fighting a losing battle against the py-cryptography r...
details: https://anonhg.NetBSD.org/pkgsrc/rev/455c0cef2d44
branches: trunk
changeset: 387009:455c0cef2d44
user: nia <nia%pkgsrc.org@localhost>
date: Wed Oct 19 14:25:18 2022 +0000
description:
fighting a losing battle against the py-cryptography rustification, part 5
Convert py-OpenSSL users to versioned_dependencies.mk
diffstat:
chat/gajim/Makefile | 5 +++--
chat/matrix-synapse/Makefile | 5 +++--
devel/py-trio/Makefile | 5 +++--
devel/py-uvloop/Makefile | 5 +++--
net/dnc/Makefile | 5 +++--
net/mitmproxy/Makefile | 5 +++--
net/py-foolscap/Makefile | 5 +++--
net/py-gcs-oauth2-boto-plugin/Makefile | 5 +++--
net/py-gsutil/Makefile | 5 +++--
net/py-impacket/Makefile | 5 +++--
net/py-pyftpdlib/Makefile | 5 +++--
net/py-twisted/Makefile | 6 +++---
security/py-acme/Makefile | 4 ++--
security/py-certbot-nginx/Makefile | 5 +++--
security/py-josepy/Makefile | 4 ++--
security/py-ndg_httpsclient/Makefile | 5 +++--
security/py-service_identity/Makefile | 5 +++--
security/py-yubikey-manager/Makefile | 4 ++--
www/py-cheroot/Makefile | 5 +++--
www/py-scrapy/Makefile | 4 ++--
www/py-urllib3/Makefile | 4 ++--
21 files changed, 58 insertions(+), 43 deletions(-)
diffs (truncated from 504 to 300 lines):
diff -r 61c7a9bb7a1f -r 455c0cef2d44 chat/gajim/Makefile
--- a/chat/gajim/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/chat/gajim/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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}-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 @@
.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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 chat/matrix-synapse/Makefile
--- a/chat/matrix-synapse/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/chat/matrix-synapse/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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}-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 @@
.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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 devel/py-trio/Makefile
--- a/devel/py-trio/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/devel/py-trio/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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}-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 @@
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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 devel/py-uvloop/Makefile
--- a/devel/py-uvloop/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/devel/py-uvloop/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/dnc/Makefile
--- a/net/dnc/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/dnc/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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 @@
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../lang/python/application.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/mitmproxy/Makefile
--- a/net/mitmproxy/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/mitmproxy/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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 @@
.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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/py-foolscap/Makefile
--- a/net/py-foolscap/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/py-foolscap/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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 @@
${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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/py-gcs-oauth2-boto-plugin/Makefile
--- a/net/py-gcs-oauth2-boto-plugin/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/py-gcs-oauth2-boto-plugin/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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}-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 @@
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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/py-gsutil/Makefile
--- a/net/py-gsutil/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/py-gsutil/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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 @@
.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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/py-impacket/Makefile
--- a/net/py-impacket/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/py-impacket/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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 @@
.endfor
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= OpenSSL
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/py-pyftpdlib/Makefile
--- a/net/py-pyftpdlib/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/py-pyftpdlib/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
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 @@
${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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 net/py-twisted/Makefile
--- a/net/py-twisted/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/net/py-twisted/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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}-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 @@
.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"
diff -r 61c7a9bb7a1f -r 455c0cef2d44 security/py-acme/Makefile
--- a/security/py-acme/Makefile Wed Oct 19 14:17:54 2022 +0000
+++ b/security/py-acme/Makefile Wed Oct 19 14:25:18 2022 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index