.gitignore

@@ -1 +1 @@
-SOURCES/requests-v2.25.0.tar.gz
+SOURCES/requests-v2.20.0.tar.gz

.python-requests.metadata

@@ -1 +1 @@
-619d5a34667fdc0f1f8d1e1be6b9b7f6127383d1 SOURCES/requests-v2.25.0.tar.gz
+2c0728fc3aca17419b2b574341a0b019e117d4f5 SOURCES/requests-v2.20.0.tar.gz

SOURCES/Don-t-inject-pyopenssl-into-urllib3.patch

@@ -0,0 +1,38 @@
+From 86b1fa39fdebdb7bc57131c1a198d4d18e104f95 Mon Sep 17 00:00:00 2001
+From: Jeremy Cline <jeremy@jcline.org>
+Date: Mon, 16 Apr 2018 10:35:35 -0400
+Subject: [PATCH] Don't inject pyopenssl into urllib3
+
+Fedora ships sufficiently new versions of Python 2 and 3 to make this
+unnecessary (rhbz 1567862)
+
+Signed-off-by: Jeremy Cline <jeremy@jcline.org>
+---
+ requests/__init__.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/requests/__init__.py b/requests/__init__.py
+index a5b3c9c3..e312d314 100644
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -90,17 +90,6 @@ except (AssertionError, ValueError):
+                   "version!".format(urllib3.__version__, chardet.__version__),
+                   RequestsDependencyWarning)
+ 
+-# Attempt to enable urllib3's SNI support, if possible
+-try:
+-    from urllib3.contrib import pyopenssl
+-    pyopenssl.inject_into_urllib3()
+-
+-    # Check cryptography version
+-    from cryptography import __version__ as cryptography_version
+-    _check_cryptography(cryptography_version)
+-except ImportError:
+-    pass
+-
+ # urllib3's DependencyWarnings should be silenced.
+ from urllib3.exceptions import DependencyWarning
+ warnings.simplefilter('ignore', DependencyWarning)
+-- 
+2.17.0
+

SOURCES/Remove-tests-that-use-the-tarpit.patch

@@ -1,4 +1,4 @@
-From bb1c91432c5e9a1f402692db5c80c65136656afb Mon Sep 17 00:00:00 2001
+From 524cd22fb77e69db9bb3f017bbb1d9782c37b0cd Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jeremy@jcline.org>
 Date: Tue, 13 Jun 2017 09:08:09 -0400
 Subject: [PATCH] Remove tests that use the tarpit
@@ -15,10 +15,10 @@ Signed-off-by: Jeremy Cline <jeremy@jcline.org>
  1 file changed, 25 deletions(-)
 
 diff --git a/tests/test_requests.py b/tests/test_requests.py
-index 7d4a4eb5..8d1c55fc 100644
+index b8350cb..46b7e9e 100755
 --- a/tests/test_requests.py
 +++ b/tests/test_requests.py
-@@ -2186,31 +2186,6 @@ class TestTimeout:
+@@ -2049,31 +2049,6 @@ class TestTimeout:
          except ReadTimeout:
              pass
  
@@ -48,8 +48,8 @@ index 7d4a4eb5..8d1c55fc 100644
 -            pass
 -
      def test_encoded_methods(self, httpbin):
-         """See: https://github.com/psf/requests/issues/2316"""
+         """See: https://github.com/requests/requests/issues/2316"""
          r = requests.request(b'GET', httpbin('get'))
 -- 
-2.24.1
+2.9.4
 

SOURCES/Skip-all-tests-needing-httpbin.patch

@@ -0,0 +1,33 @@
+From 650da6c0267ba711d9d02d2bba8d79540437055f Mon Sep 17 00:00:00 2001
+From: Tomas Orsava <torsava@redhat.com>
+Date: Wed, 13 Jun 2018 15:44:42 +0200
+Subject: [PATCH] Skip all tests needing httpbin
+
+httpbin has too many dependencies to be shipped in RHEL just for
+build-time package tests
+---
+ tests/conftest.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index cd64a76..6cdc95a 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -15,10 +15,12 @@ def prepare_url(value):
+ 
+ 
+ @pytest.fixture
+-def httpbin(httpbin):
++def httpbin():
++    pytest.skip()
+     return prepare_url(httpbin)
+ 
+ 
+ @pytest.fixture
+-def httpbin_secure(httpbin_secure):
++def httpbin_secure():
++    pytest.skip()
+     return prepare_url(httpbin_secure)
+-- 
+2.14.4
+

SOURCES/patch-requests-certs.py-to-use-the-system-CA-bundle.patch

@@ -1,19 +1,19 @@
-From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001
+From a8ef690988f92a56226f8b688f1a3638346bca8e Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
+From: Jeremy Cline <jeremy@jcline.org>
-Date: Thu, 13 Dec 2018 10:55:29 -0500
+Date: Mon, 19 Jun 2017 16:09:02 -0400
 Subject: [PATCH] Patch requests/certs.py to use the system CA bundle
 
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
+Signed-off-by: Jeremy Cline <jeremy@jcline.org>
 ---
- requests/certs.py | 8 +++++++-
+ requests/certs.py | 11 ++++++++++-
- setup.py          | 1 -
+ setup.py          |  1 -
- 2 files changed, 7 insertions(+), 2 deletions(-)
+ 2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/requests/certs.py b/requests/certs.py
-index d1a378d7..5eb2f1a9 100644
+index d1a378d7..7b103baf 100644
 --- a/requests/certs.py
 +++ b/requests/certs.py
-@@ -11,8 +11,14 @@ only one — the one from the certifi package.
+@@ -11,8 +11,17 @@ only one — the one from the certifi package.
  If you are packaging Requests, e.g., for a Linux distribution or a managed
  environment, you can change the definition of where() to return a separately
  packaged CA bundle.
@@ -22,25 +22,28 @@ index d1a378d7..5eb2f1a9 100644
 +by the ca-certificates RPM package.
  """
 -from certifi import where
-+def where():
++try:
-+    """Return the absolute path to the system CA bundle."""
++    from certifi import where
-+    return '/etc/pki/tls/certs/ca-bundle.crt'
++except ImportError:
++    def where():
++        """Return the absolute path to the system CA bundle."""
++        return '/etc/pki/tls/certs/ca-bundle.crt'
 +
  
  if __name__ == '__main__':
      print(where())
 diff --git a/setup.py b/setup.py
-index 2da9ba07..851d9a42 100755
+index 4e2ad936..60de5861 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -45,7 +45,6 @@ requires = [
-     'chardet>=3.0.2,<4',
+     'chardet>=3.0.2,<3.1.0',
-     'idna>=2.5,<3',
+     'idna>=2.5,<2.8',
-     'urllib3>=1.21.1,<1.27',
+     'urllib3>=1.21.1,<1.25',
 -    'certifi>=2017.4.17'
  
  ]
  test_requirements = [
 -- 
-2.24.1
+2.19.1
 

SOURCES/properly-handle-default-ports-in-auth-stripping.patch

@@ -0,0 +1,67 @@
+diff --git a/requests/sessions.py b/requests/sessions.py
+index a448bd8..d73d700 100644
+--- a/requests/sessions.py
++++ b/requests/sessions.py
+@@ -19,7 +19,7 @@ from .cookies import (
+ from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
+ from .hooks import default_hooks, dispatch_hook
+ from ._internal_utils import to_native_string
+-from .utils import to_key_val_list, default_headers
++from .utils import to_key_val_list, default_headers, DEFAULT_PORTS
+ from .exceptions import (
+     TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
+ 
+@@ -128,8 +128,17 @@ class SessionRedirectMixin(object):
+         if (old_parsed.scheme == 'http' and old_parsed.port in (80, None)
+                 and new_parsed.scheme == 'https' and new_parsed.port in (443, None)):
+             return False
++
++        # Handle default port usage corresponding to scheme.
++        changed_port = old_parsed.port != new_parsed.port
++        changed_scheme = old_parsed.scheme != new_parsed.scheme
++        default_port = (DEFAULT_PORTS.get(old_parsed.scheme, None), None)
++        if (not changed_scheme and old_parsed.port in default_port
++                and new_parsed.port in default_port):
++            return False
++
+         # Standard case: root URI must match
+-        return old_parsed.port != new_parsed.port or old_parsed.scheme != new_parsed.scheme
++        return changed_port or changed_scheme
+ 
+     def resolve_redirects(self, resp, req, stream=False, timeout=None,
+                           verify=True, cert=None, proxies=None, yield_requests=False, **adapter_kwargs):
+diff --git a/requests/utils.py b/requests/utils.py
+index 0ce7fe1..04145c8 100644
+--- a/requests/utils.py
++++ b/requests/utils.py
+@@ -38,6 +38,8 @@ NETRC_FILES = ('.netrc', '_netrc')
+ 
+ DEFAULT_CA_BUNDLE_PATH = certs.where()
+ 
++DEFAULT_PORTS = {'http': 80, 'https': 443}
++
+ 
+ if sys.platform == 'win32':
+     # provide a proxy_bypass version on Windows without DNS lookups
+diff --git a/tests/test_requests.py b/tests/test_requests.py
+index f46561e..f99fdaf 100644
+--- a/tests/test_requests.py
++++ b/tests/test_requests.py
+@@ -1611,6 +1611,17 @@ class TestRequests:
+         s = requests.Session()
+         assert s.should_strip_auth('http://example.com:1234/foo', 'https://example.com:4321/bar')
+ 
++    @pytest.mark.parametrize(
++        'old_uri, new_uri', (
++            ('https://example.com:443/foo', 'https://example.com/bar'),
++            ('http://example.com:80/foo', 'http://example.com/bar'),
++            ('https://example.com/foo', 'https://example.com:443/bar'),
++            ('http://example.com/foo', 'http://example.com:80/bar')
++        ))
++    def test_should_strip_auth_default_port(self, old_uri, new_uri):
++        s = requests.Session()
++        assert not s.should_strip_auth(old_uri, new_uri)
++
+     def test_manual_redirect_with_partial_body_read(self, httpbin):
+         s = requests.Session()
+         r1 = s.get(httpbin('redirect/2'), allow_redirects=False, stream=True)

SPECS/python-requests.spec

@@ -1,9 +1,9 @@
-# RHEL8: Tests disabled due to missing dependencies
+%bcond_without tests
-%bcond_with tests
+%bcond_without python3
 
 Name:           python-requests
-Version:        2.25.0
+Version:        2.20.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HTTP library, written in Python, for human beings
 
 License:        ASL 2.0
@@ -23,11 +23,21 @@ Patch2:         Remove-tests-that-use-the-tarpit.patch
 # a pretty odd one so this is a niche requirement.
 Patch3:         requests-2.12.4-tests_nonet.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1567862
+Patch4:         Don-t-inject-pyopenssl-into-urllib3.patch
+
+# Skip all tests needing httpbin
+#   httpbin has too many dependencies to be shipped in RHEL just for
+#   build-time package tests
+Patch5:         Skip-all-tests-needing-httpbin.patch
+
+# Properly handle default ports when stripping the authorization header.
+# This fixes a regression introduced with fixing CVE-2018-18074.
+# Fixed upstream: https://github.com/psf/requests/pull/4851
+# Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1762422
+Patch6:         properly-handle-default-ports-in-auth-stripping.patch
+
 BuildArch:      noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
-# x86_64 compose of CRB, but we don't want to ship it at all.
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:    i686
 
 %description
 Most existing Python modules for sending HTTP requests are extremely verbose and
@@ -35,29 +45,54 @@ cumbersome. Python’s built-in urllib2 module provides most of the HTTP
 capabilities you should need, but the API is thoroughly broken. This library is
 designed to make HTTP requests easy for developers.
 
+%package -n python2-requests
+Summary: HTTP library, written in Python, for human beings
+%{?python_provide:%python_provide python2-requests}
+
+BuildRequires:  python2-devel
+BuildRequires:  python2-chardet
+BuildRequires:  python2-urllib3
+BuildRequires:  python2-idna
+%if %{with tests}
+BuildRequires:  python2-pytest
+BuildRequires:  python2-pytest-mock
+%endif
+
+
+Requires:       ca-certificates
+Requires:       python2-chardet
+Requires:       python2-urllib3
+Requires:       python2-idna
+
+%if 0%{?rhel} && 0%{?rhel} <= 6
+BuildRequires:  python-ordereddict
+Requires:       python-ordereddict
+%endif
+
+%description -n python2-requests
+Most existing Python modules for sending HTTP requests are extremely verbose and
+cumbersome. Python’s built-in urllib2 module provides most of the HTTP
+capabilities you should need, but the API is thoroughly broken. This library is
+designed to make HTTP requests easy for developers.
+
+%if %{with python3}
 %package -n python%{python3_pkgversion}-requests
 Summary: HTTP library, written in Python, for human beings
 
 %{?python_provide:%python_provide python%{python3_pkgversion}-requests}
 
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
 BuildRequires:  python%{python3_pkgversion}-chardet
 BuildRequires:  python%{python3_pkgversion}-urllib3
 BuildRequires:  python%{python3_pkgversion}-idna
-# RHEL8: pygments is used for syntax highlighting in the docs - disabled due to missing deps
-# BuildRequires:  python%{python3_pkgversion}-pygments
-BuildRequires:  python%{python3_pkgversion}-setuptools
 %if %{with tests}
 BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-pytest-httpbin
 BuildRequires:  python%{python3_pkgversion}-pytest-mock
 %endif
 
-Requires:  python%{python3_pkgversion}-chardet
+Requires:       python%{python3_pkgversion}-chardet
-Requires:  python%{python3_pkgversion}-urllib3
+Requires:       python%{python3_pkgversion}-urllib3
-Requires:  python%{python3_pkgversion}-idna
+Requires:       python%{python3_pkgversion}-idna
-
 
 %description -n python%{python3_pkgversion}-requests
 Most existing Python modules for sending HTTP requests are extremely verbose and
@@ -65,6 +100,8 @@ cumbersome. Python’s built-in urllib2 module provides most of the HTTP
 capabilities you should need, but the API is thoroughly broken. This library is
 designed to make HTTP requests easy for developers.
 
+%endif
+
 %prep
 %autosetup -p1 -n requests-%{version}
 
@@ -74,128 +111,78 @@ rm -rf requests/cacert.pem
 # env shebang in nonexecutable file
 sed -i '/#!\/usr\/.*python/d' requests/certs.py
 
-# Some doctests use the internet and fail to pass in Koji. Since doctests don't have names, I don't
-# know a way to skip them. We also don't want to patch them out, because patching them out will
-# change the docs. Thus, we set pytest not to run doctests at all.
-sed -i 's/ --doctest-modules//' pytest.ini
-
-
 %build
+%py2_build
+%if %{with python3}
 %py3_build
-
+%endif
 
 %install
+%py2_install
+%if %{with python3}
 %py3_install
-
+%endif
 
 %if %{with tests}
 %check
-# test_https_warnings: https://github.com/psf/requests/issues/5530
+PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v
-%pytest -v -k "not test_https_warnings"
+%if %{with python3}
+PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
+%endif
 %endif # tests
 
 
+%files -n python2-requests
+%license LICENSE
+%doc README.md HISTORY.md
+%{python2_sitelib}/*.egg-info
+%{python2_sitelib}/requests/
+
+%if %{with python3}
 %files -n python%{python3_pkgversion}-requests
 %license LICENSE
 %doc README.md HISTORY.md
-%{python3_sitelib}/*.egg-info/
+%{python3_sitelib}/*.egg-info
 %{python3_sitelib}/requests/
+%endif
 
 
 %changelog
-* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 2.25.0-2
+* Fri Nov 1 2019 Charalampos Stratakis <cstratak@redhat.com> - 2.20.0-3
-- Convert from Fedora to the python39 module in RHEL8
+- Properly handle default ports when stripping the authorization header
-- Resolves: rhbz#1877430
+Resolves: rhbz#1762422
 
-* Wed Nov 25 2020 Petr Viktorin <pviktori@redhat.com> - 2.25.0-1
+* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 2.20.0-2
-- Update to 2.25.0
+- Bumping due to problems with modular RPM upgrade path
-
+- Resolves: rhbz#1695587
-* Fri Nov 13 2020 Miro Hrončok <mhroncok@redhat.com> - 2.24.0-5
-- Don't BR pytest-cov
-
-* Fri Sep 18 2020 Miro Hrončok <mhroncok@redhat.com> - 2.24.0-3
-- Build with pytest 6, older version is no longer required
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.24.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Miro Hrončok <mhroncok@redhat.com> - 2.24.0-1
-- Update to 2.24.0
-- Resolves rhbz#1848104
-
-* Fri Jul 10 2020 Miro Hrončok <mhroncok@redhat.com> - 2.23.0-5
-- Add requests[security] and requests[socks] subpackages
-
-* Sat May 30 2020 Miro Hrončok <mhroncok@redhat.com> - 2.23.0-4
-- Test with pytest 4, drop manual requires
-
-* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 2.23.0-3
-- Rebuilt for Python 3.9
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 2.23.0-2
-- Bootstrap for Python 3.9
-
-* Fri Feb 21 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 2.23.0-1
-- Update to 2.23.0 (#1804863).
-- https://requests.readthedocs.io/en/latest/community/updates/
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.22.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Oct 22 2019 Charalampos Stratakis <cstratak@redhat.com> - 2.22.0-7
-- Remove the python2 subpackage (rhbz#1761787)
-
-* Wed Sep 18 2019 Petr Viktorin <pviktori@redhat.com> - 2.22.0-6
-- Python 2: Remove tests and test dependencies
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.22.0-5
-- Rebuilt for Python 3.8
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.22.0-4
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.22.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 11 2019 Yatin Karel <ykarel@redhat.com> - 2.22.0-2
-- Add minimum requirement for chardet and urllib3
-
-* Thu May 23 2019 Jeremy Cline <jcline@redhat.com> - 2.22.0-1
-- Update to v2.22.0
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Jeremy Cline <jeremy@jcline.org> - 2.21.0-1
-- Update to v2.21.0
-- Don't rely on certifi being patched properly to use the system CA bundle
-
-* Mon Nov 26 2018 Miro Hrončok <mhroncok@redhat.com> - 2.20.0-2
-- No pytest-httpbin for Python 2
 
 * Mon Oct 29 2018 Jeremy Cline <jeremy@jcline.org> - 2.20.0-1
-- Update to v2.20.0
+- Update to v2.20.0 for CVE-2018-18074.
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.19.1-3
+* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 2.19.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Make possible to disable python3 subpackage
 
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 2.19.1-2
+* Mon Jul 16 2018 Lumír Balhar <lbalhar@redhat.com> - 2.19.1-4
-- Rebuilt for Python 3.7
+- First version for python27 module
 
-* Thu Jun 14 2018 Jeremy Cline <jeremy@jcline.org> - 2.19.1-1
+* Thu Jun 21 2018 Lumír Balhar <lbalhar@redhat.com> - 2.19.1-3
+- Allow build with Python 2
+
+* Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 2.19.1-2
+- Remove the python-pytest-cov dependency
+
+* Tue Jun 19 2018 Jeremy Cline <jeremy@jcline.org> - 2.19.1-1
 - Update to v2.19.1 (rhbz 1591531)
 
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 2.19.0-2
+* Tue Jun 19 2018 Jeremy Cline <jeremy@jcline.org> - 2.19.0-1
-- Bootstrap for Python 3.7
-
-* Tue Jun 12 2018 Jeremy Cline <jeremy@jcline.org> - 2.19.0-1
 - Update to v2.19.0 (rhbz 1590508)
 
-* Fri Jun 08 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-6
+* Wed Jun 13 2018 Tomas Orsava <torsava@redhat.com> - 2.18.4-6
-- Don't print runtime warning about urllib3 v1.23 (rhbz 1589306)
+- Skip all tests needing httpbin: httpbin has too many dependencies to be
+  shipped in RHEL just for build-time package tests
 
-* Tue Jun 05 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-5
+* Tue Jun 12 2018 Tomas Orsava <torsava@redhat.com> - 2.18.4-5
-- Allow urllib3 v1.23 (rhbz 1586311)
+- BR idna, or the tests fail to start
 
 * Mon Apr 16 2018 Jeremy Cline <jeremy@jcline.org> - 2.18.4-4
 - Stop injecting PyOpenSSL (rhbz 1567862)