Attachment #208975 for bug #229322




# $FreeBSD$

PORTNAME=	urllib3
PORTVERSION=	1.25.6
PORTEPOCH=	1
CATEGORIES=	net python
MASTER_SITES=	CHEESESHOP

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}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}

USES=		python
USE_PYTHON=	autoplist concurrent distutils

NO_ARCH=	yes
SUB_FILES=	pkg-message

OPTIONS_DEFINE=	BROTLI SOCKS SSL
OPTIONS_DEFAULT=SOCKS SSL

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}

# 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>

Lines 1-3 Link Here

(-)net/py-urllib3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1500642203	1	TIMESTAMP = 1572969530
2	SHA256 (urllib3-1.22.tar.gz) = cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f	2	SHA256 (urllib3-1.25.6.tar.gz) = 9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86
3	SIZE (urllib3-1.22.tar.gz) = 226083	3	SIZE (urllib3-1.25.6.tar.gz) = 248292

Lines 1-11 Link Here

(-)net/py-urllib3/files/patch-setup.py (-11 lines)
1	--- setup.py.orig 2016-09-06 14:39:59 UTC
2	+++ setup.py
3	@@ -61,7 +61,7 @@ setup(name='urllib3',
4	'certifi',
5	],
6	'socks': [
7	- 'PySocks>=1.5.6,<2.0,!=1.5.7',
8	+ 'PySocks>=1.5.6',
9	]
10	},
11	)

Lines 1-7 Link Here

(-)net/py-urllib3/files/pkg-message.in (-7 lines)
1	[
2	{ type: install
3	message: <<EOM
4	Be careful, support of IPv6 is broken with PySocks 1.5.7.
5	EOM
6	}
7	]

Return to bug 229322

Lines 2-8 Link Here

(-)net/py-urllib3/Makefile (-15 / +19 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= urllib3	4	PORTNAME= urllib3
5	PORTVERSION= 1.22	5	PORTVERSION= 1.25.6
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= net python	7	CATEGORIES= net python
8	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
Lines 14-38 Link Here
14	LICENSE= MIT	14	LICENSE= MIT
15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
16		16
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR} \
19	${PY_IPADDRESS} \
20	${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks@${PY_FLAVOR}
22	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \	17	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}	19	${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
25	#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${PY_FLAVOR}
26		20
27	USES= python	21	USES= python
28	USE_PYTHON= autoplist concurrent distutils	22	USE_PYTHON= autoplist concurrent distutils
		23
29	NO_ARCH= yes	24	NO_ARCH= yes
30	SUB_FILES= pkg-message
31		25
32	.include <bsd.port.pre.mk>	26	OPTIONS_DEFINE= BROTLI SOCKS SSL
		27	OPTIONS_DEFAULT=SOCKS SSL
33		28
34	.if ${PYTHON_REL} < 3400	29	BROTLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotlipy>=0.6.0:archivers/py-brotlipy@${PY_FLAVOR}
35	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR}	30	SOCKS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR}
36	.endif	31	SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${PY_FLAVOR} \
		32	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
		33	${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \
		34	${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR} \
		35	${PY_IPADDRESS}
37		36
38	.include <bsd.port.post.mk>	37	# Test 'test_ssl_read_timeout' fails with FreeBSD >= 12.0, that was already the
		38	# case with www/py-urllib3 1.22,1.
		39	do-test:
		40	@cd ${WRKSRC} && ${SETENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} -m pytest -v -rs -k 'not test_ssl_read_timeout'
		41
		42	.include <bsd.port.mk>