Attachment #171696 for bug #210484

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

Lines 2-9 Link Here

(-)security/py-cryptography/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cryptography	4	PORTNAME= cryptography
5	PORTVERSION= 1.0.2	5	PORTVERSION= 1.4
6	PORTREVISION= 4
7	CATEGORIES= security python	6	CATEGORIES= security python
8	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 14-20 Link Here
14	LICENSE= APACHE20	13	LICENSE= APACHE20
15	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
16		15
17	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi	16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi
18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \	17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
19	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \	18	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \
20	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \	19	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \

Lines 1-2 Link Here

(-)security/py-cryptography/distinfo (-2 / +2 lines)
1	SHA256 (cryptography-1.0.2.tar.gz) = d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca	1	SHA256 (cryptography-1.4.tar.gz) = bb149540ed90c4b2171bf694fe6991d6331bc149ae623c8ff419324f4222d128
2	SIZE (cryptography-1.0.2.tar.gz) = 332870	2	SIZE (cryptography-1.4.tar.gz) = 399707




From 64c9d893c3748e962d01a935625c58610826f23c Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Tue, 1 Mar 2016 14:22:32 -0600
Subject: [PATCH] move BIO_new_mem_buf to macros to handle 1.0.2g signature
 change

---
 src/_cffi_src/openssl/bio.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py
index ac86683..6439e63 100644
--- src/_cffi_src/openssl/bio.py
+++ src/_cffi_src/openssl/bio.py
@@ -99,7 +99,6 @@
 BIO *BIO_next(BIO *);
 BIO *BIO_find_type(BIO *, int);
 BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *, int);
 BIO_METHOD *BIO_s_file(void);
 BIO *BIO_new_file(const char *, const char *);
 BIO *BIO_new_fp(FILE *, int);
@@ -127,6 +126,8 @@
 """
 
 MACROS = """
+/* BIO_new_mem_buf became const void * in 1.0.2g */
+BIO *BIO_new_mem_buf(void *, int);
 long BIO_set_fd(BIO *, long, int);
 long BIO_get_fd(BIO *, char *);
 long BIO_set_mem_eof_return(BIO *, int);




--- src/_cffi_src/openssl/ec.py.orig	2015-09-27 13:51:07 UTC
+++ src/_cffi_src/openssl/ec.py
@@ -396,7 +396,8 @@ EC_GROUP *(*EC_GROUP_new_curve_GF2m)(
 static const long Cryptography_HAS_EC2M = 1;
 #endif
 
-#if defined(OPENSSL_NO_EC) || OPENSSL_VERSION_NUMBER < 0x1000200f || \
+#if defined(OPENSSL_NO_EC) || \
+    OPENSSL_VERSION_NUMBER < 0x1000200f && !defined(LIBRESSL_VERSION_NUMBER) || \
     defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L
 static const long Cryptography_HAS_EC_1_0_2 = 0;
 const char *(*EC_curve_nid2nist)(int) = NULL;

Return to bug 210484

Lines 1-31 Link Here

(-)security/py-cryptography/files/patch-64c9d893 (-31 lines)
1	From 64c9d893c3748e962d01a935625c58610826f23c Mon Sep 17 00:00:00 2001
2	From: Paul Kehrer <paul.l.kehrer@gmail.com>
3	Date: Tue, 1 Mar 2016 14:22:32 -0600
4	Subject: [PATCH] move BIO_new_mem_buf to macros to handle 1.0.2g signature
5	change
6
7	---
8	src/_cffi_src/openssl/bio.py \| 3 ++-
9	1 file changed, 2 insertions(+), 1 deletion(-)
10
11	diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py
12	index ac86683..6439e63 100644
13	--- src/_cffi_src/openssl/bio.py
14	+++ src/_cffi_src/openssl/bio.py
15	@@ -99,7 +99,6 @@
16	BIO BIO_next(BIO );
17	BIO BIO_find_type(BIO , int);
18	BIO_METHOD *BIO_s_mem(void);
19	-BIO BIO_new_mem_buf(void , int);
20	BIO_METHOD *BIO_s_file(void);
21	BIO BIO_new_file(const char , const char *);
22	BIO BIO_new_fp(FILE , int);
23	@@ -127,6 +126,8 @@
24	"""
25
26	MACROS = """
27	+/* BIO_new_mem_buf became const void * in 1.0.2g */
28	+BIO BIO_new_mem_buf(void , int);
29	long BIO_set_fd(BIO *, long, int);
30	long BIO_get_fd(BIO , char );
31	long BIO_set_mem_eof_return(BIO *, int);

Lines 1-12 Link Here

(-)security/py-cryptography/files/patch-src___cffi__src_openssl_ec.py (-12 lines)
1	--- src/_cffi_src/openssl/ec.py.orig 2015-09-27 13:51:07 UTC
2	+++ src/_cffi_src/openssl/ec.py
3	@@ -396,7 +396,8 @@ EC_GROUP (EC_GROUP_new_curve_GF2m)(
4	static const long Cryptography_HAS_EC2M = 1;
5	#endif
6
7	-#if defined(OPENSSL_NO_EC) \|\| OPENSSL_VERSION_NUMBER < 0x1000200f \|\| \
8	+#if defined(OPENSSL_NO_EC) \|\| \
9	+ OPENSSL_VERSION_NUMBER < 0x1000200f && !defined(LIBRESSL_VERSION_NUMBER) \|\| \
10	defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L
11	static const long Cryptography_HAS_EC_1_0_2 = 0;
12	const char (EC_curve_nid2nist)(int) = NULL;