Attachment #151775 for bug #196827

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

Lines 2-8 Link Here

(-)Makefile (-4 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cryptography	4	PORTNAME= cryptography
5	PORTVERSION= 0.5.4	5	PORTVERSION= 0.7.2
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 14-23 Link Here
14	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
15		15
16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0.8:${PORTSDIR}/devel/py-cffi \	16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0.8:${PORTSDIR}/devel/py-cffi \
17	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:${PORTSDIR}/devel/py-six	17	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:${PORTSDIR}/devel/py-six \
		18	${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1
		19
18	RUN_DEPENDS:= ${BUILD_DEPENDS}	20	RUN_DEPENDS:= ${BUILD_DEPENDS}
19	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \	21	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
20	${PYTHON_PKGNAMEPREFIX}asn1>0:${PORTSDIR}/devel/py-asn1	22	${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601
21		23
22	USES= python	24	USES= python
23	USE_OPENSSL= yes	25	USE_OPENSSL= yes
Lines 26-32 Link Here
26	CFLAGS+= -I${OPENSSLINC}	28	CFLAGS+= -I${OPENSSLINC}
27	LDFLAGS+= -L${OPENSSLLIB}	29	LDFLAGS+= -L${OPENSSLLIB}
28		30
		31	.include <bsd.port.pre.mk>
		32
		33	.if ${PYTHON_REL} < 340
		34	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
		35	.endif
		36
29	regression-test: build	37	regression-test: build
30	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test	38	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
31		39
32	.include <bsd.port.mk>	40	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (cryptography-0.5.4.tar.gz) = 5675999f3744cbc32a60cb0bba64de21405abced32ce19655212612262dd270d	1	SHA256 (cryptography-0.7.2.tar.gz) = fab7fcdde360ec6614442d0321dcd0eff5e43544cb30d975e9d75a914a4cdf78
2	SIZE (cryptography-0.5.4.tar.gz) = 320104	2	SIZE (cryptography-0.7.2.tar.gz) = 247477

Line 0 Link Here

(-)files/patch-src_cryptography_hazmat_bindings_openssl_engine.py (+10 lines)
	1	--- src/cryptography/hazmat/bindings/openssl/engine.py.orig 2015-01-16 13:26:59 UTC
	2	+++ src/cryptography/hazmat/bindings/openssl/engine.py
	3	@@ -49,7 +49,6 @@ int ENGINE_init(ENGINE *);
	4	int ENGINE_finish(ENGINE *);
	5	void ENGINE_load_openssl(void);
	6	void ENGINE_load_dynamic(void);
	7	-void ENGINE_load_cryptodev(void);
	8	void ENGINE_load_builtin_engines(void);
	9	void ENGINE_cleanup(void);
	10	ENGINE *ENGINE_get_default_RSA(void);




--- src/cryptography/hazmat/bindings/openssl/rand.py.orig	2015-01-16 13:26:59 UTC
+++ src/cryptography/hazmat/bindings/openssl/rand.py
@@ -16,9 +16,6 @@ void ERR_load_RAND_strings(void);
 void RAND_seed(const void *, int);
 void RAND_add(const void *, int, double);
 int RAND_status(void);
-int RAND_egd(const char *);
-int RAND_egd_bytes(const char *, int);
-int RAND_query_egd_bytes(const char *, unsigned char *, int);
 const char *RAND_file_name(char *, size_t);
 int RAND_load_file(const char *, long);
 int RAND_write_file(const char *);




--- src/cryptography/hazmat/bindings/openssl/ssl.py.orig	2015-01-16 13:26:59 UTC
+++ src/cryptography/hazmat/bindings/openssl/ssl.py
@@ -189,10 +189,6 @@ int SSL_shutdown(SSL *);
 const char *SSL_get_cipher_list(const SSL *, int);
 Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
 
-const COMP_METHOD *SSL_get_current_compression(SSL *);
-const COMP_METHOD *SSL_get_current_expansion(SSL *);
-const char *SSL_COMP_get_name(const COMP_METHOD *);
-
 /*  context */
 void SSL_CTX_free(SSL_CTX *);
 long SSL_CTX_set_timeout(SSL_CTX *, long);
@@ -415,6 +411,16 @@ static const long Cryptography_HAS_RELEA
 const long SSL_MODE_RELEASE_BUFFERS = 0;
 #endif
 
+#ifndef OPENSSL_NO_COMP
+const COMP_METHOD *SSL_get_current_compression(SSL *s);
+const COMP_METHOD *SSL_get_current_expansion(SSL *s);
+const char *SSL_COMP_get_name(const COMP_METHOD *comp);
+#else
+const void *SSL_get_current_compression(SSL *s);
+const void *SSL_get_current_expansion(SSL *s);
+const char *SSL_COMP_get_name(const void *comp);
+#endif
+
 #ifdef SSL_OP_NO_COMPRESSION
 static const long Cryptography_HAS_OP_NO_COMPRESSION = 1;
 #else




--- src/cryptography/hazmat/bindings/openssl/x509_vfy.py.orig	2015-01-16 13:26:59 UTC
+++ src/cryptography/hazmat/bindings/openssl/x509_vfy.py
@@ -191,7 +191,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_V
 
 CUSTOMIZATIONS = """
 /* OpenSSL 1.0.2+ verification error codes */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if X509_V_ERR_EMAIL_MISMATCH
 static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1;
 #else
 static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
@@ -207,7 +207,7 @@ static const long X509_V_ERR_IP_ADDRESS_
 #endif
 
 /* OpenSSL 1.0.2+ verification parameters */
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if X509_V_FLAG_PARTIAL_CHAIN
 static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
 #else
 static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;

Return to bug 196827