diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2016-03-01 22:16:53 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2016-03-01 22:18:21 -0500 |
| commit | 223f004279c64d8abffa2e3a051f9f8e23131f1e (patch) | |
| tree | ce07bbaab2b43f38e36af72fd891b78e8a7c54d4 /dev-python/cryptography/files | |
| parent | app-emulation/spice: add live ebuild (diff) | |
| download | gentoo-223f004279c64d8abffa2e3a051f9f8e23131f1e.tar.gz gentoo-223f004279c64d8abffa2e3a051f9f8e23131f1e.tar.bz2 gentoo-223f004279c64d8abffa2e3a051f9f8e23131f1e.zip | |
dev-python/cryptography: Backport openssl 1.0.2g fix to stable ebuild
The replaces the patch by zx2c4 with a more flexible patch
from upstream. This ensures that the package can build against any
version of openssl in the tree.
Package-Manager: portage-2.2.27_p64
Diffstat (limited to 'dev-python/cryptography/files')
| -rw-r--r-- | dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch b/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch index 64d270b6e963..fbe690e83608 100644 --- a/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch +++ b/dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch @@ -1,12 +1,31 @@ -diff -ru cryptography-1.2.2/src/_cffi_src/openssl/bio.py cryptography-1.2.2-fixed/src/_cffi_src/openssl/bio.py ---- cryptography-1.2.2/src/_cffi_src/openssl/bio.py 2016-01-29 20:26:11.000000000 +0100 -+++ cryptography-1.2.2-fixed/src/_cffi_src/openssl/bio.py 2016-03-01 20:32:25.172776288 +0100 -@@ -99,7 +99,7 @@ +From df779dfec9ce87b79e48448aea3c597a4716b29e 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 +--- a/src/_cffi_src/openssl/bio.py ++++ b/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 *BIO_new_mem_buf(const 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); |