From f3350c1f1a1cf2c4cf045eda3fdc562432e9f2aa Mon Sep 17 00:00:00 2001 From: Carl George Date: Sun, 22 Mar 2020 15:21:52 -0500 Subject: [PATCH 01/82] Update to 1.25.8 * Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1771186 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 19cdadc..2d35953 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /urllib3-1.25.3.tar.gz /urllib3-1.25.6.tar.gz /urllib3-1.25.7.tar.gz +/urllib3-1.25.8.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 10221ab..be890f3 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.25.7 -Release: 3%{?dist} +Version: 1.25.8 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -95,6 +95,9 @@ popd %changelog +* Sun Mar 22 2020 Carl George - 1.25.8-1 +- Latest upstream rhbz#1771186 + * Thu Jan 30 2020 Fedora Release Engineering - 1.25.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f8dfc21..64b05b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.25.7.tar.gz) = bbf55a1d46fe799b98c311bdb47628c14719d5b3ae00fb27515da774d8f7c043ff79a9684f12b133101574527531d4a79134fe67e28dad518d429e55f82e0c59 +SHA512 (urllib3-1.25.8.tar.gz) = 813f8a6d0f848444a7807d9ea46a93b576220ca50d364af2107ca46ff572f828e35c1a076bc477a269f33bf95e430a89d22d8e4de1dc8d8628ae687fa3551d6b From 6fdabe5c0b56e7a7c8af9bf936b4725d824409e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 18:00:21 +0200 Subject: [PATCH 02/82] Bootstrap for Python 3.9 --- python-urllib3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index be890f3..3dc176b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %global srcname urllib3 # When bootstrapping Python, we cannot test this yet @@ -5,7 +6,7 @@ Name: python-%{srcname} Version: 1.25.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -95,6 +96,9 @@ popd %changelog +* Fri May 22 2020 Miro Hrončok - 1.25.8-2 +- Bootstrap for Python 3.9 + * Sun Mar 22 2020 Carl George - 1.25.8-1 - Latest upstream rhbz#1771186 From 23fcbeb6475cb389b49d6aafec68b4e7174e8a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 24 May 2020 21:14:40 +0200 Subject: [PATCH 03/82] Rebuilt for Python 3.9 --- python-urllib3.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 3dc176b..4d5de1d 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %global srcname urllib3 # When bootstrapping Python, we cannot test this yet @@ -6,7 +5,7 @@ Name: python-%{srcname} Version: 1.25.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -96,6 +95,9 @@ popd %changelog +* Sun May 24 2020 Miro Hrončok - 1.25.8-3 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Miro Hrončok - 1.25.8-2 - Bootstrap for Python 3.9 From e65e04a4bd95ba207c583aa2736fb11419af9a99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 04:29:40 +0000 Subject: [PATCH 04/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 4d5de1d..21f9baf 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.25.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -95,6 +95,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.25.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun May 24 2020 Miro Hrončok - 1.25.8-3 - Rebuilt for Python 3.9 From 2a892015ad75c1a37632c6844a01b50201d79615 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 27 Sep 2020 17:24:36 -0700 Subject: [PATCH 05/82] Update to 1.25.10. Fixed bug #1824900 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d35953..35a75f1 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /urllib3-1.25.6.tar.gz /urllib3-1.25.7.tar.gz /urllib3-1.25.8.tar.gz +/urllib3-1.25.10.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 21f9baf..0a266e1 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.25.8 -Release: 4%{?dist} +Version: 1.25.10 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -95,6 +95,9 @@ popd %changelog +* Sun Sep 27 2020 Kevin Fenzi - 1.25.10-1 +- Update to 1.25.10. Fixed bug #1824900 + * Wed Jul 29 2020 Fedora Release Engineering - 1.25.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 64b05b6..8412fcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.25.8.tar.gz) = 813f8a6d0f848444a7807d9ea46a93b576220ca50d364af2107ca46ff572f828e35c1a076bc477a269f33bf95e430a89d22d8e4de1dc8d8628ae687fa3551d6b +SHA512 (urllib3-1.25.10.tar.gz) = 7927e58de8ef24474179297e6ef7700bb3026a13d578e5bb01e32c6c4b6b5e70cc35980a815e3bcd976678e344250222d38fb86abe0f956e5023deb0f80bc1a1 From 87cc35d1966c541921bba5746bf76785ff750838 Mon Sep 17 00:00:00 2001 From: Anna Khaitovich Date: Wed, 30 Oct 2019 16:03:49 +0100 Subject: [PATCH 06/82] Update RECENT_DATE dynamically --- python-urllib3.spec | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 0a266e1..85fd454 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.25.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -45,6 +45,24 @@ Python3 HTTP module with connection pooling and file POST abilities. %prep %autosetup -p1 -n %{srcname}-%{version} +# Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. +# RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date +# (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either, +# since a user's system time could be set to a little in the past from what build time is (because of timezones, +# corner cases, etc). As stated in the comment in src/urllib3/connection.py: +# When updating RECENT_DATE, move it to within two years of the current date, +# and not less than 6 months ago. +# Example: if Today is 2018-01-01, then RECENT_DATE should be any date on or +# after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months) +# There is also a test_ssl_wrong_system_time test (from test/with_dummyserver/test_https.py) that tests if +# user's system time isn't set as too far in the past, because it could lead to SSL verification errors. +# That is why we need RECENT_DATE to be set at most 2 years ago (or else test_ssl_wrong_system_time would +# result in false positive), but before at least 6 month ago (so this test could tolerate user's system time being +# set to some time in the past, but not to far away from the present). +# Next few lines update RECENT_DATE dynamically. +recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d") +sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py + # Drop the dummyserver tests in koji. They fail there in real builds, but not # in scratch builds (weird). rm -rf test/with_dummyserver/ @@ -95,6 +113,9 @@ popd %changelog +* Tue Jan 05 2021 Anna Khaitovich - 1.25.10-2 +- Update RECENT_DATE dynamically + * Sun Sep 27 2020 Kevin Fenzi - 1.25.10-1 - Update to 1.25.10. Fixed bug #1824900 From edd63be688277f5100037c0c9f550788c9632d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 15 Jan 2021 18:57:52 +0100 Subject: [PATCH 07/82] Remove unwanted BRs Nose is officially deprecated and not needed. Mock is a backport module. Not needed here. --- python-urllib3.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 85fd454..5bd9d57 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.25.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -24,8 +24,6 @@ Summary: Python3 HTTP library with thread-safe connection pooling and fil BuildRequires: python3-devel BuildRequires: python3-setuptools %if %{with tests} -BuildRequires: python3-nose -BuildRequires: python3-mock BuildRequires: python3-six BuildRequires: python3-pysocks BuildRequires: python3-pytest @@ -76,6 +74,11 @@ rm -rf test/contrib/ # fail when combined with the unbundling of backports-ssl_match_hostname rm -f test/test_no_ssl.py +# Use the standard library instead of a backport +sed -i -e 's/^import mock/from unittest import mock/' \ + -e 's/^from mock import /from unittest.mock import /' \ + test/*.py docs/conf.py + %build %py3_build @@ -113,6 +116,10 @@ popd %changelog +* Fri Jan 15 2021 Miro Hrončok - 1.25.10-3 +- Drop redundant BuildRequires for nose +- Instead of the mock backport, use unittest.mock from the standard library + * Tue Jan 05 2021 Anna Khaitovich - 1.25.10-2 - Update RECENT_DATE dynamically From 0d27139c00c61cf0839210cb289a97f9b4399d30 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:02:32 +0000 Subject: [PATCH 08/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 5bd9d57..28e9c5b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.25.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -116,6 +116,9 @@ popd %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.25.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 15 2021 Miro Hrončok - 1.25.10-3 - Drop redundant BuildRequires for nose - Instead of the mock backport, use unittest.mock from the standard library From c3cafe2099a268d4e5af49edb10b984a290c486e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 18 May 2021 19:59:57 +0200 Subject: [PATCH 09/82] Update to 1.26.4 - switch to %pytest - don't ship our own ssl_match_hostname wrapper, use the one from upstream --- .gitignore | 1 + python-urllib3.spec | 25 ++++++++++++++----------- sources | 2 +- ssl_match_hostname_py3.py | 1 - 4 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 ssl_match_hostname_py3.py diff --git a/.gitignore b/.gitignore index 35a75f1..b81808c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /urllib3-1.25.7.tar.gz /urllib3-1.25.8.tar.gz /urllib3-1.25.10.tar.gz +/urllib3-1.26.4.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 28e9c5b..300f0c3 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,15 +4,13 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.25.10 -Release: 4%{?dist} +Version: 1.26.4 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT URL: https://github.com/urllib3/urllib3 Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# Unbundle ssl_match_hostname since we depend on it -Source1: ssl_match_hostname_py3.py BuildArch: noarch %description @@ -24,9 +22,12 @@ Summary: Python3 HTTP library with thread-safe connection pooling and fil BuildRequires: python3-devel BuildRequires: python3-setuptools %if %{with tests} +BuildRequires: python3-dateutil BuildRequires: python3-six BuildRequires: python3-pysocks BuildRequires: python3-pytest +BuildRequires: python3-pytest-freezegun +BuildRequires: python3-pytest-timeout BuildRequires: python3-tornado BuildRequires: python3-trustme BuildRequires: python3-idna @@ -87,12 +88,12 @@ sed -i -e 's/^import mock/from unittest import mock/' \ %py3_install # Unbundle the Python 3 build -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py* -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six* -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/ +rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py +rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six.* +rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/_implementation.py +rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/__pycache__/_implementation.* mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/ -cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \ %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ @@ -102,9 +103,7 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %if %{with tests} %check -pushd test -PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pytest -v -popd +%pytest -v %endif @@ -116,6 +115,10 @@ popd %changelog +* Tue May 18 2021 Miro Hrončok - 1.26.4-1 +- Update to 1.26.4 +- Fixes rhbz#1889391 + * Wed Jan 27 2021 Fedora Release Engineering - 1.25.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 8412fcf..3ca6661 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.25.10.tar.gz) = 7927e58de8ef24474179297e6ef7700bb3026a13d578e5bb01e32c6c4b6b5e70cc35980a815e3bcd976678e344250222d38fb86abe0f956e5023deb0f80bc1a1 +SHA512 (urllib3-1.26.4.tar.gz) = c770ae93e024af2bd79145d90426ad56f89184a4a02a55551bf54680a1ba369e683080e1899f00d57efcb085145e29a189f502ae6b41e572de111909297fb4e6 diff --git a/ssl_match_hostname_py3.py b/ssl_match_hostname_py3.py deleted file mode 100644 index 99d425a..0000000 --- a/ssl_match_hostname_py3.py +++ /dev/null @@ -1 +0,0 @@ -from ssl import match_hostname, CertificateError From dc936fbd657a7bd4b0b3ea5d9cc4f7b9d49725b6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 18:47:32 +0200 Subject: [PATCH 10/82] Bootstrap for Python 3.10 --- python-urllib3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 300f0c3..1545195 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %global srcname urllib3 # When bootstrapping Python, we cannot test this yet @@ -5,7 +6,7 @@ Name: python-%{srcname} Version: 1.26.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -115,6 +116,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Wed Jun 02 2021 Python Maint - 1.26.4-2 +- Bootstrap for Python 3.10 + * Tue May 18 2021 Miro Hrončok - 1.26.4-1 - Update to 1.26.4 - Fixes rhbz#1889391 From 8a166800e1d14cd61cecf820c223b5e9d801801d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 13:24:35 +0200 Subject: [PATCH 11/82] Rebuilt for Python 3.10 --- python-urllib3.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 1545195..8b8af88 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %global srcname urllib3 # When bootstrapping Python, we cannot test this yet @@ -6,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -116,6 +115,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Fri Jun 04 2021 Python Maint - 1.26.4-3 +- Rebuilt for Python 3.10 + * Wed Jun 02 2021 Python Maint - 1.26.4-2 - Bootstrap for Python 3.10 From 3cb40d6431fa6e9e3253933cbe9a8393352be4f7 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 20 May 2021 09:15:21 +0200 Subject: [PATCH 12/82] Run pipenv tests on package update --- .fmf/version | 1 + plans/pipenv.fmf | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/pipenv.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/pipenv.fmf b/plans/pipenv.fmf new file mode 100644 index 0000000..8f1a535 --- /dev/null +++ b/plans/pipenv.fmf @@ -0,0 +1,7 @@ +summary: Run pipenv tests +discover: + how: fmf + url: https://src.fedoraproject.org/rpms/pipenv/ +execute: + how: tmt + From 70fe2fa5521d494484df2367c0471da667f888da Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 16 Jun 2021 10:11:46 +0200 Subject: [PATCH 13/82] Update to 1.26.5 --- .gitignore | 1 + python-urllib3.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b81808c..a8a0a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /urllib3-1.25.8.tar.gz /urllib3-1.25.10.tar.gz /urllib3-1.26.4.tar.gz +/urllib3-1.26.5.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 8b8af88..e98a415 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.26.4 -Release: 3%{?dist} +Version: 1.26.5 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -115,6 +115,10 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Wed Jun 16 2021 Karolina Surma - 1.26.5-1 +- Update to 1.26.5 +- Fixes rhbz#1965056 + * Fri Jun 04 2021 Python Maint - 1.26.4-3 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 3ca6661..f80ee90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.4.tar.gz) = c770ae93e024af2bd79145d90426ad56f89184a4a02a55551bf54680a1ba369e683080e1899f00d57efcb085145e29a189f502ae6b41e572de111909297fb4e6 +SHA512 (urllib3-1.26.5.tar.gz) = d4a97aa05f9138cbd2fceadd6268f55f1389a57abccc44f6dfd7755778d417a6648f081ceefd376b27c17e384ccc81caf49f0ea23b4d9ac8e347a06d85cb4639 From b71ec3d8c8cbe6411fc734a1811e66fe7ab839a4 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 16 Jun 2021 12:42:54 +0200 Subject: [PATCH 14/82] Restore ssl_match_hostname unbundle wrapper This is to prevent pipenv failure when it creates Pipfile.lock in Python2 environment. --- python-urllib3.spec | 6 ++++-- ssl_match_hostname_py3.py | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ssl_match_hostname_py3.py diff --git a/python-urllib3.spec b/python-urllib3.spec index e98a415..18b8ea0 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -11,6 +11,8 @@ Summary: Python HTTP library with thread-safe connection pooling and file License: MIT URL: https://github.com/urllib3/urllib3 Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +# Unbundle ssl_match_hostname since we depend on it +Source1: ssl_match_hostname_py3.py BuildArch: noarch %description @@ -90,10 +92,10 @@ sed -i -e 's/^import mock/from unittest import mock/' \ # Unbundle the Python 3 build rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six.* -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/_implementation.py -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/__pycache__/_implementation.* +rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/ mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/ +cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \ %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ diff --git a/ssl_match_hostname_py3.py b/ssl_match_hostname_py3.py new file mode 100644 index 0000000..99d425a --- /dev/null +++ b/ssl_match_hostname_py3.py @@ -0,0 +1 @@ +from ssl import match_hostname, CertificateError From a1d6618ef3c4f81103425df0e4969f4d3209ab36 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 8 Jun 2020 10:28:47 +0530 Subject: [PATCH 15/82] Update minimal requirement of six to >= 1.16.0 urllib3-1.26.5 to work properly needs six to be atleast >= 1.16.0. So to ensure when urllib3 is installed already installed python3-six is upgraded let's set minimum requirement of six to >= 1.16.0[1] which contains required methods like six.ensure_text method needed by urllib3-1.26.5, also urllib3 bundles six-1.16.0[2]. [1] https://github.com/urllib3/urllib3/commit/5b047b [2] https://github.com/urllib3/urllib3/commit/2698537 --- python-urllib3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 18b8ea0..d758a9e 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -37,7 +37,7 @@ BuildRequires: python3-idna Requires: ca-certificates Requires: python3-idna -Requires: python3-six +Requires: python3-six >= 1.16.0 Requires: python3-pysocks %description -n python3-%{srcname} @@ -117,6 +117,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Wed Jun 30 2021 Yatin Karel - 1.26.5-2 +- Update minimal requirement of six to >= 1.16.0 + * Wed Jun 16 2021 Karolina Surma - 1.26.5-1 - Update to 1.26.5 - Fixes rhbz#1965056 From 67a7304903e6c7583f613cd061f39560aedd8f81 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 11 Jul 2021 08:00:13 -0700 Subject: [PATCH 16/82] Update to 1.26.1. Fixes rhbz#1976190 Fix FTBFS. Fixes rhbz#1966120 --- .gitignore | 1 + python-urllib3.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a8a0a0c..1df01bc 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /urllib3-1.25.10.tar.gz /urllib3-1.26.4.tar.gz /urllib3-1.26.5.tar.gz +/urllib3-1.26.6.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index d758a9e..0e6f463 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.26.5 -Release: 2%{?dist} +Version: 1.26.6 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -111,12 +111,16 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %files -n python3-%{srcname} %license LICENSE.txt -%doc CHANGES.rst README.rst CONTRIBUTORS.txt +%doc CHANGES.rst README.rst %{python3_sitelib}/urllib3/ %{python3_sitelib}/urllib3-*.egg-info/ %changelog +* Sun Jul 11 2021 Kevin Fenzi - 1.26.6-1 +- Update to 1.26.1. Fixes rhbz#1976190 +- Fix FTBFS. Fixes rhbz#1966120 + * Wed Jun 30 2021 Yatin Karel - 1.26.5-2 - Update minimal requirement of six to >= 1.16.0 diff --git a/sources b/sources index f80ee90..2b402e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.5.tar.gz) = d4a97aa05f9138cbd2fceadd6268f55f1389a57abccc44f6dfd7755778d417a6648f081ceefd376b27c17e384ccc81caf49f0ea23b4d9ac8e347a06d85cb4639 +SHA512 (urllib3-1.26.6.tar.gz) = 9d2f41fb0b5eb907e7daa559cdb48d130604b975c25bec47f55320a41e7df4aa495152cbaf842daf3414ed6c17131114463551c1e9771a848e392e74453ba0d3 From 822b1fd2e9bbf649a122822003f56aaa7b78c046 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:07:28 +0000 Subject: [PATCH 17/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 0e6f463..0b55bf4 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -117,6 +117,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.26.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jul 11 2021 Kevin Fenzi - 1.26.6-1 - Update to 1.26.1. Fixes rhbz#1976190 - Fix FTBFS. Fixes rhbz#1966120 From 1fde83908de3741e2b12844e0924ac607b2c4099 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 3 Aug 2021 10:08:04 +0200 Subject: [PATCH 18/82] Remove pipenv metadata This package is bundled with pipenv, there is no need to test it with Fedora's version. --- .fmf/version | 1 - plans/pipenv.fmf | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 .fmf/version delete mode 100644 plans/pipenv.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/plans/pipenv.fmf b/plans/pipenv.fmf deleted file mode 100644 index 8f1a535..0000000 --- a/plans/pipenv.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run pipenv tests -discover: - how: fmf - url: https://src.fedoraproject.org/rpms/pipenv/ -execute: - how: tmt - From 2f8e5b2c20f49eca833fc0ad9cc4ba9fe633db82 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 26 Sep 2021 13:09:32 -0700 Subject: [PATCH 19/82] Update to 1.26.7. Fixes rhbz#2006973 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1df01bc..616978e 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /urllib3-1.26.4.tar.gz /urllib3-1.26.5.tar.gz /urllib3-1.26.6.tar.gz +/urllib3-1.26.7.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 0b55bf4..a7311e1 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.26.6 -Release: 2%{?dist} +Version: 1.26.7 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -117,6 +117,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Sun Sep 26 2021 Kevin Fenzi - 1.26.7-1 +- Update to 1.26.7. Fixes rhbz#2006973 + * Fri Jul 23 2021 Fedora Release Engineering - 1.26.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 2b402e8..1ffeae7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.6.tar.gz) = 9d2f41fb0b5eb907e7daa559cdb48d130604b975c25bec47f55320a41e7df4aa495152cbaf842daf3414ed6c17131114463551c1e9771a848e392e74453ba0d3 +SHA512 (urllib3-1.26.7.tar.gz) = 5a0f55cba31c987c416d113ddfd4ade64704f70e4ff20092ff6d7370f260dada71e149b14ea62c8967a4c0f5ad79b441325d623446e0016c133c7e9277d3c8be From e98e5d81d0c7be7220f3fc433970f1b5ff8ced21 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jan 2022 10:18:17 -0800 Subject: [PATCH 20/82] Stop unbundling ssl.match_hostname, it's deprecated upstream (#2009550) --- python-urllib3.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index a7311e1..e293bb4 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,14 +5,12 @@ Name: python-%{srcname} Version: 1.26.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT URL: https://github.com/urllib3/urllib3 Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# Unbundle ssl_match_hostname since we depend on it -Source1: ssl_match_hostname_py3.py BuildArch: noarch %description @@ -92,10 +90,8 @@ sed -i -e 's/^import mock/from unittest import mock/' \ # Unbundle the Python 3 build rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six.* -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname/ mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/ -cp -a %{SOURCE1} %{buildroot}/%{python3_sitelib}/urllib3/packages/ssl_match_hostname.py ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \ %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ @@ -117,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Tue Jan 04 2022 Adam Williamson - 1.26.7-2 +- Stop unbundling ssl.match_hostname, it's deprecated upstream (#2009550) + * Sun Sep 26 2021 Kevin Fenzi - 1.26.7-1 - Update to 1.26.7. Fixes rhbz#2006973 From a7666c4b0156e3049c14a058f38ad13061dc7b65 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 8 Jan 2022 15:40:06 -0800 Subject: [PATCH 21/82] Update to 1.26.8. Fixes rhbz#2038246 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 616978e..2c2fc4a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /urllib3-1.26.5.tar.gz /urllib3-1.26.6.tar.gz /urllib3-1.26.7.tar.gz +/urllib3-1.26.8.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index e293bb4..242c106 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.26.7 -Release: 2%{?dist} +Version: 1.26.8 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Sat Jan 08 2022 Kevin Fenzi - 1.26.8-1 +- Update to 1.26.8. Fixes rhbz#2038246 + * Tue Jan 04 2022 Adam Williamson - 1.26.7-2 - Stop unbundling ssl.match_hostname, it's deprecated upstream (#2009550) diff --git a/sources b/sources index 1ffeae7..62c58a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.7.tar.gz) = 5a0f55cba31c987c416d113ddfd4ade64704f70e4ff20092ff6d7370f260dada71e149b14ea62c8967a4c0f5ad79b441325d623446e0016c133c7e9277d3c8be +SHA512 (urllib3-1.26.8.tar.gz) = 7ba3c3f48315d0f2ef3f2fbdef2b9e508a4af4e9c9f805b96bab2f47d5d35dc29672a16f2163a0ba375ea01bbc005052481ead37dfdcba18f22e90e03616b6d5 From 047bcf31b8163354cb43ae187fac3c5d52caf61b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 16:18:01 +0000 Subject: [PATCH 22/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 242c106..c66aa6b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.26.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Kevin Fenzi - 1.26.8-1 - Update to 1.26.8. Fixes rhbz#2038246 From 50b1f9d1e9371a0b1f66916419dfce05e3dd70d2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 30 May 2022 14:19:03 -0700 Subject: [PATCH 23/82] Update to 1.26.9. fixes rhbz#2064777 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2c2fc4a..6788234 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /urllib3-1.26.6.tar.gz /urllib3-1.26.7.tar.gz /urllib3-1.26.8.tar.gz +/urllib3-1.26.9.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index c66aa6b..324c9ac 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.26.8 -Release: 2%{?dist} +Version: 1.26.9 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Mon May 30 2022 Kevin Fenzi - 1.26.9-1 +- Update to 1.26.9. fixes rhbz#2064777 + * Fri Jan 21 2022 Fedora Release Engineering - 1.26.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 62c58a2..7475799 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.8.tar.gz) = 7ba3c3f48315d0f2ef3f2fbdef2b9e508a4af4e9c9f805b96bab2f47d5d35dc29672a16f2163a0ba375ea01bbc005052481ead37dfdcba18f22e90e03616b6d5 +SHA512 (urllib3-1.26.9.tar.gz) = 328994450c2053681acf81d6dc6132b3d2408d728cb0e44f571d794f673fe212f2211142b26bacc1c5a076cc20c40e37cecbc3ffb5673b6399419b1345d0c0d2 From 7ec351410abe4e1c83903a01b21086b3580eb461 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:32:22 +0200 Subject: [PATCH 24/82] Bootstrap for Python 3.11 --- python-urllib3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 324c9ac..ff872be 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %global srcname urllib3 # When bootstrapping Python, we cannot test this yet @@ -5,7 +6,7 @@ Name: python-%{srcname} Version: 1.26.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +114,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Mon Jun 13 2022 Python Maint - 1.26.9-2 +- Bootstrap for Python 3.11 + * Mon May 30 2022 Kevin Fenzi - 1.26.9-1 - Update to 1.26.9. fixes rhbz#2064777 From 778adc584b710e0a12c5d532ca34cf0bc2a74b13 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 14 Jun 2022 10:02:04 +0200 Subject: [PATCH 25/82] Rebuilt for Python 3.11 --- python-urllib3.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index ff872be..5eb9659 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %global srcname urllib3 # When bootstrapping Python, we cannot test this yet @@ -6,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -114,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Tue Jun 14 2022 Python Maint - 1.26.9-3 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 1.26.9-2 - Bootstrap for Python 3.11 From ddef1309a65bd15442b5b0556f9f707ff34098b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 23:14:17 +0000 Subject: [PATCH 26/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 5eb9659..6b7d423 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.26.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 14 2022 Python Maint - 1.26.9-3 - Rebuilt for Python 3.11 From dffef64b1fd71f8221cd36cf1715756afdda33a2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 15 Sep 2022 18:12:14 -0700 Subject: [PATCH 27/82] Update to 1.26.12. Fixes rhbz#2104964 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6788234..4aead00 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /urllib3-1.26.7.tar.gz /urllib3-1.26.8.tar.gz /urllib3-1.26.9.tar.gz +/urllib3-1.26.12.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 6b7d423..7ccda21 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -4,8 +4,8 @@ %bcond_without tests Name: python-%{srcname} -Version: 1.26.9 -Release: 4%{?dist} +Version: 1.26.12 +Release: 1%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Thu Sep 15 2022 Kevin Fenzi - 1.26.12-1 +- Update to 1.26.12. Fixes rhbz#2104964 + * Fri Jul 22 2022 Fedora Release Engineering - 1.26.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 7475799..775ec39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.9.tar.gz) = 328994450c2053681acf81d6dc6132b3d2408d728cb0e44f571d794f673fe212f2211142b26bacc1c5a076cc20c40e37cecbc3ffb5673b6399419b1345d0c0d2 +SHA512 (urllib3-1.26.12.tar.gz) = 71b4b14782d336a3fc187bb82197be02f06acfca06569e4ae2b73edb64cde2f30fded65eb36a9cbac6172e7c90a49f6d2283c6b9cb27f215e111ae49cf41850f From 2c7ece9d32f8dfce4e33c4c7cab91c2fe9453bf8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 18:12:20 +0000 Subject: [PATCH 28/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 7ccda21..29da836 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 1.26.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -113,6 +113,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.26.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Sep 15 2022 Kevin Fenzi - 1.26.12-1 - Update to 1.26.12. Fixes rhbz#2104964 From c01f4482419e758b495cdb6d7cea06742b9e67af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Tue, 16 May 2023 12:14:35 +0200 Subject: [PATCH 29/82] Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython See: https://github.com/python/cpython/issues/96931 Fixes: rhbz#2203773 --- 4855d71.patch | 28 ++++++++++++++++++++++++++++ python-urllib3.spec | 11 ++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 4855d71.patch diff --git a/4855d71.patch b/4855d71.patch new file mode 100644 index 0000000..22945ff --- /dev/null +++ b/4855d71.patch @@ -0,0 +1,28 @@ +From 4855d71ad5535bdff47a0dc5cfe09fb610ff6576 Mon Sep 17 00:00:00 2001 +From: Thomas Grainger +Date: Sat, 15 Apr 2023 20:41:24 +0100 +Subject: [PATCH] Fix test_ssl_object_attributes + +Co-authored-by: Seth Michael Larson +--- + test/test_ssltransport.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/test/test_ssltransport.py b/test/test_ssltransport.py +index a3b7381639..cace51db96 100644 +--- a/test/test_ssltransport.py ++++ b/test/test_ssltransport.py +@@ -229,8 +229,11 @@ def test_ssl_object_attributes(self) -> None: + assert ssock.selected_npn_protocol() is None + + shared_ciphers = ssock.shared_ciphers() +- assert type(shared_ciphers) == list +- assert len(shared_ciphers) > 0 ++ # SSLContext.shared_ciphers() changed behavior completely in a patch version. ++ # See: https://github.com/python/cpython/issues/96931 ++ assert shared_ciphers is None or ( ++ type(shared_ciphers) is list and len(shared_ciphers) > 0 ++ ) + + assert ssock.compression() is None + diff --git a/python-urllib3.spec b/python-urllib3.spec index 29da836..2fc5a82 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,12 +5,17 @@ Name: python-%{srcname} Version: 1.26.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT URL: https://github.com/urllib3/urllib3 Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz + +# Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython +# See: https://github.com/python/cpython/issues/96931 +Patch: https://github.com/urllib3/urllib3/commit/4855d71.patch + BuildArch: noarch %description @@ -113,6 +118,10 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Tue May 16 2023 Tomáš Hrnčiar - 1.26.12-3 +- Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython +- Fixes: rhbz#2203773 + * Fri Jan 20 2023 Fedora Release Engineering - 1.26.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 794c8daefaf6fc4b515a5f946d1fdabaf8f7530e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 May 2023 17:47:00 -0400 Subject: [PATCH 30/82] Disable tests by default in RHEL builds RHEL does not include the test dependencies. This is based on c9s: https://gitlab.com/redhat/centos-stream/rpms/python-urllib3/-/commit/dca5fdb5e0f604b971c17f713cd26a987a6f5398 --- python-urllib3.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 2fc5a82..75a4afa 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,11 +1,16 @@ %global srcname urllib3 # When bootstrapping Python, we cannot test this yet +# RHEL does not include the test dependencies +%if 0%{?rhel} +%bcond_with tests +%else %bcond_without tests +%endif Name: python-%{srcname} Version: 1.26.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -118,6 +123,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 +- Disable tests by default in RHEL builds + * Tue May 16 2023 Tomáš Hrnčiar - 1.26.12-3 - Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython - Fixes: rhbz#2203773 From 788484c3169ddbcdf98f0de50530fad7d734b19b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 21 May 2023 10:17:38 -0400 Subject: [PATCH 31/82] Remove unused backport source --- ssl_match_hostname_py3.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 ssl_match_hostname_py3.py diff --git a/ssl_match_hostname_py3.py b/ssl_match_hostname_py3.py deleted file mode 100644 index 99d425a..0000000 --- a/ssl_match_hostname_py3.py +++ /dev/null @@ -1 +0,0 @@ -from ssl import match_hostname, CertificateError From 1335afad42aad00b1e76c8edba16914817b414ac Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 09:07:33 -0400 Subject: [PATCH 32/82] Confirm the License is SPDX MIT --- python-urllib3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 75a4afa..fb6803f 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -10,9 +10,10 @@ Name: python-%{srcname} Version: 1.26.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post +# SPDX License: MIT URL: https://github.com/urllib3/urllib3 Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz @@ -123,6 +124,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog +* Thu May 18 2023 Benjamin A. Beasley - 1.26.12-5 +- Confirm the License is SPDX MIT + * Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 - Disable tests by default in RHEL builds From 43abf0a6171a67441a75b62310bd03faf550de1d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 09:10:16 -0400 Subject: [PATCH 33/82] Update Summary and description based on upstream --- python-urllib3.spec | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index fb6803f..fc956df 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -11,7 +11,7 @@ Name: python-%{srcname} Version: 1.26.12 Release: 5%{?dist} -Summary: Python HTTP library with thread-safe connection pooling and file post +Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX License: MIT @@ -24,11 +24,24 @@ Patch: https://github.com/urllib3/urllib3/commit/4855d71.patch BuildArch: noarch -%description -Python HTTP module with connection pooling and file POST abilities. +%global _description %{expand: +urllib3 is a powerful, user-friendly HTTP client for Python. urllib3 brings +many critical features that are missing from the Python standard libraries: + + • Thread safety. + • Connection pooling. + • Client-side SSL/TLS verification. + • File uploads with multipart encoding. + • Helpers for retrying requests and dealing with HTTP redirects. + • Support for gzip, deflate, brotli, and zstd encoding. + • Proxy support for HTTP and SOCKS. + • 100% test coverage.} + +%description %{_description} + %package -n python3-%{srcname} -Summary: Python3 HTTP library with thread-safe connection pooling and file post +Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -49,8 +62,7 @@ Requires: python3-idna Requires: python3-six >= 1.16.0 Requires: python3-pysocks -%description -n python3-%{srcname} -Python3 HTTP module with connection pooling and file POST abilities. +%description -n python3-%{srcname} %{_description} %prep @@ -126,6 +138,7 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %changelog * Thu May 18 2023 Benjamin A. Beasley - 1.26.12-5 - Confirm the License is SPDX MIT +- Update Summary and description based on upstream * Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 - Disable tests by default in RHEL builds From 71553419abb910ac9169b9f7582f3503299fdf4d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 09:11:54 -0400 Subject: [PATCH 34/82] Stop numbering the Source --- python-urllib3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index fc956df..abde2b2 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -16,7 +16,7 @@ Summary: HTTP library with thread-safe connection pooling, file post, and # SPDX License: MIT URL: https://github.com/urllib3/urllib3 -Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Source: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz # Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython # See: https://github.com/python/cpython/issues/96931 From 91662c8644e09aff7f048f06c088084d92a9ac9a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 09:22:00 -0400 Subject: [PATCH 35/82] Add metapackages for brotli and socks extras --- python-urllib3.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index abde2b2..e9f3320 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -45,6 +45,13 @@ Summary: %{summary} BuildRequires: python3-devel BuildRequires: python3-setuptools + +# “brotli” extra (BuildRequire to avoid failure to install the extra metapackage) +BuildRequires: %{py3_dist brotli} >= 1.0.9 + +# “socks” extra (BuildRequire to avoid failure to install the extra metapackage) +BuildRequires: (%{py3_dist PySocks} >= 1.5.6 with %{py3_dist PySocks} < 2) + %if %{with tests} BuildRequires: python3-dateutil BuildRequires: python3-six @@ -59,12 +66,22 @@ BuildRequires: python3-idna Requires: ca-certificates Requires: python3-idna +# Unbundled Requires: python3-six >= 1.16.0 -Requires: python3-pysocks +# There has historically been a manual hard dependency on python3-pysocks; +# since bringing it in is the sole function of python3-urllib3+socks, we just +# depend on that instead. +Requires: python3-%{srcname}+socks = %{version}-%{release} %description -n python3-%{srcname} %{_description} +# We do NOT package the “secure” extra because it is deprecated; see: +# “Deprecate the pyOpenSSL TLS implementation and [secure] extra” +# https://github.com/urllib3/urllib3/issues/2680 +%python_extras_subpkg -n python3-%{srcname} -i %{python3_sitelib}/*.egg-info brotli socks + + %prep %autosetup -p1 -n %{srcname}-%{version} # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. @@ -139,6 +156,7 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ * Thu May 18 2023 Benjamin A. Beasley - 1.26.12-5 - Confirm the License is SPDX MIT - Update Summary and description based on upstream +- Add metapackages for brotli and socks extras * Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 - Disable tests by default in RHEL builds From 0b52151511b33d039061526989e1979476191b0a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 10:07:51 -0400 Subject: [PATCH 36/82] Ignore unwanted tests instead of removing the files --- python-urllib3.spec | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index e9f3320..3243736 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -102,24 +102,12 @@ Requires: python3-%{srcname}+socks = %{version}-%{release} recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d") sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py -# Drop the dummyserver tests in koji. They fail there in real builds, but not -# in scratch builds (weird). -rm -rf test/with_dummyserver/ -# Don't run the Google App Engine tests -rm -rf test/appengine/ -# Lots of these tests started failing, even for old versions, so it has something -# to do with Fedora in particular. They don't fail in upstream build infrastructure -rm -rf test/contrib/ - -# Tests for Python built without SSL, but Fedora builds with SSL. These tests -# fail when combined with the unbundling of backports-ssl_match_hostname -rm -f test/test_no_ssl.py - # Use the standard library instead of a backport sed -i -e 's/^import mock/from unittest import mock/' \ -e 's/^from mock import /from unittest.mock import /' \ test/*.py docs/conf.py + %build %py3_build @@ -141,7 +129,18 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %if %{with tests} %check -%pytest -v +# Drop the dummyserver tests in koji. They fail there in real builds, but not +# in scratch builds (weird). +ignore="${ignore-} --ignore=test/with_dummyserver/" +# Don't run the Google App Engine tests +ignore="${ignore-} --ignore=test/appengine/" +# Lots of these tests started failing, even for old versions, so it has something +# to do with Fedora in particular. They don't fail in upstream build infrastructure +ignore="${ignore-} --ignore=test/contrib/" +# Tests for Python built without SSL, but Fedora builds with SSL. These tests +# fail when combined with the unbundling of backports-ssl_match_hostname +ignore="${ignore-} --ignore=test/test_no_ssl.py" +%pytest -v ${ignore-} %endif From 1fd31e84440bbed6f1fc2e892032adc61085bc60 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 10:22:41 -0400 Subject: [PATCH 37/82] Port to pyproject-rpm-macros --- python-urllib3.spec | 95 +++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 3243736..3b67ad2 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,5 +1,3 @@ -%global srcname urllib3 - # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %if 0%{?rhel} @@ -8,7 +6,7 @@ %bcond_without tests %endif -Name: python-%{srcname} +Name: python-urllib3 Version: 1.26.12 Release: 5%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -16,7 +14,7 @@ Summary: HTTP library with thread-safe connection pooling, file post, and # SPDX License: MIT URL: https://github.com/urllib3/urllib3 -Source: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +Source: %{url}/archive/%{version}/urllib3-%{version}.tar.gz # Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython # See: https://github.com/python/cpython/issues/96931 @@ -24,6 +22,35 @@ Patch: https://github.com/urllib3/urllib3/commit/4855d71.patch BuildArch: noarch +BuildRequires: python3-devel + +%if %{with tests} +# Test dependencies are listed only in dev-requirements.txt. Because there are +# linters and coverage tools mixed in, and exact versions are pinned, we resort +# to manual listing. +# mock==3.0.5: patched out in %%prep +# coverage~=6.0;python_version>="3.6": omitted linter/coverage tool +# tornado==6.1.0;python_version>="3.6" +BuildRequires: %{py3_dist tornado} >= 6.1 +# PySocks==1.7.1 +BuildRequires: %{py3_dist PySocks} >= 1.7.1 +# win-inet-pton==1.1.0: Windows-only workaround +# pytest==6.2.4; python_version>="3.10" +BuildRequires: %{py3_dist pytest} >= 6.2.4 +# pytest-timeout==1.4.2 +BuildRequires: %{py3_dist pytest-timeout} >= 1.4.2 +# pytest-freezegun==0.4.2 +BuildRequires: %{py3_dist pytest-freezegun} >= 0.4.2 +# flaky==3.7.0: not really required +# trustme==0.7.0 +BuildRequires: %{py3_dist trustme} >= 0.7 +# cryptography==38.0.3;python_version>="3.6": associated with the deprecated +# “secure” extra +# python-dateutil==2.8.1 +BuildRequires: %{py3_dist python-dateutil} >= 2.8.1 +# gcp-devrel-py-tools==0.0.16: not used in offline testing +%endif + %global _description %{expand: urllib3 is a powerful, user-friendly HTTP client for Python. urllib3 brings many critical features that are missing from the Python standard libraries: @@ -40,50 +67,36 @@ many critical features that are missing from the Python standard libraries: %description %{_description} -%package -n python3-%{srcname} +%package -n python3-urllib3 Summary: %{summary} -BuildRequires: python3-devel -BuildRequires: python3-setuptools - -# “brotli” extra (BuildRequire to avoid failure to install the extra metapackage) -BuildRequires: %{py3_dist brotli} >= 1.0.9 - -# “socks” extra (BuildRequire to avoid failure to install the extra metapackage) -BuildRequires: (%{py3_dist PySocks} >= 1.5.6 with %{py3_dist PySocks} < 2) - -%if %{with tests} -BuildRequires: python3-dateutil -BuildRequires: python3-six -BuildRequires: python3-pysocks -BuildRequires: python3-pytest -BuildRequires: python3-pytest-freezegun -BuildRequires: python3-pytest-timeout -BuildRequires: python3-tornado -BuildRequires: python3-trustme -BuildRequires: python3-idna -%endif - +BuildRequires: ca-certificates Requires: ca-certificates -Requires: python3-idna + +# There has historically been a manual hard dependency on python3-idna. +BuildRequires: %{py3_dist idna} +Requires: %{py3_dist idna} + # Unbundled -Requires: python3-six >= 1.16.0 +BuildRequires: %{py3_dist six} >= 1.16 +Requires: %{py3_dist six} >= 1.16 + # There has historically been a manual hard dependency on python3-pysocks; # since bringing it in is the sole function of python3-urllib3+socks, we just # depend on that instead. -Requires: python3-%{srcname}+socks = %{version}-%{release} +Requires: python3-urllib3+socks = %{version}-%{release} -%description -n python3-%{srcname} %{_description} +%description -n python3-urllib3 %{_description} # We do NOT package the “secure” extra because it is deprecated; see: # “Deprecate the pyOpenSSL TLS implementation and [secure] extra” # https://github.com/urllib3/urllib3/issues/2680 -%python_extras_subpkg -n python3-%{srcname} -i %{python3_sitelib}/*.egg-info brotli socks +%pyproject_extras_subpkg -n python3-urllib3 brotli socks %prep -%autosetup -p1 -n %{srcname}-%{version} +%autosetup -p1 -n urllib3-%{version} # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date # (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either, @@ -108,12 +121,18 @@ sed -i -e 's/^import mock/from unittest import mock/' \ test/*.py docs/conf.py +%generate_buildrequires +# Generate BR’s from packaged extras even when tests are disabled, to ensure +# the extras metapackages are installable if the build succeeds. +%pyproject_buildrequires -x brotli,socks + + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install # Unbundle the Python 3 build rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py @@ -126,6 +145,8 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1 ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ +%pyproject_save_files urllib3 + %if %{with tests} %check @@ -144,11 +165,8 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %endif -%files -n python3-%{srcname} -%license LICENSE.txt +%files -n python3-urllib3 -f %{pyproject_files} %doc CHANGES.rst README.rst -%{python3_sitelib}/urllib3/ -%{python3_sitelib}/urllib3-*.egg-info/ %changelog @@ -156,6 +174,7 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" - Confirm the License is SPDX MIT - Update Summary and description based on upstream - Add metapackages for brotli and socks extras +- Port to pyproject-rpm-macros * Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 - Disable tests by default in RHEL builds From 071f6c97d5c89a47da2dc7d6b41aec352f73fd96 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 10:35:20 -0400 Subject: [PATCH 38/82] Update to 1.26.15 --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4aead00..8a133f4 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /urllib3-1.26.8.tar.gz /urllib3-1.26.9.tar.gz /urllib3-1.26.12.tar.gz +/urllib3-1.26.15.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 3b67ad2..0a35290 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -7,8 +7,8 @@ %endif Name: python-urllib3 -Version: 1.26.12 -Release: 5%{?dist} +Version: 1.26.15 +Release: 1%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -170,6 +170,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Thu May 18 2023 Benjamin A. Beasley - 1.26.15-1 +- Update to 1.26.15 + * Thu May 18 2023 Benjamin A. Beasley - 1.26.12-5 - Confirm the License is SPDX MIT - Update Summary and description based on upstream diff --git a/sources b/sources index 775ec39..0b52ef1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.12.tar.gz) = 71b4b14782d336a3fc187bb82197be02f06acfca06569e4ae2b73edb64cde2f30fded65eb36a9cbac6172e7c90a49f6d2283c6b9cb27f215e111ae49cf41850f +SHA512 (urllib3-1.26.15.tar.gz) = edd52a05049a047b1bb913de1cc211a6f7b70802e9ddcb639a973fb910bf218210577a5375077b6569ef382c07668ad6057adb67a31475125c2e5517c603131d From d2128231a6880511dc95576a86bcf5e72491231f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 00:03:30 +0200 Subject: [PATCH 39/82] Bootstrap for Python 3.12 --- python-urllib3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 0a35290..83ab3ae 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %if 0%{?rhel} @@ -8,7 +9,7 @@ Name: python-urllib3 Version: 1.26.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -170,6 +171,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Tue Jun 13 2023 Python Maint - 1.26.15-2 +- Bootstrap for Python 3.12 + * Thu May 18 2023 Benjamin A. Beasley - 1.26.15-1 - Update to 1.26.15 From 6d2b685706ebd604b287f129b3abb916cb601322 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 1 Jul 2023 13:04:01 +0200 Subject: [PATCH 40/82] Rebuilt for Python 3.12 --- python-urllib3.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 83ab3ae..7f4ef5d 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %if 0%{?rhel} @@ -9,7 +8,7 @@ Name: python-urllib3 Version: 1.26.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -171,6 +170,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Sat Jul 01 2023 Python Maint - 1.26.15-3 +- Rebuilt for Python 3.12 + * Tue Jun 13 2023 Python Maint - 1.26.15-2 - Bootstrap for Python 3.12 From 69d07b0bcf2fa88d3cb57b5d01742601442821dc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Jun 2023 19:52:14 -0400 Subject: [PATCH 41/82] Update to 1.26.16 --- .gitignore | 1 + 4855d71.patch | 28 ---------------------------- python-urllib3.spec | 13 ++++++------- sources | 2 +- 4 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 4855d71.patch diff --git a/.gitignore b/.gitignore index 8a133f4..282aa2f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /urllib3-1.26.9.tar.gz /urllib3-1.26.12.tar.gz /urllib3-1.26.15.tar.gz +/urllib3-1.26.16.tar.gz diff --git a/4855d71.patch b/4855d71.patch deleted file mode 100644 index 22945ff..0000000 --- a/4855d71.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4855d71ad5535bdff47a0dc5cfe09fb610ff6576 Mon Sep 17 00:00:00 2001 -From: Thomas Grainger -Date: Sat, 15 Apr 2023 20:41:24 +0100 -Subject: [PATCH] Fix test_ssl_object_attributes - -Co-authored-by: Seth Michael Larson ---- - test/test_ssltransport.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/test/test_ssltransport.py b/test/test_ssltransport.py -index a3b7381639..cace51db96 100644 ---- a/test/test_ssltransport.py -+++ b/test/test_ssltransport.py -@@ -229,8 +229,11 @@ def test_ssl_object_attributes(self) -> None: - assert ssock.selected_npn_protocol() is None - - shared_ciphers = ssock.shared_ciphers() -- assert type(shared_ciphers) == list -- assert len(shared_ciphers) > 0 -+ # SSLContext.shared_ciphers() changed behavior completely in a patch version. -+ # See: https://github.com/python/cpython/issues/96931 -+ assert shared_ciphers is None or ( -+ type(shared_ciphers) is list and len(shared_ciphers) > 0 -+ ) - - assert ssock.compression() is None - diff --git a/python-urllib3.spec b/python-urllib3.spec index 7f4ef5d..8d9d29c 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -7,8 +7,8 @@ %endif Name: python-urllib3 -Version: 1.26.15 -Release: 3%{?dist} +Version: 1.26.16 +Release: 1%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -16,10 +16,6 @@ License: MIT URL: https://github.com/urllib3/urllib3 Source: %{url}/archive/%{version}/urllib3-%{version}.tar.gz -# Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython -# See: https://github.com/python/cpython/issues/96931 -Patch: https://github.com/urllib3/urllib3/commit/4855d71.patch - BuildArch: noarch BuildRequires: python3-devel @@ -96,7 +92,7 @@ Requires: python3-urllib3+socks = %{version}-%{release} %prep -%autosetup -p1 -n urllib3-%{version} +%autosetup -n urllib3-%{version} # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date # (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either, @@ -170,6 +166,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Sat Jul 01 2023 Benjamin A. Beasley - 1.26.16-1 +- Update to 1.26.16 + * Sat Jul 01 2023 Python Maint - 1.26.15-3 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 0b52ef1..81f5417 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.15.tar.gz) = edd52a05049a047b1bb913de1cc211a6f7b70802e9ddcb639a973fb910bf218210577a5375077b6569ef382c07668ad6057adb67a31475125c2e5517c603131d +SHA512 (urllib3-1.26.16.tar.gz) = 47cb993acabf169470448bc91b1a0d1fb4df6e60bf97ce6fb06f5397935f33f693cd0851a663fb36a7c5a4b19ed4dbcc0fcce9f45839315354a013f41d837f7a From f382cf50f897958083987848a9dcaec6d3835250 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 15:06:09 +0000 Subject: [PATCH 42/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 8d9d29c..55307b5 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -8,7 +8,7 @@ Name: python-urllib3 Version: 1.26.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -166,6 +166,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.26.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jul 01 2023 Benjamin A. Beasley - 1.26.16-1 - Update to 1.26.16 From d140ead59776cdb21f32eebc6c1a14267655f214 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 30 Aug 2023 14:31:02 -0400 Subject: [PATCH 43/82] Use bundled six Unbundling python modules through symlinks is clumsy at best, and potentially error-prone; for example when built for flatpaks, urllib3 and six are not necessarily in the same prefix. The bundled six is kept current, so there is no harm in bundling with the required declaration. --- python-urllib3.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 55307b5..3197ecc 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -8,7 +8,7 @@ Name: python-urllib3 Version: 1.26.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -73,9 +73,8 @@ Requires: ca-certificates BuildRequires: %{py3_dist idna} Requires: %{py3_dist idna} -# Unbundled -BuildRequires: %{py3_dist six} >= 1.16 -Requires: %{py3_dist six} >= 1.16 +# grep __version__ src/urllib3/packages/six.py +Provides: bundled(python3dist(six)) = 1.16.0 # There has historically been a manual hard dependency on python3-pysocks; # since bringing it in is the sole function of python3-urllib3+socks, we just @@ -130,17 +129,6 @@ sed -i -e 's/^import mock/from unittest import mock/' \ %install %pyproject_install -# Unbundle the Python 3 build -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py -rm -rf %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/six.* - -mkdir -p %{buildroot}/%{python3_sitelib}/urllib3/packages/ -ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages/six.py -ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc \ - %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ -ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \ - %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ - %pyproject_save_files urllib3 @@ -166,6 +154,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Wed Aug 30 2023 Yaakov Selkowitz - 1.26.16-3 +- Use bundled six + * Fri Jul 21 2023 Fedora Release Engineering - 1.26.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 20e01faab849c3cb626aea93faec4db4db4f515d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 2 Oct 2023 14:14:57 -0400 Subject: [PATCH 44/82] Update to 1.26.17: fix CVE-2023-43804 (GHSA-v845-jxx5-vc9f) --- .gitignore | 1 + python-urllib3.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 282aa2f..67a6808 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /urllib3-1.26.12.tar.gz /urllib3-1.26.15.tar.gz /urllib3-1.26.16.tar.gz +/urllib3-1.26.17.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 3197ecc..59cf01b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -7,8 +7,8 @@ %endif Name: python-urllib3 -Version: 1.26.16 -Release: 3%{?dist} +Version: 1.26.17 +Release: 1%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -154,6 +154,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Mon Oct 02 2023 Benjamin A. Beasley - 1.26.17-1 +- Update to 1.26.17: fix CVE-2023-43804 (GHSA-v845-jxx5-vc9f) + * Wed Aug 30 2023 Yaakov Selkowitz - 1.26.16-3 - Use bundled six diff --git a/sources b/sources index 81f5417..3272333 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.16.tar.gz) = 47cb993acabf169470448bc91b1a0d1fb4df6e60bf97ce6fb06f5397935f33f693cd0851a663fb36a7c5a4b19ed4dbcc0fcce9f45839315354a013f41d837f7a +SHA512 (urllib3-1.26.17.tar.gz) = ee235b2e31c34f26ab872623ef17a1119c9776c5a1bf0b4eb5ec92139de7c585dcf3cf90bfc2c6e1db5a1819aafbe6e732a8c540a4ae64ed7659267906c09768 From 85ab608837e5aa04cddf6d38e90a779f06ca5e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Oct 2023 19:45:30 +0200 Subject: [PATCH 45/82] Switch the hardcoded dependency on urllib3[socks] to a weak one --- python-urllib3.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 59cf01b..1a072df 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -8,7 +8,7 @@ Name: python-urllib3 Version: 1.26.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -77,9 +77,9 @@ Requires: %{py3_dist idna} Provides: bundled(python3dist(six)) = 1.16.0 # There has historically been a manual hard dependency on python3-pysocks; -# since bringing it in is the sole function of python3-urllib3+socks, we just -# depend on that instead. -Requires: python3-urllib3+socks = %{version}-%{release} +# since bringing it in is the sole function of python3-urllib3+socks, +# we recommend it, so it is installed by default. +Recommends: python3-urllib3+socks %description -n python3-urllib3 %{_description} @@ -154,6 +154,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Mon Oct 09 2023 Miro Hrončok - 1.26.17-2 +- Switch the hardcoded dependency on urllib3[socks] to a weak one + * Mon Oct 02 2023 Benjamin A. Beasley - 1.26.17-1 - Update to 1.26.17: fix CVE-2023-43804 (GHSA-v845-jxx5-vc9f) From 04a972bc7a6a690a1009163b161ba97a723b2e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Oct 2023 19:49:30 +0200 Subject: [PATCH 46/82] Don't package urllib3[socks] and urrlib3[brotli] on RHEL It appears that pysocks is only in RHEL because of this package. Now went he hardcoded runtime dependency was dropped, we can remove the package from RHEL by not packaging extras here. --- python-urllib3.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 1a072df..1b28ed5 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,9 +1,11 @@ # When bootstrapping Python, we cannot test this yet -# RHEL does not include the test dependencies +# RHEL does not include the test dependencies and the dependencies for extras %if 0%{?rhel} %bcond_with tests +%bcond_with extras %else %bcond_without tests +%bcond_without extras %endif Name: python-urllib3 @@ -76,18 +78,22 @@ Requires: %{py3_dist idna} # grep __version__ src/urllib3/packages/six.py Provides: bundled(python3dist(six)) = 1.16.0 +%if %{with extras} # There has historically been a manual hard dependency on python3-pysocks; # since bringing it in is the sole function of python3-urllib3+socks, # we recommend it, so it is installed by default. Recommends: python3-urllib3+socks +%endif %description -n python3-urllib3 %{_description} +%if %{with extras} # We do NOT package the “secure” extra because it is deprecated; see: # “Deprecate the pyOpenSSL TLS implementation and [secure] extra” # https://github.com/urllib3/urllib3/issues/2680 %pyproject_extras_subpkg -n python3-urllib3 brotli socks +%endif %prep @@ -119,7 +125,7 @@ sed -i -e 's/^import mock/from unittest import mock/' \ %generate_buildrequires # Generate BR’s from packaged extras even when tests are disabled, to ensure # the extras metapackages are installable if the build succeeds. -%pyproject_buildrequires -x brotli,socks +%pyproject_buildrequires %{?with_extras:-x brotli,socks} %build From 3ddc523acde262c738e093d8fdd9cb23793c24d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Oct 2023 20:25:56 +0200 Subject: [PATCH 47/82] Always perform at least a basic import check in %check --- python-urllib3.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 1b28ed5..39c7baa 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -138,8 +138,16 @@ sed -i -e 's/^import mock/from unittest import mock/' \ %pyproject_save_files urllib3 -%if %{with tests} %check +# urllib3.contrib.socks requires urllib3[socks] +# urllib3.contrib.ntlmpool is deprecated and requires ntlm +# urllib3.contrib.securetransport is macOS only +# urllib3.contrib.pyopenssl requires urllib3[secure] +%{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks} + -e urllib3.contrib.ntlmpool + -e urllib3.contrib.securetransport + -e urllib3.contrib.pyopenssl} +%if %{with tests} # Drop the dummyserver tests in koji. They fail there in real builds, but not # in scratch builds (weird). ignore="${ignore-} --ignore=test/with_dummyserver/" From 0502dda22208c4e09903ec551f0f705ca23329b5 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 17 Oct 2023 15:28:43 -0500 Subject: [PATCH 48/82] Update to 1.26.18. Mitigates CVE-2023-45803 / GHSA-g4mx-q9vg-27p4. Ref: https://github.com/advisories/GHSA-g4mx-q9vg-27p4 --- .gitignore | 1 + python-urllib3.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 67a6808..1a390e6 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /urllib3-1.26.15.tar.gz /urllib3-1.26.16.tar.gz /urllib3-1.26.17.tar.gz +/urllib3-1.26.18.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 39c7baa..cadf132 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,8 +9,8 @@ %endif Name: python-urllib3 -Version: 1.26.17 -Release: 2%{?dist} +Version: 1.26.18 +Release: 1%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -168,6 +168,10 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Tue Oct 17 2023 Maxwell G - 1.26.18-1 +- Update to 1.26.18. +- Mitigates CVE-2023-45803 / GHSA-g4mx-q9vg-27p4. + * Mon Oct 09 2023 Miro Hrončok - 1.26.17-2 - Switch the hardcoded dependency on urllib3[socks] to a weak one diff --git a/sources b/sources index 3272333..a21e385 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.17.tar.gz) = ee235b2e31c34f26ab872623ef17a1119c9776c5a1bf0b4eb5ec92139de7c585dcf3cf90bfc2c6e1db5a1819aafbe6e732a8c540a4ae64ed7659267906c09768 +SHA512 (urllib3-1.26.18.tar.gz) = 62c0af4b11e797a85420ef3f0888f2e608334329eddd88b9fe563b5437189cbea8dbbcd53f999557d9828fcf4bf03b8ca9f6e3d401533bc4ae8ff96e3ece1557 From 4d2892fa649c697fa3d218d2805c0777296d3781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 08:43:57 +0000 Subject: [PATCH 49/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index cadf132..207e3d4 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -10,7 +10,7 @@ Name: python-urllib3 Version: 1.26.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -168,6 +168,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.26.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 17 2023 Maxwell G - 1.26.18-1 - Update to 1.26.18. - Mitigates CVE-2023-45803 / GHSA-g4mx-q9vg-27p4. From d773ad3430432c32240a046cfb4e498ebb44bc48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 12:28:10 +0000 Subject: [PATCH 50/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-urllib3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 207e3d4..1386c49 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -10,7 +10,7 @@ Name: python-urllib3 Version: 1.26.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -168,6 +168,9 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.26.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.26.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 23891381310d4a905b059fc36dc052cdf8cb4720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 29 Jan 2024 15:42:15 +0100 Subject: [PATCH 51/82] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 362 +++++++++++++++++++++++++++++++++++++++++++ python-urllib3.spec | 365 +------------------------------------------- 2 files changed, 364 insertions(+), 363 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..cb8c68f --- /dev/null +++ b/changelog @@ -0,0 +1,362 @@ +* Fri Jan 26 2024 Fedora Release Engineering - 1.26.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.26.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 17 2023 Maxwell G - 1.26.18-1 +- Update to 1.26.18. +- Mitigates CVE-2023-45803 / GHSA-g4mx-q9vg-27p4. + +* Mon Oct 09 2023 Miro Hrončok - 1.26.17-2 +- Switch the hardcoded dependency on urllib3[socks] to a weak one + +* Mon Oct 02 2023 Benjamin A. Beasley - 1.26.17-1 +- Update to 1.26.17: fix CVE-2023-43804 (GHSA-v845-jxx5-vc9f) + +* Wed Aug 30 2023 Yaakov Selkowitz - 1.26.16-3 +- Use bundled six + +* Fri Jul 21 2023 Fedora Release Engineering - 1.26.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jul 01 2023 Benjamin A. Beasley - 1.26.16-1 +- Update to 1.26.16 + +* Sat Jul 01 2023 Python Maint - 1.26.15-3 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 1.26.15-2 +- Bootstrap for Python 3.12 + +* Thu May 18 2023 Benjamin A. Beasley - 1.26.15-1 +- Update to 1.26.15 + +* Thu May 18 2023 Benjamin A. Beasley - 1.26.12-5 +- Confirm the License is SPDX MIT +- Update Summary and description based on upstream +- Add metapackages for brotli and socks extras +- Port to pyproject-rpm-macros + +* Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 +- Disable tests by default in RHEL builds + +* Tue May 16 2023 Tomáš Hrnčiar - 1.26.12-3 +- Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython +- Fixes: rhbz#2203773 + +* Fri Jan 20 2023 Fedora Release Engineering - 1.26.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Sep 15 2022 Kevin Fenzi - 1.26.12-1 +- Update to 1.26.12. Fixes rhbz#2104964 + +* Fri Jul 22 2022 Fedora Release Engineering - 1.26.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 14 2022 Python Maint - 1.26.9-3 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 1.26.9-2 +- Bootstrap for Python 3.11 + +* Mon May 30 2022 Kevin Fenzi - 1.26.9-1 +- Update to 1.26.9. fixes rhbz#2064777 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.26.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 Kevin Fenzi - 1.26.8-1 +- Update to 1.26.8. Fixes rhbz#2038246 + +* Tue Jan 04 2022 Adam Williamson - 1.26.7-2 +- Stop unbundling ssl.match_hostname, it's deprecated upstream (#2009550) + +* Sun Sep 26 2021 Kevin Fenzi - 1.26.7-1 +- Update to 1.26.7. Fixes rhbz#2006973 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.26.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jul 11 2021 Kevin Fenzi - 1.26.6-1 +- Update to 1.26.1. Fixes rhbz#1976190 +- Fix FTBFS. Fixes rhbz#1966120 + +* Wed Jun 30 2021 Yatin Karel - 1.26.5-2 +- Update minimal requirement of six to >= 1.16.0 + +* Wed Jun 16 2021 Karolina Surma - 1.26.5-1 +- Update to 1.26.5 +- Fixes rhbz#1965056 + +* Fri Jun 04 2021 Python Maint - 1.26.4-3 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 1.26.4-2 +- Bootstrap for Python 3.10 + +* Tue May 18 2021 Miro Hrončok - 1.26.4-1 +- Update to 1.26.4 +- Fixes rhbz#1889391 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.25.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 15 2021 Miro Hrončok - 1.25.10-3 +- Drop redundant BuildRequires for nose +- Instead of the mock backport, use unittest.mock from the standard library + +* Tue Jan 05 2021 Anna Khaitovich - 1.25.10-2 +- Update RECENT_DATE dynamically + +* Sun Sep 27 2020 Kevin Fenzi - 1.25.10-1 +- Update to 1.25.10. Fixed bug #1824900 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.25.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 1.25.8-3 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 1.25.8-2 +- Bootstrap for Python 3.9 + +* Sun Mar 22 2020 Carl George - 1.25.8-1 +- Latest upstream rhbz#1771186 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.25.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 18 2019 Miro Hrončok - 1.25.7-2 +- Subpackage python2-urllib3 has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Tue Oct 15 2019 Jeremy Cline - 1.25.6-1 +- Update to v1.25.6 + +* Thu Oct 03 2019 Miro Hrončok - 1.25.3-7 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Sun Aug 18 2019 Miro Hrončok - 1.25.3-6 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 1.25.3-5 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.25.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 08 2019 Miro Hrončok - 1.25.3-3 +- Set RECENT_DATE not to be older than 2 years (#1727796) + +* Tue May 28 2019 Jeremy Cline - 1.25.3-2 +- Drop the Python 2 tests since Tornado is going away + +* Tue May 28 2019 Jeremy Cline - 1.25.3-1 +- Update to 1.25.3 + +* Sat Feb 02 2019 Fedora Release Engineering - 1.24.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Nov 13 2018 Jeremy Cline - 1.24.1-2 +- Adjust unbundling of ssl_match_hostname + +* Mon Oct 29 2018 Jeremy Cline - 1.24.1-1 +- Update to v1.24.1 + +* Wed Jun 20 2018 Lumír Balhar - 1.23-4 +- Removed unneeded dependency python[23]-psutil + +* Mon Jun 18 2018 Miro Hrončok - 1.23-3 +- Rebuilt for Python 3.7 + +* Thu Jun 14 2018 Miro Hrončok - 1.23-2 +- Bootstrap for Python 3.7 + +* Tue Jun 05 2018 Jeremy Cline - 1.23-1 +- Update to the latest upstream release (rhbz 1586072) + +* Wed May 30 2018 Jeremy Cline - 1.22-10 +- Backport patch to support Python 3.7 (rhbz 1584112) + +* Thu May 03 2018 Lukas Slebodnik - 1.22-9 +- Do not lowercase hostnames with custom-protocol (rhbz 1567862) +- upstream: https://github.com/urllib3/urllib3/issues/1267 + +* Wed Apr 18 2018 Jeremy Cline - 1.22-8 +- Drop the dependency on idna and cryptography (rhbz 1567862) + +* Mon Apr 16 2018 Jeremy Cline - 1.22-7 +- Drop the dependency on PyOpenSSL, it's not needed (rhbz 1567862) + +* Fri Feb 09 2018 Fedora Release Engineering - 1.22-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Iryna Shcherbina - 1.22-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Thu Jan 25 2018 Tomas Hoger - 1.22-4 +- Fix FTBFS - Move RECENT_DATE to 2017-06-30 + +* Fri Dec 01 2017 Jeremy Cline - 1.22-3 +- Symlink the Python 3 bytecode for six (rbhz 1519147) + +* Thu Jul 27 2017 Fedora Release Engineering - 1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 21 2017 Jeremy Cline - 1.22-1 +- Update to 1.22 (#1473293) + +* Wed May 17 2017 Jeremy Cline - 1.21.1-1 +- Update to 1.21.1 (#1445280) + +* Thu Feb 09 2017 Jeremy Cline - 1.20-1 +- Update to 1.20 (#1414775) + +* Tue Dec 13 2016 Stratakis Charalampos - 1.19.1-2 +- Rebuild for Python 3.6 + +* Thu Nov 17 2016 Jeremy Cline 1.19.1-1 +- Update to 1.19.1 +- Clean up the specfile to only support Fedora 26 + +* Wed Aug 10 2016 Kevin Fenzi - 1.16-3 +- Rebuild now that python-requests is ready to update. + +* Tue Jul 19 2016 Fedora Release Engineering - 1.16-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 15 2016 Kevin Fenzi - 1.16-1 +- Update to 1.16 + +* Thu Jun 02 2016 Ralph Bean - 1.15.1-3 +- Create python2 subpackage to comply with guidelines. + +* Wed Jun 01 2016 Ralph Bean - 1.15.1-2 +- Remove broken symlinks to unbundled python3-six files + https://bugzilla.redhat.com/show_bug.cgi?id=1295015 + +* Fri Apr 29 2016 Ralph Bean - 1.15.1-1 +- Removed patch for ipv6 support, now applied upstream. +- Latest version. +- New dep on pysocks. + +* Fri Feb 26 2016 Ralph Bean - 1.13.1-3 +- Apply patch from upstream to fix ipv6. + +* Thu Feb 04 2016 Fedora Release Engineering - 1.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 21 2015 Ralph Bean - 1.13.1-1 +- new version + +* Fri Dec 18 2015 Ralph Bean - 1.13-1 +- new version + +* Mon Dec 14 2015 Ralph Bean - 1.12-1 +- new version + +* Thu Oct 15 2015 Robert Kuska - 1.10.4-7 +- Rebuilt for Python3.5 rebuild + +* Sat Oct 10 2015 Ralph Bean - 1.10.4-6 +- Sync from PyPI instead of a git checkout. + +* Tue Sep 08 2015 Ralph Bean - 1.10.4-5.20150503gita91975b +- Drop requirement on python-backports-ssl_match_hostname on F22 and newer. + +* Thu Jun 18 2015 Fedora Release Engineering - 1.10.4-4.20150503gita91975b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Jun 08 2015 Ralph Bean - 1.10.4-3.20150503gita91975b +- Apply pyopenssl injection for an outdated cpython as per upstream advice + https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning + https://urllib3.readthedocs.org/en/latest/security.html#pyopenssl + +* Tue May 19 2015 Ralph Bean - 1.10.4-2.20150503gita91975b +- Specify symlinks for six.py{c,o}, fixing rhbz #1222142. + +* Sun May 03 2015 Ralph Bean - 1.10.4-1.20150503gita91975b +- Latest release for python-requests-2.7.0 + +* Wed Apr 29 2015 Ralph Bean - 1.10.3-2.20150429git585983a +- Grab a git snapshot to get around this chunked encoding failure. + +* Wed Apr 22 2015 Ralph Bean - 1.10.3-1 +- new version + +* Thu Feb 26 2015 Ralph Bean - 1.10.2-1 +- new version + +* Wed Feb 18 2015 Ralph Bean - 1.10.1-1 +- new version + +* Wed Feb 18 2015 Ralph Bean - 1.10.1-1 +- new version + +* Mon Jan 05 2015 Ralph Bean - 1.10-2 +- Copy in a shim for ssl_match_hostname on python3. + +* Sun Dec 14 2014 Ralph Bean - 1.10-1 +- Latest upstream 1.10, for python-requests-2.5.0. +- Re-do unbundling without patch, with symlinks. +- Modernize python2 macros. +- Remove the with_dummyserver tests which fail only sometimes. + +* Wed Nov 05 2014 Ralph Bean - 1.9.1-1 +- Latest upstream, 1.9.1 for latest python-requests. + +* Mon Aug 4 2014 Tom Callaway - 1.8.2-4 +- fix license handling + +* Sun Jun 08 2014 Fedora Release Engineering - 1.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 14 2014 Bohuslav Kabrda - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Mon Apr 21 2014 Arun S A G - 1.8.2-1 +- Update to latest upstream version + +* Mon Oct 28 2013 Ralph Bean - 1.7.1-2 +- Update patch to find ca_certs in the correct location. + +* Wed Sep 25 2013 Ralph Bean - 1.7.1-1 +- Latest upstream with support for a new timeout class and py3.4. + +* Wed Aug 28 2013 Ralph Bean - 1.7-3 +- Bump release again, just to push an unpaired update. + +* Mon Aug 26 2013 Ralph Bean - 1.7-2 +- Bump release to pair an update with python-requests. + +* Thu Aug 22 2013 Ralph Bean - 1.7-1 +- Update to latest upstream. +- Removed the accept-header proxy patch which is included in upstream now. +- Removed py2.6 compat patch which is included in upstream now. + +* Sun Aug 04 2013 Fedora Release Engineering - 1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jun 11 2013 Toshio Kuratomi - 1.5-6 +- Fix Requires of python-ordereddict to only apply to RHEL + +* Fri Mar 1 2013 Toshio Kuratomi - 1.5-5 +- Unbundling finished! + +* Fri Mar 01 2013 Ralph Bean - 1.5-4 +- Upstream patch to fix Accept header when behind a proxy. +- Reorganize patch numbers to more clearly distinguish them. + +* Wed Feb 27 2013 Ralph Bean - 1.5-3 +- Renamed patches to python-urllib3-* +- Fixed ssl check patch to use the correct cert path for Fedora. +- Included dependency on ca-certificates +- Cosmetic indentation changes to the .spec file. + +* Tue Feb 5 2013 Toshio Kuratomi - 1.5-2 +- python3-tornado BR and run all unittests on python3 + +* Mon Feb 04 2013 Toshio Kuratomi 1.5-1 +- Initial fedora build. diff --git a/python-urllib3.spec b/python-urllib3.spec index 1386c49..f308e3b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -10,7 +10,7 @@ Name: python-urllib3 Version: 1.26.18 -Release: 3%{?dist} +Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX @@ -168,365 +168,4 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %changelog -* Fri Jan 26 2024 Fedora Release Engineering - 1.26.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.26.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Oct 17 2023 Maxwell G - 1.26.18-1 -- Update to 1.26.18. -- Mitigates CVE-2023-45803 / GHSA-g4mx-q9vg-27p4. - -* Mon Oct 09 2023 Miro Hrončok - 1.26.17-2 -- Switch the hardcoded dependency on urllib3[socks] to a weak one - -* Mon Oct 02 2023 Benjamin A. Beasley - 1.26.17-1 -- Update to 1.26.17: fix CVE-2023-43804 (GHSA-v845-jxx5-vc9f) - -* Wed Aug 30 2023 Yaakov Selkowitz - 1.26.16-3 -- Use bundled six - -* Fri Jul 21 2023 Fedora Release Engineering - 1.26.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jul 01 2023 Benjamin A. Beasley - 1.26.16-1 -- Update to 1.26.16 - -* Sat Jul 01 2023 Python Maint - 1.26.15-3 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 1.26.15-2 -- Bootstrap for Python 3.12 - -* Thu May 18 2023 Benjamin A. Beasley - 1.26.15-1 -- Update to 1.26.15 - -* Thu May 18 2023 Benjamin A. Beasley - 1.26.12-5 -- Confirm the License is SPDX MIT -- Update Summary and description based on upstream -- Add metapackages for brotli and socks extras -- Port to pyproject-rpm-macros - -* Tue May 16 2023 Yaakov Selkowitz - 1.26.12-4 -- Disable tests by default in RHEL builds - -* Tue May 16 2023 Tomáš Hrnčiar - 1.26.12-3 -- Accomodate the test to the changed behavior of SSLContext.shared_ciphers() in CPython -- Fixes: rhbz#2203773 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.26.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Sep 15 2022 Kevin Fenzi - 1.26.12-1 -- Update to 1.26.12. Fixes rhbz#2104964 - -* Fri Jul 22 2022 Fedora Release Engineering - 1.26.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 14 2022 Python Maint - 1.26.9-3 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 1.26.9-2 -- Bootstrap for Python 3.11 - -* Mon May 30 2022 Kevin Fenzi - 1.26.9-1 -- Update to 1.26.9. fixes rhbz#2064777 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.26.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jan 08 2022 Kevin Fenzi - 1.26.8-1 -- Update to 1.26.8. Fixes rhbz#2038246 - -* Tue Jan 04 2022 Adam Williamson - 1.26.7-2 -- Stop unbundling ssl.match_hostname, it's deprecated upstream (#2009550) - -* Sun Sep 26 2021 Kevin Fenzi - 1.26.7-1 -- Update to 1.26.7. Fixes rhbz#2006973 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.26.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 11 2021 Kevin Fenzi - 1.26.6-1 -- Update to 1.26.1. Fixes rhbz#1976190 -- Fix FTBFS. Fixes rhbz#1966120 - -* Wed Jun 30 2021 Yatin Karel - 1.26.5-2 -- Update minimal requirement of six to >= 1.16.0 - -* Wed Jun 16 2021 Karolina Surma - 1.26.5-1 -- Update to 1.26.5 -- Fixes rhbz#1965056 - -* Fri Jun 04 2021 Python Maint - 1.26.4-3 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 1.26.4-2 -- Bootstrap for Python 3.10 - -* Tue May 18 2021 Miro Hrončok - 1.26.4-1 -- Update to 1.26.4 -- Fixes rhbz#1889391 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.25.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 15 2021 Miro Hrončok - 1.25.10-3 -- Drop redundant BuildRequires for nose -- Instead of the mock backport, use unittest.mock from the standard library - -* Tue Jan 05 2021 Anna Khaitovich - 1.25.10-2 -- Update RECENT_DATE dynamically - -* Sun Sep 27 2020 Kevin Fenzi - 1.25.10-1 -- Update to 1.25.10. Fixed bug #1824900 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.25.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun May 24 2020 Miro Hrončok - 1.25.8-3 -- Rebuilt for Python 3.9 - -* Fri May 22 2020 Miro Hrončok - 1.25.8-2 -- Bootstrap for Python 3.9 - -* Sun Mar 22 2020 Carl George - 1.25.8-1 -- Latest upstream rhbz#1771186 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.25.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Nov 18 2019 Miro Hrončok - 1.25.7-2 -- Subpackage python2-urllib3 has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Tue Oct 15 2019 Jeremy Cline - 1.25.6-1 -- Update to v1.25.6 - -* Thu Oct 03 2019 Miro Hrončok - 1.25.3-7 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Sun Aug 18 2019 Miro Hrončok - 1.25.3-6 -- Rebuilt for Python 3.8 - -* Thu Aug 15 2019 Miro Hrončok - 1.25.3-5 -- Bootstrap for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.25.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 08 2019 Miro Hrončok - 1.25.3-3 -- Set RECENT_DATE not to be older than 2 years (#1727796) - -* Tue May 28 2019 Jeremy Cline - 1.25.3-2 -- Drop the Python 2 tests since Tornado is going away - -* Tue May 28 2019 Jeremy Cline - 1.25.3-1 -- Update to 1.25.3 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.24.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Nov 13 2018 Jeremy Cline - 1.24.1-2 -- Adjust unbundling of ssl_match_hostname - -* Mon Oct 29 2018 Jeremy Cline - 1.24.1-1 -- Update to v1.24.1 - -* Wed Jun 20 2018 Lumír Balhar - 1.23-4 -- Removed unneeded dependency python[23]-psutil - -* Mon Jun 18 2018 Miro Hrončok - 1.23-3 -- Rebuilt for Python 3.7 - -* Thu Jun 14 2018 Miro Hrončok - 1.23-2 -- Bootstrap for Python 3.7 - -* Tue Jun 05 2018 Jeremy Cline - 1.23-1 -- Update to the latest upstream release (rhbz 1586072) - -* Wed May 30 2018 Jeremy Cline - 1.22-10 -- Backport patch to support Python 3.7 (rhbz 1584112) - -* Thu May 03 2018 Lukas Slebodnik - 1.22-9 -- Do not lowercase hostnames with custom-protocol (rhbz 1567862) -- upstream: https://github.com/urllib3/urllib3/issues/1267 - -* Wed Apr 18 2018 Jeremy Cline - 1.22-8 -- Drop the dependency on idna and cryptography (rhbz 1567862) - -* Mon Apr 16 2018 Jeremy Cline - 1.22-7 -- Drop the dependency on PyOpenSSL, it's not needed (rhbz 1567862) - -* Fri Feb 09 2018 Fedora Release Engineering - 1.22-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Iryna Shcherbina - 1.22-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Jan 25 2018 Tomas Hoger - 1.22-4 -- Fix FTBFS - Move RECENT_DATE to 2017-06-30 - -* Fri Dec 01 2017 Jeremy Cline - 1.22-3 -- Symlink the Python 3 bytecode for six (rbhz 1519147) - -* Thu Jul 27 2017 Fedora Release Engineering - 1.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Jeremy Cline - 1.22-1 -- Update to 1.22 (#1473293) - -* Wed May 17 2017 Jeremy Cline - 1.21.1-1 -- Update to 1.21.1 (#1445280) - -* Thu Feb 09 2017 Jeremy Cline - 1.20-1 -- Update to 1.20 (#1414775) - -* Tue Dec 13 2016 Stratakis Charalampos - 1.19.1-2 -- Rebuild for Python 3.6 - -* Thu Nov 17 2016 Jeremy Cline 1.19.1-1 -- Update to 1.19.1 -- Clean up the specfile to only support Fedora 26 - -* Wed Aug 10 2016 Kevin Fenzi - 1.16-3 -- Rebuild now that python-requests is ready to update. - -* Tue Jul 19 2016 Fedora Release Engineering - 1.16-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Jun 15 2016 Kevin Fenzi - 1.16-1 -- Update to 1.16 - -* Thu Jun 02 2016 Ralph Bean - 1.15.1-3 -- Create python2 subpackage to comply with guidelines. - -* Wed Jun 01 2016 Ralph Bean - 1.15.1-2 -- Remove broken symlinks to unbundled python3-six files - https://bugzilla.redhat.com/show_bug.cgi?id=1295015 - -* Fri Apr 29 2016 Ralph Bean - 1.15.1-1 -- Removed patch for ipv6 support, now applied upstream. -- Latest version. -- New dep on pysocks. - -* Fri Feb 26 2016 Ralph Bean - 1.13.1-3 -- Apply patch from upstream to fix ipv6. - -* Thu Feb 04 2016 Fedora Release Engineering - 1.13.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 21 2015 Ralph Bean - 1.13.1-1 -- new version - -* Fri Dec 18 2015 Ralph Bean - 1.13-1 -- new version - -* Mon Dec 14 2015 Ralph Bean - 1.12-1 -- new version - -* Thu Oct 15 2015 Robert Kuska - 1.10.4-7 -- Rebuilt for Python3.5 rebuild - -* Sat Oct 10 2015 Ralph Bean - 1.10.4-6 -- Sync from PyPI instead of a git checkout. - -* Tue Sep 08 2015 Ralph Bean - 1.10.4-5.20150503gita91975b -- Drop requirement on python-backports-ssl_match_hostname on F22 and newer. - -* Thu Jun 18 2015 Fedora Release Engineering - 1.10.4-4.20150503gita91975b -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jun 08 2015 Ralph Bean - 1.10.4-3.20150503gita91975b -- Apply pyopenssl injection for an outdated cpython as per upstream advice - https://urllib3.readthedocs.org/en/latest/security.html#insecureplatformwarning - https://urllib3.readthedocs.org/en/latest/security.html#pyopenssl - -* Tue May 19 2015 Ralph Bean - 1.10.4-2.20150503gita91975b -- Specify symlinks for six.py{c,o}, fixing rhbz #1222142. - -* Sun May 03 2015 Ralph Bean - 1.10.4-1.20150503gita91975b -- Latest release for python-requests-2.7.0 - -* Wed Apr 29 2015 Ralph Bean - 1.10.3-2.20150429git585983a -- Grab a git snapshot to get around this chunked encoding failure. - -* Wed Apr 22 2015 Ralph Bean - 1.10.3-1 -- new version - -* Thu Feb 26 2015 Ralph Bean - 1.10.2-1 -- new version - -* Wed Feb 18 2015 Ralph Bean - 1.10.1-1 -- new version - -* Wed Feb 18 2015 Ralph Bean - 1.10.1-1 -- new version - -* Mon Jan 05 2015 Ralph Bean - 1.10-2 -- Copy in a shim for ssl_match_hostname on python3. - -* Sun Dec 14 2014 Ralph Bean - 1.10-1 -- Latest upstream 1.10, for python-requests-2.5.0. -- Re-do unbundling without patch, with symlinks. -- Modernize python2 macros. -- Remove the with_dummyserver tests which fail only sometimes. - -* Wed Nov 05 2014 Ralph Bean - 1.9.1-1 -- Latest upstream, 1.9.1 for latest python-requests. - -* Mon Aug 4 2014 Tom Callaway - 1.8.2-4 -- fix license handling - -* Sun Jun 08 2014 Fedora Release Engineering - 1.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 14 2014 Bohuslav Kabrda - 1.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Mon Apr 21 2014 Arun S A G - 1.8.2-1 -- Update to latest upstream version - -* Mon Oct 28 2013 Ralph Bean - 1.7.1-2 -- Update patch to find ca_certs in the correct location. - -* Wed Sep 25 2013 Ralph Bean - 1.7.1-1 -- Latest upstream with support for a new timeout class and py3.4. - -* Wed Aug 28 2013 Ralph Bean - 1.7-3 -- Bump release again, just to push an unpaired update. - -* Mon Aug 26 2013 Ralph Bean - 1.7-2 -- Bump release to pair an update with python-requests. - -* Thu Aug 22 2013 Ralph Bean - 1.7-1 -- Update to latest upstream. -- Removed the accept-header proxy patch which is included in upstream now. -- Removed py2.6 compat patch which is included in upstream now. - -* Sun Aug 04 2013 Fedora Release Engineering - 1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Toshio Kuratomi - 1.5-6 -- Fix Requires of python-ordereddict to only apply to RHEL - -* Fri Mar 1 2013 Toshio Kuratomi - 1.5-5 -- Unbundling finished! - -* Fri Mar 01 2013 Ralph Bean - 1.5-4 -- Upstream patch to fix Accept header when behind a proxy. -- Reorganize patch numbers to more clearly distinguish them. - -* Wed Feb 27 2013 Ralph Bean - 1.5-3 -- Renamed patches to python-urllib3-* -- Fixed ssl check patch to use the correct cert path for Fedora. -- Included dependency on ca-certificates -- Cosmetic indentation changes to the .spec file. - -* Tue Feb 5 2013 Toshio Kuratomi - 1.5-2 -- python3-tornado BR and run all unittests on python3 - -* Mon Feb 04 2013 Toshio Kuratomi 1.5-1 -- Initial fedora build. +%autochangelog From a0e3211cd558f4d9dd9735ea7c40fa78678bcd4e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 11:48:24 +0200 Subject: [PATCH 52/82] Bootstrap for Python 3.13 --- python-urllib3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-urllib3.spec b/python-urllib3.spec index f308e3b..44139df 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies and the dependencies for extras %if 0%{?rhel} From 565cbba75be5e2668894f74dbbc5121872bc6408 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 13:01:10 +0200 Subject: [PATCH 53/82] Rebuilt for Python 3.13 --- python-urllib3.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 44139df..f308e3b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies and the dependencies for extras %if 0%{?rhel} From e21f85ab8e8a5f239a849f264f4fdffea2acb09f Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 26 Jun 2024 14:29:39 +0200 Subject: [PATCH 54/82] Update to 1.26.19 to fix CVE-2024-37891 (rhbz#2292790) --- .gitignore | 1 + python-urllib3.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a390e6..c53326a 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /urllib3-1.26.16.tar.gz /urllib3-1.26.17.tar.gz /urllib3-1.26.18.tar.gz +/urllib3-1.26.19.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index f308e3b..7acc053 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,7 +9,7 @@ %endif Name: python-urllib3 -Version: 1.26.18 +Version: 1.26.19 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more diff --git a/sources b/sources index a21e385..010dd3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.18.tar.gz) = 62c0af4b11e797a85420ef3f0888f2e608334329eddd88b9fe563b5437189cbea8dbbcd53f999557d9828fcf4bf03b8ca9f6e3d401533bc4ae8ff96e3ece1557 +SHA512 (urllib3-1.26.19.tar.gz) = 6b72012dbd85434b2441229cbdea2a94583693f904dde349780e1290d581c8a5e10fe00a287a032ed1276349d0078b530f16a133e0f164dcea18105fa3dec79a From 23ccadd3fdbc5dfd98d82fa46fc4d9035b361e74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 16:50:41 +0000 Subject: [PATCH 55/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 52671c660b7a4b04969fa0db68871131f4bd0a5b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 10:35:20 -0400 Subject: [PATCH 56/82] Update to 2.0.7 - Add metapackage for new zstd extra - Upstream no longer vendors six, so we no longer need to bundle it - Assert that there is a license file in the .dist-info directory - Greatly reduce the number of skipped tests - Stop explicitly bounding versions of build dependencies for testing --- .gitignore | 1 + python-urllib3.spec | 108 ++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 61 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index c53326a..315bf3c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /urllib3-1.26.17.tar.gz /urllib3-1.26.18.tar.gz /urllib3-1.26.19.tar.gz +/urllib3-2.0.7.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 7acc053..54c5ec8 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,7 +9,7 @@ %endif Name: python-urllib3 -Version: 1.26.19 +Version: 2.0.7 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -26,27 +26,25 @@ BuildRequires: python3-devel # Test dependencies are listed only in dev-requirements.txt. Because there are # linters and coverage tools mixed in, and exact versions are pinned, we resort # to manual listing. -# mock==3.0.5: patched out in %%prep -# coverage~=6.0;python_version>="3.6": omitted linter/coverage tool -# tornado==6.1.0;python_version>="3.6" -BuildRequires: %{py3_dist tornado} >= 6.1 +# coverage==7.3.2: omitted linter/coverage tool +# tornado==6.3.3 +BuildRequires: %{py3_dist tornado} # PySocks==1.7.1 -BuildRequires: %{py3_dist PySocks} >= 1.7.1 -# win-inet-pton==1.1.0: Windows-only workaround -# pytest==6.2.4; python_version>="3.10" -BuildRequires: %{py3_dist pytest} >= 6.2.4 -# pytest-timeout==1.4.2 -BuildRequires: %{py3_dist pytest-timeout} >= 1.4.2 -# pytest-freezegun==0.4.2 -BuildRequires: %{py3_dist pytest-freezegun} >= 0.4.2 -# flaky==3.7.0: not really required -# trustme==0.7.0 -BuildRequires: %{py3_dist trustme} >= 0.7 -# cryptography==38.0.3;python_version>="3.6": associated with the deprecated -# “secure” extra -# python-dateutil==2.8.1 -BuildRequires: %{py3_dist python-dateutil} >= 2.8.1 -# gcp-devrel-py-tools==0.0.16: not used in offline testing +BuildRequires: %{py3_dist PySocks} +# pytest==7.4.2 +BuildRequires: %{py3_dist pytest} +# pytest-timeout==2.1.0 +BuildRequires: %{py3_dist pytest-timeout} +# pyOpenSSL==23.2.0 +BuildRequires: %{py3_dist pyOpenSSL} +# trustme==1.1.0 +BuildRequires: %{py3_dist trustme} +# cryptography==41.0.4 +BuildRequires: %{py3_dist cryptography} +# backports.zoneinfo==0.2.1;python_version<"3.9" +# towncrier==23.6.0: used for generating a changelog +# pytest-memray==1.5.0;python_version>="3.8" and implementation_name=="cpython": +# not packaged, unwanted profiler %endif %global _description %{expand: @@ -75,9 +73,6 @@ Requires: ca-certificates BuildRequires: %{py3_dist idna} Requires: %{py3_dist idna} -# grep __version__ src/urllib3/packages/six.py -Provides: bundled(python3dist(six)) = 1.16.0 - %if %{with extras} # There has historically been a manual hard dependency on python3-pysocks; # since bringing it in is the sole function of python3-urllib3+socks, @@ -89,10 +84,7 @@ Recommends: python3-urllib3+socks %if %{with extras} -# We do NOT package the “secure” extra because it is deprecated; see: -# “Deprecate the pyOpenSSL TLS implementation and [secure] extra” -# https://github.com/urllib3/urllib3/issues/2680 -%pyproject_extras_subpkg -n python3-urllib3 brotli socks +%pyproject_extras_subpkg -n python3-urllib3 brotli zstd socks %endif @@ -116,16 +108,11 @@ Recommends: python3-urllib3+socks recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d") sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py -# Use the standard library instead of a backport -sed -i -e 's/^import mock/from unittest import mock/' \ - -e 's/^from mock import /from unittest.mock import /' \ - test/*.py docs/conf.py - %generate_buildrequires # Generate BR’s from packaged extras even when tests are disabled, to ensure # the extras metapackages are installable if the build succeeds. -%pyproject_buildrequires %{?with_extras:-x brotli,socks} +%pyproject_buildrequires %{?with_extras:-x brotli,zstd,socks} %build @@ -135,36 +122,59 @@ sed -i -e 's/^import mock/from unittest import mock/' \ %install %pyproject_install -%pyproject_save_files urllib3 +%pyproject_save_files -l urllib3 %check # urllib3.contrib.socks requires urllib3[socks] # urllib3.contrib.ntlmpool is deprecated and requires ntlm # urllib3.contrib.securetransport is macOS only -# urllib3.contrib.pyopenssl requires urllib3[secure] +# urllib3.contrib.pyopenssl requires pyOpenSSL %{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks} -e urllib3.contrib.ntlmpool -e urllib3.contrib.securetransport -e urllib3.contrib.pyopenssl} + +# Increase the “long timeout” for slower environments; as of this writing, it +# is increased from 0.1 to 0.5 second. +export CI=1 + %if %{with tests} -# Drop the dummyserver tests in koji. They fail there in real builds, but not -# in scratch builds (weird). -ignore="${ignore-} --ignore=test/with_dummyserver/" -# Don't run the Google App Engine tests -ignore="${ignore-} --ignore=test/appengine/" -# Lots of these tests started failing, even for old versions, so it has something -# to do with Fedora in particular. They don't fail in upstream build infrastructure -ignore="${ignore-} --ignore=test/contrib/" -# Tests for Python built without SSL, but Fedora builds with SSL. These tests -# fail when combined with the unbundling of backports-ssl_match_hostname -ignore="${ignore-} --ignore=test/test_no_ssl.py" -%pytest -v ${ignore-} +# These tests *may* time out; https://github.com/urllib3/urllib3/pull/3206 +# purports to fix some of them, but there is still a lot of flakiness here. +ignore="${ignore-} --ignore=test/with_dummyserver/test_socketlevel.py" +# This test still times out sometimes, especially on certain architectures, +# even when we export the CI environment variable to increase timeouts. +k="${k-}${k+ and }not (TestHTTPProxyManager and test_tunneling_proxy_request_timeout[https-https])" +%if 0%{?__isa_bits} == 32 +# These fail on i686 and presumably on other 32-bit architectures. Note that +# since the base package is noarch and the package may be assigned to a builder +# of any architecture, there is no guarantee that these tests run at all in a +# particular build. See discussion in +# https://src.fedoraproject.org/rpms/python-urllib3/pull-request/33. +k="${k-}${k+ and }not (TestSSL and test_requesting_large_resources_via_ssl)" +k="${k-}${k+ and }not (TestSocketSSL and test_requesting_large_resources_via_ssl)" +%endif +# These require network access: +k="${k-}${k+ and }not (TestPoolManager and test_deprecated_no_scheme)" +# The error message does not quite match what upstream expects; this is fixed +# in later urllib3 releases. +# > with pytest.raises( +# SSLError, match=r"(wrong version number|record overflow)" +# ): +# E AssertionError: Regex pattern did not match. +# E Regex: '(wrong version number|record overflow)' +# E Input: '("read error: Error([(\'SSL routines\', \'\', +# \'packet length too long\'), (\'SSL routines\', \'\', +# \'record layer failure\')])",)' +k="${k-}${k+ and }not (TestSocketSSL and test_ssl_failure_midway_through_conn)" + +%pytest -v -rs ${ignore-} -k "${k-}" %endif %files -n python3-urllib3 -f %{pyproject_files} -%doc CHANGES.rst README.rst +%doc CHANGES.rst README.md %changelog diff --git a/sources b/sources index 010dd3d..84e7405 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-1.26.19.tar.gz) = 6b72012dbd85434b2441229cbdea2a94583693f904dde349780e1290d581c8a5e10fe00a287a032ed1276349d0078b530f16a133e0f164dcea18105fa3dec79a +SHA512 (urllib3-2.0.7.tar.gz) = 3819d87a0b37859b7b6615170016fe2885ed818e289fc56ecd180b97eef4d1ad0c587b0250cc0d2eb73a3c21223febda95a5b6a5b4c27f88038da89d3e889eeb From 3e635b369724a701f175fad07ada87f64335df7d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 18 May 2023 10:35:20 -0400 Subject: [PATCH 57/82] Update to 2.1.0 --- .gitignore | 1 + python-urllib3.spec | 4 +--- sources | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 315bf3c..74e9ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /urllib3-1.26.18.tar.gz /urllib3-1.26.19.tar.gz /urllib3-2.0.7.tar.gz +/urllib3-2.1.0.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 54c5ec8..8e75be0 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,7 +9,7 @@ %endif Name: python-urllib3 -Version: 2.0.7 +Version: 2.1.0 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -155,8 +155,6 @@ k="${k-}${k+ and }not (TestHTTPProxyManager and test_tunneling_proxy_request_tim k="${k-}${k+ and }not (TestSSL and test_requesting_large_resources_via_ssl)" k="${k-}${k+ and }not (TestSocketSSL and test_requesting_large_resources_via_ssl)" %endif -# These require network access: -k="${k-}${k+ and }not (TestPoolManager and test_deprecated_no_scheme)" # The error message does not quite match what upstream expects; this is fixed # in later urllib3 releases. # > with pytest.raises( diff --git a/sources b/sources index 84e7405..8326d49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urllib3-2.0.7.tar.gz) = 3819d87a0b37859b7b6615170016fe2885ed818e289fc56ecd180b97eef4d1ad0c587b0250cc0d2eb73a3c21223febda95a5b6a5b4c27f88038da89d3e889eeb +SHA512 (urllib3-2.1.0.tar.gz) = 3568803cbfa8d6cb57cb20e91c1bf2eb84e6d40e81c77adf93934220f3c61c371a1107448fa50ab909d942787497e8a9c77536016c93a13dae7e0c9e7563d3a9 From 5dd099fde6015b0d27b68caa239a4879079c429c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 30 Jan 2024 15:43:19 -0500 Subject: [PATCH 58/82] Update to 2.2.0 --- .gitignore | 2 ++ python-urllib3.spec | 59 ++++++++++++++++++++++++++++++++++++--------- sources | 3 ++- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 74e9ffd..7eb9f60 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,5 @@ /urllib3-1.26.19.tar.gz /urllib3-2.0.7.tar.gz /urllib3-2.1.0.tar.gz +/urllib3-2.2.0.tar.gz +/hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 8e75be0..04c5259 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,14 +9,30 @@ %endif Name: python-urllib3 -Version: 2.1.0 +Version: 2.2.0 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more # SPDX License: MIT URL: https://github.com/urllib3/urllib3 -Source: %{url}/archive/%{version}/urllib3-%{version}.tar.gz +Source0: %{url}/archive/%{version}/urllib3-%{version}.tar.gz +# A special forked copy of Hypercorn is required for testing. We asked about +# the possiblility of using a released version in the future in: +# Path toward testing with a released version of hypercorn? +# https://github.com/urllib3/urllib3/3334 +# Upstream would like to get the necessary changes merged into Hypercorn, but +# explained clearly why the forked copy is needed for now. +# +# Note that dev-requirements.txt references the urllib3-changes branch of +# https://github.com/urllib3/hypercorn/, and we should use the latest commit +# from that branch, but we package using a commit hash for reproducibility. +# +# We do not need to treat this as a bundled dependency because it is not +# installed in the buildroot or otherwise included in any of the binary RPMs. +%global hypercorn_url https://github.com/urllib3/hypercorn +%global hypercorn_commit d1719f8c1570cbd8e6a3719ffdb14a4d72880abb +Source1: %{hypercorn_url}/archive/%{hypercorn_commit}/hypercorn-%{hypercorn_commit}.tar.gz BuildArch: noarch @@ -26,9 +42,9 @@ BuildRequires: python3-devel # Test dependencies are listed only in dev-requirements.txt. Because there are # linters and coverage tools mixed in, and exact versions are pinned, we resort # to manual listing. -# coverage==7.3.2: omitted linter/coverage tool -# tornado==6.3.3 -BuildRequires: %{py3_dist tornado} +# h2==4.1.0: also in the h2 extra +BuildRequires: %{py3_dist h2} +# coverage==7.4.1: omitted linter/coverage tool # PySocks==1.7.1 BuildRequires: %{py3_dist PySocks} # pytest==7.4.2 @@ -37,14 +53,29 @@ BuildRequires: %{py3_dist pytest} BuildRequires: %{py3_dist pytest-timeout} # pyOpenSSL==23.2.0 BuildRequires: %{py3_dist pyOpenSSL} +# idna==3.4 +BuildRequires: %{py3_dist idna} # trustme==1.1.0 BuildRequires: %{py3_dist trustme} -# cryptography==41.0.4 +# cryptography==41.0.6 BuildRequires: %{py3_dist cryptography} # backports.zoneinfo==0.2.1;python_version<"3.9" # towncrier==23.6.0: used for generating a changelog # pytest-memray==1.5.0;python_version>="3.8" and implementation_name=="cpython": # not packaged, unwanted profiler +# trio==0.23.1 +BuildRequires: %{py3_dist trio} +# Quart==0.19.4 +BuildRequires: %{py3_dist Quart} +# quart-trio==0.11.1 +BuildRequires: %{py3_dist quart-trio} +# # https://github.com/pgjones/hypercorn/issues/62 +# # https://github.com/pgjones/hypercorn/issues/168 +# # https://github.com/pgjones/hypercorn/issues/169 +# hypercorn @ git+https://github.com/urllib3/hypercorn@urllib3-changes +# hypercorn is packaged, but we need the forked/bundled version +# httpx==0.25.2 +BuildRequires: %{py3_dist httpx} %endif %global _description %{expand: @@ -84,12 +115,14 @@ Recommends: python3-urllib3+socks %if %{with extras} -%pyproject_extras_subpkg -n python3-urllib3 brotli zstd socks +%pyproject_extras_subpkg -n python3-urllib3 brotli zstd socks h2 %endif %prep %autosetup -n urllib3-%{version} +%setup -q -n urllib3-%{version} -T -D -b 1 + # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date # (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either, @@ -112,7 +145,7 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d %generate_buildrequires # Generate BR’s from packaged extras even when tests are disabled, to ensure # the extras metapackages are installable if the build succeeds. -%pyproject_buildrequires %{?with_extras:-x brotli,zstd,socks} +%pyproject_buildrequires %{?with_extras:-x brotli,zstd,socks,h2} %build @@ -127,10 +160,13 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d %check # urllib3.contrib.socks requires urllib3[socks] +# +# urllib3.contrib.emscripten is “special” (import js will fail) # urllib3.contrib.ntlmpool is deprecated and requires ntlm # urllib3.contrib.securetransport is macOS only # urllib3.contrib.pyopenssl requires pyOpenSSL %{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks} + -e urllib3.contrib.emscripten* -e urllib3.contrib.ntlmpool -e urllib3.contrib.securetransport -e urllib3.contrib.pyopenssl} @@ -138,11 +174,11 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d # Increase the “long timeout” for slower environments; as of this writing, it # is increased from 0.1 to 0.5 second. export CI=1 +# Interpose the special forked copy of Hypercorn. +hypercorndir="${PWD}/../hypercorn-%{hypercorn_commit}/src" +export PYTHONPATH="${hypercorndir}:%{buildroot}%{python3_sitelib}" %if %{with tests} -# These tests *may* time out; https://github.com/urllib3/urllib3/pull/3206 -# purports to fix some of them, but there is still a lot of flakiness here. -ignore="${ignore-} --ignore=test/with_dummyserver/test_socketlevel.py" # This test still times out sometimes, especially on certain architectures, # even when we export the CI environment variable to increase timeouts. k="${k-}${k+ and }not (TestHTTPProxyManager and test_tunneling_proxy_request_timeout[https-https])" @@ -168,6 +204,7 @@ k="${k-}${k+ and }not (TestSocketSSL and test_requesting_large_resources_via_ssl k="${k-}${k+ and }not (TestSocketSSL and test_ssl_failure_midway_through_conn)" %pytest -v -rs ${ignore-} -k "${k-}" +%pytest -v -rs ${ignore-} -k "${k-}" --integration %endif diff --git a/sources b/sources index 8326d49..06db068 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (urllib3-2.1.0.tar.gz) = 3568803cbfa8d6cb57cb20e91c1bf2eb84e6d40e81c77adf93934220f3c61c371a1107448fa50ab909d942787497e8a9c77536016c93a13dae7e0c9e7563d3a9 +SHA512 (urllib3-2.2.0.tar.gz) = 3914442c92980c9b803e7726228b147e326f71bf4ae7507b64474de6cb6df86e3e90026fd2f41e4f83e8bc6735b0f816cfc9945839a7cc5d0a86d31a5a8d6438 +SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From f66d25224ca06c85bec2b16c74351c782326fd8f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 18 Feb 2024 17:00:57 -0500 Subject: [PATCH 59/82] Update to 2.2.1 --- .gitignore | 1 + python-urllib3.spec | 22 +++++++++++++++------- sources | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7eb9f60..7a727fb 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /urllib3-2.1.0.tar.gz /urllib3-2.2.0.tar.gz /hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz +/urllib3-2.2.1.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 04c5259..d5d4c92 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,7 +9,7 @@ %endif Name: python-urllib3 -Version: 2.2.0 +Version: 2.2.1 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -47,23 +47,26 @@ BuildRequires: %{py3_dist h2} # coverage==7.4.1: omitted linter/coverage tool # PySocks==1.7.1 BuildRequires: %{py3_dist PySocks} -# pytest==7.4.2 +# pytest==7.4.4 BuildRequires: %{py3_dist pytest} # pytest-timeout==2.1.0 BuildRequires: %{py3_dist pytest-timeout} -# pyOpenSSL==23.2.0 +# pyOpenSSL==24.0.0 BuildRequires: %{py3_dist pyOpenSSL} # idna==3.4 BuildRequires: %{py3_dist idna} # trustme==1.1.0 BuildRequires: %{py3_dist trustme} -# cryptography==41.0.6 +# cryptography==42.0.2 BuildRequires: %{py3_dist cryptography} # backports.zoneinfo==0.2.1;python_version<"3.9" # towncrier==23.6.0: used for generating a changelog -# pytest-memray==1.5.0;python_version>="3.8" and implementation_name=="cpython": -# not packaged, unwanted profiler -# trio==0.23.1 +# pytest-memray==1.5.0;python_version<"3.13" and sys_platform!="win32" and +# implementation_name=="cpython": not packaged, unwanted profiler +# trio==0.23.1;python_version<"3.13" +# # We need a release of Trio newer than 0.24.0 to support CPython 3.13. +# # https://github.com/python-trio/trio/issues/2903 +# trio @ git+https://github.com/python-trio/trio@e4c8eb2d7ef59eeea1441656e392fe1b0870a374; python_version == "3.13" BuildRequires: %{py3_dist trio} # Quart==0.19.4 BuildRequires: %{py3_dist Quart} @@ -76,6 +79,11 @@ BuildRequires: %{py3_dist quart-trio} # hypercorn is packaged, but we need the forked/bundled version # httpx==0.25.2 BuildRequires: %{py3_dist httpx} +# pytest-socket==0.7.0: not packaged, not strictly required +# # CFFI is not going to support CPython 3.13 in an actual release until +# # there is a release candidate for 3.13. +# # https://github.com/python-cffi/cffi/issues/23#issuecomment-1845861410 +# cffi @ git+https://github.com/python-cffi/cffi@14723b0bbd127790c450945099db31018d80fa83; python_version == "3.13" %endif %global _description %{expand: diff --git a/sources b/sources index 06db068..0f1cec6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.2.0.tar.gz) = 3914442c92980c9b803e7726228b147e326f71bf4ae7507b64474de6cb6df86e3e90026fd2f41e4f83e8bc6735b0f816cfc9945839a7cc5d0a86d31a5a8d6438 +SHA512 (urllib3-2.2.1.tar.gz) = 86713f54fe2a4c6c6ecfddfa939611526f81282162851d44e00d4b7ed21c3265b11a3ff506d685ddb88c0998f392809b7ffd08775608e309dd290fc30ab5d741 SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 50a7af007fa2609f717ea90eefcb14e59f0b8528 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 5 Aug 2024 13:07:12 -0400 Subject: [PATCH 60/82] Add an rpmlintrc file [skip changelog] --- python-urllib3.rpmlintrc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 python-urllib3.rpmlintrc diff --git a/python-urllib3.rpmlintrc b/python-urllib3.rpmlintrc new file mode 100644 index 0000000..0b83833 --- /dev/null +++ b/python-urllib3.rpmlintrc @@ -0,0 +1,6 @@ +# It is normal that extras metapackages should not have documentation, or any +# files at all. +addFilter(r"\+\w+\.\w+: W: no-documentation") +# Not real spelling errors +addFilter(r"spelling-error \('([Mm]etapackage)s?',") +addFilter(r"spelling-error \('(gzip|brotli|zstd)',") From 1e83993ed022c6025af14d26a9a88169fa6f5203 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 5 Aug 2024 11:38:01 -0400 Subject: [PATCH 61/82] Update to 2.2.2 (close RHBZ#2143021) --- .gitignore | 1 + python-urllib3.spec | 28 +++++++++++++--------------- sources | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 7a727fb..de750c9 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /urllib3-2.2.0.tar.gz /hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz /urllib3-2.2.1.tar.gz +/urllib3-2.2.2.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index d5d4c92..e4b0f66 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,5 +1,5 @@ # When bootstrapping Python, we cannot test this yet -# RHEL does not include the test dependencies and the dependencies for extras +# RHEL does not include the test dependencies and the dependencies for extras %if 0%{?rhel} %bcond_with tests %bcond_with extras @@ -9,7 +9,7 @@ %endif Name: python-urllib3 -Version: 2.2.1 +Version: 2.2.2 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -47,26 +47,26 @@ BuildRequires: %{py3_dist h2} # coverage==7.4.1: omitted linter/coverage tool # PySocks==1.7.1 BuildRequires: %{py3_dist PySocks} -# pytest==7.4.4 +# pytest==8.0.2 BuildRequires: %{py3_dist pytest} # pytest-timeout==2.1.0 BuildRequires: %{py3_dist pytest-timeout} # pyOpenSSL==24.0.0 BuildRequires: %{py3_dist pyOpenSSL} -# idna==3.4 +# idna==3.7 BuildRequires: %{py3_dist idna} -# trustme==1.1.0 +# # As of v1.1.0, child CA certificates generated by trustme fail +# # verification by CPython 3.13. +# # https://github.com/python-trio/trustme/pull/642 +# trustme @ git+https://github.com/python-trio/trustme@b3a767f336e20600f30c9ff78385a58352ff6ee3 BuildRequires: %{py3_dist trustme} -# cryptography==42.0.2 +# cryptography==42.0.4 BuildRequires: %{py3_dist cryptography} # backports.zoneinfo==0.2.1;python_version<"3.9" # towncrier==23.6.0: used for generating a changelog # pytest-memray==1.5.0;python_version<"3.13" and sys_platform!="win32" and # implementation_name=="cpython": not packaged, unwanted profiler -# trio==0.23.1;python_version<"3.13" -# # We need a release of Trio newer than 0.24.0 to support CPython 3.13. -# # https://github.com/python-trio/trio/issues/2903 -# trio @ git+https://github.com/python-trio/trio@e4c8eb2d7ef59eeea1441656e392fe1b0870a374; python_version == "3.13" +# trio==0.25.0 BuildRequires: %{py3_dist trio} # Quart==0.19.4 BuildRequires: %{py3_dist Quart} @@ -80,10 +80,8 @@ BuildRequires: %{py3_dist quart-trio} # httpx==0.25.2 BuildRequires: %{py3_dist httpx} # pytest-socket==0.7.0: not packaged, not strictly required -# # CFFI is not going to support CPython 3.13 in an actual release until -# # there is a release candidate for 3.13. -# # https://github.com/python-cffi/cffi/issues/23#issuecomment-1845861410 -# cffi @ git+https://github.com/python-cffi/cffi@14723b0bbd127790c450945099db31018d80fa83; python_version == "3.13" +# cffi==1.17.0rc1 +BuildRequires: %{py3_dist cffi} %endif %global _description %{expand: @@ -173,7 +171,7 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d # urllib3.contrib.ntlmpool is deprecated and requires ntlm # urllib3.contrib.securetransport is macOS only # urllib3.contrib.pyopenssl requires pyOpenSSL -%{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks} +%{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks -e urllib3.http2} -e urllib3.contrib.emscripten* -e urllib3.contrib.ntlmpool -e urllib3.contrib.securetransport diff --git a/sources b/sources index 0f1cec6..8f4906c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.2.1.tar.gz) = 86713f54fe2a4c6c6ecfddfa939611526f81282162851d44e00d4b7ed21c3265b11a3ff506d685ddb88c0998f392809b7ffd08775608e309dd290fc30ab5d741 +SHA512 (urllib3-2.2.2.tar.gz) = 4a7bb41c78e8061b4ba54034d3e8087bb6acd350d4765dbdacc30068f147f6bd58f0b28f23fdc8d477e625c7f3ab7a419a8f326c7988e858241b52a3ac76f5ec SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 907972b0074eff58ead35f9dca537ca86e877be2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Sep 2024 09:29:07 -0400 Subject: [PATCH 62/82] Update to 2.2.3 (close RHBZ#2311902) --- .gitignore | 1 + python-urllib3.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index de750c9..ce4092a 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz /urllib3-2.2.1.tar.gz /urllib3-2.2.2.tar.gz +/urllib3-2.2.3.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index e4b0f66..7a9f81c 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -9,7 +9,7 @@ %endif Name: python-urllib3 -Version: 2.2.2 +Version: 2.2.3 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -149,12 +149,14 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d %generate_buildrequires +export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' # Generate BR’s from packaged extras even when tests are disabled, to ensure # the extras metapackages are installable if the build succeeds. %pyproject_buildrequires %{?with_extras:-x brotli,zstd,socks,h2} %build +export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' %pyproject_wheel @@ -171,7 +173,7 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d # urllib3.contrib.ntlmpool is deprecated and requires ntlm # urllib3.contrib.securetransport is macOS only # urllib3.contrib.pyopenssl requires pyOpenSSL -%{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks -e urllib3.http2} +%{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks -e urllib3.http2*} -e urllib3.contrib.emscripten* -e urllib3.contrib.ntlmpool -e urllib3.contrib.securetransport diff --git a/sources b/sources index 8f4906c..3d19dd9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.2.2.tar.gz) = 4a7bb41c78e8061b4ba54034d3e8087bb6acd350d4765dbdacc30068f147f6bd58f0b28f23fdc8d477e625c7f3ab7a419a8f326c7988e858241b52a3ac76f5ec +SHA512 (urllib3-2.2.3.tar.gz) = 5082c87d9692864ff0b30817f846c5d4ff298d2007085bc619431551183d6c0c6c25464be1777763890257c2f55801698b83378fbf956c663f495e96f6d1e837 SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 812b9bc5aaf42816e485a8f72fb1c299c49b6f1d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Sep 2024 11:01:50 -0400 Subject: [PATCH 63/82] Stop skipping one test that now passes --- python-urllib3.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 7a9f81c..98d62cb 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -199,17 +199,6 @@ k="${k-}${k+ and }not (TestHTTPProxyManager and test_tunneling_proxy_request_tim k="${k-}${k+ and }not (TestSSL and test_requesting_large_resources_via_ssl)" k="${k-}${k+ and }not (TestSocketSSL and test_requesting_large_resources_via_ssl)" %endif -# The error message does not quite match what upstream expects; this is fixed -# in later urllib3 releases. -# > with pytest.raises( -# SSLError, match=r"(wrong version number|record overflow)" -# ): -# E AssertionError: Regex pattern did not match. -# E Regex: '(wrong version number|record overflow)' -# E Input: '("read error: Error([(\'SSL routines\', \'\', -# \'packet length too long\'), (\'SSL routines\', \'\', -# \'record layer failure\')])",)' -k="${k-}${k+ and }not (TestSocketSSL and test_ssl_failure_midway_through_conn)" %pytest -v -rs ${ignore-} -k "${k-}" %pytest -v -rs ${ignore-} -k "${k-}" --integration From 9ef9d7a5d6026d044f6cdd30e7826e3abcf1a7bb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 12 Sep 2024 11:02:18 -0400 Subject: [PATCH 64/82] Remove a 32-bit workaround (since noarch packages no longer build on i686) --- python-urllib3.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 98d62cb..2da657e 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -190,15 +190,6 @@ export PYTHONPATH="${hypercorndir}:%{buildroot}%{python3_sitelib}" # This test still times out sometimes, especially on certain architectures, # even when we export the CI environment variable to increase timeouts. k="${k-}${k+ and }not (TestHTTPProxyManager and test_tunneling_proxy_request_timeout[https-https])" -%if 0%{?__isa_bits} == 32 -# These fail on i686 and presumably on other 32-bit architectures. Note that -# since the base package is noarch and the package may be assigned to a builder -# of any architecture, there is no guarantee that these tests run at all in a -# particular build. See discussion in -# https://src.fedoraproject.org/rpms/python-urllib3/pull-request/33. -k="${k-}${k+ and }not (TestSSL and test_requesting_large_resources_via_ssl)" -k="${k-}${k+ and }not (TestSocketSSL and test_requesting_large_resources_via_ssl)" -%endif %pytest -v -rs ${ignore-} -k "${k-}" %pytest -v -rs ${ignore-} -k "${k-}" --integration From a7b762063216e49c0741bced8d74ecd5f60e600d Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 10 Sep 2024 13:29:43 +0200 Subject: [PATCH 65/82] Add a smoke test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstreamed from rhel's Sanity/smoke Commit hash: a3e2fcfaef1fe4ffa257bdc21d535c9cdc35cafd Only the test file was kept. Co-Authored-By: Braňo Náter --- .fmf/version | 1 + plans.fmf | 4 ++++ tests/smoke/smoke.fmf | 5 +++++ tests/smoke/test.py | 9 +++++++++ 4 files changed, 19 insertions(+) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/smoke/smoke.fmf create mode 100644 tests/smoke/test.py diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..2bb6f53 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,4 @@ +discover: + how: fmf +execute: + how: tmt \ No newline at end of file diff --git a/tests/smoke/smoke.fmf b/tests/smoke/smoke.fmf new file mode 100644 index 0000000..69c01da --- /dev/null +++ b/tests/smoke/smoke.fmf @@ -0,0 +1,5 @@ +test: python3 test.py +framework: shell +require: +- python3 +- python3-urllib3 diff --git a/tests/smoke/test.py b/tests/smoke/test.py new file mode 100644 index 0000000..d622ddd --- /dev/null +++ b/tests/smoke/test.py @@ -0,0 +1,9 @@ +import urllib3 + +http = urllib3.PoolManager() +r = http.request('GET', 'http://example.com/') +print('status = {0}'.format(r.status)) +print("headers['server'] = {0}".format(r.headers['server'])) +print(r.data) +if r.status != 200 or not r.data: + raise SystemExit(1) From a2a67038ae31113ded79a3c90bf97f78bc5586d9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 11 Aug 2024 16:40:16 -0400 Subject: [PATCH 66/82] Add extras to ELN builds RHEL 10 only ships the core module with no extras, but the extras are needed for other things in EPEL (e.g. python-django). ELN covers both without adding the extras build dependencies so as to not add them to the future RHEL buildroot. These changes allow a single ELN build to serve both ELN and ELN Extras without polluting the ELN buildroot. --- python-urllib3.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index 2da657e..1f3b207 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,12 +1,8 @@ # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies and the dependencies for extras -%if 0%{?rhel} -%bcond_with tests -%bcond_with extras -%else -%bcond_without tests -%bcond_without extras -%endif +%bcond tests %{undefined rhel} +%bcond extras %[%{undefined rhel} || %{defined eln}] +%bcond extradeps %{undefined rhel} Name: python-urllib3 Version: 2.2.3 @@ -110,7 +106,7 @@ Requires: ca-certificates BuildRequires: %{py3_dist idna} Requires: %{py3_dist idna} -%if %{with extras} +%if %{with extradeps} # There has historically been a manual hard dependency on python3-pysocks; # since bringing it in is the sole function of python3-urllib3+socks, # we recommend it, so it is installed by default. @@ -152,7 +148,7 @@ sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_d export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' # Generate BR’s from packaged extras even when tests are disabled, to ensure # the extras metapackages are installable if the build succeeds. -%pyproject_buildrequires %{?with_extras:-x brotli,zstd,socks,h2} +%pyproject_buildrequires %{?with_extradeps:-x brotli,zstd,socks,h2} %build @@ -173,7 +169,7 @@ export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' # urllib3.contrib.ntlmpool is deprecated and requires ntlm # urllib3.contrib.securetransport is macOS only # urllib3.contrib.pyopenssl requires pyOpenSSL -%{pyproject_check_import %{!?with_extras:-e urllib3.contrib.socks -e urllib3.http2*} +%{pyproject_check_import %{!?with_extradeps:-e urllib3.contrib.socks -e urllib3.http2*} -e urllib3.contrib.emscripten* -e urllib3.contrib.ntlmpool -e urllib3.contrib.securetransport From 38b04c1b212008b13905df9b27de3431f880cbff Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 22 Dec 2024 10:57:48 -0500 Subject: [PATCH 67/82] Update to 2.3.0 (close RHBZ#2333724) --- .gitignore | 1 + python-urllib3.spec | 23 +++++++++-------------- sources | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ce4092a..08d4b37 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /urllib3-2.2.1.tar.gz /urllib3-2.2.2.tar.gz /urllib3-2.2.3.tar.gz +/urllib3-2.3.0.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 1f3b207..999385c 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ %bcond extradeps %{undefined rhel} Name: python-urllib3 -Version: 2.2.3 +Version: 2.3.0 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -40,31 +40,28 @@ BuildRequires: python3-devel # to manual listing. # h2==4.1.0: also in the h2 extra BuildRequires: %{py3_dist h2} -# coverage==7.4.1: omitted linter/coverage tool +# coverage==7.6.4: omitted linter/coverage tool # PySocks==1.7.1 BuildRequires: %{py3_dist PySocks} # pytest==8.0.2 BuildRequires: %{py3_dist pytest} # pytest-timeout==2.1.0 BuildRequires: %{py3_dist pytest-timeout} -# pyOpenSSL==24.0.0 +# pyOpenSSL==24.2.1 BuildRequires: %{py3_dist pyOpenSSL} # idna==3.7 BuildRequires: %{py3_dist idna} -# # As of v1.1.0, child CA certificates generated by trustme fail -# # verification by CPython 3.13. -# # https://github.com/python-trio/trustme/pull/642 -# trustme @ git+https://github.com/python-trio/trustme@b3a767f336e20600f30c9ff78385a58352ff6ee3 +# trustme==1.2.0 BuildRequires: %{py3_dist trustme} -# cryptography==42.0.4 +# cryptography==43.0.1 BuildRequires: %{py3_dist cryptography} -# backports.zoneinfo==0.2.1;python_version<"3.9" # towncrier==23.6.0: used for generating a changelog -# pytest-memray==1.5.0;python_version<"3.13" and sys_platform!="win32" and +# pytest-memray==1.5.0;python_version<"3.14" and sys_platform!="win32" and # implementation_name=="cpython": not packaged, unwanted profiler -# trio==0.25.0 +# trio==0.26.2 BuildRequires: %{py3_dist trio} -# Quart==0.19.4 +# # https://github.com/pallets/quart/pull/369 +# Quart @ git+https://github.com/pallets/quart@67110bf383d8973bce1619e957b4b6ea088ad9f2 BuildRequires: %{py3_dist Quart} # quart-trio==0.11.1 BuildRequires: %{py3_dist quart-trio} @@ -76,8 +73,6 @@ BuildRequires: %{py3_dist quart-trio} # httpx==0.25.2 BuildRequires: %{py3_dist httpx} # pytest-socket==0.7.0: not packaged, not strictly required -# cffi==1.17.0rc1 -BuildRequires: %{py3_dist cffi} %endif %global _description %{expand: diff --git a/sources b/sources index 3d19dd9..6c51285 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.2.3.tar.gz) = 5082c87d9692864ff0b30817f846c5d4ff298d2007085bc619431551183d6c0c6c25464be1777763890257c2f55801698b83378fbf956c663f495e96f6d1e837 +SHA512 (urllib3-2.3.0.tar.gz) = 7b4b8732f4a4cddb8a6f6854d21febcbecba0762bff65d2291d95d1f54a972c3168f8d7ca1786edfb5c0a0c955cf3812ff6fe1b7925973d3fe31077fbfbdc39c SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 461062088404da5eb767af673d53e8a4964f658c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 20:28:39 +0000 Subject: [PATCH 68/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b8b7567aeecca104ae526e92800fa1de0fee1758 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 15 Apr 2025 07:50:41 -0400 Subject: [PATCH 69/82] =?UTF-8?q?In=20the=20CI=20smoke=20test,=20do=20not?= =?UTF-8?q?=20check=20for=20a=20=E2=80=98server=E2=80=99=20header?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It no longer seems to be present, and this particular header was not the point of the test. --- tests/smoke/test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/smoke/test.py b/tests/smoke/test.py index d622ddd..9ac5805 100644 --- a/tests/smoke/test.py +++ b/tests/smoke/test.py @@ -3,7 +3,6 @@ import urllib3 http = urllib3.PoolManager() r = http.request('GET', 'http://example.com/') print('status = {0}'.format(r.status)) -print("headers['server'] = {0}".format(r.headers['server'])) print(r.data) if r.status != 200 or not r.data: raise SystemExit(1) From 85033d9c3d0b4fdaedf1b6351868fe5f92416fc4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 12 Apr 2025 07:35:04 -0400 Subject: [PATCH 70/82] Update to 2.4.0 (close RHBZ#2358892) --- .gitignore | 1 + python-urllib3.spec | 81 +++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 39 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 08d4b37..f08b3a1 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /urllib3-2.2.2.tar.gz /urllib3-2.2.3.tar.gz /urllib3-2.3.0.tar.gz +/urllib3-2.4.0.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 999385c..d0dba77 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ %bcond extradeps %{undefined rhel} Name: python-urllib3 -Version: 2.3.0 +Version: 2.4.0 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -20,9 +20,10 @@ Source0: %{url}/archive/%{version}/urllib3-%{version}.tar.gz # Upstream would like to get the necessary changes merged into Hypercorn, but # explained clearly why the forked copy is needed for now. # -# Note that dev-requirements.txt references the urllib3-changes branch of -# https://github.com/urllib3/hypercorn/, and we should use the latest commit -# from that branch, but we package using a commit hash for reproducibility. +# Note that tool.uv.sources.hypercorn in pyproject.toml references the +# urllib3-changes branch of https://github.com/urllib3/hypercorn/, and we +# should use the latest commit from that branch, but we package using a commit +# hash for reproducibility. # # We do not need to treat this as a bundled dependency because it is not # installed in the buildroot or otherwise included in any of the binary RPMs. @@ -33,46 +34,10 @@ Source1: %{hypercorn_url}/archive/%{hypercorn_commit}/hypercorn-%{hyperco BuildArch: noarch BuildRequires: python3-devel - +# The conditional is important: we benefit from tomcli for editing dependency +# groups, but we do not want it when bootstrapping or in RHEL. %if %{with tests} -# Test dependencies are listed only in dev-requirements.txt. Because there are -# linters and coverage tools mixed in, and exact versions are pinned, we resort -# to manual listing. -# h2==4.1.0: also in the h2 extra -BuildRequires: %{py3_dist h2} -# coverage==7.6.4: omitted linter/coverage tool -# PySocks==1.7.1 -BuildRequires: %{py3_dist PySocks} -# pytest==8.0.2 -BuildRequires: %{py3_dist pytest} -# pytest-timeout==2.1.0 -BuildRequires: %{py3_dist pytest-timeout} -# pyOpenSSL==24.2.1 -BuildRequires: %{py3_dist pyOpenSSL} -# idna==3.7 -BuildRequires: %{py3_dist idna} -# trustme==1.2.0 -BuildRequires: %{py3_dist trustme} -# cryptography==43.0.1 -BuildRequires: %{py3_dist cryptography} -# towncrier==23.6.0: used for generating a changelog -# pytest-memray==1.5.0;python_version<"3.14" and sys_platform!="win32" and -# implementation_name=="cpython": not packaged, unwanted profiler -# trio==0.26.2 -BuildRequires: %{py3_dist trio} -# # https://github.com/pallets/quart/pull/369 -# Quart @ git+https://github.com/pallets/quart@67110bf383d8973bce1619e957b4b6ea088ad9f2 -BuildRequires: %{py3_dist Quart} -# quart-trio==0.11.1 -BuildRequires: %{py3_dist quart-trio} -# # https://github.com/pgjones/hypercorn/issues/62 -# # https://github.com/pgjones/hypercorn/issues/168 -# # https://github.com/pgjones/hypercorn/issues/169 -# hypercorn @ git+https://github.com/urllib3/hypercorn@urllib3-changes -# hypercorn is packaged, but we need the forked/bundled version -# httpx==0.25.2 -BuildRequires: %{py3_dist httpx} -# pytest-socket==0.7.0: not packaged, not strictly required +BuildRequires: tomcli %endif %global _description %{expand: @@ -138,12 +103,40 @@ Recommends: python3-urllib3+socks recent_date=$(date --date "7 month ago" +"%Y, %_m, %_d") sed -i "s/^RECENT_DATE = datetime.date(.*)/RECENT_DATE = datetime.date($recent_date)/" src/urllib3/connection.py +%if %{with tests} +# Possible improvements to dependency groups +# https://github.com/urllib3/urllib3/issues/3594 +# Adjust the contents of the "dev" dependency group by removing: +remove_from_dev() { + tomcli set pyproject.toml lists delitem 'dependency-groups.dev' "($1)\b.*" +} +# - Linters, coverage tools, profilers, etc.: +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters +remove_from_dev 'coverage|pytest-memray' +# - Dependencies for maintainer tasks +remove_from_dev 'build|towncrier' +# - Dependencies that are not packaged and not strictly required +remove_from_dev 'pytest-socket' +# - Hypercorn, because we have a special forked version we must use for +# testing instead, so we do not want to generate a dependency on the system +# copy. Note that the system copy is still an indirect dependency via quart +# and quart-trio. +remove_from_dev 'hypercorn' + +# Remove all version bounds for test dependencies. We must attempt to make do +# with what we have. (This also removes any python version or platform +# constraints, which is currently fine, but could theoretically cause trouble +# in the future. We’ll cross that bridge if we ever arrive at it.) +tomcli set pyproject.toml lists replace --type regex_search \ + 'dependency-groups.dev' '[>=]=.*' '' +%endif + %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' # Generate BR’s from packaged extras even when tests are disabled, to ensure # the extras metapackages are installable if the build succeeds. -%pyproject_buildrequires %{?with_extradeps:-x brotli,zstd,socks,h2} +%pyproject_buildrequires %{?with_extradeps:-x brotli,zstd,socks,h2} %{?with_tests:-g dev} %build diff --git a/sources b/sources index 6c51285..2812134 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.3.0.tar.gz) = 7b4b8732f4a4cddb8a6f6854d21febcbecba0762bff65d2291d95d1f54a972c3168f8d7ca1786edfb5c0a0c955cf3812ff6fe1b7925973d3fe31077fbfbdc39c +SHA512 (urllib3-2.4.0.tar.gz) = 78afd6daea5594381783cae2cc3efbfcc89455da7f86994a17bd86c3c840d2e304fd3b744e8c0789cbbe6704502ef03a1bbaaadd2b1713b084adb250cfdffb9f SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From e2a4d0479834d85eaeceb7ecc263f3369b9ed2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 29 May 2025 11:46:29 +0200 Subject: [PATCH 71/82] Unpin hatch-vcs version --- python-urllib3.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-urllib3.spec b/python-urllib3.spec index d0dba77..1f8532b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -85,6 +85,10 @@ Recommends: python3-urllib3+socks %autosetup -n urllib3-%{version} %setup -q -n urllib3-%{version} -T -D -b 1 +# Unpin hatch-vcs version +# See https://github.com/urllib3/urllib3/issues/3612 +sed -i 's/hatch-vcs==/hatch-vcs>=/' pyproject.toml + # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date # (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either, From da087985d09435caf96c61f2f9a26a7845159e9e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 09:58:05 +0200 Subject: [PATCH 72/82] Bootstrap for Python 3.14 --- python-urllib3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-urllib3.spec b/python-urllib3.spec index 1f8532b..a65a8af 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,3 +1,5 @@ +%global _without_extradeps 1 +%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies and the dependencies for extras %bcond tests %{undefined rhel} From 50a131c01cecedd5ad415b51ad64183293236c7f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 13 Jun 2025 08:13:47 -0400 Subject: [PATCH 73/82] Non-bootstrap build for Python 3.14 --- python-urllib3.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-urllib3.spec b/python-urllib3.spec index a65a8af..1f8532b 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -1,5 +1,3 @@ -%global _without_extradeps 1 -%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies and the dependencies for extras %bcond tests %{undefined rhel} From 30af009037c3510c9f30a7b0c78061aba3e6480b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 10:59:26 +0000 Subject: [PATCH 74/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e5f7f4eaa8f27aecfebf26af53bb5500cb7755bf Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 7 Aug 2025 16:09:56 +0200 Subject: [PATCH 75/82] Update to 2.5.0 (rhbz#2375401) --- .gitignore | 1 + python-urllib3.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f08b3a1..cbe6feb 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /urllib3-2.2.3.tar.gz /urllib3-2.3.0.tar.gz /urllib3-2.4.0.tar.gz +/urllib3-2.5.0.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 1f8532b..d56aabc 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ %bcond extradeps %{undefined rhel} Name: python-urllib3 -Version: 2.4.0 +Version: 2.5.0 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more diff --git a/sources b/sources index 2812134..c289b5f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.4.0.tar.gz) = 78afd6daea5594381783cae2cc3efbfcc89455da7f86994a17bd86c3c840d2e304fd3b744e8c0789cbbe6704502ef03a1bbaaadd2b1713b084adb250cfdffb9f +SHA512 (urllib3-2.5.0.tar.gz) = 492ebb3e0481ee5433f45bef184ddb01714dedcbe2eb61665c781f3dcd0d9a226204052d64215c02e8972155560bc146395022723f79c076cb59abe1c0ef51ff SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 53699eb0701d033a32eddf1643c63303c13942b1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:06:11 +0200 Subject: [PATCH 76/82] Rebuilt for Python 3.14.0rc2 bytecode From b97cc1ac48029944152d8227cd8a0476a5014fc0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:42:14 +0200 Subject: [PATCH 77/82] Rebuilt for Python 3.14.0rc3 bytecode From 9b878192d61ca16c137dc73e869f255df013da44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 8 Dec 2025 12:37:59 +0100 Subject: [PATCH 78/82] Allow building with setuptools_scm 9 --- python-urllib3.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-urllib3.spec b/python-urllib3.spec index d56aabc..7d4d9ba 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -88,6 +88,8 @@ Recommends: python3-urllib3+socks # Unpin hatch-vcs version # See https://github.com/urllib3/urllib3/issues/3612 sed -i 's/hatch-vcs==/hatch-vcs>=/' pyproject.toml +# Allow setuptools_scm 9, https://github.com/urllib3/urllib3/commit/1ce1b59ec6 +sed -i 's/setuptools-scm>=8,<9/setuptools-scm>=8,<10/' pyproject.toml # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date From 5baec5bbecb9d967237ff5c28d36298997feeb8a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 8 Dec 2025 11:12:58 +0000 Subject: [PATCH 79/82] Update to 2.6.1 (close RHBZ#2419408) - Fixes CVE-2025-66471 / GHSA-2xpw-w6gg-jr37 - Fixes CVE-2025-66418 / GHSA-gm62-xv2j-4w53 --- .gitignore | 2 ++ python-urllib3.spec | 8 +------- sources | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cbe6feb..12cf6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ /urllib3-2.3.0.tar.gz /urllib3-2.4.0.tar.gz /urllib3-2.5.0.tar.gz +/urllib3-2.6.0.tar.gz +/urllib3-2.6.1.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 7d4d9ba..17659fd 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ %bcond extradeps %{undefined rhel} Name: python-urllib3 -Version: 2.5.0 +Version: 2.6.1 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -85,12 +85,6 @@ Recommends: python3-urllib3+socks %autosetup -n urllib3-%{version} %setup -q -n urllib3-%{version} -T -D -b 1 -# Unpin hatch-vcs version -# See https://github.com/urllib3/urllib3/issues/3612 -sed -i 's/hatch-vcs==/hatch-vcs>=/' pyproject.toml -# Allow setuptools_scm 9, https://github.com/urllib3/urllib3/commit/1ce1b59ec6 -sed -i 's/setuptools-scm>=8,<9/setuptools-scm>=8,<10/' pyproject.toml - # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is. # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date # (from test/test_connection.py) would fail. However, it shouldn't be to close to the build time either, diff --git a/sources b/sources index c289b5f..ecf4691 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.5.0.tar.gz) = 492ebb3e0481ee5433f45bef184ddb01714dedcbe2eb61665c781f3dcd0d9a226204052d64215c02e8972155560bc146395022723f79c076cb59abe1c0ef51ff +SHA512 (urllib3-2.6.1.tar.gz) = a5935e42cfa843688f68e2c71de3eff4c505907bd155f41a6f3406000cfaa060db0184a18448e269192c3f69861f5630a112fe207874da45bf475bebbdeb2b83 SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 994f0a13b1a5689dd47975ada30224d3cecdea3d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 12 Dec 2025 06:59:19 +0000 Subject: [PATCH 80/82] Update to 2.6.2 (close RHBZ#2421420) --- .gitignore | 1 + python-urllib3.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 12cf6b3..bd674b9 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /urllib3-2.5.0.tar.gz /urllib3-2.6.0.tar.gz /urllib3-2.6.1.tar.gz +/urllib3-2.6.2.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 17659fd..7b2af84 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ %bcond extradeps %{undefined rhel} Name: python-urllib3 -Version: 2.6.1 +Version: 2.6.2 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more diff --git a/sources b/sources index ecf4691..a84bd3c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.6.1.tar.gz) = a5935e42cfa843688f68e2c71de3eff4c505907bd155f41a6f3406000cfaa060db0184a18448e269192c3f69861f5630a112fe207874da45bf475bebbdeb2b83 +SHA512 (urllib3-2.6.2.tar.gz) = 7d2167924922f27cd618bb3f8b56a3c4c6a49254ec5ee7ee48aba6d39cd924e40c58db9b759b0a41ac676f7273b56fe8978d6e20b798ff9b8c8c745c74cf9a15 SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b From 78aa0cc35e74f25a92ba0538c60af2eef0c771db Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 7 Jan 2026 23:24:55 +0000 Subject: [PATCH 81/82] Update .rpmlintrc file [skip changelog] --- python-urllib3.rpmlintrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-urllib3.rpmlintrc b/python-urllib3.rpmlintrc index 0b83833..e9bd352 100644 --- a/python-urllib3.rpmlintrc +++ b/python-urllib3.rpmlintrc @@ -1,6 +1 @@ -# It is normal that extras metapackages should not have documentation, or any -# files at all. -addFilter(r"\+\w+\.\w+: W: no-documentation") -# Not real spelling errors -addFilter(r"spelling-error \('([Mm]etapackage)s?',") addFilter(r"spelling-error \('(gzip|brotli|zstd)',") From cd3e490d533b1b4c3aaea5cddbc7aec5e0e82fb0 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 7 Jan 2026 23:19:39 +0000 Subject: [PATCH 82/82] Update to 2.6.3 (close RHBZ#2427603) --- .gitignore | 1 + python-urllib3.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bd674b9..e3fee0e 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /urllib3-2.6.0.tar.gz /urllib3-2.6.1.tar.gz /urllib3-2.6.2.tar.gz +/urllib3-2.6.3.tar.gz diff --git a/python-urllib3.spec b/python-urllib3.spec index 7b2af84..5b863bf 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -5,7 +5,7 @@ %bcond extradeps %{undefined rhel} Name: python-urllib3 -Version: 2.6.2 +Version: 2.6.3 Release: %autorelease Summary: HTTP library with thread-safe connection pooling, file post, and more diff --git a/sources b/sources index a84bd3c..d7b27ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (urllib3-2.6.2.tar.gz) = 7d2167924922f27cd618bb3f8b56a3c4c6a49254ec5ee7ee48aba6d39cd924e40c58db9b759b0a41ac676f7273b56fe8978d6e20b798ff9b8c8c745c74cf9a15 +SHA512 (urllib3-2.6.3.tar.gz) = 554cedfd97d411fffa9a8ba46f592eab9e58c5fa8822ecd5a73ab45d6adfc188a6b9c4e238d02a4fbd3a1067a25a1de841a33d398d0641e22a32ea414876b615 SHA512 (hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.tar.gz) = 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b