pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: convert to versioned_dependencies for py-cryptography
details: https://anonhg.NetBSD.org/pkgsrc/rev/c24a1e5a0de6
branches: trunk
changeset: 377518:c24a1e5a0de6
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Apr 21 10:59:59 2022 +0000
description:
*: convert to versioned_dependencies for py-cryptography
diffstat:
comms/py-esptool/Makefile | 6 ++++--
databases/py-pymysql/Makefile | 5 +++--
devel/py-requests/Makefile | 6 +++---
net/py-ec2instanceconnectcli/Makefile | 6 ++++--
net/scapy/options.mk | 5 +++--
security/ca-certificates/Makefile | 5 +++--
security/py-OpenSSL/Makefile | 6 ++++--
security/py-authlib/Makefile | 6 ++++--
security/py-fido2/Makefile | 6 ++++--
security/py-ntlm-auth/Makefile | 5 +++--
security/py-paramiko/Makefile | 6 +++---
security/py-requests-kerberos/Makefile | 6 ++++--
security/py-requests-ntlm/Makefile | 6 ++++--
security/py-trustme/Makefile | 6 +++---
sysutils/ansible-base/Makefile | 4 ++--
www/py-flask-user/Makefile | 6 ++++--
www/py-http_ece/Makefile | 5 +++--
www/py-urllib3/Makefile | 6 ++++--
18 files changed, 62 insertions(+), 39 deletions(-)
diffs (truncated from 435 to 300 lines):
diff -r bda64ae0270e -r c24a1e5a0de6 comms/py-esptool/Makefile
--- a/comms/py-esptool/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/comms/py-esptool/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/04/20 12:22:11 adam Exp $
+# $NetBSD: Makefile,v 1.12 2022/04/21 10:59:59 wiz Exp $
DISTNAME= esptool-3.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,14 +12,16 @@
BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
DEPENDS+= ${PYPKGPREFIX}-bitstring>=3.1.6:../../devel/py-bitstring
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-ecdsa>=0.16.0:../../security/py-ecdsa
DEPENDS+= ${PYPKGPREFIX}-reedsolo>=1.5.3:../../converters/py-reedsolo
DEPENDS+= ${PYPKGPREFIX}-serial>=3.0:../../comms/py-serial
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+
USE_LANGUAGES= # none
PYTHON_SELF_CONFLICT= yes
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 databases/py-pymysql/Makefile
--- a/databases/py-pymysql/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/databases/py-pymysql/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:52:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/04/21 11:00:00 wiz Exp $
DISTNAME= PyMySQL-0.10.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,9 +11,10 @@
COMMENT= Pure-Python MySQL driver
LICENSE= mit
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
USE_LANGUAGES= # none
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 devel/py-requests/Makefile
--- a/devel/py-requests/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/devel/py-requests/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/01/07 16:23:16 adam Exp $
+# $NetBSD: Makefile,v 1.53 2022/04/21 11:00:00 wiz Exp $
DISTNAME= requests-2.27.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@
LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-certifi>=2017.4.17:../../security/py-certifi
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=1.3.4:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
DEPENDS+= ${PYPKGPREFIX}-urllib3>=1.21.1:../../www/py-urllib3
TEST_DEPENDS+= ${PYPKGPREFIX}-Socks>=1.5.8:../../net/py-Socks
@@ -20,7 +19,8 @@
TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+= test:test
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
USE_LANGUAGES= # none
REPLACE_PYTHON+= requests/certs.py
diff -r bda64ae0270e -r c24a1e5a0de6 net/py-ec2instanceconnectcli/Makefile
--- a/net/py-ec2instanceconnectcli/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/net/py-ec2instanceconnectcli/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/04/21 11:00:00 wiz Exp $
DISTNAME= ec2instanceconnectcli-1.0.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@
LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-botocore>=1.12.179:../../net/py-botocore
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=1.9:../../security/py-cryptography
+
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
USE_LANGUAGES= # none
@@ -22,5 +23,6 @@
.endfor
${RM} ${DESTDIR}${PREFIX}/bin/*.cmd
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 net/scapy/options.mk
--- a/net/scapy/options.mk Thu Apr 21 10:50:52 2022 +0000
+++ b/net/scapy/options.mk Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2022/01/25 01:44:22 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2022/04/21 11:00:00 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.scapy
@@ -20,7 +20,8 @@
### Add in crypto support for WEP operations
###
.if !empty(PKG_OPTIONS:Mscapy-crypto)
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+.include "../../lang/python/versioned_dependencies.mk"
.endif
###
diff -r bda64ae0270e -r c24a1e5a0de6 security/ca-certificates/Makefile
--- a/security/ca-certificates/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/ca-certificates/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/28 06:46:52 kim Exp $
+# $NetBSD: Makefile,v 1.6 2022/04/21 11:00:00 wiz Exp $
PKGNAME= ca-certificates-20211016
PKGREVISION= 1
@@ -15,7 +15,7 @@
NO_CONFIGURE= yes
PYTHON_FOR_BUILD_ONLY= yes
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography:build
USE_TOOLS= echo:run find:run ln:run openssl:run rm:run sed:run sort:run wc:run
@@ -81,4 +81,5 @@
${DESTDIR}${EGDIR}/
.include "../../lang/python/tool.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-OpenSSL/Makefile
--- a/security/py-OpenSSL/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-OpenSSL/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2022/01/04 20:54:37 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2022/04/21 11:00:00 wiz Exp $
DISTNAME= pyOpenSSL-21.0.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,15 +11,17 @@
COMMENT= Python interface to the OpenSSL library
LICENSE= apache-2.0
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=3.3:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
TEST_DEPENDS+= ${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+
# https://github.com/pyca/pyopenssl/issues/656
PYSETUPTESTTARGET= pytest
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-authlib/Makefile
--- a/security/py-authlib/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-authlib/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/21 11:00:00 wiz Exp $
DISTNAME= Authlib-0.15.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,10 +11,12 @@
COMMENT= Ultimate Python library in building OAuth and OpenID Connect servers
LICENSE= modified-bsd
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-fido2/Makefile
--- a/security/py-fido2/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-fido2/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/04 20:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/04/21 11:00:01 wiz Exp $
DISTNAME= fido2-0.8.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,10 @@
COMMENT= Yubico FIDO U2F and FIDO 2.0 USB Python library
LICENSE= 2-clause-bsd AND apache-2.0 AND mpl-2.0
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=1.5:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-six>=0:../../lang/py-six
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-ntlm-auth/Makefile
--- a/security/py-ntlm-auth/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-ntlm-auth/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/21 11:00:01 wiz Exp $
DISTNAME= ntlm-auth-1.5.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,10 @@
COMMENT= NTLM authentication handler for python-requests
LICENSE= mit
-DEPENDS+= ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-paramiko/Makefile
--- a/security/py-paramiko/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-paramiko/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/01/04 20:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2022/04/21 11:00:01 wiz Exp $
DISTNAME= paramiko-2.8.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,12 +12,12 @@
LICENSE= gnu-lgpl-v2.1
DEPENDS+= ${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-nacl>=1.0.1:../../security/py-nacl
TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
TEST_DEPENDS+= ${PYPKGPREFIX}-test-relaxed-[0-9]*:../../devel/py-test-relaxed
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+= test:test
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-requests-kerberos/Makefile
--- a/security/py-requests-kerberos/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-requests-kerberos/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/04/21 11:00:01 wiz Exp $
DISTNAME= requests-kerberos-0.12.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,10 +11,11 @@
COMMENT= Kerberos authentication handler for python-requests
LICENSE= apache-2.0
-DEPENDS+= ${PYPKGPREFIX}-cryptography>=1.3:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-kerberos>=1.1.8nb1:../../security/py-kerberos
DEPENDS+= ${PYPKGPREFIX}-requests>=1.1.0:../../devel/py-requests
+PYTHON_VERSIONED_DEPENDENCIES+= cryptography
+
USE_LANGUAGES= # none
SUBST_CLASSES+= requires
@@ -23,4 +24,5 @@
SUBST_SED.requires= -e 's/pykerberos/kerberos/'
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bda64ae0270e -r c24a1e5a0de6 security/py-requests-ntlm/Makefile
--- a/security/py-requests-ntlm/Makefile Thu Apr 21 10:50:52 2022 +0000
+++ b/security/py-requests-ntlm/Makefile Thu Apr 21 10:59:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/21 11:00:01 wiz Exp $
DISTNAME= requests_ntlm-1.1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -11,11 +11,13 @@
COMMENT= NTLM authentication handler for python-requests
Home |
Main Index |
Thread Index |
Old Index