From e6e57d525589fb3628baaf7e69c450e3c1f6a2efed40de102bf5464b9c561d96 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 19 Jun 2023 20:26:28 +0000 Subject: [PATCH 1/2] - update to 23.2.0: * Removed ``X509StoreFlags.NOTIFY_POLICY``. * ``cryptography`` maximum version has been increased to 41.0.x. * Invalid versions are now rejected in ``OpenSSL.crypto.X509Req.set_version``. * Added ``X509VerificationCodes`` to ``OpenSSL.SSL``. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=105 --- pyOpenSSL-23.1.1.tar.gz | 3 --- pyOpenSSL-23.2.0.tar.gz | 3 +++ python-pyOpenSSL.changes | 11 +++++++++++ python-pyOpenSSL.spec | 4 +--- skip-networked-test.patch | 22 +++++++++++----------- 5 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 pyOpenSSL-23.1.1.tar.gz create mode 100644 pyOpenSSL-23.2.0.tar.gz diff --git a/pyOpenSSL-23.1.1.tar.gz b/pyOpenSSL-23.1.1.tar.gz deleted file mode 100644 index bf6918b..0000000 --- a/pyOpenSSL-23.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7 -size 183402 diff --git a/pyOpenSSL-23.2.0.tar.gz b/pyOpenSSL-23.2.0.tar.gz new file mode 100644 index 0000000..f3ecf27 --- /dev/null +++ b/pyOpenSSL-23.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac +size 185132 diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index 995c931..1cb0d5f 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 19 20:25:32 UTC 2023 - Dirk Müller + +- update to 23.2.0: + * Removed ``X509StoreFlags.NOTIFY_POLICY``. + * ``cryptography`` maximum version has been increased to + 41.0.x. + * Invalid versions are now rejected in + ``OpenSSL.crypto.X509Req.set_version``. + * Added ``X509VerificationCodes`` to ``OpenSSL.SSL``. + ------------------------------------------------------------------- Fri Apr 21 12:30:17 UTC 2023 - Dirk Müller diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 9fd9488..38d8697 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -25,10 +24,9 @@ %define psuffix %{nil} %bcond_with test %endif -%global skip_python2 1 %{?sle15_python_module_pythons} Name: python-pyOpenSSL%{psuffix} -Version: 23.1.1 +Version: 23.2.0 Release: 0 Summary: Python wrapper module around the OpenSSL library License: Apache-2.0 diff --git a/skip-networked-test.patch b/skip-networked-test.patch index 7ee1860..d02761d 100644 --- a/skip-networked-test.patch +++ b/skip-networked-test.patch @@ -1,8 +1,8 @@ -Index: pyOpenSSL-22.1.0/tests/test_ssl.py +Index: pyOpenSSL-23.2.0/tests/test_ssl.py =================================================================== ---- pyOpenSSL-22.1.0.orig/tests/test_ssl.py -+++ pyOpenSSL-22.1.0/tests/test_ssl.py -@@ -1244,6 +1244,7 @@ class TestContext: +--- pyOpenSSL-23.2.0.orig/tests/test_ssl.py ++++ pyOpenSSL-23.2.0/tests/test_ssl.py +@@ -1252,6 +1252,7 @@ class TestContext: reason="set_default_verify_paths appears not to work on Windows. " "See LP#404343 and LP#404344.", ) @@ -10,20 +10,20 @@ Index: pyOpenSSL-22.1.0/tests/test_ssl.py def test_set_default_verify_paths(self): """ `Context.set_default_verify_paths` causes the platform-specific CA -Index: pyOpenSSL-22.1.0/setup.cfg +Index: pyOpenSSL-23.2.0/setup.cfg =================================================================== ---- pyOpenSSL-22.1.0.orig/setup.cfg -+++ pyOpenSSL-22.1.0/setup.cfg -@@ -2,6 +2,8 @@ - minversion = 3.0.1 - strict = true +--- pyOpenSSL-23.2.0.orig/setup.cfg ++++ pyOpenSSL-23.2.0/setup.cfg +@@ -1,6 +1,8 @@ + [tool:pytest] + addopts = "-r s --strict-markers" testpaths = tests +markers = + network: test case requires network connection [metadata] license_file = LICENSE -@@ -16,4 +18,3 @@ doc_files = doc/_build/html +@@ -15,4 +17,3 @@ doc_files = doc/_build/html [egg_info] tag_build = tag_date = 0 From 0339fa1688b23921a50aa6fcecdad692a1b97e45ba9a12bf7064a1e70e558338 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 19 Jun 2023 20:46:55 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=106 --- python-pyOpenSSL.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 38d8697..d1a6ab4 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -40,7 +40,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros %if %{with test} -BuildRequires: %{python_module cryptography >= 38.0.0 with %python-cryptography < 41} +BuildRequires: %{python_module cryptography >= 38.0.0 with %python-cryptography < 42} BuildRequires: %{python_module flaky} BuildRequires: %{python_module pretend} BuildRequires: %{python_module pyOpenSSL >= %version} @@ -49,7 +49,7 @@ BuildRequires: ca-certificates-mozilla BuildRequires: openssl %endif Requires: python-cffi -Requires: (python-cryptography >= 38.0.0 with python-cryptography < 41) +Requires: (python-cryptography >= 38.0.0 with python-cryptography < 42) Provides: pyOpenSSL = %{version} BuildArch: noarch %python_subpackages