From 2f2c5ffc0363e865bbf3b5bfb48316915f4ef239936762a50c75bb2c5a65fca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 6 Jun 2019 12:28:18 +0000 Subject: [PATCH 1/4] - Upgrade to 0.34.0 - no upstream changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=81 --- M2Crypto-0.33.0.tar.gz | 3 --- M2Crypto-0.34.0.tar.gz | 3 +++ python-M2Crypto.changes | 6 ++++++ python-M2Crypto.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 M2Crypto-0.33.0.tar.gz create mode 100644 M2Crypto-0.34.0.tar.gz diff --git a/M2Crypto-0.33.0.tar.gz b/M2Crypto-0.33.0.tar.gz deleted file mode 100644 index 84f01d6..0000000 --- a/M2Crypto-0.33.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75deaa3f6d25c8300c41da042a1abfa27154de5164c7073d68cb1809cedb8553 -size 1297415 diff --git a/M2Crypto-0.34.0.tar.gz b/M2Crypto-0.34.0.tar.gz new file mode 100644 index 0000000..8946fc1 --- /dev/null +++ b/M2Crypto-0.34.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f771ad1c8ef6ac4a906950813b82f9f205b4ae61ae30fe490bc41781173f1b9 +size 1117318 diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index cf8e580..a5df67f 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 6 12:27:35 UTC 2019 - Ondřej Súkup + +- Upgrade to 0.34.0 +- no upstream changelog + ------------------------------------------------------------------- Fri Apr 26 16:48:44 CEST 2019 - Matej Cepl diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 3d27379..45e02e5 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -19,7 +19,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto -Version: 0.33.0 +Version: 0.34.0 Release: 0 Summary: Crypto and SSL toolkit for Python License: MIT From 143ba85e2b808f3e949e96d73f86ef45e1c823d94c97e8071e63a48d4a5f2729 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 7 Jun 2019 21:11:09 +0000 Subject: [PATCH 2/4] Accepting request 708462 from home:mcepl:branches:devel:languages:python - Add fix_OpenSSL111c.patch patch to ensure compatibility with OpenSSL 1.1.1c. gl#m2crypto/m2crypto#258 OBS-URL: https://build.opensuse.org/request/show/708462 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=82 --- fix_OpenSSL111c.patch | 28 ++++++++++++++++++++++++++++ python-M2Crypto.changes | 6 ++++++ python-M2Crypto.spec | 1 + 3 files changed, 35 insertions(+) create mode 100644 fix_OpenSSL111c.patch diff --git a/fix_OpenSSL111c.patch b/fix_OpenSSL111c.patch new file mode 100644 index 0000000..7c7f88d --- /dev/null +++ b/fix_OpenSSL111c.patch @@ -0,0 +1,28 @@ +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -113,6 +113,8 @@ class RSATestCase(unittest.TestCase): + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) + ++ @unittest.skipIf(m2.OPENSSL_VERSION_NUMBER < 0x1010103f, ++ 'Relies on fix which happened only in OpenSSL 1.1.1c') + def test_public_encrypt(self): + priv = RSA.load_key(self.privkey) + # pkcs1_padding, pkcs1_oaep_padding +@@ -124,13 +126,11 @@ class RSATestCase(unittest.TestCase): + + # sslv23_padding + ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_decrypt(ctxt, RSA.sslv23_padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_decrypt(ctxt, RSA.sslv23_padding) ++ res = priv.private_decrypt(ctxt, RSA.sslv23_padding) ++ self.assertEqual(res, self.data) + + # no_padding +- with self.assertRaises(RSA.RSAError): ++ with six.assertRaisesRegex(self, TypeError, 'data too small'): + priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index a5df67f..dd14892 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 7 22:21:23 CEST 2019 - Matej Cepl + +- Add fix_OpenSSL111c.patch patch to ensure compatibility with + OpenSSL 1.1.1c. gl#m2crypto/m2crypto#258 + ------------------------------------------------------------------- Thu Jun 6 12:27:35 UTC 2019 - Ondřej Súkup diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 45e02e5..c5db753 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -26,6 +26,7 @@ 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: fix_OpenSSL111c.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing} From 35ca199081febc62cfd5a906176699d6523d91adf8f3800eab024df2742495ee Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 8 Jun 2019 07:30:27 +0000 Subject: [PATCH 3/4] Accepting request 708732 from home:mcepl:branches:devel:languages:python - Replace fix_OpenSSL111c.patch with proper new release 0.35.1 (there is really not much more in it). OBS-URL: https://build.opensuse.org/request/show/708732 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=83 --- M2Crypto-0.34.0.tar.gz | 3 --- M2Crypto-0.35.1.tar.gz | 3 +++ fix_OpenSSL111c.patch | 28 ---------------------------- python-M2Crypto.changes | 6 ++++++ python-M2Crypto.spec | 3 +-- 5 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 M2Crypto-0.34.0.tar.gz create mode 100644 M2Crypto-0.35.1.tar.gz delete mode 100644 fix_OpenSSL111c.patch diff --git a/M2Crypto-0.34.0.tar.gz b/M2Crypto-0.34.0.tar.gz deleted file mode 100644 index 8946fc1..0000000 --- a/M2Crypto-0.34.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f771ad1c8ef6ac4a906950813b82f9f205b4ae61ae30fe490bc41781173f1b9 -size 1117318 diff --git a/M2Crypto-0.35.1.tar.gz b/M2Crypto-0.35.1.tar.gz new file mode 100644 index 0000000..93f6ff5 --- /dev/null +++ b/M2Crypto-0.35.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:617c683089bf846bc217ecf26b333d86984aa0ed808a40ed975962328f67c41b +size 1117466 diff --git a/fix_OpenSSL111c.patch b/fix_OpenSSL111c.patch deleted file mode 100644 index 7c7f88d..0000000 --- a/fix_OpenSSL111c.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/tests/test_rsa.py -+++ b/tests/test_rsa.py -@@ -113,6 +113,8 @@ class RSATestCase(unittest.TestCase): - with self.assertRaises(TypeError): - priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) - -+ @unittest.skipIf(m2.OPENSSL_VERSION_NUMBER < 0x1010103f, -+ 'Relies on fix which happened only in OpenSSL 1.1.1c') - def test_public_encrypt(self): - priv = RSA.load_key(self.privkey) - # pkcs1_padding, pkcs1_oaep_padding -@@ -124,13 +126,11 @@ class RSATestCase(unittest.TestCase): - - # sslv23_padding - ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding) -- with self.assertRaises(RSA.RSAError): -- priv.private_decrypt(ctxt, RSA.sslv23_padding) -- with self.assertRaises(RSA.RSAError): -- priv.private_decrypt(ctxt, RSA.sslv23_padding) -+ res = priv.private_decrypt(ctxt, RSA.sslv23_padding) -+ self.assertEqual(res, self.data) - - # no_padding -- with self.assertRaises(RSA.RSAError): -+ with six.assertRaisesRegex(self, TypeError, 'data too small'): - priv.public_encrypt(self.data, RSA.no_padding) - - # Type-check the data to be encrypted. diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index dd14892..0e62af0 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jun 8 08:58:56 CEST 2019 - Matej Cepl + +- Replace fix_OpenSSL111c.patch with proper new release 0.35.1 + (there is really not much more in it). + ------------------------------------------------------------------- Fri Jun 7 22:21:23 CEST 2019 - Matej Cepl diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index c5db753..05478a8 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -19,14 +19,13 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto -Version: 0.34.0 +Version: 0.35.1 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: fix_OpenSSL111c.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module typing} From 3e2e735ccdd9cf219b14a01d0e4efe7b1f8957fc76786c0c765e4849c9e34d80 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 10 Jun 2019 12:57:07 +0000 Subject: [PATCH 4/4] Accepting request 708964 from home:mcepl:branches:devel:languages:python Better OBS-URL: https://build.opensuse.org/request/show/708964 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=84 --- M2Crypto-0.35.1.tar.gz | 3 --- M2Crypto-0.35.2.tar.gz | 3 +++ python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 M2Crypto-0.35.1.tar.gz create mode 100644 M2Crypto-0.35.2.tar.gz diff --git a/M2Crypto-0.35.1.tar.gz b/M2Crypto-0.35.1.tar.gz deleted file mode 100644 index 93f6ff5..0000000 --- a/M2Crypto-0.35.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:617c683089bf846bc217ecf26b333d86984aa0ed808a40ed975962328f67c41b -size 1117466 diff --git a/M2Crypto-0.35.2.tar.gz b/M2Crypto-0.35.2.tar.gz new file mode 100644 index 0000000..50de91e --- /dev/null +++ b/M2Crypto-0.35.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127 +size 1117706 diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 0e62af0..de67da8 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 10 13:59:24 CEST 2019 - Matej Cepl + +- Update to fix release 0.35.2 ... just fixing the test suite. + ------------------------------------------------------------------- Sat Jun 8 08:58:56 CEST 2019 - Matej Cepl diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 05478a8..46972b2 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -19,7 +19,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-M2Crypto -Version: 0.35.1 +Version: 0.35.2 Release: 0 Summary: Crypto and SSL toolkit for Python License: MIT