Accepting request 682462 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/682462
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-M2Crypto?expand=0&rev=31

0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch

@@ -0,0 +1,31 @@
+From 862167880780c1b1219b6be3864ba587f0bdddba Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Sat, 2 Mar 2019 17:08:39 +0100
+Subject: [PATCH] tests/test_ssl: use -ciphercuites for TLS1.3 cipher in
+ openssl1.1
+
+The -cipher can not be used in OpenSSL 1.1.b+ for TLS1.3 cipher since
+openssl upstream commit 1c31fe7eb093a ("Ignore cipher suites when
+setting cipher list").
+
+Use -ciphersuites for TLS1.3 cipher as documented.
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+---
+ tests/test_ssl.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/tests/test_ssl.py
++++ b/tests/test_ssl.py
+@@ -460,9 +460,10 @@ class MiscSSLClientTestCase(BaseSSLClien
+     def test_cipher_ok(self):
+         if OPENSSL111:
+             TCIPHER = 'TLS_AES_256_GCM_SHA384'
++            self.args = self.args + ['-ciphersuites', TCIPHER]
+         else:
+             TCIPHER = 'AES128-SHA'
+-        self.args = self.args + ['-cipher', TCIPHER]
++            self.args = self.args + ['-cipher', TCIPHER]
+ 
+         pid = self.start_server(self.args)
+         try:

M2Crypto-0.31.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd59a9705275d609948005f4cbcaf25f28a4271308237eb166169528692ce498
-size 1292016

M2Crypto-0.32.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29c9c6fa6abdeb4156b8e0342c30028c5ee68055b60aa21c88abfb1d85fea325
+size 1292542

python-M2Crypto.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Mar  7 14:14:45 CET 2019 - Matej Cepl <mcepl@suse.com>
+
+- Fix for compatibility with OpenSSL 1.1.0h by adding the patch
+  0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch
+
+-------------------------------------------------------------------
+Tue Mar  5 09:01:46 CET 2019 - Matej Cepl <mcepl@suse.com>
+
+- Update to 0.32.0:
+    * 471582f - setup.py: use ${CPP} as path to cpp <Duncan Macleod>
+    * efb1580 - Bump pipeline OpenSSL from 1.1.0i to 1.1.0j 
+    * 35bb71b - Stub wchar_t helpers and ignore unused WCHAR defs 
+    * effc7be - Add type comment to setup.py  <Matěj Cepl>
+
 -------------------------------------------------------------------
 Wed Dec  5 14:30:23 UTC 2018 - Matej Cepl <mcepl@suse.com>
 

python-M2Crypto.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-M2Crypto
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -19,13 +19,14 @@
 %define oldpython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-M2Crypto
-Version:        0.31.0
+Version:        0.32.0
 Release:        0
 Summary:        Crypto and SSL toolkit for Python
 License:        MIT
 Group:          Development/Languages/Python
 Url:            https://gitlab.com/m2crypto/m2crypto
 Source:         https://files.pythonhosted.org/packages/source/M/M2Crypto/M2Crypto-%{version}.tar.gz
+Patch0:         0001-tests-test_ssl-use-ciphercuites-for-TLS1.3-cipher-in.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module typing}
@@ -77,8 +78,8 @@ messenger for Zope.
 Documentation for the Crypto and SSL toolkit for Python
 
 %prep
-# %%setup -q -n M2Crypto-%%{version}
-%setup -q -n M2Crypto-0.31.0
+%setup -q -n M2Crypto-%{version}
+%autopatch -p1
 
 %build
 export CFLAGS="%{optflags}"