From c7e9b97dcacf0d84cc44dd54ff238b40d3a217f991783a1a6db7b2f86553ca79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 12:34:43 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-urllib3_1 revision 30ffe62e978deab14e32535e11f6f13f --- openssl-3.2.patch | 34 ---------------------------------- python-urllib3_1.changes | 15 +++++++++++++++ python-urllib3_1.spec | 7 ++----- urllib3-1.26.18.tar.gz | 3 --- urllib3-1.26.20.tar.gz | 3 +++ 5 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 openssl-3.2.patch delete mode 100644 urllib3-1.26.18.tar.gz create mode 100644 urllib3-1.26.20.tar.gz diff --git a/openssl-3.2.patch b/openssl-3.2.patch deleted file mode 100644 index 2fb27ef..0000000 --- a/openssl-3.2.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: urllib3-1.26.18/changelog/3268.bugfix.rst -=================================================================== ---- /dev/null -+++ urllib3-1.26.18/changelog/3268.bugfix.rst -@@ -0,0 +1 @@ -+Fixed handling of OpenSSL 3.2.0 new error message for misconfiguring an HTTP proxy as HTTPS. -Index: urllib3-1.26.18/test/with_dummyserver/test_socketlevel.py -=================================================================== ---- urllib3-1.26.18.orig/test/with_dummyserver/test_socketlevel.py -+++ urllib3-1.26.18/test/with_dummyserver/test_socketlevel.py -@@ -1226,7 +1226,8 @@ class TestSSL(SocketDummyServerTestCase) - self._start_server(socket_handler) - with HTTPSConnectionPool(self.host, self.port, ca_certs=DEFAULT_CA) as pool: - with pytest.raises( -- SSLError, match=r"(wrong version number|record overflow)" -+ SSLError, -+ match=r"(wrong version number|record overflow|record layer failure)", - ): - pool.request("GET", "/", retries=False) - -Index: urllib3-1.26.18/src/urllib3/connectionpool.py -=================================================================== ---- urllib3-1.26.18.orig/src/urllib3/connectionpool.py -+++ urllib3-1.26.18/src/urllib3/connectionpool.py -@@ -768,7 +768,8 @@ class HTTPConnectionPool(ConnectionPool, - # so we try to cover our bases here! - message = " ".join(re.split("[^a-z]", str(ssl_error).lower())) - return ( -- "wrong version number" in message or "unknown protocol" in message -+ "wrong version number" in message or "unknown protocol" in message or "record layer failure" in message -+ - ) - - # Try to detect a common user error with proxies which is to diff --git a/python-urllib3_1.changes b/python-urllib3_1.changes index 9463e55..f56a61b 100644 --- a/python-urllib3_1.changes +++ b/python-urllib3_1.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Sep 10 06:30:59 UTC 2024 - Steve Kowalik + +- Update to 1.26.20: + * Fixed a crash where certain standard library hash functions were absent + in FIPS-compliant environments. + * Replaced deprecated dash-separated setuptools entries in setup.cfg. + * Backported changes to our tests and CI configuration from v2.x to + support testing with CPython 3.12 and 3.13. + * Added the Proxy-Authorization header to the list of headers to strip + from requests when redirecting to a different host. As before, different + headers can be set via Retry.remove_headers_on_redirect. +- Drop patch openssl-3.2.patch: + * No longer required. + ------------------------------------------------------------------- Thu Jan 11 12:03:28 UTC 2024 - Daniel Garcia diff --git a/python-urllib3_1.spec b/python-urllib3_1.spec index f226373..5467f5d 100644 --- a/python-urllib3_1.spec +++ b/python-urllib3_1.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-urllib3_1 # # Copyright (c) 2024 SUSE LLC # @@ -26,18 +26,15 @@ %endif %{?sle15_python_module_pythons} Name: python-urllib3_1%{psuffix} -Version: 1.26.18 +Version: 1.26.20 Release: 0 Summary: HTTP library with thread-safe connection pooling, file post, and more License: MIT -Group: Development/Languages/Python URL: https://urllib3.readthedocs.org/ Source: https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz # PATCH-FIX-UPSTREAM remove_mock.patch gh#urllib3/urllib3#2108 mcepl@suse.com # remove dependency on the external module mock Patch0: remove_mock.patch -# PATCH-FIX-UPSTREAM openssl-3.2.patch gh#urllib3/urllib3#3271 -Patch1: openssl-3.2.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} diff --git a/urllib3-1.26.18.tar.gz b/urllib3-1.26.18.tar.gz deleted file mode 100644 index 6347a83..0000000 --- a/urllib3-1.26.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0 -size 305687 diff --git a/urllib3-1.26.20.tar.gz b/urllib3-1.26.20.tar.gz new file mode 100644 index 0000000..41e62b3 --- /dev/null +++ b/urllib3-1.26.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32 +size 307380