From df549fb6c7574d61bc80d5095ad6fc2e15af001b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 23 Oct 2023 14:07:24 +0200 Subject: [PATCH] Convert from Fedora for the Python 3.12 stack in RHEL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Miro Hrončok --- python3.12-urllib3.spec | 488 +++++----------------------------------- 1 file changed, 61 insertions(+), 427 deletions(-) diff --git a/python3.12-urllib3.spec b/python3.12-urllib3.spec index cadf132..3a0c950 100644 --- a/python3.12-urllib3.spec +++ b/python3.12-urllib3.spec @@ -1,14 +1,10 @@ -# 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 +%global __python3 /usr/bin/python3.12 +%global python3_pkgversion 3.12 -Name: python-urllib3 +# RHEL does not include the test dependencies +%bcond_with tests + +Name: python%{python3_pkgversion}-urllib3 Version: 1.26.18 Release: 1%{?dist} Summary: HTTP library with thread-safe connection pooling, file post, and more @@ -20,7 +16,9 @@ Source: %{url}/archive/%{version}/urllib3-%{version}.tar.gz BuildArch: noarch -BuildRequires: python3-devel +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-rpm-macros +BuildRequires: python%{python3_pkgversion}-setuptools %if %{with tests} # Test dependencies are listed only in dev-requirements.txt. Because there are @@ -29,27 +27,37 @@ BuildRequires: python3-devel # 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 +BuildRequires: python%{python3_pkgversion}-tornado >= 6.1 # PySocks==1.7.1 -BuildRequires: %{py3_dist PySocks} >= 1.7.1 +BuildRequires: python%{python3_pkgversion}-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 +BuildRequires: python%{python3_pkgversion}-pytest >= 6.2.4 # pytest-timeout==1.4.2 -BuildRequires: %{py3_dist pytest-timeout} >= 1.4.2 +BuildRequires: python%{python3_pkgversion}-pytest-timeout >= 1.4.2 # pytest-freezegun==0.4.2 -BuildRequires: %{py3_dist pytest-freezegun} >= 0.4.2 +BuildRequires: python%{python3_pkgversion}-pytest-freezegun >= 0.4.2 # flaky==3.7.0: not really required # trustme==0.7.0 -BuildRequires: %{py3_dist trustme} >= 0.7 +BuildRequires: python%{python3_pkgversion}-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 +BuildRequires: python%{python3_pkgversion}-python-dateutil >= 2.8.1 # gcp-devrel-py-tools==0.0.16: not used in offline testing %endif -%global _description %{expand: +BuildRequires: ca-certificates +Requires: ca-certificates + +# There has historically been a manual hard dependency on python3-idna. +BuildRequires: python%{python3_pkgversion}-idna +Requires: python%{python3_pkgversion}-idna + +# grep __version__ src/urllib3/packages/six.py +Provides: bundled(python%{python3_pkgversion}dist(six)) = 1.16.0 + +%description urllib3 is a powerful, user-friendly HTTP client for Python. urllib3 brings many critical features that are missing from the Python standard libraries: @@ -62,39 +70,6 @@ many critical features that are missing from the Python standard libraries: • Proxy support for HTTP and SOCKS. • 100% test coverage.} -%description %{_description} - - -%package -n python3-urllib3 -Summary: %{summary} - -BuildRequires: ca-certificates -Requires: ca-certificates - -# There has historically been a manual hard dependency on python3-idna. -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, -# 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 %autosetup -n urllib3-%{version} @@ -122,31 +97,15 @@ 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 %{?with_extras:-x brotli,socks} - - %build -%pyproject_wheel +%py3_build %install -%pyproject_install - -%pyproject_save_files urllib3 +%py3_install %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). @@ -163,364 +122,39 @@ ignore="${ignore-} --ignore=test/test_no_ssl.py" %endif -%files -n python3-urllib3 -f %{pyproject_files} +%files -n python%{python3_pkgversion}-urllib3 +%license LICENSE.txt %doc CHANGES.rst README.rst +%{python3_sitelib}/urllib3/ +%{python3_sitelib}/urllib3-*.egg-info/ %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 - -* 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. +* Mon Oct 23 2023 Tomáš Hrnčiar - 1.26.18-1 +- Initial package +- Fedora contributions by + Adam Williamson + Anna Khaitovich + Arun S A G + Benjamin A. Beasley + Carl George + Charalampos Stratakis + Dennis Gilmore + Haikel Guemar + Iryna Shcherbina + Jeremy Cline + Karolina Surma + Kevin Fenzi + Lukas Slebodnik + Lumir Balhar + Maxwell G + Miro Hrončok + Ralph Bean + Robert Kuska + Slavek Kabrda + Tomas Hoger + Tomáš Hrnčiar + Tom Callaway + Toshio Kuratomi + Yaakov Selkowitz + yatinkarel