gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-30 10:38:07 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/cryptography: Backport openssl 1.0.2g fix to stable ebuild

Browse Source 
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
This commit is contained in:
Mike Gilbert
2016-03-01 22:16:53 -05:00
parent 349cd66916
commit 223f004279
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-python/cryptography/cryptography-1.1.2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
PATCHES=( "${FILESDIR}/${PN}-1.2.2-openssl-1.0.2g-mem_buf.patch" )
python_test() {
py.test -v -v -x || die "Tests fail with ${EPYTHON}"
}

29
dev-python/cryptography/files/cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch
View File

@@ -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);