Attachment #186621 for bug #222519

View | Details | Raw Unified | Return to bug 222519
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	cryptography
PORTVERSION=	2.0.3
CATEGORIES=	security python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	koobs@FreeBSD.org
COMMENT=	Cryptographic recipes and primitives for Python developers

LICENSE=	APACHE20 BSD3CLAUSE
LICENSE_COMB=	dual
LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.APACHE
LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.BSD

BUILD_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi
RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
		${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto \
		${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi \
		${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486315564	1	TIMESTAMP = 1506109144
2	SHA256 (cryptography-1.7.2.tar.gz) = 878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9	2	SHA256 (cryptography-2.0.3.tar.gz) = d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a
3	SIZE (cryptography-1.7.2.tar.gz) = 420867	3	SIZE (cryptography-2.0.3.tar.gz) = 427544




--- src/_cffi_src/openssl/x509_vfy.py.orig	2017-01-27 15:09:52 UTC
+++ src/_cffi_src/openssl/x509_vfy.py
@@ -221,10 +221,16 @@ static const long X509_V_ERR_SUITE_B_INV
 static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
 static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
 static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
+#ifndef X509_V_ERR_HOSTNAME_MISMATCH
 static const long X509_V_ERR_HOSTNAME_MISMATCH = 0;
+#endif
+#ifndef X509_V_ERR_EMAIL_MISMATCH
 static const long X509_V_ERR_EMAIL_MISMATCH = 0;
+#endif
+#ifndef X509_V_ERR_IP_ADDRESS_MISMATCH
 static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
 #endif
+#endif
 
 /* OpenSSL 1.0.2beta2+ verification parameters */
 #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \

Return to bug 222519

Lines 2-8 Link Here

(-)Makefile (-7 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cryptography	4	PORTNAME= cryptography
5	PORTVERSION= 1.7.2	5	PORTVERSION= 2.0.3
6	CATEGORIES= security python	6	CATEGORIES= security python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 10-23 Link Here
10	MAINTAINER= koobs@FreeBSD.org	10	MAINTAINER= koobs@FreeBSD.org
11	COMMENT= Cryptographic recipes and primitives for Python developers	11	COMMENT= Cryptographic recipes and primitives for Python developers
12		12
13	LICENSE= APACHE20	13	LICENSE= APACHE20 BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_COMB= dual
		15	LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE
		16	LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD
15		17
16	BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi	18	BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi
17	RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \	19	RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
18	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \	20	${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto \
19	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \	21	${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi \
20	${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna	22	${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna
21	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \	23	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
22	${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601	24	${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601
23		25

Lines 1-19 Link Here

(-)files/patch-src___cffi__src_openssl_x509__vfy.py (-19 lines)
1	--- src/_cffi_src/openssl/x509_vfy.py.orig 2017-01-27 15:09:52 UTC
2	+++ src/_cffi_src/openssl/x509_vfy.py
3	@@ -221,10 +221,16 @@ static const long X509_V_ERR_SUITE_B_INV
4	static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
5	static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
6	static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
7	+#ifndef X509_V_ERR_HOSTNAME_MISMATCH
8	static const long X509_V_ERR_HOSTNAME_MISMATCH = 0;
9	+#endif
10	+#ifndef X509_V_ERR_EMAIL_MISMATCH
11	static const long X509_V_ERR_EMAIL_MISMATCH = 0;
12	+#endif
13	+#ifndef X509_V_ERR_IP_ADDRESS_MISMATCH
14	static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
15	#endif
16	+#endif
17
18	/* OpenSSL 1.0.2beta2+ verification parameters */
19	#if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \