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 py-cryptography rusti...
details: https://anonhg.NetBSD.org/pkgsrc/rev/48fb1f9fbfe4
branches: trunk
changeset: 386998:48fb1f9fbfe4
user: nia <nia%pkgsrc.org@localhost>
date: Wed Oct 19 13:56:31 2022 +0000
description:
fighting a losing battle against py-cryptography rustification, part 2
Switch users to versioned_dependencies.mk.
diffstat:
mail/py-postfix-mta-sts-resolver/Makefile | 5 +++--
net/py-ec2instanceconnectcli/Makefile | 5 +++--
net/py-lexicon/Makefile | 5 +++--
net/py-moto/Makefile | 5 +++--
net/py-onionbalance/Makefile | 4 ++--
net/py-txtorcon/Makefile | 5 +++--
security/ca-certificates/Makefile | 8 ++++----
security/py-acme/Makefile | 5 +++--
security/py-asyncssh/Makefile | 5 +++--
security/py-certbot/Makefile | 5 +++--
security/py-google-auth/Makefile | 6 +++---
security/py-josepy/Makefile | 5 +++--
security/py-oauthlib/Makefile | 5 +++--
security/py-paramiko/Makefile | 5 +++--
security/py-requests-kerberos/Makefile | 5 +++--
security/py-requests-ntlm/Makefile | 5 +++--
security/py-solo/Makefile | 5 +++--
security/py-trustme/Makefile | 5 +++--
security/py-yubikey-manager/Makefile | 5 +++--
sysutils/ansible-core/Makefile | 5 +++--
textproc/py-JWT/Makefile | 5 +++--
www/py-autobahn/Makefile | 5 +++--
www/py-flask-user/Makefile | 5 +++--
www/py-jwcrypto/Makefile | 6 ++++--
www/py-scrapy/Makefile | 5 +++--
www/py-urllib3/Makefile | 5 +++--
26 files changed, 79 insertions(+), 55 deletions(-)
diffs (truncated from 628 to 300 lines):
diff -r 64662a05db8a -r 48fb1f9fbfe4 mail/py-postfix-mta-sts-resolver/Makefile
--- a/mail/py-postfix-mta-sts-resolver/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/mail/py-postfix-mta-sts-resolver/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/08/19 20:36:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/10/19 13:56:31 nia Exp $
DISTNAME= postfix_mta_sts_resolver-1.1.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -10,7 +10,6 @@
COMMENT= Daemon providing TLS client policy for Postfix based on MTA-STS policy
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cryptography>=1.6:../../security/py-cryptography
BUILD_DEPENDS+= ${PYPKGPREFIX}-pylint>=0:../../devel/py-pylint
BUILD_DEPENDS+= ${PYPKGPREFIX}-tox>=0:../../devel/py-tox
BUILD_DEPENDS+= ${PYPKGPREFIX}-twine>=1.11.0:../../net/py-twine
@@ -35,4 +34,6 @@
cd ${DESTDIR}${PREFIX}/bin && ${MV} mta-sts-query mta-sts-query-${PYVERSSUFFIX} || ${TRUE}
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography:build
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 net/py-ec2instanceconnectcli/Makefile
--- a/net/py-ec2instanceconnectcli/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/net/py-ec2instanceconnectcli/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/09/11 17:11:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/10/19 13:56:31 nia Exp $
DISTNAME= ec2instanceconnectcli-1.0.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@
LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-botocore>=1.12.179:../../net/py-botocore
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=0:../../security/py-cryptography
PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -25,4 +24,6 @@
${RM} ${DESTDIR}${PREFIX}/bin/*.cmd
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 net/py-lexicon/Makefile
--- a/net/py-lexicon/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/net/py-lexicon/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2022/10/12 07:40:42 adam Exp $
+# $NetBSD: Makefile,v 1.80 2022/10/19 13:56:32 nia Exp $
DISTNAME= dns_lexicon-3.11.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/dns_//}
@@ -11,7 +11,6 @@
LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4>=4:../../www/py-beautifulsoup4
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=2:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-requests>=2:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-tldextract>=2:../../net/py-tldextract
DEPENDS+= ${PYPKGPREFIX}-yaml>=5:../../textproc/py-yaml
@@ -32,4 +31,6 @@
cd ${WRKSRC}/lexicon && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests/test_*
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 net/py-moto/Makefile
--- a/net/py-moto/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/net/py-moto/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/02/15 15:32:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2022/10/19 13:56:32 nia Exp $
DISTNAME= moto-3.0.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@
DEPENDS+= ${PYPKGPREFIX}-boto3>=1.9.201:../../net/py-boto3
DEPENDS+= ${PYPKGPREFIX}-botocore-[0-9]*:../../net/py-botocore
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=3.3.1:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-requests>=2.5:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-xmltodict-[0-9]*:../../textproc/py-xmltodict
DEPENDS+= ${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug
@@ -48,4 +47,6 @@
cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 net/py-onionbalance/Makefile
--- a/net/py-onionbalance/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/net/py-onionbalance/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/01/05 15:41:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2022/10/19 13:56:32 nia Exp $
DISTNAME= OnionBalance-0.2.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,7 +12,6 @@
LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-future>=0.14.0:../../devel/py-future
DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
DEPENDS+= ${PYPKGPREFIX}-stem>=1.8:../../devel/py-stem
@@ -30,6 +29,7 @@
PYTHON_VERSIONS_INCOMPATIBLE= 27
PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
USE_PKG_RESOURCES= yes
diff -r 64662a05db8a -r 48fb1f9fbfe4 net/py-txtorcon/Makefile
--- a/net/py-txtorcon/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/net/py-txtorcon/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/10/19 13:56:32 nia Exp $
DISTNAME= txtorcon-20.0.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@
DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface
DEPENDS+= ${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-incremental-[0-9]*:../../devel/py-incremental
DEPENDS+= ${PYPKGPREFIX}-twisted>=15.5.0:../../net/py-twisted
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
@@ -28,4 +27,6 @@
cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/ca-certificates/Makefile
--- a/security/ca-certificates/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/ca-certificates/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/07/17 02:58:32 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2022/10/19 13:56:32 nia Exp $
PKGNAME= ca-certificates-20211016
PKGREVISION= 4
@@ -12,10 +12,8 @@
COMMENT= Root CA certificates from the Mozilla Project
LICENSE= gnu-gpl-v2 AND mpl-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
-
NO_CONFIGURE= yes
-PYTHON_FOR_BUILD_ONLY= yes
+PYTHON_FOR_BUILD_ONLY= tool
PYTHON_VERSIONS_INCOMPATIBLE= 27
USE_TOOLS= echo:run find:run ln:run openssl:run rm:run sed:run sort:run wc:run
@@ -86,4 +84,6 @@
${DESTDIR}${EGDIR}/
.include "../../lang/python/tool.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography:tool
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/py-acme/Makefile
--- a/security/py-acme/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/py-acme/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2022/07/12 05:43:58 adam Exp $
+# $NetBSD: Makefile,v 1.30 2022/10/19 13:56:32 nia Exp $
.include "../../security/py-certbot/Makefile.common"
@@ -8,7 +8,6 @@
COMMENT= ACME protocol implementation in Python
DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=17.5.0:../../security/py-OpenSSL
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.5.0:../../security/py-cryptography
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,4 +18,6 @@
TEST_DEPENDS+= ${PYPKGPREFIX}-typing-extensions-[0-9]*:../../devel/py-typing-extensions
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/py-asyncssh/Makefile
--- a/security/py-asyncssh/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/py-asyncssh/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2022/08/18 16:45:30 adam Exp $
+# $NetBSD: Makefile,v 1.33 2022/10/19 13:56:32 nia Exp $
DISTNAME= asyncssh-2.12.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,11 +12,12 @@
DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=17.0.0:../../security/py-OpenSSL
DEPENDS+= ${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=3.1:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-gssapi>=1.2.0:../../security/py-gssapi
DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.6:../../devel/py-typing-extensions
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/py-certbot/Makefile
--- a/security/py-certbot/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/py-certbot/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2022/03/17 12:23:31 adam Exp $
+# $NetBSD: Makefile,v 1.35 2022/10/19 13:56:32 nia Exp $
.include "../../security/py-certbot/Makefile.common"
@@ -10,7 +10,6 @@
DEPENDS+= ${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
DEPENDS+= ${PYPKGPREFIX}-configargparse>=0.9.3:../../devel/py-configargparse
DEPENDS+= ${PYPKGPREFIX}-configobj>=5.0.6:../../devel/py-configobj
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.5.0:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-distro>=1.0.1:../../devel/py-distro
DEPENDS+= ${PYPKGPREFIX}-josepy>=1.13.0:../../security/py-josepy
DEPENDS+= ${PYPKGPREFIX}-parsedatetime>=2.4:../../time/py-parsedatetime
@@ -52,4 +51,6 @@
${DESTDIR}${PREFIX}/share/examples/certbot-${PYVERSSUFFIX}
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/py-google-auth/Makefile
--- a/security/py-google-auth/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/py-google-auth/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2022/08/30 12:01:51 sborrill Exp $
+# $NetBSD: Makefile,v 1.43 2022/10/19 13:56:32 nia Exp $
DISTNAME= google-auth-2.11.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -20,8 +20,6 @@
TEST_DEPENDS+= ${PYPKGPREFIX}-oauth2client-[0-9]*:../../security/py-oauth2client
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
TEST_DEPENDS+= ${PYPKGPREFIX}-test-localserver-[0-9]*:../../devel/py-test-localserver
-# not mentioned, but needed
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
TEST_DEPENDS+= ${PYPKGPREFIX}-freezegun-[0-9]*:../../devel/py-freezegun
TEST_DEPENDS+= ${PYPKGPREFIX}-responses-[0-9]*:../../net/py-responses
@@ -34,4 +32,6 @@
cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/py-josepy/Makefile
--- a/security/py-josepy/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/py-josepy/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/03/17 08:16:22 adam Exp $
+# $NetBSD: Makefile,v 1.18 2022/10/19 13:56:33 nia Exp $
DISTNAME= josepy-1.13.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@
LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=1.5:../../security/py-cryptography
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,4 +32,6 @@
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
.include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 64662a05db8a -r 48fb1f9fbfe4 security/py-oauthlib/Makefile
--- a/security/py-oauthlib/Makefile Wed Oct 19 13:42:46 2022 +0000
+++ b/security/py-oauthlib/Makefile Wed Oct 19 13:56:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2022/09/13 12:32:55 adam Exp $
+# $NetBSD: Makefile,v 1.25 2022/10/19 13:56:33 nia Exp $
Home |
Main Index |
Thread Index |
Old Index