From c7db0b07f9583e79134ece9c77453a916666ded6cf5fcb14d6addc31c3721167 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 2 Mar 2016 17:41:00 +0000 Subject: [PATCH 1/2] Accepting request 364667 from home:msmeissn:branches:devel:languages:python - cryptography-new-bio-new-type.patch: openssl 1.0.2g changed the type of BIO_new_mem_buf() (added a const). OBS-URL: https://build.opensuse.org/request/show/364667 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cryptography?expand=0&rev=32 --- cryptography-new-bio-new-type.patch | 13 +++++++++++++ python-cryptography.changes | 6 ++++++ python-cryptography.spec | 7 ++++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 cryptography-new-bio-new-type.patch diff --git a/cryptography-new-bio-new-type.patch b/cryptography-new-bio-new-type.patch new file mode 100644 index 0000000..d741c6a --- /dev/null +++ b/cryptography-new-bio-new-type.patch @@ -0,0 +1,13 @@ +Index: cryptography-1.2.1/src/_cffi_src/openssl/bio.py +=================================================================== +--- cryptography-1.2.1.orig/src/_cffi_src/openssl/bio.py ++++ cryptography-1.2.1/src/_cffi_src/openssl/bio.py +@@ -99,7 +99,7 @@ BIO *BIO_pop(BIO *); + 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); diff --git a/python-cryptography.changes b/python-cryptography.changes index 8ef2566..da0a175 100644 --- a/python-cryptography.changes +++ b/python-cryptography.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 2 14:19:46 UTC 2016 - meissner@suse.com + +- cryptography-new-bio-new-type.patch: openssl 1.0.2g changed + the type of BIO_new_mem_buf() (added a const). + ------------------------------------------------------------------- Sat Jan 9 16:58:46 UTC 2016 - michael@stroeder.com diff --git a/python-cryptography.spec b/python-cryptography.spec index 9df1381..68947c7 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -1,7 +1,7 @@ # # spec file for package python-cryptography # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Source3: https://pypi.python.org/packages/source/c/cryptography-vectors/c Source4: https://pypi.python.org/packages/source/c/cryptography-vectors/cryptography_vectors-%{version}.tar.gz.asc # PATCH-FIX-SLE disable-uneven-sizes-tests.patch bnc#944204 Patch1: disable-uneven-sizes-tests.patch +# PATCH-FIX-OPENSUSE cryptography-new-bio-new-type.patch fix build with openssl 1.0.2g +Patch2: cryptography-new-bio-new-type.patch BuildRequires: libopenssl-devel BuildRequires: python-cffi >= 1.1.0 BuildRequires: python-devel @@ -77,6 +79,9 @@ functions. tar xvzf %{SOURCE3} %patch1 -p1 +if pkg-config --atleast-version=1.0.2g openssl; then +%patch2 -p1 +fi %build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build From 78681f6686dee6b5257d29b423ef68f1fea33ad28371a1383920f47d9b7b7a21 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 4 Mar 2016 15:48:14 +0000 Subject: [PATCH 2/2] Accepting request 365006 from home:dimstar:Factory - Add pkg-config BuildRequires: in order for the last introduced condition to apply the patch to work, pkg-config has to be present. OBS-URL: https://build.opensuse.org/request/show/365006 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cryptography?expand=0&rev=33 --- python-cryptography.changes | 7 +++++++ python-cryptography.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/python-cryptography.changes b/python-cryptography.changes index da0a175..4ed76d2 100644 --- a/python-cryptography.changes +++ b/python-cryptography.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 2 21:47:58 UTC 2016 - dimstar@opensuse.org + +- Add pkg-config BuildRequires: in order for the last introduced + condition to apply the patch to work, pkg-config has to be + present. + ------------------------------------------------------------------- Wed Mar 2 14:19:46 UTC 2016 - meissner@suse.com diff --git a/python-cryptography.spec b/python-cryptography.spec index 68947c7..11132f1 100644 --- a/python-cryptography.spec +++ b/python-cryptography.spec @@ -33,6 +33,7 @@ Patch1: disable-uneven-sizes-tests.patch # PATCH-FIX-OPENSUSE cryptography-new-bio-new-type.patch fix build with openssl 1.0.2g Patch2: cryptography-new-bio-new-type.patch BuildRequires: libopenssl-devel +BuildRequires: pkg-config BuildRequires: python-cffi >= 1.1.0 BuildRequires: python-devel BuildRequires: python-enum34