[gentoo-commits] repo/gentoo:master commit in: dev-python/cryptography/files/, dev-python/cryptography/

[Mike Gilbert]

commit:     223f004279c64d8abffa2e3a051f9f8e23131f1e
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  2 03:16:53 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar  2 03:18:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223f0042

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

 dev-python/cryptography/cryptography-1.1.2.ebuild  |  4 ++-
 ...cryptography-1.2.2-openssl-1.0.2g-mem_buf.patch | 29 ++++++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/dev-python/cryptography/cryptography-1.1.2.ebuild b/dev-python/cryptography/cryptography-1.1.2.ebuild
index 0556b6a..cfd7541 100644
--- a/dev-python/cryptography/cryptography-1.1.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.1.2.ebuild
@@ -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}"
 }

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 64d270b..fbe690e 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@×××××.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);