From bd69c073dc90e92d8121ff3dbe515ee1faddb67d3e7aa3b501ebc0450b950651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 11:59:48 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-pyOpenSSL revision 33517660b16137a5368e1e4405e343bc --- pyOpenSSL-24.0.0.tar.gz | 3 --- pyopenssl-24.2.1.tar.gz | 3 +++ python-pyOpenSSL.changes | 22 ++++++++++++++++++++++ python-pyOpenSSL.spec | 13 +++++++------ skip-networked-test.patch | 22 +++++++++++----------- 5 files changed, 43 insertions(+), 20 deletions(-) delete mode 100644 pyOpenSSL-24.0.0.tar.gz create mode 100644 pyopenssl-24.2.1.tar.gz diff --git a/pyOpenSSL-24.0.0.tar.gz b/pyOpenSSL-24.0.0.tar.gz deleted file mode 100644 index 273e392..0000000 --- a/pyOpenSSL-24.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6aa33039a93fffa4563e655b61d11364d01264be8ccb49906101e02a334530bf -size 183238 diff --git a/pyopenssl-24.2.1.tar.gz b/pyopenssl-24.2.1.tar.gz new file mode 100644 index 0000000..e34e812 --- /dev/null +++ b/pyopenssl-24.2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95 +size 184323 diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index f1cb656..21b3287 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jul 23 11:39:23 UTC 2024 - Adrian Schröter + +- 24.2.1: + * Deprecated OpenSSL.crypto.X509Req, + OpenSSL.crypto.load_certificate_request, + OpenSSL.crypto.dump_certificate_request. + Instead, cryptography.x509.CertificateSigningRequest,s + cryptography.x509.CertificateSigningRequestBuilder,s + cryptography.x509.load_der_x509_csr,s + or cryptography.x509.load_pem_x509_csr should be used. + * Added type hints for the SSL module. #1308. + * Changed OpenSSL.crypto.PKey.from_cryptography_key to accept public and private EC, ED25519, ED448 keys + +------------------------------------------------------------------- +Sat Mar 16 13:04:43 UTC 2024 - Dirk Müller + +- update to 24.1.0: + * Removed the deprecated OpenSSL.crypto.PKCS12 and + OpenSSL.crypto.NetscapeSPKI. OpenSSL.crypto.PKCS12 may be + replaced by the PKCS#12 APIs in the cryptography package. + ------------------------------------------------------------------- Mon Jan 29 21:16:31 UTC 2024 - Dirk Müller diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index cb3ee2d..0661646 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -26,12 +26,12 @@ %endif %{?sle15_python_module_pythons} Name: python-pyOpenSSL%{psuffix} -Version: 24.0.0 +Version: 24.2.1 Release: 0 Summary: Python wrapper module around the OpenSSL library License: Apache-2.0 URL: https://github.com/pyca/pyopenssl -Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/pyopenssl/pyopenssl-%{version}.tar.gz # PATCH-FIX-UPSTREAM skip-networked-test.patch gh#pyca/pyopenssl#68 mcepl@suse.com # Mark tests requiring network access Patch0: skip-networked-test.patch @@ -40,15 +40,16 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-cffi -Requires: (python-cryptography >= 41.0.5 with python-cryptography < 43) +Requires: (python-cryptography >= 41.0.5 with python-cryptography < 44) Provides: pyOpenSSL = %{version} +Provides: pyopenssl = %{version}-%release BuildArch: noarch %if %{with test} -BuildRequires: %{python_module cryptography >= 41.0.5 with %python-cryptography < 43} -BuildRequires: %{python_module flaky} +BuildRequires: %{python_module cryptography >= 41.0.5 with %python-cryptography < 44} BuildRequires: %{python_module pretend} BuildRequires: %{python_module pyOpenSSL >= %version} BuildRequires: %{python_module pytest >= 3.0.1} +BuildRequires: %{python_module pytest-rerunfailures} BuildRequires: ca-certificates-mozilla BuildRequires: openssl %endif @@ -64,7 +65,7 @@ cryptography (), which provides (among other things) a cffi-based interface to OpenSSL. %prep -%autosetup -p1 -n pyOpenSSL-%{version} +%autosetup -p1 -n pyopenssl-%{version} %build %python_build diff --git a/skip-networked-test.patch b/skip-networked-test.patch index 9bb78c4..a491498 100644 --- a/skip-networked-test.patch +++ b/skip-networked-test.patch @@ -1,8 +1,8 @@ -Index: pyOpenSSL-24.0.0/tests/test_ssl.py +Index: pyOpenSSL-24.1.0/tests/test_ssl.py =================================================================== ---- pyOpenSSL-24.0.0.orig/tests/test_ssl.py -+++ pyOpenSSL-24.0.0/tests/test_ssl.py -@@ -1250,6 +1250,7 @@ class TestContext: +--- pyOpenSSL-24.1.0.orig/tests/test_ssl.py ++++ pyOpenSSL-24.1.0/tests/test_ssl.py +@@ -1249,6 +1249,7 @@ class TestContext: reason="set_default_verify_paths appears not to work on Windows. " "See LP#404343 and LP#404344.", ) @@ -10,19 +10,19 @@ Index: pyOpenSSL-24.0.0/tests/test_ssl.py def test_set_default_verify_paths(self): """ `Context.set_default_verify_paths` causes the platform-specific CA -Index: pyOpenSSL-24.0.0/setup.cfg +Index: pyOpenSSL-24.1.0/setup.cfg =================================================================== ---- pyOpenSSL-24.0.0.orig/setup.cfg -+++ pyOpenSSL-24.0.0/setup.cfg +--- pyOpenSSL-24.1.0.orig/setup.cfg ++++ pyOpenSSL-24.1.0/setup.cfg @@ -11,4 +11,3 @@ doc_files = doc/_build/html [egg_info] tag_build = tag_date = 0 - -Index: pyOpenSSL-24.0.0/pyproject.toml +Index: pyOpenSSL-24.1.0/pyproject.toml =================================================================== ---- pyOpenSSL-24.0.0.orig/pyproject.toml -+++ pyOpenSSL-24.0.0/pyproject.toml +--- pyOpenSSL-24.1.0.orig/pyproject.toml ++++ pyOpenSSL-24.1.0/pyproject.toml @@ -42,6 +42,9 @@ ignore_missing_imports = true [tool.pytest.ini_options] addopts = "-r s --strict-markers" @@ -32,4 +32,4 @@ Index: pyOpenSSL-24.0.0/pyproject.toml +] [tool.ruff] - select = ['E', 'F', 'I', 'W', 'UP', 'RUF'] + lint.select = ['E', 'F', 'I', 'W', 'UP', 'RUF']