summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkoobs <koobs@FreeBSD.org>2016-03-02 17:14:23 +0000
committerkoobs <koobs@FreeBSD.org>2016-03-02 17:14:23 +0000
commitd7b69ef48acd0e305b62e75d64187f0d812055fe (patch)
treecfa6420a360827d07d56f6ade0f0fec122acda12
parent1614a4089111506cb5289d78f3fee4f2eef1fe4f (diff)
downloadFreeBSD-ports-d7b69ef48acd0e305b62e75d64187f0d812055fe.zip
FreeBSD-ports-d7b69ef48acd0e305b62e75d64187f0d812055fe.tar.gz
security/py-cryptography: Fix build with OpenSSL 1.0.2g
Backport upstream commit [1] fixing build failures after the OpenSSL 1.0.2g update [1] https://github.com/pyca/cryptography/commit/df779dfec9ce87b79e48448aea3c597a4716b29e PR: 207624 Reported by: matthew, Pierre Guinoiseau <pierre guinoiseau eu> MFH: 2016Q1
-rw-r--r--security/py-cryptography/Makefile2
-rw-r--r--security/py-cryptography/files/patch-64c9d89331
2 files changed, 32 insertions, 1 deletions
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 2fb0922..97fd234 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cryptography
PORTVERSION= 1.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-cryptography/files/patch-64c9d893 b/security/py-cryptography/files/patch-64c9d893
new file mode 100644
index 0000000..f9ec88a3
--- /dev/null
+++ b/security/py-cryptography/files/patch-64c9d893
@@ -0,0 +1,31 @@
+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);
OpenPOWER on IntegriCloud