From becda8b9cd9285b064d723165670670dea7a3a3b185b2b8998084066d1b988d8 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Tue, 30 Oct 2018 16:13:10 +0000
Subject: [PATCH] - WIP: pre-release of 0.31.0 tarball and attempts to fix
 OpenSSL   1.1.1 compatibility.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=65
---
 M2Crypto-0.30.1.tar.gz      |  3 ---
 M2Crypto-0.31.0~pre1.tar.gz |  3 +++
 openssl-1_1_1-compat.patch  | 10 ++++++++++
 python-M2Crypto.changes     |  6 ++++++
 python-M2Crypto.spec        |  7 +++++--
 5 files changed, 24 insertions(+), 5 deletions(-)
 delete mode 100644 M2Crypto-0.30.1.tar.gz
 create mode 100644 M2Crypto-0.31.0~pre1.tar.gz
 create mode 100644 openssl-1_1_1-compat.patch

diff --git a/M2Crypto-0.30.1.tar.gz b/M2Crypto-0.30.1.tar.gz
deleted file mode 100644
index ff85bd3..0000000
--- a/M2Crypto-0.30.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6
-size 1272599
diff --git a/M2Crypto-0.31.0~pre1.tar.gz b/M2Crypto-0.31.0~pre1.tar.gz
new file mode 100644
index 0000000..db50e92
--- /dev/null
+++ b/M2Crypto-0.31.0~pre1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2b044d3ce9d8beeaebb45c78a89667dae8e146e00238727cf7215841d7bcee8
+size 1291871
diff --git a/openssl-1_1_1-compat.patch b/openssl-1_1_1-compat.patch
new file mode 100644
index 0000000..aa51e31
--- /dev/null
+++ b/openssl-1_1_1-compat.patch
@@ -0,0 +1,10 @@
+--- a/tests/test_ssl.py
++++ b/tests/test_ssl.py
+@@ -199,6 +199,7 @@ class HttpslibSSLClientTestCase(BaseSSLC
+             data = six.ensure_text(c2.getresponse().read())
+             c.close()
+             c2.close()
++            log.debug('t = %s, t2 = %s', t, t2)
+             self.assertEqual(t, t2, "Sessions did not match")
+         finally:
+             self.stop_server(pid)
diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes
index 996f0d1..a78918f 100644
--- a/python-M2Crypto.changes
+++ b/python-M2Crypto.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 30 17:12:11 CET 2018 - mcepl@suse.com
+
+- WIP: pre-release of 0.31.0 tarball and attempts to fix OpenSSL
+  1.1.1 compatibility.
+
 -------------------------------------------------------------------
 Mon Sep 24 15:14:14 UTC 2018 - Matěj Cepl <mcepl@suse.com>
 
diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec
index 71c46f3..7b9409f 100644
--- a/python-M2Crypto.spec
+++ b/python-M2Crypto.spec
@@ -19,13 +19,14 @@
 %define oldpython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-M2Crypto
-Version:        0.30.1
+Version:        0.31.0~pre1
 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:         openssl-1_1_1-compat.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module typing}
@@ -77,7 +78,9 @@ messenger for Zope.
 Documentation for the Crypto and SSL toolkit for Python
 
 %prep
-%setup -q -n M2Crypto-%{version}
+# %%setup -q -n M2Crypto-%%{version}
+%setup -q -n M2Crypto-0.31.0
+%autopatch -p1
 
 %build
 export CFLAGS="%{optflags}"