Attachment 208975 Details for Bug 229322 – py-urllib-1.25.6.patch

[patch] py-urllib-1.25.6.patch

py-urllib-1.25.6.patch (text/plain), 4.28 KB, created by Kai Knoblich on 2019-11-08 15:29:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-11-08 15:29:49 UTC

Size: 4.28 KB

patch

obsolete

>Index: net/py-urllib3/Makefile
>===================================================================
>--- net/py-urllib3/Makefile	(revision 516801)
>+++ net/py-urllib3/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	urllib3
>-PORTVERSION=	1.22
>+PORTVERSION=	1.25.6
> PORTEPOCH=	1
> CATEGORIES=	net python
> MASTER_SITES=	CHEESESHOP
>@@ -14,25 +14,29 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR} \
>-		${PY_IPADDRESS} \
>-		${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks@${PY_FLAVOR}
> TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
>-#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
>+
> NO_ARCH=	yes
>-SUB_FILES=	pkg-message
> 
>-.include <bsd.port.pre.mk>
>+OPTIONS_DEFINE=	BROTLI SOCKS SSL
>+OPTIONS_DEFAULT=SOCKS SSL
> 
>-.if ${PYTHON_REL} < 3400
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR}
>-.endif
>+BROTLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}brotlipy>=0.6.0:archivers/py-brotlipy@${PY_FLAVOR}
>+SOCKS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR}
>+SSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR} \
>+			${PY_IPADDRESS}
> 
>-.include <bsd.port.post.mk>
>+# Test 'test_ssl_read_timeout' fails with FreeBSD >= 12.0, that was already the
>+# case with www/py-urllib3 1.22,1.
>+do-test:
>+	@cd ${WRKSRC} && ${SETENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} -m pytest -v -rs -k 'not test_ssl_read_timeout'
>+
>+.include <bsd.port.mk>
>Index: net/py-urllib3/distinfo
>===================================================================
>--- net/py-urllib3/distinfo	(revision 516801)
>+++ net/py-urllib3/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1500642203
>-SHA256 (urllib3-1.22.tar.gz) = cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f
>-SIZE (urllib3-1.22.tar.gz) = 226083
>+TIMESTAMP = 1572969530
>+SHA256 (urllib3-1.25.6.tar.gz) = 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86
>+SIZE (urllib3-1.25.6.tar.gz) = 248292
>Index: net/py-urllib3/files/patch-setup.py
>===================================================================
>--- net/py-urllib3/files/patch-setup.py	(revision 516801)
>+++ net/py-urllib3/files/patch-setup.py	(nonexistent)
>@@ -1,11 +0,0 @@
>---- setup.py.orig	2016-09-06 14:39:59 UTC
>-+++ setup.py
>-@@ -61,7 +61,7 @@ setup(name='urllib3',
>-               'certifi',
>-           ],
>-           'socks': [
>--              'PySocks>=1.5.6,<2.0,!=1.5.7',
>-+              'PySocks>=1.5.6',
>-           ]
>-       },
>-       )
>
>Property changes on: net/py-urllib3/files/patch-setup.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/py-urllib3/files/pkg-message.in
>===================================================================
>--- net/py-urllib3/files/pkg-message.in	(revision 516801)
>+++ net/py-urllib3/files/pkg-message.in	(nonexistent)
>@@ -1,7 +0,0 @@
>-[
>-{ type: install
>-  message: <<EOM
>-Be careful, support of IPv6 is broken with PySocks 1.5.7.
>-EOM
>-}
>-]
>
>Property changes on: net/py-urllib3/files/pkg-message.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 229322: 208975 | 209275