Accepting request 366051 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/366051
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-cryptography?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2016-03-05 10:21:43 +00:00 committed by Git OBS Bridge
commit 93aa2e2581
3 changed files with 33 additions and 1 deletions

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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

View File

@ -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,7 +30,10 @@ 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: pkg-config
BuildRequires: python-cffi >= 1.1.0
BuildRequires: python-devel
BuildRequires: python-enum34
@ -77,6 +80,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