Attachment 225729 Details for Bug 254038 – pyjwt1.diff

[patch] pyjwt1.diff

pyjwt.diff (text/plain), 12.28 KB, created by Goran Mekić on 2021-06-11 11:58:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Goran Mekić

Created: 2021-06-11 11:58:19 UTC

Size: 12.28 KB

patch

obsolete

>diff --git a/databases/py-python-arango/Makefile b/databases/py-python-arango/Makefile
>index a5d100cfbf8c..4424190bc456 100644
>--- a/databases/py-python-arango/Makefile
>+++ b/databases/py-python-arango/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Python driver for ArangoDB
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR} \
>+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyjwt1>0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>0:www/py-requests-toolbelt@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
>diff --git a/devel/py-apns2/Makefile b/devel/py-apns2/Makefile
>index 38aeb0c002bf..4d4ce41dd27b 100644
>--- a/devel/py-apns2/Makefile
>+++ b/devel/py-apns2/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}hyper>0:www/py-hyper@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>0:www/py-pyjwt1@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	distutils autoplist
>diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile
>index df54d60c2401..5596ecfe4a05 100644
>--- a/devel/py-buildbot/Makefile
>+++ b/devel/py-buildbot/Makefile
>@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.13:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \
>diff --git a/devel/py-msal/Makefile b/devel/py-msal/Makefile
>index df54baa72cb4..4353e4e32da3 100644
>--- a/devel/py-msal/Makefile
>+++ b/devel/py-msal/Makefile
>@@ -10,7 +10,7 @@ COMMENT=	Microsoft Authentication Library (MSAL) for Python
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.0.0<3:www/py-requests@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0<3:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.0.0<3:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>=0.6<4:security/py-cryptography@${PY_FLAVOR}
> 
> USES=		python:3.6+
>diff --git a/devel/py-pygithub/Makefile b/devel/py-pygithub/Makefile
>index 96dd8d073cad..54f68549e9c4 100644
>--- a/devel/py-pygithub/Makefile
>+++ b/devel/py-pygithub/Makefile
>@@ -14,7 +14,7 @@ LICENSE=	LGPL3
> LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.14.0:www/py-requests@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>0:www/py-pyjwt1@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	distutils autoplist
>diff --git a/devel/py-twilio/Makefile b/devel/py-twilio/Makefile
>index b8f9e9c356e1..0b2efd43ae81 100644
>--- a/devel/py-twilio/Makefile
>+++ b/devel/py-twilio/Makefile
>@@ -12,7 +12,7 @@ LICENSE=	MIT
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	autoplist concurrent distutils
>diff --git a/net-mgmt/py-adal/Makefile b/net-mgmt/py-adal/Makefile
>index ea74734a3e35..4413d2a0290e 100644
>--- a/net-mgmt/py-adal/Makefile
>+++ b/net-mgmt/py-adal/Makefile
>@@ -12,7 +12,7 @@ COMMENT=	Authentication to Azure Active Directory for Python applications
> LICENSE=	MIT
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=1.1.0:security/py-cryptography@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0<3:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.0.0<3:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1.0<3:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.0.0<3:www/py-requests@${PY_FLAVOR}
> 
>diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
>index 278e49fd533e..2143960ccb1f 100644
>--- a/security/py-oauthlib/Makefile
>+++ b/security/py-oauthlib/Makefile
>@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.0.0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR}
> 
> OPTIONS_DEFINE=		RSA SIGNALS SIGNEDTOKEN
>@@ -27,7 +27,7 @@ SIGNEDTOKEN_DESC=	Support for Signed Token
> RSA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
> SIGNALS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR}
> SIGNEDTOKEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
>-				${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${PY_FLAVOR}
>+				${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.0.0:www/py-pyjwt1@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	autoplist distutils
>diff --git a/security/py-social-auth-core/Makefile b/security/py-social-auth-core/Makefile
>index 42f31a36cd76..f0dda348029a 100644
>--- a/security/py-social-auth-core/Makefile
>+++ b/security/py-social-auth-core/Makefile
>@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.1:security/py-cryptography@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.10:security/py-python3-openid@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.7.1:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.7.1:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}oauthlib>=1.0.3:security/py-oauthlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${PY_FLAVOR} \
>diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile
>index b48ebeb45678..35cf69237bba 100644
>--- a/sysutils/conan/Makefile
>+++ b/sysutils/conan/Makefile
>@@ -22,7 +22,7 @@ PY_DEPENDS=	\
> 		${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4,<1.18:devel/py-patch-ng@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0,<3.0:textproc/py-pygments@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0,<2.0.0:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=1.4.0,<2.0.0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1,<3.0.0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
>diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile
>index aa5c4c3b26da..0bfef5868625 100644
>--- a/sysutils/py-azure-cli-core/Makefile
>+++ b/sysutils/py-azure-cli-core/Makefile
>@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}adal>=1.2.7:net-mgmt/py-adal@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}msrestazure>=0.6.3:net-mgmt/py-msrestazure@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8<3.0.0:security/py-paramiko@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}openssl>=17.1.0:security/py-openssl@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=2.22:www/py-requests@${PY_FLAVOR} \
>diff --git a/www/Makefile b/www/Makefile
>index 2aaee5870f45..4946395b6bb1 100644
>--- a/www/Makefile
>+++ b/www/Makefile
>@@ -1693,6 +1693,7 @@
>     SUBDIR += py-puppetboard
>     SUBDIR += py-py-restclient
>     SUBDIR += py-pyjwt
>+    SUBDIR += py-pyjwt1
>     SUBDIR += py-pylsqpack
>     SUBDIR += py-pyocclient
>     SUBDIR += py-pyramid
>diff --git a/www/py-mwoauth/Makefile b/www/py-mwoauth/Makefile
>index 3a6b0b04eb55..2086a013d7a6 100644
>--- a/www/py-mwoauth/Makefile
>+++ b/www/py-mwoauth/Makefile
>@@ -11,7 +11,7 @@ LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
>diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile
>index a890a6808a1f..e5b8a822163a 100644
>--- a/www/py-pyjwt/Makefile
>+++ b/www/py-pyjwt/Makefile
>@@ -1,11 +1,11 @@
> PORTNAME=	pyjwt
>-PORTVERSION=	1.7.1
>+PORTVERSION=	2.1.0
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> DISTNAME=	PyJWT-${PORTVERSION}
> 
>-MAINTAINER=	terje@elde.net
>+MAINTAINER=	meka@tilda.center
> COMMENT=	JSON Web Token implementation in Python
> 
> LICENSE=	MIT
>diff --git a/www/py-pyjwt/distinfo b/www/py-pyjwt/distinfo
>index 381402aac2e6..6089a8e1a102 100644
>--- a/www/py-pyjwt/distinfo
>+++ b/www/py-pyjwt/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1577039206
>-SHA256 (PyJWT-1.7.1.tar.gz) = 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96
>-SIZE (PyJWT-1.7.1.tar.gz) = 41979
>+TIMESTAMP = 1623361268
>+SHA256 (PyJWT-2.1.0.tar.gz) = fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130
>+SIZE (PyJWT-2.1.0.tar.gz) = 60092
>diff --git a/www/py-pyjwt1/Makefile b/www/py-pyjwt1/Makefile
>new file mode 100644
>index 000000000000..756aa5a53245
>--- /dev/null
>+++ b/www/py-pyjwt1/Makefile
>@@ -0,0 +1,33 @@
>+PORTNAME=	pyjwt1
>+PORTVERSION=	1.7.1
>+CATEGORIES=	www python
>+MASTER_SITES=	CHEESESHOP
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+DISTNAME=	PyJWT-${PORTVERSION}
>+
>+MAINTAINER=	terje@elde.net
>+COMMENT=	JSON Web Token implementation in Python
>+
>+LICENSE=	MIT
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+# Some tests are skipped without pycrypto, but its not
>+# referenced as a requirement anymore.
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR}
>+
>+USES=		python:3.6+
>+USE_PYTHON=	distutils concurrent autoplist
>+
>+OPTIONS_DEFINE=	RSASSA
>+
>+RSASSA_DESC=		RSASSA-PKCS1 v1.5 signature support
>+RSASSA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
>+
>+NO_ARCH=	yes
>+
>+do-test:
>+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts=
>+
>+.include <bsd.port.mk>
>diff --git a/www/py-pyjwt1/distinfo b/www/py-pyjwt1/distinfo
>new file mode 100644
>index 000000000000..381402aac2e6
>--- /dev/null
>+++ b/www/py-pyjwt1/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1577039206
>+SHA256 (PyJWT-1.7.1.tar.gz) = 8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96
>+SIZE (PyJWT-1.7.1.tar.gz) = 41979
>diff --git a/www/py-pyjwt1/pkg-descr b/www/py-pyjwt1/pkg-descr
>new file mode 100644
>index 000000000000..2ab6c36f9b72
>--- /dev/null
>+++ b/www/py-pyjwt1/pkg-descr
>@@ -0,0 +1,3 @@
>+A Python implementation of JSON Web Tokens.
>+
>+WWW: https://github.com/progrium/pyjwt
>diff --git a/www/seahub/Makefile b/www/seahub/Makefile
>index ecd416900bb0..12479ce24a3d 100644
>--- a/www/seahub/Makefile
>+++ b/www/seahub/Makefile
>@@ -29,7 +29,7 @@ RUN_DEPENDS=	bash:shells/bash \
> 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
> 		${PY_PILLOW} \
>-		${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR}
>

Actions: View | Diff

Attachments on bug 254038: 223004 | 225729 | 229749