From 9c755120837d8d18778e58db8faa09b99602a00e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 1 Jul 2013 15:06:25 -0400 Subject: [PATCH 001/165] Update to the latest upstream. --- .gitignore | 1 + python-requests-system-cert-bundle.patch | 33 +++++------- python-requests-system-urllib3.patch | 68 ++++++++++++++---------- python-requests.spec | 10 ++-- sources | 2 +- 5 files changed, 61 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 3fb1685..b67e6fd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /requests-0.13.1.tar.gz /requests-0.14.1.tar.gz /requests-1.1.0.tar.gz +/requests-1.2.3.tar.gz diff --git a/python-requests-system-cert-bundle.patch b/python-requests-system-cert-bundle.patch index 9184c66..c5ddb81 100644 --- a/python-requests-system-cert-bundle.patch +++ b/python-requests-system-cert-bundle.patch @@ -1,44 +1,37 @@ -From 415619361cc23dd87b1a7a5fd0cfba38e33d24fd Mon Sep 17 00:00:00 2001 +From 6ca0a139fa69545fc22b611485a39e281a07798b Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Wed, 27 Feb 2013 09:16:20 -0500 -Subject: [PATCH] system cert bundle +Date: Mon, 1 Jul 2013 14:50:34 -0400 +Subject: [PATCH 1/3] system cert bundle --- - requests/certs.py | 17 +++++------------ - 1 file changed, 5 insertions(+), 12 deletions(-) + requests/certs.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requests/certs.py b/requests/certs.py -index 8148276..6e07f5e 100644 +index bc00826..9b78e3b 100644 --- a/requests/certs.py +++ b/requests/certs.py -@@ -10,22 +10,15 @@ This module returns the preferred default CA certificate bundle. +@@ -10,15 +10,15 @@ This module returns the preferred default CA certificate bundle. 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. -""" -- --import os.path --certifi = None --try: -- import certifi --except ImportError: -- pass +-import os.path +We return "/etc/pki/tls/certs/ca-bundle.crt" provided by the ca-certificates +package. +""" + def where(): - """Return the preferred certificate bundle.""" -- if certifi: -- return certifi.where() -- +- """Return the preferred certificate bundle.""" +- # vendored bundle inside Requests - return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ # Don't use the certs bundled with requests, use ca-certificates'. ++ """ Don't use the certs bundled with requests, use ca-certificates. """ + return "/etc/pki/tls/certs/ca-bundle.crt" if __name__ == '__main__': print(where()) -- -1.8.1.2 +1.8.1.4 diff --git a/python-requests-system-urllib3.patch b/python-requests-system-urllib3.patch index 90b078b..8a911c6 100644 --- a/python-requests-system-urllib3.patch +++ b/python-requests-system-urllib3.patch @@ -1,30 +1,48 @@ -From 5d23c608e72025f72e1f3223cb6c7e3979e93c7f Mon Sep 17 00:00:00 2001 +From 3ca53c8ba4557fc04c98c2b3b6aced09ddac6f7b Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Thu, 28 Feb 2013 10:57:20 -0500 -Subject: [PATCH] system-urllib3 +Date: Mon, 1 Jul 2013 15:00:59 -0400 +Subject: [PATCH 3/3] system urllib3 --- + requests/__init__.py | 7 ------- requests/adapters.py | 12 ++++++------ - requests/compat.py | 6 +++++- + requests/compat.py | 5 ++++- requests/models.py | 4 ++-- - 3 files changed, 13 insertions(+), 9 deletions(-) + 4 files changed, 12 insertions(+), 16 deletions(-) +diff --git a/requests/__init__.py b/requests/__init__.py +index 1af8d8e..8bc9843 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz' + __license__ = 'Apache 2.0' + __copyright__ = 'Copyright 2013 Kenneth Reitz' + +-# Attempt to enable urllib3's SNI support, if possible +-try: +- from requests.packages.urllib3.contrib import pyopenssl +- pyopenssl.inject_into_urllib3() +-except ImportError: +- pass +- + from . import utils + from .models import Request, Response, PreparedRequest + from .api import request, get, head, post, patch, put, delete, options diff --git a/requests/adapters.py b/requests/adapters.py -index 5f9d9c7..1f61bd6 100644 +index 98b7317..9ec3b1d 100644 --- a/requests/adapters.py +++ b/requests/adapters.py -@@ -11,17 +11,17 @@ and maintain connections. +@@ -11,16 +11,16 @@ and maintain connections. import socket from .models import Response --from .packages.urllib3.poolmanager import PoolManager, proxy_from_url +-from .packages.urllib3.poolmanager import PoolManager, ProxyManager -from .packages.urllib3.response import HTTPResponse -+from urllib3.poolmanager import PoolManager, proxy_from_url ++from urllib3.poolmanager import PoolManager, ProxyManager +from urllib3.response import HTTPResponse - from .hooks import dispatch_hook - from .compat import urlparse, basestring, urldefrag + from .compat import urlparse, basestring, urldefrag, unquote from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed) + prepend_scheme_if_needed, get_auth_from_url) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import TimeoutError @@ -36,17 +54,16 @@ index 5f9d9c7..1f61bd6 100644 +from urllib3.exceptions import HTTPError as _HTTPError from .cookies import extract_cookies_to_jar from .exceptions import ConnectionError, Timeout, SSLError - + from .auth import _basic_auth_str diff --git a/requests/compat.py b/requests/compat.py -index 39421ed..d9ab218 100644 +index 93f6bb6..8b4a3bd 100644 --- a/requests/compat.py +++ b/requests/compat.py -@@ -89,7 +89,11 @@ if is_py2: +@@ -89,7 +89,10 @@ if is_py2: import cookielib from Cookie import Morsel from StringIO import StringIO - from .packages.urllib3.packages.ordered_dict import OrderedDict -+ + try: + from collections import OrderedDict + except ImportError: @@ -55,27 +72,20 @@ index 39421ed..d9ab218 100644 builtin_str = str bytes = str diff --git a/requests/models.py b/requests/models.py -index 5202e6f..218b4f2 100644 +index 6cf2aaa..8a0ae9a 100644 --- a/requests/models.py +++ b/requests/models.py -@@ -17,7 +17,7 @@ from .status_codes import codes +@@ -17,8 +17,8 @@ from .structures import CaseInsensitiveDict from .auth import HTTPBasicAuth from .cookies import cookiejar_from_dict, get_cookie_header -from .packages.urllib3.filepost import encode_multipart_formdata +-from .packages.urllib3.util import parse_url +from urllib3.filepost import encode_multipart_formdata ++from urllib3.util import parse_url from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL from .utils import ( - stream_untransfer, guess_filename, requote_uri, -@@ -121,7 +121,7 @@ class RequestEncodingMixin(object): - fp = StringIO(fp) - if isinstance(fp, bytes): - fp = BytesIO(fp) -- -+ - if ft: - new_v = (fn, fp.read(), ft) - else: + guess_filename, get_auth_from_url, requote_uri, -- -1.8.1.2 +1.8.1.4 diff --git a/python-requests.spec b/python-requests.spec index 10502db..6845147 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %endif Name: python-requests -Version: 1.1.0 -Release: 4%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -129,6 +129,10 @@ popd %endif %changelog +* Mon Jul 01 2013 Ralph Bean - 1.2.3-1 +- Latest upstream. +- Fixed bogus date in changelog. + * Tue Jun 11 2013 Ralph Bean - 1.1.0-4 - Correct a rhel conditional on python-ordereddict @@ -158,7 +162,7 @@ popd - Fix a problem with cookie handling + https://bugzilla.redhat.com/show_bug.cgi?id=906924 -* Wed Oct 22 2012 Arun S A G 0.14.1-1 +* Mon Oct 22 2012 Arun S A G 0.14.1-1 - Updated to latest upstream release * Sun Jun 10 2012 Arun S A G 0.13.1-1 diff --git a/sources b/sources index f5403f5..0333ce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0158815af244c32041a3147ee09abf3 requests-1.1.0.tar.gz +adbd3f18445f7fe5e77f65c502e264fb requests-1.2.3.tar.gz From 529a069240684626b684dc4f8f4d638e08588d56 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:31:56 -0500 Subject: [PATCH 002/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 6845147..6d69778 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -129,6 +129,9 @@ popd %endif %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Mon Jul 01 2013 Ralph Bean - 1.2.3-1 - Latest upstream. - Fixed bogus date in changelog. From 47d04d26a4ef938671cce9b710069c87e2e4baec Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 22 Aug 2013 16:12:58 -0400 Subject: [PATCH 003/165] Release bump for a coupled update with python-urllib3. --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 6d69778..e9d6ef0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 1.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -129,6 +129,9 @@ popd %endif %changelog +* Thu Aug 22 2013 Ralph Bean - 1.2.3-3 +- Release bump for a coupled update with python-urllib3. + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 9bb69bf47bffda68e8d32cd76155181cf7ed6b1d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 26 Aug 2013 11:03:18 -0400 Subject: [PATCH 004/165] Explicitly versioned the requirements on python-urllib3 --- python-requests.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index e9d6ef0..7438d9b 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 1.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -29,7 +29,7 @@ BuildRequires: python-urllib3 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 +Requires: python-urllib3>=1.7 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -49,7 +49,7 @@ BuildRequires: python3-devel BuildRequires: python3-chardet BuildRequires: python3-urllib3 Requires: python3-chardet -Requires: python3-urllib3 +Requires: python3-urllib3>=1.7 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -129,6 +129,9 @@ popd %endif %changelog +* Mon Aug 26 2013 Ralph Bean - 1.2.3-4 +- Explicitly versioned the requirements on python-urllib3. + * Thu Aug 22 2013 Ralph Bean - 1.2.3-3 - Release bump for a coupled update with python-urllib3. From 14d9138969bc67e0d09aac0770bac913374e1591 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Aug 2013 11:26:16 -0500 Subject: [PATCH 005/165] fix versioned dep on python-urllib3 --- python-requests.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 7438d9b..c8d74c2 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 1.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -29,7 +29,7 @@ BuildRequires: python-urllib3 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3>=1.7 +Requires: python-urllib3 >= 1.7 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -49,7 +49,7 @@ BuildRequires: python3-devel BuildRequires: python3-chardet BuildRequires: python3-urllib3 Requires: python3-chardet -Requires: python3-urllib3>=1.7 +Requires: python3-urllib3 >= 1.7 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -129,6 +129,9 @@ popd %endif %changelog +* Mon Aug 26 2013 Rex Dieter 1.2.3-5 +- fix versioned dep on python-urllib3 + * Mon Aug 26 2013 Ralph Bean - 1.2.3-4 - Explicitly versioned the requirements on python-urllib3. From d75372e530b18db082c255761d7b720ab495842e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 25 Sep 2013 14:22:48 -0400 Subject: [PATCH 006/165] Latest major upstream release - requests-2.0.0 --- .gitignore | 1 + python-requests-system-cert-bundle.patch | 4 +- ...-requests-system-chardet-not-charade.patch | 8 ++-- python-requests-system-urllib3.patch | 38 ++++++++++--------- python-requests.spec | 18 ++++++--- sources | 2 +- 6 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index b67e6fd..6303539 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /requests-0.14.1.tar.gz /requests-1.1.0.tar.gz /requests-1.2.3.tar.gz +/requests-2.0.0.tar.gz diff --git a/python-requests-system-cert-bundle.patch b/python-requests-system-cert-bundle.patch index c5ddb81..8e467bd 100644 --- a/python-requests-system-cert-bundle.patch +++ b/python-requests-system-cert-bundle.patch @@ -1,4 +1,4 @@ -From 6ca0a139fa69545fc22b611485a39e281a07798b Mon Sep 17 00:00:00 2001 +From ad98b45e959dc7325c294c26d94e68901700c407 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 1 Jul 2013 14:50:34 -0400 Subject: [PATCH 1/3] system cert bundle @@ -33,5 +33,5 @@ index bc00826..9b78e3b 100644 if __name__ == '__main__': print(where()) -- -1.8.1.4 +1.8.3.1 diff --git a/python-requests-system-chardet-not-charade.patch b/python-requests-system-chardet-not-charade.patch index e9abcf2..130b0aa 100644 --- a/python-requests-system-chardet-not-charade.patch +++ b/python-requests-system-chardet-not-charade.patch @@ -1,14 +1,14 @@ -From 07c1df1053a61ec5097fe79c68aba7fda7bac3b5 Mon Sep 17 00:00:00 2001 +From ff921c66c3d0d38b2aa63eba529c9f0cb68c549a Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 27 Feb 2013 10:03:41 -0500 -Subject: [PATCH] Use system chardet, not charade. +Subject: [PATCH 2/3] Use system chardet, not charade. --- requests/compat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/compat.py b/requests/compat.py -index 5bd4fcb..39421ed 100644 +index 0d61a57..62bfef9 100644 --- a/requests/compat.py +++ b/requests/compat.py @@ -4,7 +4,7 @@ @@ -21,5 +21,5 @@ index 5bd4fcb..39421ed 100644 import sys -- -1.8.1.2 +1.8.3.1 diff --git a/python-requests-system-urllib3.patch b/python-requests-system-urllib3.patch index 8a911c6..b5d5dd4 100644 --- a/python-requests-system-urllib3.patch +++ b/python-requests-system-urllib3.patch @@ -1,17 +1,17 @@ -From 3ca53c8ba4557fc04c98c2b3b6aced09ddac6f7b Mon Sep 17 00:00:00 2001 +From c3fcc7597106553ad7b495a22535645617e20e18 Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Mon, 1 Jul 2013 15:00:59 -0400 +Date: Wed, 25 Sep 2013 09:05:31 -0400 Subject: [PATCH 3/3] system urllib3 --- requests/__init__.py | 7 ------- - requests/adapters.py | 12 ++++++------ + requests/adapters.py | 14 +++++++------- requests/compat.py | 5 ++++- requests/models.py | 4 ++-- - 4 files changed, 12 insertions(+), 16 deletions(-) + 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py -index 1af8d8e..8bc9843 100644 +index 837f0df..a28977d 100644 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz' @@ -20,7 +20,7 @@ index 1af8d8e..8bc9843 100644 -# Attempt to enable urllib3's SNI support, if possible -try: -- from requests.packages.urllib3.contrib import pyopenssl +- from .packages.urllib3.contrib import pyopenssl - pyopenssl.inject_into_urllib3() -except ImportError: - pass @@ -29,20 +29,22 @@ index 1af8d8e..8bc9843 100644 from .models import Request, Response, PreparedRequest from .api import request, get, head, post, patch, put, delete, options diff --git a/requests/adapters.py b/requests/adapters.py -index 98b7317..9ec3b1d 100644 +index d557b74..577bced 100644 --- a/requests/adapters.py +++ b/requests/adapters.py -@@ -11,16 +11,16 @@ and maintain connections. +@@ -11,17 +11,17 @@ and maintain connections. import socket from .models import Response --from .packages.urllib3.poolmanager import PoolManager, ProxyManager +-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url -from .packages.urllib3.response import HTTPResponse -+from urllib3.poolmanager import PoolManager, ProxyManager +-from .packages.urllib3.util import Timeout as TimeoutSauce ++from urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse ++from urllib3.util import Timeout as TimeoutSauce from .compat import urlparse, basestring, urldefrag, unquote from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed, get_auth_from_url) + except_on_missing_scheme, get_auth_from_url) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import TimeoutError @@ -56,7 +58,7 @@ index 98b7317..9ec3b1d 100644 from .exceptions import ConnectionError, Timeout, SSLError from .auth import _basic_auth_str diff --git a/requests/compat.py b/requests/compat.py -index 93f6bb6..8b4a3bd 100644 +index 62bfef9..b394b17 100644 --- a/requests/compat.py +++ b/requests/compat.py @@ -89,7 +89,10 @@ if is_py2: @@ -68,11 +70,11 @@ index 93f6bb6..8b4a3bd 100644 + from collections import OrderedDict + except ImportError: + from ordereddict import OrderedDict + from httplib import IncompleteRead builtin_str = str - bytes = str diff --git a/requests/models.py b/requests/models.py -index 6cf2aaa..8a0ae9a 100644 +index 8fd9735..7df85c1 100644 --- a/requests/models.py +++ b/requests/models.py @@ -17,8 +17,8 @@ from .structures import CaseInsensitiveDict @@ -83,9 +85,9 @@ index 6cf2aaa..8a0ae9a 100644 -from .packages.urllib3.util import parse_url +from urllib3.filepost import encode_multipart_formdata +from urllib3.util import parse_url - from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL - from .utils import ( - guess_filename, get_auth_from_url, requote_uri, + from .exceptions import ( + HTTPError, RequestException, MissingSchema, InvalidURL, + ChunkedEncodingError) -- -1.8.1.4 +1.8.3.1 diff --git a/python-requests.spec b/python-requests.spec index c8d74c2..5e300f7 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %endif Name: python-requests -Version: 1.2.3 -Release: 5%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -25,11 +25,11 @@ Patch2: python-requests-system-urllib3.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 +BuildRequires: python-urllib3 >= 1.7.1 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 >= 1.7 +Requires: python-urllib3 >= 1.7.1 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -47,9 +47,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 +BuildRequires: python3-urllib3 >= 1.7.1 Requires: python3-chardet -Requires: python3-urllib3 >= 1.7 +Requires: python3-urllib3 >= 1.7.1 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -124,11 +124,17 @@ popd %if 0%{?_with_python3} %files -n python3-requests +%doc NOTICE LICENSE README.rst HISTORY.rst %{python3_sitelib}/*.egg-info %{python3_sitelib}/requests/ %endif %changelog +* Wed Sep 25 2013 Ralph Bean - 2.0.0-1 +- Latest upstream. +- Add doc macro to the python3 files section. +- Require python-urllib3 greater than or at 1.7.1. + * Mon Aug 26 2013 Rex Dieter 1.2.3-5 - fix versioned dep on python-urllib3 diff --git a/sources b/sources index 0333ce4..f81436e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -adbd3f18445f7fe5e77f65c502e264fb requests-1.2.3.tar.gz +856fc825c17483e25fd55db115028e3f requests-2.0.0.tar.gz From 3e12c85f52e2232c74e4aa8ce81627121c6b161b Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Thu, 15 May 2014 17:00:16 +0200 Subject: [PATCH 007/165] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 5e300f7..4871e02 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -130,6 +130,9 @@ popd %endif %changelog +* Wed May 14 2014 Bohuslav Kabrda - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + * Wed Sep 25 2013 Ralph Bean - 2.0.0-1 - Latest upstream. - Add doc macro to the python3 files section. From 1b6b3feb3c0389c92cbf1a48a061754c8e5c41ec Mon Sep 17 00:00:00 2001 From: Arun S A G Date: Fri, 30 May 2014 01:06:57 -0700 Subject: [PATCH 008/165] Updated to requests 2.3.0 and rebased patches --- .gitignore | 1 + ...-requests-system-chardet-not-charade.patch | 21 +--- python-requests-system-urllib3.patch | 99 +++++++++---------- python-requests.spec | 17 ++-- sources | 2 +- 5 files changed, 65 insertions(+), 75 deletions(-) diff --git a/.gitignore b/.gitignore index 6303539..2f11463 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /requests-1.1.0.tar.gz /requests-1.2.3.tar.gz /requests-2.0.0.tar.gz +/requests-2.3.0.tar.gz diff --git a/python-requests-system-chardet-not-charade.patch b/python-requests-system-chardet-not-charade.patch index 130b0aa..ea71522 100644 --- a/python-requests-system-chardet-not-charade.patch +++ b/python-requests-system-chardet-not-charade.patch @@ -1,25 +1,12 @@ -From ff921c66c3d0d38b2aa63eba529c9f0cb68c549a Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Wed, 27 Feb 2013 10:03:41 -0500 -Subject: [PATCH 2/3] Use system chardet, not charade. - ---- - requests/compat.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requests/compat.py b/requests/compat.py -index 0d61a57..62bfef9 100644 ---- a/requests/compat.py -+++ b/requests/compat.py +diff -up ./requests/compat.py.orig ./requests/compat.py +--- ./requests/compat.py.orig 2014-05-30 00:23:21.910322912 -0700 ++++ ./requests/compat.py 2014-05-30 00:24:06.697631425 -0700 @@ -4,7 +4,7 @@ pythoncompat """ --from .packages import charade as chardet +-from .packages import chardet +import chardet import sys --- -1.8.3.1 - diff --git a/python-requests-system-urllib3.patch b/python-requests-system-urllib3.patch index b5d5dd4..235f807 100644 --- a/python-requests-system-urllib3.patch +++ b/python-requests-system-urllib3.patch @@ -1,38 +1,7 @@ -From c3fcc7597106553ad7b495a22535645617e20e18 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Wed, 25 Sep 2013 09:05:31 -0400 -Subject: [PATCH 3/3] system urllib3 - ---- - requests/__init__.py | 7 ------- - requests/adapters.py | 14 +++++++------- - requests/compat.py | 5 ++++- - requests/models.py | 4 ++-- - 4 files changed, 13 insertions(+), 17 deletions(-) - -diff --git a/requests/__init__.py b/requests/__init__.py -index 837f0df..a28977d 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz' - __license__ = 'Apache 2.0' - __copyright__ = 'Copyright 2013 Kenneth Reitz' - --# Attempt to enable urllib3's SNI support, if possible --try: -- from .packages.urllib3.contrib import pyopenssl -- pyopenssl.inject_into_urllib3() --except ImportError: -- pass -- - from . import utils - from .models import Request, Response, PreparedRequest - from .api import request, get, head, post, patch, put, delete, options -diff --git a/requests/adapters.py b/requests/adapters.py -index d557b74..577bced 100644 ---- a/requests/adapters.py -+++ b/requests/adapters.py -@@ -11,17 +11,17 @@ and maintain connections. +diff -up ./requests/adapters.py.orig ./requests/adapters.py +--- ./requests/adapters.py.orig 2014-05-30 00:27:36.151074219 -0700 ++++ ./requests/adapters.py 2014-05-30 00:31:26.712662414 -0700 +@@ -11,18 +11,18 @@ and maintain connections. import socket from .models import Response @@ -44,23 +13,24 @@ index d557b74..577bced 100644 +from urllib3.util import Timeout as TimeoutSauce from .compat import urlparse, basestring, urldefrag, unquote from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - except_on_missing_scheme, get_auth_from_url) + prepend_scheme_if_needed, get_auth_from_url) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import TimeoutError -from .packages.urllib3.exceptions import SSLError as _SSLError -from .packages.urllib3.exceptions import HTTPError as _HTTPError +-from .packages.urllib3.exceptions import ProxyError as _ProxyError +from urllib3.exceptions import MaxRetryError +from urllib3.exceptions import TimeoutError +from urllib3.exceptions import SSLError as _SSLError +from urllib3.exceptions import HTTPError as _HTTPError ++from urllib3.exceptions import ProxyError as _ProxyError from .cookies import extract_cookies_to_jar - from .exceptions import ConnectionError, Timeout, SSLError + from .exceptions import ConnectionError, Timeout, SSLError, ProxyError from .auth import _basic_auth_str -diff --git a/requests/compat.py b/requests/compat.py -index 62bfef9..b394b17 100644 ---- a/requests/compat.py -+++ b/requests/compat.py +diff -up ./requests/compat.py.orig ./requests/compat.py +--- ./requests/compat.py.orig 2014-05-30 00:46:53.888049149 -0700 ++++ ./requests/compat.py 2014-05-30 00:54:17.647105931 -0700 @@ -89,7 +89,10 @@ if is_py2: import cookielib from Cookie import Morsel @@ -73,21 +43,50 @@ index 62bfef9..b394b17 100644 from httplib import IncompleteRead builtin_str = str -diff --git a/requests/models.py b/requests/models.py -index 8fd9735..7df85c1 100644 ---- a/requests/models.py -+++ b/requests/models.py -@@ -17,8 +17,8 @@ from .structures import CaseInsensitiveDict +diff -up ./requests/exceptions.py.orig ./requests/exceptions.py +--- ./requests/exceptions.py.orig 2014-05-30 00:59:00.825056566 -0700 ++++ ./requests/exceptions.py 2014-05-30 00:59:13.416143297 -0700 +@@ -7,7 +7,7 @@ requests.exceptions + This module contains the set of Requests' exceptions. + + """ +-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError ++from urllib3.exceptions import HTTPError as BaseHTTPError + + + class RequestException(IOError): +diff -up ./requests/__init__.py.orig ./requests/__init__.py +--- ./requests/__init__.py.orig 2014-05-30 00:27:56.025211120 -0700 ++++ ./requests/__init__.py 2014-05-30 00:54:37.009239302 -0700 +@@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz' + __license__ = 'Apache 2.0' + __copyright__ = 'Copyright 2014 Kenneth Reitz' + +-# Attempt to enable urllib3's SNI support, if possible +-try: +- from .packages.urllib3.contrib import pyopenssl +- pyopenssl.inject_into_urllib3() +-except ImportError: +- pass +- + from . import utils + from .models import Request, Response, PreparedRequest + from .api import request, get, head, post, patch, put, delete, options +diff -up ./requests/models.py.orig ./requests/models.py +--- ./requests/models.py.orig 2014-05-30 00:27:18.926955573 -0700 ++++ ./requests/models.py 2014-05-30 00:31:12.714565990 -0700 +@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveD from .auth import HTTPBasicAuth from .cookies import cookiejar_from_dict, get_cookie_header +-from .packages.urllib3.fields import RequestField -from .packages.urllib3.filepost import encode_multipart_formdata -from .packages.urllib3.util import parse_url +-from .packages.urllib3.exceptions import DecodeError ++from urllib3.fields import RequestField +from urllib3.filepost import encode_multipart_formdata +from urllib3.util import parse_url ++from urllib3.exceptions import DecodeError from .exceptions import ( HTTPError, RequestException, MissingSchema, InvalidURL, - ChunkedEncodingError) --- -1.8.3.1 - + ChunkedEncodingError, ContentDecodingError) diff --git a/python-requests.spec b/python-requests.spec index 4871e02..aedfd14 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %endif Name: python-requests -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -25,11 +25,11 @@ Patch2: python-requests-system-urllib3.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 >= 1.7.1 +BuildRequires: python-urllib3 >= 1.8.2 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 >= 1.7.1 +Requires: python-urllib3 >= 1.8.2 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -47,9 +47,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 >= 1.7.1 +BuildRequires: python3-urllib3 >= 1.8.2 Requires: python3-chardet -Requires: python3-urllib3 >= 1.7.1 +Requires: python3-urllib3 >= 1.8.2 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -79,7 +79,7 @@ pushd %{py3dir} %{__python3} setup.py build # Unbundle chardet. Patch1 switches usage to system chardet. -rm -rf build/lib/requests/packages/charade +rm -rf build/lib/requests/packages/chardet # Unbundle urllib3. Patch1 switches usage to system urllib3. rm -rf build/lib/requests/packages @@ -130,6 +130,9 @@ popd %endif %changelog +* Thu May 29 2014 Arun S A G - 2.3.0-1 +- Latest upstream + * Wed May 14 2014 Bohuslav Kabrda - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 diff --git a/sources b/sources index f81436e..2ed91ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -856fc825c17483e25fd55db115028e3f requests-2.0.0.tar.gz +7449ffdc8ec9ac37bbcd286003c80f00 requests-2.3.0.tar.gz From a3d6ffe71ef7061253fab521cee319e216887bd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 17:45:33 -0500 Subject: [PATCH 009/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index aedfd14..aab56ca 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -130,6 +130,9 @@ popd %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 29 2014 Arun S A G - 2.3.0-1 - Latest upstream From cd981a741943ad6bc0565362df1a81a84f16d2fd Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sun, 3 Aug 2014 17:42:24 -0400 Subject: [PATCH 010/165] fix license handling --- python-requests.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index aab56ca..540b958 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -117,19 +117,26 @@ popd %files %defattr(-,root,root,-) -%doc NOTICE LICENSE README.rst HISTORY.rst +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc NOTICE README.rst HISTORY.rst %{python_sitelib}/*.egg-info %dir %{python_sitelib}/requests %{python_sitelib}/requests/* %if 0%{?_with_python3} %files -n python3-requests -%doc NOTICE LICENSE README.rst HISTORY.rst +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc NOTICE README.rst HISTORY.rst %{python3_sitelib}/*.egg-info %{python3_sitelib}/requests/ %endif %changelog +* Sun Aug 3 2014 Tom Callaway - 2.3.0-3 +- fix license handling + * Sat Jun 07 2014 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From d282fb97bc65fbbd93d063bf0519e5e6c953e3ca Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sun, 3 Aug 2014 17:42:52 -0400 Subject: [PATCH 011/165] fix license handling --- python-requests.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index aab56ca..540b958 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -117,19 +117,26 @@ popd %files %defattr(-,root,root,-) -%doc NOTICE LICENSE README.rst HISTORY.rst +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc NOTICE README.rst HISTORY.rst %{python_sitelib}/*.egg-info %dir %{python_sitelib}/requests %{python_sitelib}/requests/* %if 0%{?_with_python3} %files -n python3-requests -%doc NOTICE LICENSE README.rst HISTORY.rst +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc NOTICE README.rst HISTORY.rst %{python3_sitelib}/*.egg-info %{python3_sitelib}/requests/ %endif %changelog +* Sun Aug 3 2014 Tom Callaway - 2.3.0-3 +- fix license handling + * Sat Jun 07 2014 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1dbd5737771b4fdbc64651ddd2d72ad990ca0ce2 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 5 Nov 2014 09:48:24 -0500 Subject: [PATCH 012/165] Re-do unbundling with symlinks. Requested https://twitter.com/sigmavirus24/status/529826381333417984 --- ...-requests-remove-nested-bundling-dep.patch | 31 +++++++ ...-requests-system-chardet-not-charade.patch | 12 --- python-requests-system-urllib3.patch | 92 ------------------- python-requests.spec | 33 ++++--- 4 files changed, 47 insertions(+), 121 deletions(-) create mode 100644 python-requests-remove-nested-bundling-dep.patch delete mode 100644 python-requests-system-chardet-not-charade.patch delete mode 100644 python-requests-system-urllib3.patch diff --git a/python-requests-remove-nested-bundling-dep.patch b/python-requests-remove-nested-bundling-dep.patch new file mode 100644 index 0000000..eb536bd --- /dev/null +++ b/python-requests-remove-nested-bundling-dep.patch @@ -0,0 +1,31 @@ +From e74bf477e53f9089e6d763d676333c9d84ab71e0 Mon Sep 17 00:00:00 2001 +From: Ralph Bean +Date: Wed, 5 Nov 2014 09:38:42 -0500 +Subject: [PATCH] Remove nested budnling dep. + +--- + requests/compat.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/requests/compat.py b/requests/compat.py +index bdf10d6..29cce93 100644 +--- a/requests/compat.py ++++ b/requests/compat.py +@@ -89,9 +89,13 @@ if is_py2: + import cookielib + from Cookie import Morsel + from StringIO import StringIO +- from .packages.urllib3.packages.ordered_dict import OrderedDict + from httplib import IncompleteRead + ++ try: ++ from collections import OrderedDict # py2.7 ++ except: ++ from ordereddict import OrderedDict # py2.6 and lower (el6, etc.) ++ + builtin_str = str + bytes = str + str = unicode +-- +1.9.3 + diff --git a/python-requests-system-chardet-not-charade.patch b/python-requests-system-chardet-not-charade.patch deleted file mode 100644 index ea71522..0000000 --- a/python-requests-system-chardet-not-charade.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./requests/compat.py.orig ./requests/compat.py ---- ./requests/compat.py.orig 2014-05-30 00:23:21.910322912 -0700 -+++ ./requests/compat.py 2014-05-30 00:24:06.697631425 -0700 -@@ -4,7 +4,7 @@ - pythoncompat - """ - --from .packages import chardet -+import chardet - - import sys - diff --git a/python-requests-system-urllib3.patch b/python-requests-system-urllib3.patch deleted file mode 100644 index 235f807..0000000 --- a/python-requests-system-urllib3.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up ./requests/adapters.py.orig ./requests/adapters.py ---- ./requests/adapters.py.orig 2014-05-30 00:27:36.151074219 -0700 -+++ ./requests/adapters.py 2014-05-30 00:31:26.712662414 -0700 -@@ -11,18 +11,18 @@ and maintain connections. - import socket - - from .models import Response --from .packages.urllib3.poolmanager import PoolManager, proxy_from_url --from .packages.urllib3.response import HTTPResponse --from .packages.urllib3.util import Timeout as TimeoutSauce -+from urllib3.poolmanager import PoolManager, proxy_from_url -+from urllib3.response import HTTPResponse -+from urllib3.util import Timeout as TimeoutSauce - from .compat import urlparse, basestring, urldefrag, unquote - from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed, get_auth_from_url) - from .structures import CaseInsensitiveDict --from .packages.urllib3.exceptions import MaxRetryError --from .packages.urllib3.exceptions import TimeoutError --from .packages.urllib3.exceptions import SSLError as _SSLError --from .packages.urllib3.exceptions import HTTPError as _HTTPError --from .packages.urllib3.exceptions import ProxyError as _ProxyError -+from urllib3.exceptions import MaxRetryError -+from urllib3.exceptions import TimeoutError -+from urllib3.exceptions import SSLError as _SSLError -+from urllib3.exceptions import HTTPError as _HTTPError -+from urllib3.exceptions import ProxyError as _ProxyError - from .cookies import extract_cookies_to_jar - from .exceptions import ConnectionError, Timeout, SSLError, ProxyError - from .auth import _basic_auth_str -diff -up ./requests/compat.py.orig ./requests/compat.py ---- ./requests/compat.py.orig 2014-05-30 00:46:53.888049149 -0700 -+++ ./requests/compat.py 2014-05-30 00:54:17.647105931 -0700 -@@ -89,7 +89,10 @@ if is_py2: - import cookielib - from Cookie import Morsel - from StringIO import StringIO -- from .packages.urllib3.packages.ordered_dict import OrderedDict -+ try: -+ from collections import OrderedDict -+ except ImportError: -+ from ordereddict import OrderedDict - from httplib import IncompleteRead - - builtin_str = str -diff -up ./requests/exceptions.py.orig ./requests/exceptions.py ---- ./requests/exceptions.py.orig 2014-05-30 00:59:00.825056566 -0700 -+++ ./requests/exceptions.py 2014-05-30 00:59:13.416143297 -0700 -@@ -7,7 +7,7 @@ requests.exceptions - This module contains the set of Requests' exceptions. - - """ --from .packages.urllib3.exceptions import HTTPError as BaseHTTPError -+from urllib3.exceptions import HTTPError as BaseHTTPError - - - class RequestException(IOError): -diff -up ./requests/__init__.py.orig ./requests/__init__.py ---- ./requests/__init__.py.orig 2014-05-30 00:27:56.025211120 -0700 -+++ ./requests/__init__.py 2014-05-30 00:54:37.009239302 -0700 -@@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz' - __license__ = 'Apache 2.0' - __copyright__ = 'Copyright 2014 Kenneth Reitz' - --# Attempt to enable urllib3's SNI support, if possible --try: -- from .packages.urllib3.contrib import pyopenssl -- pyopenssl.inject_into_urllib3() --except ImportError: -- pass -- - from . import utils - from .models import Request, Response, PreparedRequest - from .api import request, get, head, post, patch, put, delete, options -diff -up ./requests/models.py.orig ./requests/models.py ---- ./requests/models.py.orig 2014-05-30 00:27:18.926955573 -0700 -+++ ./requests/models.py 2014-05-30 00:31:12.714565990 -0700 -@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveD - - from .auth import HTTPBasicAuth - from .cookies import cookiejar_from_dict, get_cookie_header --from .packages.urllib3.fields import RequestField --from .packages.urllib3.filepost import encode_multipart_formdata --from .packages.urllib3.util import parse_url --from .packages.urllib3.exceptions import DecodeError -+from urllib3.fields import RequestField -+from urllib3.filepost import encode_multipart_formdata -+from urllib3.util import parse_url -+from urllib3.exceptions import DecodeError - from .exceptions import ( - HTTPError, RequestException, MissingSchema, InvalidURL, - ChunkedEncodingError, ContentDecodingError) diff --git a/python-requests.spec b/python-requests.spec index 540b958..43b99a5 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -15,12 +15,9 @@ Source0: http://pypi.python.org/packages/source/r/requests/requests-%{ver # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: python-requests-system-cert-bundle.patch -# Unbundle python-charade (a fork of python-chardet). -# https://bugzilla.redhat.com/show_bug.cgi?id=904623 -Patch1: python-requests-system-chardet-not-charade.patch -# Unbundle python-charade (a fork of python-urllib3). -# https://bugzilla.redhat.com/show_bug.cgi?id=904623 -Patch2: python-requests-system-urllib3.patch + +# Remove an unnecessary reference to a bundled compat lib in urllib3 +Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch BuildRequires: python2-devel @@ -63,7 +60,6 @@ designed to make HTTP requests easy for developers. %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -78,32 +74,32 @@ cp -a . %{py3dir} pushd %{py3dir} %{__python3} setup.py build -# Unbundle chardet. Patch1 switches usage to system chardet. +# Unbundle chardet and urllib3. We replace these with symlinks to system libs. rm -rf build/lib/requests/packages/chardet - -# Unbundle urllib3. Patch1 switches usage to system urllib3. -rm -rf build/lib/requests/packages +rm -rf build/lib/requests/packages/urllib3 popd %endif %{__python} setup.py build -# Unbundle chardet. Patch1 switches usage to system chardet. -rm -rf build/lib/requests/packages/charade - -# Unbundle urllib3. Patch1 switches usage to system urllib3. -rm -rf build/lib/requests/packages +# Unbundle chardet and urllib3. We replace these with symlinks to system libs. +rm -rf build/lib/requests/packages/chardet +rm -rf build/lib/requests/packages/urllib3 %install rm -rf $RPM_BUILD_ROOT %if 0%{?_with_python3} pushd %{py3dir} %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT +ln -s ../../chardet %{buildroot}/%{python3_sitelib}/requests/packages/chardet +ln -s ../../urllib3 %{buildroot}/%{python3_sitelib}/requests/packages/urllib3 popd %endif %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +ln -s ../../chardet %{buildroot}/%{python_sitelib}/requests/packages/chardet +ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 ## The tests succeed if run locally, but fail in koji. ## They require an active network connection to query httpbin.org @@ -134,6 +130,9 @@ popd %endif %changelog +* Wed Nov 05 2014 Ralph Bean - 2.3.0-4 +- Re-do unbundling by symlinking system libs into the requests/packages/ dir. + * Sun Aug 3 2014 Tom Callaway - 2.3.0-3 - fix license handling From 85d9fba1a5190a8449b09a8884940765990382cf Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 5 Nov 2014 10:30:35 -0500 Subject: [PATCH 013/165] Latest upstream, 2.4.3 for #1136283 --- ...-requests-remove-nested-bundling-dep.patch | 16 ++++---- python-requests-system-cert-bundle.patch | 39 ++++++++++--------- python-requests.spec | 7 +++- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/python-requests-remove-nested-bundling-dep.patch b/python-requests-remove-nested-bundling-dep.patch index eb536bd..d915a4e 100644 --- a/python-requests-remove-nested-bundling-dep.patch +++ b/python-requests-remove-nested-bundling-dep.patch @@ -1,31 +1,29 @@ -From e74bf477e53f9089e6d763d676333c9d84ab71e0 Mon Sep 17 00:00:00 2001 +From 8c2259d4ab03ef982738aaf863068a1015cadf3d Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Wed, 5 Nov 2014 09:38:42 -0500 -Subject: [PATCH] Remove nested budnling dep. +Date: Wed, 5 Nov 2014 10:23:44 -0500 +Subject: [PATCH] Remove nested bundling dep. --- requests/compat.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/requests/compat.py b/requests/compat.py -index bdf10d6..29cce93 100644 +index be5a1ed..70ea4e8 100644 --- a/requests/compat.py +++ b/requests/compat.py -@@ -89,9 +89,13 @@ if is_py2: +@@ -91,7 +91,11 @@ if is_py2: import cookielib from Cookie import Morsel from StringIO import StringIO - from .packages.urllib3.packages.ordered_dict import OrderedDict - from httplib import IncompleteRead - ++ + try: + from collections import OrderedDict # py2.7 + except: + from ordereddict import OrderedDict # py2.6 and lower (el6, etc.) -+ + builtin_str = str bytes = str - str = unicode -- 1.9.3 diff --git a/python-requests-system-cert-bundle.patch b/python-requests-system-cert-bundle.patch index 8e467bd..e76b741 100644 --- a/python-requests-system-cert-bundle.patch +++ b/python-requests-system-cert-bundle.patch @@ -1,37 +1,38 @@ -From ad98b45e959dc7325c294c26d94e68901700c407 Mon Sep 17 00:00:00 2001 +From a49b39fbfe01791880c6e7179f6efdad03e8ce58 Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Mon, 1 Jul 2013 14:50:34 -0400 -Subject: [PATCH 1/3] system cert bundle +Date: Wed, 5 Nov 2014 10:15:17 -0500 +Subject: [PATCH] system cert bundle --- - requests/certs.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + requests/certs.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/requests/certs.py b/requests/certs.py -index bc00826..9b78e3b 100644 +index 07e6475..2c7ca96 100644 --- a/requests/certs.py +++ b/requests/certs.py -@@ -10,15 +10,15 @@ This module returns the preferred default CA certificate bundle. +@@ -10,16 +10,17 @@ This module returns the preferred default CA certificate bundle. 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. --""" - --import os.path ++ +We return "/etc/pki/tls/certs/ca-bundle.crt" provided by the ca-certificates +package. -+""" + """ +-import os.path - - def where(): -- """Return the preferred certificate bundle.""" -- # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ """ Don't use the certs bundled with requests, use ca-certificates. """ -+ return "/etc/pki/tls/certs/ca-bundle.crt" + try: + from certifi import where + except ImportError: + def where(): +- """Return the preferred certificate bundle.""" +- # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ """ Don't use the certs bundled with requests, use ca-certificates. """ ++ return "/etc/pki/tls/certs/ca-bundle.crt" if __name__ == '__main__': print(where()) -- -1.8.3.1 +1.9.3 diff --git a/python-requests.spec b/python-requests.spec index 43b99a5..e374e86 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %endif Name: python-requests -Version: 2.3.0 -Release: 4%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -130,6 +130,9 @@ ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 %endif %changelog +* Wed Nov 05 2014 Ralph Bean - 2.4.3-1 +- Latest upstream, 2.4.3 for #1136283 + * Wed Nov 05 2014 Ralph Bean - 2.3.0-4 - Re-do unbundling by symlinking system libs into the requests/packages/ dir. From 9f8b618ab45cf0f8ca8905c33b0222e6d7779827 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 5 Nov 2014 10:32:23 -0500 Subject: [PATCH 014/165] Add forgotten sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2f11463..533a41a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /requests-1.2.3.tar.gz /requests-2.0.0.tar.gz /requests-2.3.0.tar.gz +/requests-2.4.3.tar.gz diff --git a/sources b/sources index 2ed91ce..effd3bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7449ffdc8ec9ac37bbcd286003c80f00 requests-2.3.0.tar.gz +02214b3a179e445545de4b7a98d3dd17 requests-2.4.3.tar.gz From 1b25c27d263c40b6f8cd2f26e743c9c646b296eb Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 11 Dec 2014 16:35:15 -0500 Subject: [PATCH 015/165] 2.5.0 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 533a41a..f88d145 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /requests-2.0.0.tar.gz /requests-2.3.0.tar.gz /requests-2.4.3.tar.gz +/requests-2.5.0.tar.gz diff --git a/python-requests.spec b/python-requests.spec index e374e86..a5c7db0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,7 +5,7 @@ %endif Name: python-requests -Version: 2.4.3 +Version: 2.5.0 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -130,6 +130,9 @@ ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 %endif %changelog +* Thu Dec 11 2014 Ralph Bean - 2.5.0-1 +- Latest upstream, 2.5.0 for #1171068 + * Wed Nov 05 2014 Ralph Bean - 2.4.3-1 - Latest upstream, 2.4.3 for #1136283 diff --git a/sources b/sources index effd3bc..0c9f3ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02214b3a179e445545de4b7a98d3dd17 requests-2.4.3.tar.gz +b8bf3ddca75e7ecf1b6776da1e6e3385 requests-2.5.0.tar.gz From ffa5143cf048a4a86ea62740c422d920aa97ec04 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 11 Dec 2014 21:55:50 -0500 Subject: [PATCH 016/165] Try a super basic test in %check. --- python-requests.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index a5c7db0..3285ee0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -103,7 +103,8 @@ ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 ## The tests succeed if run locally, but fail in koji. ## They require an active network connection to query httpbin.org -#%%check +%check + #%%{__python} test_requests.py #%%if 0%%{?_with_python3} #pushd %%{py3dir} @@ -111,6 +112,16 @@ ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 #popd #%%endif +# At very, very least, we'll try to start python and import requests +PYTHONPATH=. %{__python} -c "import requests" + +%if 0%{?_with_python3} +pushd %{py3dir} +PYTHONPATH=. %{__python3} -c "import requests" +popd +%endif + + %files %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} @@ -130,6 +141,9 @@ ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 %endif %changelog +* Thu Dec 11 2014 Ralph Bean - 2.5.0-2 +- Do the most basic of tests in the check section. + * Thu Dec 11 2014 Ralph Bean - 2.5.0-1 - Latest upstream, 2.5.0 for #1171068 From bb1e96f504df0f72d087f8a03fb9f32d59afcc99 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 16 Dec 2014 14:18:45 -0500 Subject: [PATCH 017/165] Pin python-urllib3 requirement at 1.10.0. --- python-requests.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 3285ee0..4338c00 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -22,11 +22,11 @@ Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 >= 1.8.2 +BuildRequires: python-urllib3 >= 1.10.0 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 >= 1.8.2 +Requires: python-urllib3 >= 1.10.0 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -44,9 +44,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 >= 1.8.2 +BuildRequires: python3-urllib3 >= 1.10.0 Requires: python3-chardet -Requires: python3-urllib3 >= 1.8.2 +Requires: python3-urllib3 >= 1.10.0 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -141,6 +141,9 @@ popd %endif %changelog +* Tue Dec 16 2014 Ralph Bean - 2.5.0-3 +- Pin python-urllib3 requirement at 1.10.0. + * Thu Dec 11 2014 Ralph Bean - 2.5.0-2 - Do the most basic of tests in the check section. From 38792a521342ed9dea051b1b8baf036a9639c0c6 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 16 Dec 2014 16:52:35 -0500 Subject: [PATCH 018/165] Try to fix requirement pinning syntax. --- python-requests.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 4338c00..93d1b60 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -22,11 +22,11 @@ Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 >= 1.10.0 +BuildRequires: python-urllib3>=1.10.0 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 >= 1.10.0 +Requires: python-urllib3>=1.10.0 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -44,9 +44,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 >= 1.10.0 +BuildRequires: python3-urllib3>=1.10.0 Requires: python3-chardet -Requires: python3-urllib3 >= 1.10.0 +Requires: python3-urllib3>=1.10.0 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -143,6 +143,7 @@ popd %changelog * Tue Dec 16 2014 Ralph Bean - 2.5.0-3 - Pin python-urllib3 requirement at 1.10.0. +- Fix requirement pinning syntax. * Thu Dec 11 2014 Ralph Bean - 2.5.0-2 - Do the most basic of tests in the check section. From 86ffa4ba04210eb1f3a8fad8aecab005940cc484 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 16 Dec 2014 19:20:28 -0500 Subject: [PATCH 019/165] Fix requirement pinning again. --- python-requests.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 93d1b60..66d8b54 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -22,11 +22,11 @@ Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3>=1.10.0 +BuildRequires: python-urllib3 >= 1.10 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3>=1.10.0 +Requires: python-urllib3 >= 1.10 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -44,9 +44,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3>=1.10.0 +BuildRequires: python3-urllib3 >= 1.10 Requires: python3-chardet -Requires: python3-urllib3>=1.10.0 +Requires: python3-urllib3 >= 1.10 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -142,7 +142,7 @@ popd %changelog * Tue Dec 16 2014 Ralph Bean - 2.5.0-3 -- Pin python-urllib3 requirement at 1.10.0. +- Pin python-urllib3 requirement at 1.10. - Fix requirement pinning syntax. * Thu Dec 11 2014 Ralph Bean - 2.5.0-2 From d52751de8db8e6441fb6e6478be097fe9559bdce Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 18 Feb 2015 14:53:12 -0500 Subject: [PATCH 020/165] 2.5.1 --- .gitignore | 1 + python-requests.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f88d145..73fc0d5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /requests-2.3.0.tar.gz /requests-2.4.3.tar.gz /requests-2.5.0.tar.gz +/requests-2.5.1.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 66d8b54..dc9b2ae 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %endif Name: python-requests -Version: 2.5.0 -Release: 3%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -141,6 +141,9 @@ popd %endif %changelog +* Wed Feb 18 2015 Ralph Bean - 2.5.1-1 +- new version + * Tue Dec 16 2014 Ralph Bean - 2.5.0-3 - Pin python-urllib3 requirement at 1.10. - Fix requirement pinning syntax. diff --git a/sources b/sources index 0c9f3ac..ca799f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8bf3ddca75e7ecf1b6776da1e6e3385 requests-2.5.0.tar.gz +c270eb5551a02e8ab7a4cbb83e22af2e requests-2.5.1.tar.gz From 32d2729e74fe4daf9373f47d834941865e2e5a76 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 25 Feb 2015 21:23:05 -0500 Subject: [PATCH 021/165] 2.5.3 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 73fc0d5..cf66402 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /requests-2.4.3.tar.gz /requests-2.5.0.tar.gz /requests-2.5.1.tar.gz +/requests-2.5.3.tar.gz diff --git a/python-requests.spec b/python-requests.spec index dc9b2ae..6748af7 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,7 +5,7 @@ %endif Name: python-requests -Version: 2.5.1 +Version: 2.5.3 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -141,6 +141,9 @@ popd %endif %changelog +* Thu Feb 26 2015 Ralph Bean - 2.5.3-1 +- new version + * Wed Feb 18 2015 Ralph Bean - 2.5.1-1 - new version diff --git a/sources b/sources index ca799f6..916e91d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c270eb5551a02e8ab7a4cbb83e22af2e requests-2.5.1.tar.gz +23bf4fcc89ea8d353eb5353bb4a475b1 requests-2.5.3.tar.gz From 2665991eeac27f4b5d59bb1c664942cfd6810050 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 16 Mar 2015 11:30:06 -0400 Subject: [PATCH 022/165] Backport patch to not ascribe cookies to the target domain --- python-requests-dont-ascribe-cookies.patch | 22 ++++++++++++++++++++++ python-requests.spec | 11 ++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 python-requests-dont-ascribe-cookies.patch diff --git a/python-requests-dont-ascribe-cookies.patch b/python-requests-dont-ascribe-cookies.patch new file mode 100644 index 0000000..dcabc25 --- /dev/null +++ b/python-requests-dont-ascribe-cookies.patch @@ -0,0 +1,22 @@ +From 3bd8afbff29e50b38f889b2f688785a669b9aafc Mon Sep 17 00:00:00 2001 +From: Cory Benfield +Date: Sat, 14 Mar 2015 08:49:55 +0000 +Subject: [PATCH] Don't ascribe cookies to the target domain. + +--- + requests/sessions.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requests/sessions.py b/requests/sessions.py +index 4f30696..9d5498c 100644 +--- a/requests/sessions.py ++++ b/requests/sessions.py +@@ -171,7 +171,7 @@ def resolve_redirects(self, resp, req, stream=False, timeout=None, + except KeyError: + pass + +- extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw) ++ extract_cookies_to_jar(prepared_request._cookies, req, resp.raw) + prepared_request._cookies.update(self.cookies) + prepared_request.prepare_cookies(prepared_request._cookies) + diff --git a/python-requests.spec b/python-requests.spec index 6748af7..b5c2d9d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -19,6 +19,10 @@ Patch0: python-requests-system-cert-bundle.patch # Remove an unnecessary reference to a bundled compat lib in urllib3 Patch1: python-requests-remove-nested-bundling-dep.patch +# Backport fix for CVE-2015-2296 +# https://github.com/kennethreitz/requests/commit/3bd8afbff29e50b38f889b2f688785a669b9aafc +Patch2: python-requests-dont-ascribe-cookies.patch + BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet @@ -61,6 +65,8 @@ designed to make HTTP requests easy for developers. %patch0 -p1 %patch1 -p1 +%patch2 -p1 + # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -141,6 +147,9 @@ popd %endif %changelog +* Mon Mar 16 2015 Ralph Bean - 2.5.3-2 +- Backport fix for CVE-2015-2296. + * Thu Feb 26 2015 Ralph Bean - 2.5.3-1 - new version From ced4b9fe1c8222eddc6f2e7916f19ed054484e1c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 22 Apr 2015 10:20:31 -0400 Subject: [PATCH 023/165] 2.6.0 --- .gitignore | 1 + python-requests-dont-ascribe-cookies.patch | 22 ---------------------- python-requests.spec | 14 ++++++-------- sources | 2 +- 4 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 python-requests-dont-ascribe-cookies.patch diff --git a/.gitignore b/.gitignore index cf66402..925063d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /requests-2.5.0.tar.gz /requests-2.5.1.tar.gz /requests-2.5.3.tar.gz +/requests-2.6.0.tar.gz diff --git a/python-requests-dont-ascribe-cookies.patch b/python-requests-dont-ascribe-cookies.patch deleted file mode 100644 index dcabc25..0000000 --- a/python-requests-dont-ascribe-cookies.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3bd8afbff29e50b38f889b2f688785a669b9aafc Mon Sep 17 00:00:00 2001 -From: Cory Benfield -Date: Sat, 14 Mar 2015 08:49:55 +0000 -Subject: [PATCH] Don't ascribe cookies to the target domain. - ---- - requests/sessions.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requests/sessions.py b/requests/sessions.py -index 4f30696..9d5498c 100644 ---- a/requests/sessions.py -+++ b/requests/sessions.py -@@ -171,7 +171,7 @@ def resolve_redirects(self, resp, req, stream=False, timeout=None, - except KeyError: - pass - -- extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw) -+ extract_cookies_to_jar(prepared_request._cookies, req, resp.raw) - prepared_request._cookies.update(self.cookies) - prepared_request.prepare_cookies(prepared_request._cookies) - diff --git a/python-requests.spec b/python-requests.spec index b5c2d9d..1324a14 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %endif Name: python-requests -Version: 2.5.3 -Release: 2%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -19,10 +19,6 @@ Patch0: python-requests-system-cert-bundle.patch # Remove an unnecessary reference to a bundled compat lib in urllib3 Patch1: python-requests-remove-nested-bundling-dep.patch -# Backport fix for CVE-2015-2296 -# https://github.com/kennethreitz/requests/commit/3bd8afbff29e50b38f889b2f688785a669b9aafc -Patch2: python-requests-dont-ascribe-cookies.patch - BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet @@ -65,8 +61,6 @@ designed to make HTTP requests easy for developers. %patch0 -p1 %patch1 -p1 -%patch2 -p1 - # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -147,6 +141,10 @@ popd %endif %changelog +* Wed Apr 22 2015 Ralph Bean - 2.6.0-1 +- new version +- Remove patch for CVE-2015-2296, now included in the upstream release. + * Mon Mar 16 2015 Ralph Bean - 2.5.3-2 - Backport fix for CVE-2015-2296. diff --git a/sources b/sources index 916e91d..07f3c4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23bf4fcc89ea8d353eb5353bb4a475b1 requests-2.5.3.tar.gz +25287278fa3ea106207461112bb37050 requests-2.6.0.tar.gz From a083b645a7e2f1e060645bd4da1015e5692609bf Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 23 Apr 2015 10:05:10 -0400 Subject: [PATCH 024/165] 2.6.1 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 925063d..9923795 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /requests-2.5.1.tar.gz /requests-2.5.3.tar.gz /requests-2.6.0.tar.gz +/requests-2.6.1.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 1324a14..3b44a16 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,7 +5,7 @@ %endif Name: python-requests -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -141,6 +141,9 @@ popd %endif %changelog +* Thu Apr 23 2015 Ralph Bean - 2.6.1-1 +- new version + * Wed Apr 22 2015 Ralph Bean - 2.6.0-1 - new version - Remove patch for CVE-2015-2296, now included in the upstream release. diff --git a/sources b/sources index 07f3c4f..c508174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25287278fa3ea106207461112bb37050 requests-2.6.0.tar.gz +da6e487f89e6a531699b7fd97ff182af requests-2.6.1.tar.gz From b418eb6ff3cc00bca77f21652247600efd88745f Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 29 Apr 2015 09:57:49 -0400 Subject: [PATCH 025/165] 2.6.2 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9923795..e5c2111 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /requests-2.5.3.tar.gz /requests-2.6.0.tar.gz /requests-2.6.1.tar.gz +/requests-2.6.2.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 3b44a16..d3c73cc 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,7 +5,7 @@ %endif Name: python-requests -Version: 2.6.1 +Version: 2.6.2 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -141,6 +141,9 @@ popd %endif %changelog +* Wed Apr 29 2015 Ralph Bean - 2.6.2-1 +- new version + * Thu Apr 23 2015 Ralph Bean - 2.6.1-1 - new version diff --git a/sources b/sources index c508174..9b33044 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da6e487f89e6a531699b7fd97ff182af requests-2.6.1.tar.gz +0d703e5be558566e0f8c37f960d95372 requests-2.6.2.tar.gz From 75426f93280e0372a3bf3a8a35142ba505224d10 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sun, 3 May 2015 22:31:33 -0400 Subject: [PATCH 026/165] 2.7.0 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e5c2111..f9c8181 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /requests-2.6.0.tar.gz /requests-2.6.1.tar.gz /requests-2.6.2.tar.gz +/requests-2.7.0.tar.gz diff --git a/python-requests.spec b/python-requests.spec index d3c73cc..7193170 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,7 +5,7 @@ %endif Name: python-requests -Version: 2.6.2 +Version: 2.7.0 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -141,6 +141,9 @@ popd %endif %changelog +* Mon May 04 2015 Ralph Bean - 2.7.0-1 +- new version + * Wed Apr 29 2015 Ralph Bean - 2.6.2-1 - new version diff --git a/sources b/sources index 9b33044..7058fc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d703e5be558566e0f8c37f960d95372 requests-2.6.2.tar.gz +29b173fd5fa572ec0764d1fd7b527260 requests-2.7.0.tar.gz From 1badb1c66c34802675263f6f981095a06db9d409 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 20:37:41 +0000 Subject: [PATCH 027/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 7193170..fe16c8f 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -141,6 +141,9 @@ popd %endif %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 04 2015 Ralph Bean - 2.7.0-1 - new version From c802119e775e99b17a0a286a70fc4488331a676c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 1 Sep 2015 10:16:13 -0400 Subject: [PATCH 028/165] Link to some discussions with upstream about bundling. --- python-requests.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-requests.spec b/python-requests.spec index fe16c8f..6b1139c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -17,6 +17,10 @@ Source0: http://pypi.python.org/packages/source/r/requests/requests-%{ver Patch0: python-requests-system-cert-bundle.patch # Remove an unnecessary reference to a bundled compat lib in urllib3 +# Some discussion with upstream: +# - https://twitter.com/sigmavirus24/status/529816751651819520 +# - https://github.com/kennethreitz/requests/issues/1811 +# - https://github.com/kennethreitz/requests/pull/1812 Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch From 026230bb9c69e7b76f8fb8eb5618b518a5d8dfe4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 4 Sep 2015 22:25:19 -0400 Subject: [PATCH 029/165] Lock down the python-urllib3 version to the specific version we unbundled. --- python-requests.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 6b1139c..d847f9d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -26,11 +26,11 @@ Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 >= 1.10 +BuildRequires: python-urllib3 == 1.10.4 Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 >= 1.10 +Requires: python-urllib3 == 1.10.4 %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -48,9 +48,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 >= 1.10 +BuildRequires: python3-urllib3 == 1.10 Requires: python3-chardet -Requires: python3-urllib3 >= 1.10 +Requires: python3-urllib3 == 1.10 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -145,6 +145,10 @@ popd %endif %changelog +* Fri Sep 04 2015 Ralph Bean - 2.7.0-3 +- Lock down the python-urllib3 version to the specific version we unbundled. + https://bugzilla.redhat.com/show_bug.cgi?id=1253823 + * Thu Jun 18 2015 Fedora Release Engineering - 2.7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 7a90ddac182bf332def10c4d320a1035a284e092 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 4 Sep 2015 22:35:19 -0400 Subject: [PATCH 030/165] Typofix. --- python-requests.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index d847f9d..c05d9f4 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -48,9 +48,9 @@ designed to make HTTP requests easy for developers. Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 == 1.10 +BuildRequires: python3-urllib3 == 1.10.4 Requires: python3-chardet -Requires: python3-urllib3 == 1.10 +Requires: python3-urllib3 == 1.10.4 %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and From bfbc9c2d1249d81d925d14cf1ba5c7cd167888e1 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 15 Sep 2015 16:59:18 -0400 Subject: [PATCH 031/165] Employ %%python_provides macro to provide python2-requests. --- python-requests.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index c05d9f4..172858e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -23,7 +23,11 @@ Patch0: python-requests-system-cert-bundle.patch # - https://github.com/kennethreitz/requests/pull/1812 Patch1: python-requests-remove-nested-bundling-dep.patch + BuildArch: noarch + +%{?python_provide:%python_provide python2-requests} + BuildRequires: python2-devel BuildRequires: python-chardet BuildRequires: python-urllib3 == 1.10.4 @@ -46,6 +50,9 @@ designed to make HTTP requests easy for developers. %if 0%{?_with_python3} %package -n python3-requests Summary: HTTP library, written in Python, for human beings + +%{?python_provide:%python_provide python2-requests} + BuildRequires: python3-devel BuildRequires: python3-chardet BuildRequires: python3-urllib3 == 1.10.4 @@ -145,6 +152,9 @@ popd %endif %changelog +* Tue Sep 15 2015 Ralph Bean - 2.7.0-4 +- Employ %%python_provides macro to provide python2-requests. + * Fri Sep 04 2015 Ralph Bean - 2.7.0-3 - Lock down the python-urllib3 version to the specific version we unbundled. https://bugzilla.redhat.com/show_bug.cgi?id=1253823 From 5af138ec59a79b29475fc3646759f30d8f94293d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Sep 2015 09:33:24 -0400 Subject: [PATCH 032/165] Remove 'provides: python2-requests' from the python3 subpackage, obviously. --- python-requests.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 172858e..937b226 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -51,7 +51,7 @@ designed to make HTTP requests easy for developers. %package -n python3-requests Summary: HTTP library, written in Python, for human beings -%{?python_provide:%python_provide python2-requests} +%{?python_provide:%python_provide python3-requests} BuildRequires: python3-devel BuildRequires: python3-chardet @@ -152,6 +152,9 @@ popd %endif %changelog +* Thu Sep 17 2015 Ralph Bean - 2.7.0-5 +- Remove 'provides: python2-requests' from the python3 subpackage, obviously. + * Tue Sep 15 2015 Ralph Bean - 2.7.0-4 - Employ %%python_provides macro to provide python2-requests. From 1d92ca7704798ed1dcf8ce82f137b8fcd1609ff3 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 17 Sep 2015 11:17:36 -0400 Subject: [PATCH 033/165] Replace the provides macro with a plain provides field for now. --- python-requests.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 937b226..cc631ce 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -26,7 +26,12 @@ Patch1: python-requests-remove-nested-bundling-dep.patch BuildArch: noarch -%{?python_provide:%python_provide python2-requests} + +# FIXME - move the python2 stuff into a python2 subpackage so we can use this +# macro correctly. See the comment from Carl George in this bz ticket: +# https://bugzilla.redhat.com/show_bug.cgi?id=1241671#c5 +Provides: python2-requests +#%%{?python_provide:%%python_provide python2-requests} BuildRequires: python2-devel BuildRequires: python-chardet @@ -152,6 +157,10 @@ popd %endif %changelog +* Thu Sep 17 2015 Ralph Bean - 2.7.0-6 +- Replace the provides macro with a plain provides field for now until we can + re-organize this package into two different subpackages. + * Thu Sep 17 2015 Ralph Bean - 2.7.0-5 - Remove 'provides: python2-requests' from the python3 subpackage, obviously. From f73b98e44a519ee15f3ceeea4c53e0e4dd25a5d4 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Sat, 10 Oct 2015 15:04:23 -0400 Subject: [PATCH 034/165] Tell setuptools about what version of urllib3 we're unbundling for https://github.com/kennethreitz/requests/issues/2816 --- python-requests-urllib3-at-1.10.4.patch | 27 +++++++++++++++++++++++++ python-requests.spec | 20 +++++++++++++----- 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 python-requests-urllib3-at-1.10.4.patch diff --git a/python-requests-urllib3-at-1.10.4.patch b/python-requests-urllib3-at-1.10.4.patch new file mode 100644 index 0000000..84a2f8c --- /dev/null +++ b/python-requests-urllib3-at-1.10.4.patch @@ -0,0 +1,27 @@ +From 8851de5ac8dabd6431328ecbe614e5e78d994ccd Mon Sep 17 00:00:00 2001 +From: Ralph Bean +Date: Sat, 10 Oct 2015 14:39:19 -0400 +Subject: [PATCH] Pin urllib3 to 1.10.4. + +--- + setup.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index f98f528..77a370c 100755 +--- a/setup.py ++++ b/setup.py +@@ -26,7 +26,9 @@ packages = [ + 'requests.packages.urllib3.packages.ssl_match_hostname', + ] + +-requires = [] ++requires = [ ++ 'urllib3==1.10.4', ++] + + version = '' + with open('requests/__init__.py', 'r') as fd: +-- +2.4.3 + diff --git a/python-requests.spec b/python-requests.spec index cc631ce..f151ef5 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -4,9 +4,11 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif +%global urllib3_unbundled_version 1.10.4 + Name: python-requests Version: 2.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -23,6 +25,9 @@ Patch0: python-requests-system-cert-bundle.patch # - https://github.com/kennethreitz/requests/pull/1812 Patch1: python-requests-remove-nested-bundling-dep.patch +# Tell setuptools about what version of urllib3 we're unbundling +# - https://github.com/kennethreitz/requests/issues/2816 +Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch BuildArch: noarch @@ -35,11 +40,11 @@ Provides: python2-requests BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 == 1.10.4 +BuildRequires: python-urllib3 == %{urllib3_unbundled_version} Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 == 1.10.4 +Requires: python-urllib3 == %{urllib3_unbundled_version} %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -60,9 +65,9 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python3-devel BuildRequires: python3-chardet -BuildRequires: python3-urllib3 == 1.10.4 +BuildRequires: python3-urllib3 == %{urllib3_unbundled_version} Requires: python3-chardet -Requires: python3-urllib3 == 1.10.4 +Requires: python3-urllib3 == %{urllib3_unbundled_version} %description -n python3-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -76,6 +81,7 @@ designed to make HTTP requests easy for developers. %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -157,6 +163,10 @@ popd %endif %changelog +* Sat Oct 10 2015 Ralph Bean - 2.7.0-7 +- Tell setuptools about what version of urllib3 we're unbundling + for https://github.com/kennethreitz/requests/issues/2816 + * Thu Sep 17 2015 Ralph Bean - 2.7.0-6 - Replace the provides macro with a plain provides field for now until we can re-organize this package into two different subpackages. From 9bbee012633fb6b57ac19832112bea73c95105ae Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Mon, 2 Nov 2015 11:59:00 +0100 Subject: [PATCH 035/165] Rebuilt for Python3.5 rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index f151ef5..ea8a672 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -8,7 +8,7 @@ Name: python-requests Version: 2.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -163,6 +163,9 @@ popd %endif %changelog +* Mon Nov 02 2015 Robert Kuska - 2.7.0-8 +- Rebuilt for Python3.5 rebuild + * Sat Oct 10 2015 Ralph Bean - 2.7.0-7 - Tell setuptools about what version of urllib3 we're unbundling for https://github.com/kennethreitz/requests/issues/2816 From d84ebd44ebc3e4f756a87975fc9ab0588bd87ea2 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 14 Dec 2015 10:28:01 -0500 Subject: [PATCH 036/165] 2.8.1 --- python-requests.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index ea8a672..069926f 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -4,11 +4,11 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -%global urllib3_unbundled_version 1.10.4 +%global urllib3_unbundled_version 1.12 Name: python-requests -Version: 2.7.0 -Release: 8%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -163,6 +163,10 @@ popd %endif %changelog +* Mon Dec 14 2015 Ralph Bean - 2.8.1-1 +- Latest upstream. +- Bump hard dep on urllib3 to 1.12. + * Mon Nov 02 2015 Robert Kuska - 2.7.0-8 - Rebuilt for Python3.5 rebuild From 7ee4441972f934a60a33936ec62d09147e5ed131 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 14 Dec 2015 10:36:59 -0500 Subject: [PATCH 037/165] Forgotten sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f9c8181..e0eb611 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /requests-2.6.1.tar.gz /requests-2.6.2.tar.gz /requests-2.7.0.tar.gz +/requests-2.8.1.tar.gz diff --git a/sources b/sources index 7058fc7..870d8a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29b173fd5fa572ec0764d1fd7b527260 requests-2.7.0.tar.gz +a27ea3d72d7822906ddce5e252d6add9 requests-2.8.1.tar.gz From 17f6b2d94ddba4fa5c9276eae16b299fc07093f1 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 14 Dec 2015 10:43:00 -0500 Subject: [PATCH 038/165] Adjust patch. --- ...ib3-at-1.10.4.patch => python-requests-urllib3-at-1.12.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename python-requests-urllib3-at-1.10.4.patch => python-requests-urllib3-at-1.12.patch (95%) diff --git a/python-requests-urllib3-at-1.10.4.patch b/python-requests-urllib3-at-1.12.patch similarity index 95% rename from python-requests-urllib3-at-1.10.4.patch rename to python-requests-urllib3-at-1.12.patch index 84a2f8c..b5fd93f 100644 --- a/python-requests-urllib3-at-1.10.4.patch +++ b/python-requests-urllib3-at-1.12.patch @@ -17,7 +17,7 @@ index f98f528..77a370c 100755 -requires = [] +requires = [ -+ 'urllib3==1.10.4', ++ 'urllib3==1.12', +] version = '' From ad24cb0001f7e86e0c07763fc6768b05654a1c85 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 18 Dec 2015 12:22:36 -0500 Subject: [PATCH 039/165] 2.9.0 --- .gitignore | 1 + ...-at-1.12.patch => python-requests-urllib3-at-1.13.patch | 2 +- python-requests.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) rename python-requests-urllib3-at-1.12.patch => python-requests-urllib3-at-1.13.patch (96%) diff --git a/.gitignore b/.gitignore index e0eb611..f01602a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /requests-2.6.2.tar.gz /requests-2.7.0.tar.gz /requests-2.8.1.tar.gz +/requests-2.9.0.tar.gz diff --git a/python-requests-urllib3-at-1.12.patch b/python-requests-urllib3-at-1.13.patch similarity index 96% rename from python-requests-urllib3-at-1.12.patch rename to python-requests-urllib3-at-1.13.patch index b5fd93f..281b8e6 100644 --- a/python-requests-urllib3-at-1.12.patch +++ b/python-requests-urllib3-at-1.13.patch @@ -17,7 +17,7 @@ index f98f528..77a370c 100755 -requires = [] +requires = [ -+ 'urllib3==1.12', ++ 'urllib3==1.13', +] version = '' diff --git a/python-requests.spec b/python-requests.spec index 069926f..0ad1589 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -4,10 +4,10 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -%global urllib3_unbundled_version 1.12 +%global urllib3_unbundled_version 1.13 Name: python-requests -Version: 2.8.1 +Version: 2.9.0 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -163,6 +163,9 @@ popd %endif %changelog +* Fri Dec 18 2015 Ralph Bean - 2.9.0-1 +- new version + * Mon Dec 14 2015 Ralph Bean - 2.8.1-1 - Latest upstream. - Bump hard dep on urllib3 to 1.12. diff --git a/sources b/sources index 870d8a8..3d643b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a27ea3d72d7822906ddce5e252d6add9 requests-2.8.1.tar.gz +2f46fdceaf4f63e5e3665a8cb50d284f requests-2.9.0.tar.gz From 1e67cd95061d41a6a5d97ad5623b4b183c5784e3 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 21 Dec 2015 10:57:00 -0500 Subject: [PATCH 040/165] 2.9.1 --- .gitignore | 1 + ...t-1.13.patch => python-requests-urllib3-at-1.13.1.patch | 2 +- python-requests.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) rename python-requests-urllib3-at-1.13.patch => python-requests-urllib3-at-1.13.1.patch (95%) diff --git a/.gitignore b/.gitignore index f01602a..fad9e75 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /requests-2.7.0.tar.gz /requests-2.8.1.tar.gz /requests-2.9.0.tar.gz +/requests-2.9.1.tar.gz diff --git a/python-requests-urllib3-at-1.13.patch b/python-requests-urllib3-at-1.13.1.patch similarity index 95% rename from python-requests-urllib3-at-1.13.patch rename to python-requests-urllib3-at-1.13.1.patch index 281b8e6..d7d7872 100644 --- a/python-requests-urllib3-at-1.13.patch +++ b/python-requests-urllib3-at-1.13.1.patch @@ -17,7 +17,7 @@ index f98f528..77a370c 100755 -requires = [] +requires = [ -+ 'urllib3==1.13', ++ 'urllib3==1.13.1', +] version = '' diff --git a/python-requests.spec b/python-requests.spec index 0ad1589..d7901cc 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -4,10 +4,10 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} %endif -%global urllib3_unbundled_version 1.13 +%global urllib3_unbundled_version 1.13.1 Name: python-requests -Version: 2.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -163,6 +163,9 @@ popd %endif %changelog +* Mon Dec 21 2015 Ralph Bean - 2.9.1-1 +- new version + * Fri Dec 18 2015 Ralph Bean - 2.9.0-1 - new version diff --git a/sources b/sources index 3d643b6..d2a3697 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f46fdceaf4f63e5e3665a8cb50d284f requests-2.9.0.tar.gz +0b7f480d19012ec52bab78292efd976d requests-2.9.1.tar.gz From 9c8df47dcdea4e3da7d6dc1da3c94775d641e4b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 20:47:39 +0000 Subject: [PATCH 041/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index d7901cc..543f276 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -8,7 +8,7 @@ Name: python-requests Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -163,6 +163,9 @@ popd %endif %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Dec 21 2015 Ralph Bean - 2.9.1-1 - new version From 113881e37381a50828bf3941d8ad6b04afa1d32c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 29 Apr 2016 21:23:11 -0400 Subject: [PATCH 042/165] Adjust py3 support. --- python-requests.spec | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 543f276..89bb8e1 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,14 +1,17 @@ -%if 0%{?fedora} %global _with_python3 1 -%else %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} + +%if 0%{?fedora} +%{!?python3_pkgversion: %global python3_pkgversion 3} +%else +%{!?python3_pkgversion: %global python3_pkgversion 34} %endif %global urllib3_unbundled_version 1.13.1 Name: python-requests Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -58,18 +61,18 @@ capabilities you should need, but the API is thoroughly broken. This library is designed to make HTTP requests easy for developers. %if 0%{?_with_python3} -%package -n python3-requests +%package -n python%{python3_pkgversion}-requests Summary: HTTP library, written in Python, for human beings -%{?python_provide:%python_provide python3-requests} +%{?python_provide:%python_provide python%{python3_pkgversion}-requests} -BuildRequires: python3-devel -BuildRequires: python3-chardet -BuildRequires: python3-urllib3 == %{urllib3_unbundled_version} -Requires: python3-chardet -Requires: python3-urllib3 == %{urllib3_unbundled_version} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-chardet +BuildRequires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} +Requires: python%{python3_pkgversion}-chardet +Requires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} -%description -n python3-requests +%description -n python%{python3_pkgversion}-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 @@ -154,7 +157,7 @@ popd %{python_sitelib}/requests/* %if 0%{?_with_python3} -%files -n python3-requests +%files -n python%{python3_pkgversion}-requests %{!?_licensedir:%global license %%doc} %license LICENSE %doc NOTICE README.rst HISTORY.rst From 142e0f8f90a8c29a77b85c0c1303afdef635b32f Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 3 May 2016 11:08:08 -0400 Subject: [PATCH 043/165] 2.10.0 --- ...ch => python-requests-urllib3-at-1.15.1.patch | 16 ++++++++-------- python-requests.spec | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) rename python-requests-urllib3-at-1.13.1.patch => python-requests-urllib3-at-1.15.1.patch (51%) diff --git a/python-requests-urllib3-at-1.13.1.patch b/python-requests-urllib3-at-1.15.1.patch similarity index 51% rename from python-requests-urllib3-at-1.13.1.patch rename to python-requests-urllib3-at-1.15.1.patch index d7d7872..91a6731 100644 --- a/python-requests-urllib3-at-1.13.1.patch +++ b/python-requests-urllib3-at-1.15.1.patch @@ -1,27 +1,27 @@ -From 8851de5ac8dabd6431328ecbe614e5e78d994ccd Mon Sep 17 00:00:00 2001 +From 3ef00c66939e0b6d2d95756f73c1d2fe716ddf40 Mon Sep 17 00:00:00 2001 From: Ralph Bean -Date: Sat, 10 Oct 2015 14:39:19 -0400 -Subject: [PATCH] Pin urllib3 to 1.10.4. +Date: Tue, 3 May 2016 10:56:53 -0400 +Subject: [PATCH] Pin urllib3 to 1.15.1 --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index f98f528..77a370c 100755 +index 3a39052..662e0ef 100755 --- a/setup.py +++ b/setup.py -@@ -26,7 +26,9 @@ packages = [ +@@ -44,7 +44,9 @@ packages = [ 'requests.packages.urllib3.packages.ssl_match_hostname', ] -requires = [] +requires = [ -+ 'urllib3==1.13.1', ++ 'urllib3==1.15.1', +] + test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov'] - version = '' with open('requests/__init__.py', 'r') as fd: -- -2.4.3 +2.5.5 diff --git a/python-requests.spec b/python-requests.spec index 89bb8e1..e913a76 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,16 +7,16 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.13.1 +%global urllib3_unbundled_version 1.15.1 Name: python-requests -Version: 2.9.1 -Release: 3%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 -URL: http://pypi.python.org/pypi/requests -Source0: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz +URL: https://pypi.io/project/requests +Source0: https://pypi.io/packages/source/r/requests/requests-%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: python-requests-system-cert-bundle.patch From e4d6b7b113689e001047ff69e832096c1e553da8 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 3 May 2016 11:20:15 -0400 Subject: [PATCH 044/165] Add forgotten sources. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fad9e75..530d24b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /requests-2.8.1.tar.gz /requests-2.9.0.tar.gz /requests-2.9.1.tar.gz +/requests-2.10.0.tar.gz diff --git a/sources b/sources index d2a3697..55530ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b7f480d19012ec52bab78292efd976d requests-2.9.1.tar.gz +a36f7a64600f1bfec4d55ae021d232ae requests-2.10.0.tar.gz From 53214a35d2074c1a273ff94bdaba7e99086420e7 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 2 Jun 2016 12:24:28 -0400 Subject: [PATCH 045/165] Make a python2 subpackage for real. --- python-requests.spec | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index e913a76..a83b91b 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -3,7 +3,7 @@ %if 0%{?fedora} %{!?python3_pkgversion: %global python3_pkgversion 3} -%else +%else %{!?python3_pkgversion: %global python3_pkgversion 34} %endif @@ -11,7 +11,7 @@ Name: python-requests Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -34,12 +34,15 @@ Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch BuildArch: noarch +%description +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. -# FIXME - move the python2 stuff into a python2 subpackage so we can use this -# macro correctly. See the comment from Carl George in this bz ticket: -# https://bugzilla.redhat.com/show_bug.cgi?id=1241671#c5 -Provides: python2-requests -#%%{?python_provide:%%python_provide python2-requests} +%package -n python2-requests +Summary: HTTP library, written in Python, for human beings +%{?python_provide:%python_provide python2-requests} BuildRequires: python2-devel BuildRequires: python-chardet @@ -54,10 +57,10 @@ BuildRequires: python-ordereddict Requires: python-ordereddict %endif -%description -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 +%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 0%{?_with_python3} @@ -147,7 +150,7 @@ popd %endif -%files +%files -n python2-requests %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE @@ -166,6 +169,9 @@ popd %endif %changelog +* Thu Jun 02 2016 Ralph Bean - 2.10.0-2 +- Fix python2 subpackage to comply with guidelines. + * Thu Feb 04 2016 Fedora Release Engineering - 2.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0df2434d3c43a56fe652fa8a8566cf6a670fa733 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 15 Jul 2016 13:34:25 -0400 Subject: [PATCH 046/165] Update python2 packaging. --- python-requests.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index a83b91b..e75c4c3 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -46,11 +46,11 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python-urllib3 == %{urllib3_unbundled_version} +BuildRequires: python2-urllib3 == %{urllib3_unbundled_version} Requires: ca-certificates Requires: python-chardet -Requires: python-urllib3 == %{urllib3_unbundled_version} +Requires: python2-urllib3 == %{urllib3_unbundled_version} %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -126,8 +126,8 @@ popd %endif %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT -ln -s ../../chardet %{buildroot}/%{python_sitelib}/requests/packages/chardet -ln -s ../../urllib3 %{buildroot}/%{python_sitelib}/requests/packages/urllib3 +ln -s ../../chardet %{buildroot}/%{python2_sitelib}/requests/packages/chardet +ln -s ../../urllib3 %{buildroot}/%{python2_sitelib}/requests/packages/urllib3 ## The tests succeed if run locally, but fail in koji. ## They require an active network connection to query httpbin.org @@ -155,9 +155,9 @@ popd %{!?_licensedir:%global license %%doc} %license LICENSE %doc NOTICE README.rst HISTORY.rst -%{python_sitelib}/*.egg-info -%dir %{python_sitelib}/requests -%{python_sitelib}/requests/* +%{python2_sitelib}/*.egg-info +%dir %{python2_sitelib}/requests +%{python2_sitelib}/requests/* %if 0%{?_with_python3} %files -n python%{python3_pkgversion}-requests @@ -169,6 +169,9 @@ popd %endif %changelog +* Fri Jul 15 2016 Ralph Bean - 2.10.0-3 +- Update python2 packaging. + * Thu Jun 02 2016 Ralph Bean - 2.10.0-2 - Fix python2 subpackage to comply with guidelines. From c5ce60bf5a5f0a3a8d4e136484d300f76b025377 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 11:27:00 +0000 Subject: [PATCH 047/165] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index e75c4c3..bc9aa00 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -169,6 +169,9 @@ popd %endif %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.10.0-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Fri Jul 15 2016 Ralph Bean - 2.10.0-3 - Update python2 packaging. From 63fd5b1c61d7f7753178056d65a143c6babb1b57 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 10 Aug 2016 15:46:58 -0600 Subject: [PATCH 048/165] Update to 2.11.0. Fixes #1365332 --- .gitignore | 1 + ...1.15.1.patch => python-requests-urllib3-at-1.16.patch | 4 ++-- python-requests.spec | 9 ++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) rename python-requests-urllib3-at-1.15.1.patch => python-requests-urllib3-at-1.16.patch (90%) diff --git a/.gitignore b/.gitignore index 530d24b..13e1b45 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /requests-2.9.0.tar.gz /requests-2.9.1.tar.gz /requests-2.10.0.tar.gz +/requests-2.11.0.tar.gz diff --git a/python-requests-urllib3-at-1.15.1.patch b/python-requests-urllib3-at-1.16.patch similarity index 90% rename from python-requests-urllib3-at-1.15.1.patch rename to python-requests-urllib3-at-1.16.patch index 91a6731..61308c5 100644 --- a/python-requests-urllib3-at-1.15.1.patch +++ b/python-requests-urllib3-at-1.16.patch @@ -1,7 +1,7 @@ From 3ef00c66939e0b6d2d95756f73c1d2fe716ddf40 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 3 May 2016 10:56:53 -0400 -Subject: [PATCH] Pin urllib3 to 1.15.1 +Subject: [PATCH] Pin urllib3 to 1.16 --- setup.py | 4 +++- @@ -17,7 +17,7 @@ index 3a39052..662e0ef 100755 -requires = [] +requires = [ -+ 'urllib3==1.15.1', ++ 'urllib3==1.16', +] test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov'] diff --git a/python-requests.spec b/python-requests.spec index bc9aa00..ad3b59c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,11 +7,11 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.15.1 +%global urllib3_unbundled_version 1.16 Name: python-requests -Version: 2.10.0 -Release: 4%{?dist} +Version: 2.11.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -169,6 +169,9 @@ popd %endif %changelog +* Wed Aug 10 2016 Kevin Fenzi - 2.11.0-1 +- Update to 2.11.0. Fixes #1365332 + * Tue Jul 19 2016 Fedora Release Engineering - 2.10.0-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 55530ea..72e0d48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a36f7a64600f1bfec4d55ae021d232ae requests-2.10.0.tar.gz +147afc07d8967cf46359701551a6cb69 requests-2.11.0.tar.gz From f81e14ff7d6caa1d3a23c446f2cbd8acba6b7bf6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 27 Aug 2016 15:36:55 -0600 Subject: [PATCH 049/165] Update to 2.11.1. Fixes #1370814 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 13e1b45..fe8438d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /requests-2.9.1.tar.gz /requests-2.10.0.tar.gz /requests-2.11.0.tar.gz +/requests-2.11.1.tar.gz diff --git a/python-requests.spec b/python-requests.spec index ad3b59c..ebafd5a 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ %global urllib3_unbundled_version 1.16 Name: python-requests -Version: 2.11.0 +Version: 2.11.1 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -169,6 +169,9 @@ popd %endif %changelog +* Sat Aug 27 2016 Kevin Fenzi - 2.11.1-1 +- Update to 2.11.1. Fixes #1370814 + * Wed Aug 10 2016 Kevin Fenzi - 2.11.0-1 - Update to 2.11.0. Fixes #1365332 diff --git a/sources b/sources index 72e0d48..c5b83f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -147afc07d8967cf46359701551a6cb69 requests-2.11.0.tar.gz +ad5f9c47b5c5dfdb28363ad7546b0763 requests-2.11.1.tar.gz From 6ce5e5ce2d218a473ea5a33c2b671b58382d6e45 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 17 Nov 2016 17:21:08 -0500 Subject: [PATCH 050/165] Update to 2.12.1 (#1395469) --- .gitignore | 1 + python-requests-urllib3-at-1.16.patch | 27 ------------------------- python-requests-urllib3-at-1.19.1.patch | 26 ++++++++++++++++++++++++ python-requests.spec | 14 +++++++++++-- sources | 2 +- 5 files changed, 40 insertions(+), 30 deletions(-) delete mode 100644 python-requests-urllib3-at-1.16.patch create mode 100644 python-requests-urllib3-at-1.19.1.patch diff --git a/.gitignore b/.gitignore index fe8438d..29018f0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /requests-2.10.0.tar.gz /requests-2.11.0.tar.gz /requests-2.11.1.tar.gz +/requests-2.12.1.tar.gz diff --git a/python-requests-urllib3-at-1.16.patch b/python-requests-urllib3-at-1.16.patch deleted file mode 100644 index 61308c5..0000000 --- a/python-requests-urllib3-at-1.16.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3ef00c66939e0b6d2d95756f73c1d2fe716ddf40 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Tue, 3 May 2016 10:56:53 -0400 -Subject: [PATCH] Pin urllib3 to 1.16 - ---- - setup.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3a39052..662e0ef 100755 ---- a/setup.py -+++ b/setup.py -@@ -44,7 +44,9 @@ packages = [ - 'requests.packages.urllib3.packages.ssl_match_hostname', - ] - --requires = [] -+requires = [ -+ 'urllib3==1.16', -+] - test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov'] - - with open('requests/__init__.py', 'r') as fd: --- -2.5.5 - diff --git a/python-requests-urllib3-at-1.19.1.patch b/python-requests-urllib3-at-1.19.1.patch new file mode 100644 index 0000000..e556bfa --- /dev/null +++ b/python-requests-urllib3-at-1.19.1.patch @@ -0,0 +1,26 @@ +From 417c2b103a7c4be9dcc2072d9c6c61e687fbe657 Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Thu, 17 Nov 2016 17:02:22 -0500 +Subject: [PATCH] python requests urllib3 at 1.19.1 + +Signed-off-by: Jeremy Cline +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index c240624..bfadfb9 100755 +--- a/setup.py ++++ b/setup.py +@@ -46,7 +46,7 @@ packages = [ + 'requests.packages.urllib3.packages.backports', + ] + +-requires = [] ++requires = ['urllib3==1.19.1'] + test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov'] + + with open('requests/__init__.py', 'r') as fd: +-- +2.9.3 + diff --git a/python-requests.spec b/python-requests.spec index ebafd5a..8fcde48 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,10 +7,10 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.16 +%global urllib3_unbundled_version 1.19.1 Name: python-requests -Version: 2.11.1 +Version: 2.12.1 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -51,6 +51,7 @@ BuildRequires: python2-urllib3 == %{urllib3_unbundled_version} Requires: ca-certificates Requires: python-chardet Requires: python2-urllib3 == %{urllib3_unbundled_version} +Requires: python-idna %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -74,6 +75,7 @@ BuildRequires: python%{python3_pkgversion}-chardet BuildRequires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} Requires: python%{python3_pkgversion}-chardet Requires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} +Requires: python%{python3_pkgversion}-idna %description -n python%{python3_pkgversion}-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -105,6 +107,7 @@ pushd %{py3dir} # Unbundle chardet and urllib3. We replace these with symlinks to system libs. rm -rf build/lib/requests/packages/chardet rm -rf build/lib/requests/packages/urllib3 +rm -rf build/lib/requests/packages/idna popd %endif @@ -114,6 +117,7 @@ popd # Unbundle chardet and urllib3. We replace these with symlinks to system libs. rm -rf build/lib/requests/packages/chardet rm -rf build/lib/requests/packages/urllib3 +rm -rf build/lib/requests/packages/idna %install rm -rf $RPM_BUILD_ROOT @@ -122,12 +126,14 @@ pushd %{py3dir} %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT ln -s ../../chardet %{buildroot}/%{python3_sitelib}/requests/packages/chardet ln -s ../../urllib3 %{buildroot}/%{python3_sitelib}/requests/packages/urllib3 +ln -s ../../idna %{buildroot}/%{python3_sitelib}/requests/packages/idna popd %endif %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT ln -s ../../chardet %{buildroot}/%{python2_sitelib}/requests/packages/chardet ln -s ../../urllib3 %{buildroot}/%{python2_sitelib}/requests/packages/urllib3 +ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna ## The tests succeed if run locally, but fail in koji. ## They require an active network connection to query httpbin.org @@ -169,6 +175,10 @@ popd %endif %changelog +* Thu Nov 17 2016 Jeremy Cline - 2.12.1-1 +- Update to 2.12.1. Fixes #1395469 +- Unbundle idna, a new upstream dependency + * Sat Aug 27 2016 Kevin Fenzi - 2.11.1-1 - Update to 2.11.1. Fixes #1370814 diff --git a/sources b/sources index c5b83f2..532a9b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad5f9c47b5c5dfdb28363ad7546b0763 requests-2.11.1.tar.gz +8c8ff05ea401ea22718038c3a416ea50 requests-2.12.1.tar.gz From 8c500849120b1ec3ccab189c6f5beee83cc22e76 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 23 Nov 2016 09:56:28 -0500 Subject: [PATCH 051/165] Backport #3713 (fixes #1397149) Signed-off-by: Jeremy Cline --- ...strict-URL-preparation-to-HTTP-HTTPS.patch | 35 +++++++++++++++++++ python-requests.spec | 10 +++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch diff --git a/0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch b/0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch new file mode 100644 index 0000000..20fdd4f --- /dev/null +++ b/0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch @@ -0,0 +1,35 @@ +From 35d7b9264b5ae2c9b327d63464ec299b3d4bda2c Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Mon, 21 Nov 2016 18:00:24 +0100 +Subject: [PATCH] Restrict URL preparation to HTTP/HTTPS + +Requests treats all URLs starting with the string 'http' as HTTP URLs. +Preparation with IDNA breaks non-standard URIs like http+unix. Requests +now prepares only URLs with prefix http:// and https://. + +Signed-off-by: Christian Heimes +Signed-off-by: Jeremy Cline +--- + requests/models.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/requests/models.py b/requests/models.py +index a4bd41b..ca9e6fe 100644 +--- a/requests/models.py ++++ b/requests/models.py +@@ -344,9 +344,9 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): + url = unicode(url) if is_py2 else str(url) + + # Don't do any URL preparation for non-HTTP schemes like `mailto`, +- # `data` etc to work around exceptions from `url_parse`, which +- # handles RFC 3986 only. +- if ':' in url and not url.lower().startswith('http'): ++ # `data`, `http+unix` etc to work around exceptions from `url_parse`, ++ # which handles RFC 3986 only. ++ if ':' in url and not url.lower().startswith(('http://', 'https://')): + self.url = url + return + +-- +2.9.3 + diff --git a/python-requests.spec b/python-requests.spec index 8fcde48..8de6fa3 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -32,6 +32,10 @@ Patch1: python-requests-remove-nested-bundling-dep.patch # - https://github.com/kennethreitz/requests/issues/2816 Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch +# Backport of https://github.com/kennethreitz/requests/pull/3713 +# This patch should be removed after the 2.12.2 or 2.13 release. +Patch3: 0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch + BuildArch: noarch %description @@ -90,6 +94,7 @@ designed to make HTTP requests easy for developers. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -175,6 +180,9 @@ popd %endif %changelog +* Wed Nov 23 2016 Jeremy Cline - 2.12.1-2 +- Backport #3713. Fixes #1397149 + * Thu Nov 17 2016 Jeremy Cline - 2.12.1-1 - Update to 2.12.1. Fixes #1395469 - Unbundle idna, a new upstream dependency From f2e692fa097ddbd0395cc2a0da4d643a045faa77 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 30 Nov 2016 16:46:49 -0500 Subject: [PATCH 052/165] Update to version 2.12.2 Signed-off-by: Jeremy Cline --- .gitignore | 1 + ...strict-URL-preparation-to-HTTP-HTTPS.patch | 35 ------------------- python-requests.spec | 12 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch diff --git a/.gitignore b/.gitignore index 29018f0..b68c404 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /requests-2.11.0.tar.gz /requests-2.11.1.tar.gz /requests-2.12.1.tar.gz +/requests-2.12.2.tar.gz diff --git a/0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch b/0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch deleted file mode 100644 index 20fdd4f..0000000 --- a/0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 35d7b9264b5ae2c9b327d63464ec299b3d4bda2c Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Mon, 21 Nov 2016 18:00:24 +0100 -Subject: [PATCH] Restrict URL preparation to HTTP/HTTPS - -Requests treats all URLs starting with the string 'http' as HTTP URLs. -Preparation with IDNA breaks non-standard URIs like http+unix. Requests -now prepares only URLs with prefix http:// and https://. - -Signed-off-by: Christian Heimes -Signed-off-by: Jeremy Cline ---- - requests/models.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/requests/models.py b/requests/models.py -index a4bd41b..ca9e6fe 100644 ---- a/requests/models.py -+++ b/requests/models.py -@@ -344,9 +344,9 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin): - url = unicode(url) if is_py2 else str(url) - - # Don't do any URL preparation for non-HTTP schemes like `mailto`, -- # `data` etc to work around exceptions from `url_parse`, which -- # handles RFC 3986 only. -- if ':' in url and not url.lower().startswith('http'): -+ # `data`, `http+unix` etc to work around exceptions from `url_parse`, -+ # which handles RFC 3986 only. -+ if ':' in url and not url.lower().startswith(('http://', 'https://')): - self.url = url - return - --- -2.9.3 - diff --git a/python-requests.spec b/python-requests.spec index 8de6fa3..96bd2ec 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,8 +10,8 @@ %global urllib3_unbundled_version 1.19.1 Name: python-requests -Version: 2.12.1 -Release: 2%{?dist} +Version: 2.12.2 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -32,10 +32,6 @@ Patch1: python-requests-remove-nested-bundling-dep.patch # - https://github.com/kennethreitz/requests/issues/2816 Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch -# Backport of https://github.com/kennethreitz/requests/pull/3713 -# This patch should be removed after the 2.12.2 or 2.13 release. -Patch3: 0001-Restrict-URL-preparation-to-HTTP-HTTPS.patch - BuildArch: noarch %description @@ -94,7 +90,6 @@ designed to make HTTP requests easy for developers. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -180,6 +175,9 @@ popd %endif %changelog +* Wed Nov 30 2016 Jeremy Cline - 2.12.2-1 +- Update to 2.12.2 + * Wed Nov 23 2016 Jeremy Cline - 2.12.1-2 - Backport #3713. Fixes #1397149 diff --git a/sources b/sources index 532a9b0..103bc3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c8ff05ea401ea22718038c3a416ea50 requests-2.12.1.tar.gz +1ec26adca0265ead9afd42919867c370 requests-2.12.2.tar.gz From cfa22b2bdf8d1e383df772db081c11e16e4080af Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 1 Dec 2016 15:29:30 -0500 Subject: [PATCH 053/165] Update to 2.12.3. Fixes #1400601 Signed-off-by: Jeremy Cline --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b68c404..4ace2bf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /requests-2.11.1.tar.gz /requests-2.12.1.tar.gz /requests-2.12.2.tar.gz +/requests-2.12.3.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 96bd2ec..d93b00d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ %global urllib3_unbundled_version 1.19.1 Name: python-requests -Version: 2.12.2 +Version: 2.12.3 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -175,6 +175,9 @@ popd %endif %changelog +* Thu Dec 01 2016 Jeremy Cline - 2.12.3-1 +- Update to 2.12.3. Fixes #1400601 + * Wed Nov 30 2016 Jeremy Cline - 2.12.2-1 - Update to 2.12.2 diff --git a/sources b/sources index 103bc3f..7f66f21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ec26adca0265ead9afd42919867c370 requests-2.12.2.tar.gz +0cafdecd95a46b081dd5fcfa4978db7a requests-2.12.3.tar.gz From 0632cc05e993ebef08ddcaa054b5107c871a8823 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Dec 2016 18:48:00 +0100 Subject: [PATCH 054/165] Rebuild for Python 3.6 --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index d93b00d..09548b8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -175,6 +175,9 @@ popd %endif %changelog +* Tue Dec 13 2016 Stratakis Charalampos - 2.12.3-2 +- Rebuild for Python 3.6 + * Thu Dec 01 2016 Jeremy Cline - 2.12.3-1 - Update to 2.12.3. Fixes #1400601 From 613ba9a9836b1adf80a8ae1b1cbd9d20367c551d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 20 Dec 2016 13:26:07 -0500 Subject: [PATCH 055/165] Update to 2.12.4. Fixes #1404680 Signed-off-by: Jeremy Cline --- .gitignore | 1 + python-requests.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4ace2bf..b1dfb2f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /requests-2.12.1.tar.gz /requests-2.12.2.tar.gz /requests-2.12.3.tar.gz +/requests-2.12.4.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 09548b8..22aea79 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,8 +10,8 @@ %global urllib3_unbundled_version 1.19.1 Name: python-requests -Version: 2.12.3 -Release: 2%{?dist} +Version: 2.12.4 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -175,6 +175,9 @@ popd %endif %changelog +* Tue Dec 20 2016 Jeremy Cline - 2.12.4-1 +- Update to 2.12.4. Fixes #1404680 + * Tue Dec 13 2016 Stratakis Charalampos - 2.12.3-2 - Rebuild for Python 3.6 diff --git a/sources b/sources index 7f66f21..8fbd8e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0cafdecd95a46b081dd5fcfa4978db7a requests-2.12.3.tar.gz +SHA512 (requests-2.12.4.tar.gz) = 100a38ad4bfe5c02c44ccfa75473da4b58416690985117750a0c2e1851e98267df740f578f6a5ad27d0a5b9de2954988f832ea1a169fffc82e8e2da15742f855 From e9eb5dd4e540407f9f0ec4dfbf33cd0d947097d9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 21 Dec 2016 10:36:05 -0700 Subject: [PATCH 056/165] Rebuild for Python 3.6 again. --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 22aea79..555a9f5 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.12.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -175,6 +175,9 @@ popd %endif %changelog +* Wed Dec 21 2016 Kevin Fenzi - 2.12.4-2 +- Rebuild for Python 3.6 again. + * Tue Dec 20 2016 Jeremy Cline - 2.12.4-1 - Update to 2.12.4. Fixes #1404680 From 1a7bf1a1bd78bd7f4534427be1b0d2c053ed4508 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 21 Dec 2016 11:47:40 -0800 Subject: [PATCH 057/165] update the note on the test suite We actually could run the tests now, but we need to package python-pytest-httpbin first. --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 555a9f5..0f45cc6 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -135,8 +135,10 @@ ln -s ../../chardet %{buildroot}/%{python2_sitelib}/requests/packages/chardet ln -s ../../urllib3 %{buildroot}/%{python2_sitelib}/requests/packages/urllib3 ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna -## The tests succeed if run locally, but fail in koji. -## They require an active network connection to query httpbin.org +## We could now run the test suite if we package python-pytest-httpbin: +## https://pypi.python.org/pypi/pytest-httpbin +## Because upstream ported to that in 2015: +## https://github.com/kennethreitz/requests/issues/2184 %check #%%{__python} test_requests.py From dbcd0be45073db2618436848dcb629fb6a6a3d8a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 30 Dec 2016 11:03:31 -0800 Subject: [PATCH 058/165] Include and enable tests (now python-pytest-httpbin is packaged) --- .gitignore | 1 + python-requests.spec | 50 ++++++++++++++++++++----------- requests-2.12.4-tests_nonet.patch | 11 +++++++ sources | 1 + 4 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 requests-2.12.4-tests_nonet.patch diff --git a/.gitignore b/.gitignore index b1dfb2f..4d3cbe1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /requests-2.12.2.tar.gz /requests-2.12.3.tar.gz /requests-2.12.4.tar.gz +/requests-2.12.4-tests.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 0f45cc6..8865e2f 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,12 +11,18 @@ Name: python-requests Version: 2.12.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 URL: https://pypi.io/project/requests Source0: https://pypi.io/packages/source/r/requests/requests-%{version}.tar.gz +# To generate: +# git clone https://github.com/kennethreitz/requests.git +# cd requests +# git checkout v%{version} +# tar cvzf requests-%{version}-tests.tar.gz tests/ +Source1: requests-2.12.4-tests.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: python-requests-system-cert-bundle.patch @@ -32,6 +38,13 @@ Patch1: python-requests-remove-nested-bundling-dep.patch # - https://github.com/kennethreitz/requests/issues/2816 Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch +# Use 127.0.0.1 not localhost for socket.bind() in the Server test +# class, to fix tests in Koji's no-network environment +# This probably isn't really upstreamable, because I guess localhost +# could technically be IPv6 or something, and our no-network env is +# a pretty odd one so this is a niche requirement. +Patch3: requests-2.12.4-tests_nonet.patch + BuildArch: noarch %description @@ -47,6 +60,12 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python2-devel BuildRequires: python-chardet BuildRequires: python2-urllib3 == %{urllib3_unbundled_version} +# For tests +BuildRequires: python2-pytest +BuildRequires: python2-pytest-cov +BuildRequires: python2-pytest-httpbin +BuildRequires: python2-pytest-mock + Requires: ca-certificates Requires: python-chardet @@ -73,6 +92,12 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-chardet BuildRequires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} +# For tests +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-pytest-cov +BuildRequires: python%{python3_pkgversion}-pytest-httpbin +BuildRequires: python%{python3_pkgversion}-pytest-mock + Requires: python%{python3_pkgversion}-chardet Requires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} Requires: python%{python3_pkgversion}-idna @@ -85,11 +110,12 @@ designed to make HTTP requests easy for developers. %endif %prep -%setup -q -n requests-%{version} +%setup -q -n requests-%{version} -a 1 %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -135,25 +161,12 @@ ln -s ../../chardet %{buildroot}/%{python2_sitelib}/requests/packages/chardet ln -s ../../urllib3 %{buildroot}/%{python2_sitelib}/requests/packages/urllib3 ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna -## We could now run the test suite if we package python-pytest-httpbin: -## https://pypi.python.org/pypi/pytest-httpbin -## Because upstream ported to that in 2015: -## https://github.com/kennethreitz/requests/issues/2184 %check -#%%{__python} test_requests.py -#%%if 0%%{?_with_python3} -#pushd %%{py3dir} -#%%{__python3} test_requests.py -#popd -#%%endif - -# At very, very least, we'll try to start python and import requests -PYTHONPATH=. %{__python} -c "import requests" - +PYTHONPATH=./ py.test %if 0%{?_with_python3} pushd %{py3dir} -PYTHONPATH=. %{__python3} -c "import requests" +PYTHONPATH=./ py.test-%{python3_pkgversion} popd %endif @@ -177,6 +190,9 @@ popd %endif %changelog +* Fri Dec 30 2016 Adam Williamson - 2.12.4-3 +- Include and enable tests (now python-pytest-httpbin is packaged) + * Wed Dec 21 2016 Kevin Fenzi - 2.12.4-2 - Rebuild for Python 3.6 again. diff --git a/requests-2.12.4-tests_nonet.patch b/requests-2.12.4-tests_nonet.patch new file mode 100644 index 0000000..5e097b1 --- /dev/null +++ b/requests-2.12.4-tests_nonet.patch @@ -0,0 +1,11 @@ +--- requests-2.12.4/tests/testserver/server.py 2016-12-21 11:31:56.000000000 -0800 ++++ requests-2.12.4/tests/testserver/server.py.new 2016-12-30 10:40:06.085995065 -0800 +@@ -27,7 +27,7 @@ + """Dummy server using for unit testing""" + WAIT_EVENT_TIMEOUT = 5 + +- def __init__(self, handler=None, host='localhost', port=0, requests_to_handle=1, wait_to_close_event=None): ++ def __init__(self, handler=None, host='127.0.0.1', port=0, requests_to_handle=1, wait_to_close_event=None): + super(Server, self).__init__() + + self.handler = handler or consume_socket_content diff --git a/sources b/sources index 8fbd8e8..5d71558 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (requests-2.12.4.tar.gz) = 100a38ad4bfe5c02c44ccfa75473da4b58416690985117750a0c2e1851e98267df740f578f6a5ad27d0a5b9de2954988f832ea1a169fffc82e8e2da15742f855 +SHA512 (requests-2.12.4-tests.tar.gz) = baeaa07a61c05ea6dd3f1b26225d77e1532434b7de2cad1a22e5d71eda546a2dffd49fcaa8beccc1694eccf2c69f545290c9fc48e2f0e24dc208b7eac41c920f From 92f3747faf42799228cc941d2b9c18a97c95b9d8 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 9 Feb 2017 13:10:42 -0500 Subject: [PATCH 059/165] Update to 2.13.0 (#1418138) Signed-off-by: Jeremy Cline --- .gitignore | 1 + ...h => python-requests-urllib3-at-1.20.patch | 12 ++++++------ python-requests.spec | 19 ++++++++----------- sources | 3 +-- 4 files changed, 16 insertions(+), 19 deletions(-) rename python-requests-urllib3-at-1.19.1.patch => python-requests-urllib3-at-1.20.patch (65%) diff --git a/.gitignore b/.gitignore index 4d3cbe1..0ba5f58 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /requests-2.12.3.tar.gz /requests-2.12.4.tar.gz /requests-2.12.4-tests.tar.gz +/requests-v2.13.0.tar.gz diff --git a/python-requests-urllib3-at-1.19.1.patch b/python-requests-urllib3-at-1.20.patch similarity index 65% rename from python-requests-urllib3-at-1.19.1.patch rename to python-requests-urllib3-at-1.20.patch index e556bfa..dc832e8 100644 --- a/python-requests-urllib3-at-1.19.1.patch +++ b/python-requests-urllib3-at-1.20.patch @@ -1,7 +1,7 @@ -From 417c2b103a7c4be9dcc2072d9c6c61e687fbe657 Mon Sep 17 00:00:00 2001 +From 46c751c2b8423038863cd619b8301a9f6df8570d Mon Sep 17 00:00:00 2001 From: Jeremy Cline -Date: Thu, 17 Nov 2016 17:02:22 -0500 -Subject: [PATCH] python requests urllib3 at 1.19.1 +Date: Thu, 19 Jan 2017 10:41:21 -0500 +Subject: [PATCH] Update setup.py for urllib3 at 1.20 Signed-off-by: Jeremy Cline --- @@ -9,7 +9,7 @@ Signed-off-by: Jeremy Cline 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index c240624..bfadfb9 100755 +index b162348..daf4a23 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ packages = [ @@ -17,8 +17,8 @@ index c240624..bfadfb9 100755 ] -requires = [] -+requires = ['urllib3==1.19.1'] - test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov'] ++requires = ['urllib3==1.20'] + test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock'] with open('requests/__init__.py', 'r') as fd: -- diff --git a/python-requests.spec b/python-requests.spec index 8865e2f..59be994 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,22 +7,16 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.19.1 +%global urllib3_unbundled_version 1.20 Name: python-requests -Version: 2.12.4 -Release: 3%{?dist} +Version: 2.13.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 URL: https://pypi.io/project/requests -Source0: https://pypi.io/packages/source/r/requests/requests-%{version}.tar.gz -# To generate: -# git clone https://github.com/kennethreitz/requests.git -# cd requests -# git checkout v%{version} -# tar cvzf requests-%{version}-tests.tar.gz tests/ -Source1: requests-2.12.4-tests.tar.gz +Source0: https://github.com/kennethreitz/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: python-requests-system-cert-bundle.patch @@ -110,7 +104,7 @@ designed to make HTTP requests easy for developers. %endif %prep -%setup -q -n requests-%{version} -a 1 +%setup -q -n requests-%{version} %patch0 -p1 %patch1 -p1 @@ -190,6 +184,9 @@ popd %endif %changelog +* Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 +- Update to 2.13.0 (#1418138) + * Fri Dec 30 2016 Adam Williamson - 2.12.4-3 - Include and enable tests (now python-pytest-httpbin is packaged) diff --git a/sources b/sources index 5d71558..f94ea47 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (requests-2.12.4.tar.gz) = 100a38ad4bfe5c02c44ccfa75473da4b58416690985117750a0c2e1851e98267df740f578f6a5ad27d0a5b9de2954988f832ea1a169fffc82e8e2da15742f855 -SHA512 (requests-2.12.4-tests.tar.gz) = baeaa07a61c05ea6dd3f1b26225d77e1532434b7de2cad1a22e5d71eda546a2dffd49fcaa8beccc1694eccf2c69f545290c9fc48e2f0e24dc208b7eac41c920f +SHA512 (requests-v2.13.0.tar.gz) = d39d0a50b05940175f0a6b7383d98c6882e28ccb23f84f25b3adc7527fa162f767dde02a67a11e82dc90e8482bd0d60c0efd8f27a73231e39d9b01b9e1d191b1 From 52b543077360f42d4247f26f614edf32d51318ce Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Sun, 14 May 2017 13:46:01 -0400 Subject: [PATCH 060/165] Don't run tests when building as a module --- python-requests.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 59be994..4828fa7 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -157,12 +157,16 @@ ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna %check +%if 0%{?_module_build} +# Don't run tests on module-build for now +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 PYTHONPATH=./ py.test %if 0%{?_with_python3} pushd %{py3dir} PYTHONPATH=./ py.test-%{python3_pkgversion} popd %endif +%endif #_module_build %files -n python2-requests @@ -184,6 +188,9 @@ popd %endif %changelog +* Sun May 14 2017 Stephen Gallagher - 2.13.0-2 +- Don't run tests when building as a module + * Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 - Update to 2.13.0 (#1418138) From ec7c554bd9d9cc20261c6b708cb210200b869d0d Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Sun, 14 May 2017 14:11:30 -0400 Subject: [PATCH 061/165] Fix typo causing the opposite of the intended affect. --- python-requests.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 4828fa7..37e2f02 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -157,7 +157,7 @@ ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna %check -%if 0%{?_module_build} +%if ! 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 PYTHONPATH=./ py.test From 36f013907836ebd7ce1396948a67087ef59329f4 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 17 May 2017 13:10:52 -0400 Subject: [PATCH 062/165] Update to 2.14.2 (#1449432) Signed-off-by: Jeremy Cline --- .gitignore | 1 + ...ch => python-requests-urllib3-at-1.21.1.patch | 16 ++++++++-------- python-requests.spec | 15 +++++++-------- sources | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) rename python-requests-urllib3-at-1.20.patch => python-requests-urllib3-at-1.21.1.patch (55%) diff --git a/.gitignore b/.gitignore index 0ba5f58..45f6d88 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /requests-2.12.4.tar.gz /requests-2.12.4-tests.tar.gz /requests-v2.13.0.tar.gz +/requests-v2.14.2.tar.gz diff --git a/python-requests-urllib3-at-1.20.patch b/python-requests-urllib3-at-1.21.1.patch similarity index 55% rename from python-requests-urllib3-at-1.20.patch rename to python-requests-urllib3-at-1.21.1.patch index dc832e8..fb44c99 100644 --- a/python-requests-urllib3-at-1.20.patch +++ b/python-requests-urllib3-at-1.21.1.patch @@ -1,7 +1,7 @@ -From 46c751c2b8423038863cd619b8301a9f6df8570d Mon Sep 17 00:00:00 2001 +From e44b99214a953fcc68227a7182f2fecd55c58267 Mon Sep 17 00:00:00 2001 From: Jeremy Cline -Date: Thu, 19 Jan 2017 10:41:21 -0500 -Subject: [PATCH] Update setup.py for urllib3 at 1.20 +Date: Wed, 17 May 2017 11:57:23 -0400 +Subject: [PATCH] python requests urllib3 at 1.21.1 Signed-off-by: Jeremy Cline --- @@ -9,18 +9,18 @@ Signed-off-by: Jeremy Cline 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index b162348..daf4a23 100755 +index 6ad0bc3..50ae1a1 100755 --- a/setup.py +++ b/setup.py -@@ -46,7 +46,7 @@ packages = [ - 'requests.packages.urllib3.packages.backports', +@@ -48,7 +48,7 @@ packages = [ + 'requests.packages.urllib3.contrib._securetransport', ] -requires = [] -+requires = ['urllib3==1.20'] ++requires = ['urllib3==1.21.1'] test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock'] with open('requests/__init__.py', 'r') as fd: -- -2.9.3 +2.9.4 diff --git a/python-requests.spec b/python-requests.spec index 59be994..26ec3bd 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,10 +7,10 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.20 +%global urllib3_unbundled_version 1.21.1 Name: python-requests -Version: 2.13.0 +Version: 2.14.2 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -104,12 +104,7 @@ designed to make HTTP requests easy for developers. %endif %prep -%setup -q -n requests-%{version} - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n requests-%{version} # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem @@ -184,6 +179,10 @@ popd %endif %changelog +* Wed May 17 2017 Jeremy Cline - 2.14.2-1 +- Update to 2.14.2 (#1449432) +- Switch to autosetup to apply patches + * Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 - Update to 2.13.0 (#1418138) diff --git a/sources b/sources index f94ea47..58b0080 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.13.0.tar.gz) = d39d0a50b05940175f0a6b7383d98c6882e28ccb23f84f25b3adc7527fa162f767dde02a67a11e82dc90e8482bd0d60c0efd8f27a73231e39d9b01b9e1d191b1 +SHA512 (requests-v2.14.2.tar.gz) = a9f2b612bbfc4ce27c9a96bfac052f01329f2adbde7f188ee5507419f73252f282ebe68616df93a8c32680998c85ee7adf683893801df24439de8f0ed02af0a2 From 2c9580baca349c6fe8409bed9ecae4dec731b28a Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 19 Jun 2017 20:35:10 +0000 Subject: [PATCH 063/165] Update to 2.18.1 (#1449432) Signed-off-by: Jeremy Cline --- .gitignore | 1 + Remove-tests-that-use-the-tarpit.patch | 55 +++++++++++++++++++ dont-import-OrderedDict-from-urllib3.patch | 29 ++++++++++ ...certs.py-to-use-the-system-CA-bundle.patch | 36 ++++++++++++ ...-requests-remove-nested-bundling-dep.patch | 29 ---------- python-requests-system-cert-bundle.patch | 38 ------------- python-requests-urllib3-at-1.21.1.patch | 26 --------- python-requests.spec | 47 ++++++---------- sources | 2 +- 9 files changed, 139 insertions(+), 124 deletions(-) create mode 100644 Remove-tests-that-use-the-tarpit.patch create mode 100644 dont-import-OrderedDict-from-urllib3.patch create mode 100644 patch-requests-certs.py-to-use-the-system-CA-bundle.patch delete mode 100644 python-requests-remove-nested-bundling-dep.patch delete mode 100644 python-requests-system-cert-bundle.patch delete mode 100644 python-requests-urllib3-at-1.21.1.patch diff --git a/.gitignore b/.gitignore index 45f6d88..fb7e44e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /requests-2.12.4-tests.tar.gz /requests-v2.13.0.tar.gz /requests-v2.14.2.tar.gz +/requests-v2.18.1.tar.gz diff --git a/Remove-tests-that-use-the-tarpit.patch b/Remove-tests-that-use-the-tarpit.patch new file mode 100644 index 0000000..3b1bcd6 --- /dev/null +++ b/Remove-tests-that-use-the-tarpit.patch @@ -0,0 +1,55 @@ +From 524cd22fb77e69db9bb3f017bbb1d9782c37b0cd Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Tue, 13 Jun 2017 09:08:09 -0400 +Subject: [PATCH] Remove tests that use the tarpit + +The latest version of Mock has started using systemd containers. The +systemd-nspawn command is being run with --private-network, which +immediately kills connections to something other than localhost. These +tests depend on the connection not being killed immediately and that +they are never responded to. + +Signed-off-by: Jeremy Cline +--- + tests/test_requests.py | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/tests/test_requests.py b/tests/test_requests.py +index b8350cb..46b7e9e 100755 +--- a/tests/test_requests.py ++++ b/tests/test_requests.py +@@ -2049,31 +2049,6 @@ class TestTimeout: + except ReadTimeout: + pass + +- @pytest.mark.parametrize( +- 'timeout', ( +- (0.1, None), +- Urllib3Timeout(connect=0.1, read=None) +- )) +- def test_connect_timeout(self, timeout): +- try: +- requests.get(TARPIT, timeout=timeout) +- pytest.fail('The connect() request should time out.') +- except ConnectTimeout as e: +- assert isinstance(e, ConnectionError) +- assert isinstance(e, Timeout) +- +- @pytest.mark.parametrize( +- 'timeout', ( +- (0.1, 0.1), +- Urllib3Timeout(connect=0.1, read=0.1) +- )) +- def test_total_timeout_connect(self, timeout): +- try: +- requests.get(TARPIT, timeout=timeout) +- pytest.fail('The connect() request should time out.') +- except ConnectTimeout: +- pass +- + def test_encoded_methods(self, httpbin): + """See: https://github.com/requests/requests/issues/2316""" + r = requests.request(b'GET', httpbin('get')) +-- +2.9.4 + diff --git a/dont-import-OrderedDict-from-urllib3.patch b/dont-import-OrderedDict-from-urllib3.patch new file mode 100644 index 0000000..0b0279c --- /dev/null +++ b/dont-import-OrderedDict-from-urllib3.patch @@ -0,0 +1,29 @@ +From 75f027ac8bc55ad280f7bf72a25db1ce8c1fc76d Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Mon, 19 Jun 2017 16:19:53 -0400 +Subject: [PATCH] Don't import OrderedDict from urllib3 + +Signed-off-by: Jeremy Cline +--- + requests/compat.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/requests/compat.py b/requests/compat.py +index 5c09ea8..61fa0c8 100644 +--- a/requests/compat.py ++++ b/requests/compat.py +@@ -46,7 +46,10 @@ if is_py2: + from Cookie import Morsel + from StringIO import StringIO + +- from urllib3.packages.ordered_dict import OrderedDict ++ try: ++ from collections import OrderedDict # py2.7+ ++ except: ++ from ordereddict import OrderedDict # py2.6 and lower (el6, etc. + + builtin_str = str + bytes = str +-- +2.9.4 + diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch new file mode 100644 index 0000000..1e06ead --- /dev/null +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -0,0 +1,36 @@ +From 5bce3f425c5bd59dccdd054f7f27baceb3cf3fb4 Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +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 +--- + requests/certs.py | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/requests/certs.py b/requests/certs.py +index d1a378d..7b103ba 100644 +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -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. ++ ++This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided ++by the ca-certificates RPM package. + """ +-from certifi import where ++try: ++ from certifi import where ++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()) +-- +2.9.4 + diff --git a/python-requests-remove-nested-bundling-dep.patch b/python-requests-remove-nested-bundling-dep.patch deleted file mode 100644 index d915a4e..0000000 --- a/python-requests-remove-nested-bundling-dep.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8c2259d4ab03ef982738aaf863068a1015cadf3d Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Wed, 5 Nov 2014 10:23:44 -0500 -Subject: [PATCH] Remove nested bundling dep. - ---- - requests/compat.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/requests/compat.py b/requests/compat.py -index be5a1ed..70ea4e8 100644 ---- a/requests/compat.py -+++ b/requests/compat.py -@@ -91,7 +91,11 @@ if is_py2: - import cookielib - from Cookie import Morsel - from StringIO import StringIO -- from .packages.urllib3.packages.ordered_dict import OrderedDict -+ -+ try: -+ from collections import OrderedDict # py2.7 -+ except: -+ from ordereddict import OrderedDict # py2.6 and lower (el6, etc.) - - builtin_str = str - bytes = str --- -1.9.3 - diff --git a/python-requests-system-cert-bundle.patch b/python-requests-system-cert-bundle.patch deleted file mode 100644 index e76b741..0000000 --- a/python-requests-system-cert-bundle.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a49b39fbfe01791880c6e7179f6efdad03e8ce58 Mon Sep 17 00:00:00 2001 -From: Ralph Bean -Date: Wed, 5 Nov 2014 10:15:17 -0500 -Subject: [PATCH] system cert bundle - ---- - requests/certs.py | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/requests/certs.py b/requests/certs.py -index 07e6475..2c7ca96 100644 ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -10,16 +10,17 @@ This module returns the preferred default CA certificate bundle. - 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. -+ -+We return "/etc/pki/tls/certs/ca-bundle.crt" provided by the ca-certificates -+package. - """ --import os.path - - try: - from certifi import where - except ImportError: - def where(): -- """Return the preferred certificate bundle.""" -- # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ """ Don't use the certs bundled with requests, use ca-certificates. """ -+ return "/etc/pki/tls/certs/ca-bundle.crt" - - if __name__ == '__main__': - print(where()) --- -1.9.3 - diff --git a/python-requests-urllib3-at-1.21.1.patch b/python-requests-urllib3-at-1.21.1.patch deleted file mode 100644 index fb44c99..0000000 --- a/python-requests-urllib3-at-1.21.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e44b99214a953fcc68227a7182f2fecd55c58267 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Wed, 17 May 2017 11:57:23 -0400 -Subject: [PATCH] python requests urllib3 at 1.21.1 - -Signed-off-by: Jeremy Cline ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 6ad0bc3..50ae1a1 100755 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,7 @@ packages = [ - 'requests.packages.urllib3.contrib._securetransport', - ] - --requires = [] -+requires = ['urllib3==1.21.1'] - test_requirements = ['pytest>=2.8.0', 'pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock'] - - with open('requests/__init__.py', 'r') as fd: --- -2.9.4 - diff --git a/python-requests.spec b/python-requests.spec index 093e3b8..8c9a42f 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,30 +7,28 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif -%global urllib3_unbundled_version 1.21.1 - Name: python-requests -Version: 2.14.2 +Version: 2.18.1 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 URL: https://pypi.io/project/requests -Source0: https://github.com/kennethreitz/requests/archive/v%{version}/requests-v%{version}.tar.gz +Source0: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 -Patch0: python-requests-system-cert-bundle.patch +Patch0: patch-requests-certs.py-to-use-the-system-CA-bundle.patch # Remove an unnecessary reference to a bundled compat lib in urllib3 # Some discussion with upstream: # - https://twitter.com/sigmavirus24/status/529816751651819520 # - https://github.com/kennethreitz/requests/issues/1811 # - https://github.com/kennethreitz/requests/pull/1812 -Patch1: python-requests-remove-nested-bundling-dep.patch +Patch1: dont-import-OrderedDict-from-urllib3.patch -# Tell setuptools about what version of urllib3 we're unbundling -# - https://github.com/kennethreitz/requests/issues/2816 -Patch2: python-requests-urllib3-at-%{urllib3_unbundled_version}.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1450608 +Patch2: Remove-tests-that-use-the-tarpit.patch # Use 127.0.0.1 not localhost for socket.bind() in the Server test # class, to fix tests in Koji's no-network environment @@ -53,7 +51,7 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python2-devel BuildRequires: python-chardet -BuildRequires: python2-urllib3 == %{urllib3_unbundled_version} +BuildRequires: python2-urllib3 # For tests BuildRequires: python2-pytest BuildRequires: python2-pytest-cov @@ -63,7 +61,7 @@ BuildRequires: python2-pytest-mock Requires: ca-certificates Requires: python-chardet -Requires: python2-urllib3 == %{urllib3_unbundled_version} +Requires: python2-urllib3 Requires: python-idna %if 0%{?rhel} && 0%{?rhel} <= 6 @@ -85,7 +83,7 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-chardet -BuildRequires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} +BuildRequires: python%{python3_pkgversion}-urllib3 # For tests BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov @@ -93,7 +91,7 @@ BuildRequires: python%{python3_pkgversion}-pytest-httpbin BuildRequires: python%{python3_pkgversion}-pytest-mock Requires: python%{python3_pkgversion}-chardet -Requires: python%{python3_pkgversion}-urllib3 == %{urllib3_unbundled_version} +Requires: python%{python3_pkgversion}-urllib3 Requires: python%{python3_pkgversion}-idna %description -n python%{python3_pkgversion}-requests @@ -119,36 +117,21 @@ cp -a . %{py3dir} pushd %{py3dir} %{__python3} setup.py build -# Unbundle chardet and urllib3. We replace these with symlinks to system libs. -rm -rf build/lib/requests/packages/chardet -rm -rf build/lib/requests/packages/urllib3 -rm -rf build/lib/requests/packages/idna - popd %endif %{__python} setup.py build -# Unbundle chardet and urllib3. We replace these with symlinks to system libs. -rm -rf build/lib/requests/packages/chardet -rm -rf build/lib/requests/packages/urllib3 -rm -rf build/lib/requests/packages/idna %install rm -rf $RPM_BUILD_ROOT %if 0%{?_with_python3} pushd %{py3dir} %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -ln -s ../../chardet %{buildroot}/%{python3_sitelib}/requests/packages/chardet -ln -s ../../urllib3 %{buildroot}/%{python3_sitelib}/requests/packages/urllib3 -ln -s ../../idna %{buildroot}/%{python3_sitelib}/requests/packages/idna popd %endif %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT -ln -s ../../chardet %{buildroot}/%{python2_sitelib}/requests/packages/chardet -ln -s ../../urllib3 %{buildroot}/%{python2_sitelib}/requests/packages/urllib3 -ln -s ../../idna %{buildroot}/%{python2_sitelib}/requests/packages/idna %check @@ -168,7 +151,7 @@ popd %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE -%doc NOTICE README.rst HISTORY.rst +%doc README.rst HISTORY.rst %{python2_sitelib}/*.egg-info %dir %{python2_sitelib}/requests %{python2_sitelib}/requests/* @@ -177,12 +160,16 @@ popd %files -n python%{python3_pkgversion}-requests %{!?_licensedir:%global license %%doc} %license LICENSE -%doc NOTICE README.rst HISTORY.rst +%doc README.rst HISTORY.rst %{python3_sitelib}/*.egg-info %{python3_sitelib}/requests/ %endif %changelog +* Mon Jun 19 2017 Jeremy Cline - 2.18.1-1 +- Update to 2.18.1 (#1449432) +- Remove tests that require non-local network (#1450608) + * Wed May 17 2017 Jeremy Cline - 2.14.2-1 - Update to 2.14.2 (#1449432) - Switch to autosetup to apply patches diff --git a/sources b/sources index 58b0080..e8af340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.14.2.tar.gz) = a9f2b612bbfc4ce27c9a96bfac052f01329f2adbde7f188ee5507419f73252f282ebe68616df93a8c32680998c85ee7adf683893801df24439de8f0ed02af0a2 +SHA512 (requests-v2.18.1.tar.gz) = a80e0487b4b729e69522817bc2eec2a9c5f1df34df385581b3e937c2409e0fcb4e1f9b4794b198c8b8a57fc05b1bc513fc70d41b324ae251de0fa9bc7c9e6947 From 42ab4cc57f4784dcf8d66088a94e3277810013d2 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 20 Jun 2017 09:05:25 -0400 Subject: [PATCH 064/165] Remove the certifi requirement from setup.py We use the certificates provided by the ca-certificates RPM package and therefore don't use certifi. Signed-off-by: Jeremy Cline --- ...s-certs.py-to-use-the-system-CA-bundle.patch | 17 +++++++++++++++-- python-requests.spec | 5 ++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index 1e06ead..df1132e 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,4 +1,4 @@ -From 5bce3f425c5bd59dccdd054f7f27baceb3cf3fb4 Mon Sep 17 00:00:00 2001 +From fd9ab446d8479360d2c1c8252508d97d58ed3e0e Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 19 Jun 2017 16:09:02 -0400 Subject: [PATCH] Patch requests/certs.py to use the system CA bundle @@ -6,7 +6,8 @@ Subject: [PATCH] Patch requests/certs.py to use the system CA bundle Signed-off-by: Jeremy Cline --- requests/certs.py | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) + setup.py | 1 - + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/requests/certs.py b/requests/certs.py index d1a378d..7b103ba 100644 @@ -31,6 +32,18 @@ index d1a378d..7b103ba 100644 if __name__ == '__main__': print(where()) +diff --git a/setup.py b/setup.py +index 93a8507..2db9569 100755 +--- a/setup.py ++++ b/setup.py +@@ -45,7 +45,6 @@ requires = [ + 'chardet>=3.0.2,<3.1.0', + 'idna>=2.5,<2.6', + 'urllib3>=1.21.1,<1.22', +- 'certifi>=2017.4.17' + + ] + test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] -- 2.9.4 diff --git a/python-requests.spec b/python-requests.spec index 8c9a42f..9cbdedd 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests Version: 2.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -166,6 +166,9 @@ popd %endif %changelog +* Tue Jun 20 2017 Jeremy Cline - 2.18.1-2 +- Drop the dependency on certifi in setup.py + * Mon Jun 19 2017 Jeremy Cline - 2.18.1-1 - Update to 2.18.1 (#1449432) - Remove tests that require non-local network (#1450608) From 33a34fdd3a608abcdc753e2a90d9d5d9373c1820 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 26 Jul 2017 12:23:54 +0200 Subject: [PATCH 065/165] Update to 2.18.2 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + patch-requests-certs.py-to-use-the-system-CA-bundle.patch | 2 +- python-requests.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index fb7e44e..3821a19 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /requests-v2.13.0.tar.gz /requests-v2.14.2.tar.gz /requests-v2.18.1.tar.gz +/requests-v2.18.2.tar.gz diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index df1132e..ee83d68 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -39,7 +39,7 @@ index 93a8507..2db9569 100755 @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<3.1.0', 'idna>=2.5,<2.6', - 'urllib3>=1.21.1,<1.22', + 'urllib3>=1.21.1,<1.23', - 'certifi>=2017.4.17' ] diff --git a/python-requests.spec b/python-requests.spec index 9cbdedd..e4adb58 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -8,8 +8,8 @@ %endif Name: python-requests -Version: 2.18.1 -Release: 2%{?dist} +Version: 2.18.2 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -166,6 +166,9 @@ popd %endif %changelog +* Wed Jul 26 2017 Igor Gnatenko - 2.18.2-1 +- Update to 2.18.2 + * Tue Jun 20 2017 Jeremy Cline - 2.18.1-2 - Drop the dependency on certifi in setup.py diff --git a/sources b/sources index e8af340..c3e044f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.18.1.tar.gz) = a80e0487b4b729e69522817bc2eec2a9c5f1df34df385581b3e937c2409e0fcb4e1f9b4794b198c8b8a57fc05b1bc513fc70d41b324ae251de0fa9bc7c9e6947 +SHA512 (requests-v2.18.2.tar.gz) = 1fc7462409b6431a2b7867bb3d01ac08a896a0ca32600dab33bc6b631a8e6b10c0401f1280244a8cb93e3c0eb88ae3d6bea2055110663718651c8d68ffed9196 From a45eccb833680c0205fc4c78a16014e35be790d5 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 18 Aug 2017 10:08:46 -0400 Subject: [PATCH 066/165] Update to 2.18.4 Signed-off-by: Jeremy Cline --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3821a19..0089e02 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /requests-v2.14.2.tar.gz /requests-v2.18.1.tar.gz /requests-v2.18.2.tar.gz +/requests-v2.18.4.tar.gz diff --git a/python-requests.spec b/python-requests.spec index e4adb58..0dba9e8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -8,7 +8,7 @@ %endif Name: python-requests -Version: 2.18.2 +Version: 2.18.4 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -166,6 +166,9 @@ popd %endif %changelog +* Fri Aug 18 2017 Jeremy Cline - 2.18.4-1 +- Update to 2.18.4 + * Wed Jul 26 2017 Igor Gnatenko - 2.18.2-1 - Update to 2.18.2 diff --git a/sources b/sources index c3e044f..0e06b51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.18.2.tar.gz) = 1fc7462409b6431a2b7867bb3d01ac08a896a0ca32600dab33bc6b631a8e6b10c0401f1280244a8cb93e3c0eb88ae3d6bea2055110663718651c8d68ffed9196 +SHA512 (requests-v2.18.4.tar.gz) = 8ca20fe18d13b8c62977be0c51617f2ae8618d3d002ad4dc554362828855db7359274efbff0cd13e8c5699508913e91205cffcf306221a70321e74ac10b2d4d7 From c281f154599757c59bc616bdfda2cc42625970fd Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 18 Aug 2017 10:23:55 -0400 Subject: [PATCH 067/165] Adjust the CA patch for new dep version The dependency version change caused the patch to not apply with --fuzz=0 Signed-off-by: Jeremy Cline --- patch-requests-certs.py-to-use-the-system-CA-bundle.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index ee83d68..06a1e99 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -38,7 +38,7 @@ index 93a8507..2db9569 100755 +++ b/setup.py @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<3.1.0', - 'idna>=2.5,<2.6', + 'idna>=2.5,<2.7', 'urllib3>=1.21.1,<1.23', - 'certifi>=2017.4.17' From ddda5a09fe8b02d24ee40172241e3c3c2b860d29 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 11 Dec 2017 13:49:41 +0100 Subject: [PATCH 068/165] Fix ambiguous Python 2 dependency declarations --- python-requests.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 0dba9e8..104f0d8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests Version: 2.18.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -50,7 +50,7 @@ Summary: HTTP library, written in Python, for human beings %{?python_provide:%python_provide python2-requests} BuildRequires: python2-devel -BuildRequires: python-chardet +BuildRequires: python2-chardet BuildRequires: python2-urllib3 # For tests BuildRequires: python2-pytest @@ -60,9 +60,9 @@ BuildRequires: python2-pytest-mock Requires: ca-certificates -Requires: python-chardet +Requires: python2-chardet Requires: python2-urllib3 -Requires: python-idna +Requires: python2-idna %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-ordereddict @@ -166,6 +166,10 @@ popd %endif %changelog +* Mon Dec 11 2017 Iryna Shcherbina - 2.18.4-2 +- Fix ambiguous Python 2 dependency declarations + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Fri Aug 18 2017 Jeremy Cline - 2.18.4-1 - Update to 2.18.4 From 87c6858d16835a146511ed8b799abece7e550768 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 10:31:22 +0000 Subject: [PATCH 069/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 104f0d8..4005e1d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests Version: 2.18.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -166,6 +166,9 @@ popd %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.18.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Dec 11 2017 Iryna Shcherbina - 2.18.4-2 - Fix ambiguous Python 2 dependency declarations (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 26f526b44e8580c21b12f080faa2c1932c603a8d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 16 Apr 2018 10:40:45 -0400 Subject: [PATCH 070/165] Don't inject pyopenssl into urllib3 (rhbz 1567862) Signed-off-by: Jeremy Cline --- Don-t-inject-pyopenssl-into-urllib3.patch | 34 +++++++++++++++++++++++ python-requests.spec | 8 +++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 Don-t-inject-pyopenssl-into-urllib3.patch diff --git a/Don-t-inject-pyopenssl-into-urllib3.patch b/Don-t-inject-pyopenssl-into-urllib3.patch new file mode 100644 index 0000000..10a9793 --- /dev/null +++ b/Don-t-inject-pyopenssl-into-urllib3.patch @@ -0,0 +1,34 @@ +From 86b1fa39fdebdb7bc57131c1a198d4d18e104f95 Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +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 +--- + requests/__init__.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/requests/__init__.py b/requests/__init__.py +index 268e7dcc..45b2c679 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -79,13 +79,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() +-except ImportError: +- pass +- + # urllib3's DependencyWarnings should be silenced. + from urllib3.exceptions import DependencyWarning + warnings.simplefilter('ignore', DependencyWarning) +-- +2.17.0 + diff --git a/python-requests.spec b/python-requests.spec index 4005e1d..db8de54 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests Version: 2.18.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -37,6 +37,9 @@ 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 + BuildArch: noarch %description @@ -166,6 +169,9 @@ popd %endif %changelog +* Mon Apr 16 2018 Jeremy Cline - 2.18.4-4 +- Stop injecting PyOpenSSL (rhbz 1567862) + * Fri Feb 09 2018 Fedora Release Engineering - 2.18.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From cd19418c792f2e5b531b1e36e46346d28d8db13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 14 May 2018 14:25:33 +0200 Subject: [PATCH 071/165] Conditionalize the tests, useful when bootstrapping Python --- python-requests.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index db8de54..f57b939 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,6 +7,16 @@ %{!?python3_pkgversion: %global python3_pkgversion 34} %endif +%if 0%{?_module_build} +# Don't run tests on module-build for now +# See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 +%bcond_with tests +%else +# When bootstrapping Python, we cannot test this yet +%bcond_without tests +%endif + + Name: python-requests Version: 2.18.4 Release: 4%{?dist} @@ -55,11 +65,12 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python2-devel BuildRequires: python2-chardet BuildRequires: python2-urllib3 -# For tests +%if %{with tests} BuildRequires: python2-pytest BuildRequires: python2-pytest-cov BuildRequires: python2-pytest-httpbin BuildRequires: python2-pytest-mock +%endif Requires: ca-certificates @@ -87,11 +98,12 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-chardet BuildRequires: python%{python3_pkgversion}-urllib3 -# For tests +%if %{with tests} BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov BuildRequires: python%{python3_pkgversion}-pytest-httpbin BuildRequires: python%{python3_pkgversion}-pytest-mock +%endif Requires: python%{python3_pkgversion}-chardet Requires: python%{python3_pkgversion}-urllib3 @@ -136,18 +148,16 @@ popd %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT -%check -%if ! 0%{?_module_build} -# Don't run tests on module-build for now -# See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 +%if %{with tests} +%check PYTHONPATH=./ py.test %if 0%{?_with_python3} pushd %{py3dir} PYTHONPATH=./ py.test-%{python3_pkgversion} popd %endif -%endif #_module_build +%endif # tests %files -n python2-requests From cb02c8bebb1d4387b0e18dd9eed8f763065bfb18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Jun 2018 16:45:30 +0200 Subject: [PATCH 072/165] BR idna, or the tests fail --- python-requests.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-requests.spec b/python-requests.spec index f57b939..f0a2b4d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -65,6 +65,7 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python2-devel BuildRequires: python2-chardet BuildRequires: python2-urllib3 +BuildRequires: python2-idna %if %{with tests} BuildRequires: python2-pytest BuildRequires: python2-pytest-cov @@ -98,6 +99,7 @@ Summary: HTTP library, written in Python, for human beings BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-chardet BuildRequires: python%{python3_pkgversion}-urllib3 +BuildRequires: python%{python3_pkgversion}-idna %if %{with tests} BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov From 7e81914aaa24fac366f329069de68a7d810b75ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Jun 2018 16:46:46 +0200 Subject: [PATCH 073/165] General cleanup of the specfile - python_sitelib was defined but never used - _with_python3 was True, so I removed the ifs - python3_pkgversion is defined on both Fedora and EPEL - %{py3dir} is deprecated and not needed here - use %pyX_build and %pyX_install macros, stop using %{__python} - run tests against the installed version - some cruft removal --- python-requests.spec | 53 +++++++------------------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index f0a2b4d..2ad3ffa 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,12 +1,3 @@ -%global _with_python3 1 -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} - -%if 0%{?fedora} -%{!?python3_pkgversion: %global python3_pkgversion 3} -%else -%{!?python3_pkgversion: %global python3_pkgversion 34} -%endif - %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -90,7 +81,6 @@ 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 0%{?_with_python3} %package -n python%{python3_pkgversion}-requests Summary: HTTP library, written in Python, for human beings @@ -116,7 +106,6 @@ 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. -%endif %prep %autosetup -p1 -n requests-%{version} @@ -124,61 +113,35 @@ designed to make HTTP requests easy for developers. # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem -%if 0%{?_with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif # with_python3 - %build -%if 0%{?_with_python3} -pushd %{py3dir} -%{__python3} setup.py build - -popd -%endif - -%{__python} setup.py build +%py2_build +%py3_build %install -rm -rf $RPM_BUILD_ROOT -%if 0%{?_with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -popd -%endif - -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +%py2_install +%py3_install %if %{with tests} %check -PYTHONPATH=./ py.test -%if 0%{?_with_python3} -pushd %{py3dir} -PYTHONPATH=./ py.test-%{python3_pkgversion} -popd -%endif +PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v +PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %endif # tests %files -n python2-requests -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.rst HISTORY.rst %{python2_sitelib}/*.egg-info -%dir %{python2_sitelib}/requests -%{python2_sitelib}/requests/* +%{python2_sitelib}/requests/ -%if 0%{?_with_python3} %files -n python%{python3_pkgversion}-requests -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.rst HISTORY.rst %{python3_sitelib}/*.egg-info %{python3_sitelib}/requests/ -%endif + %changelog * Mon Apr 16 2018 Jeremy Cline - 2.18.4-4 From ae81b73839f768013b6bdb79e4677e8be8613ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 Jun 2018 16:55:51 +0200 Subject: [PATCH 074/165] Remove useless shebang --- python-requests.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-requests.spec b/python-requests.spec index 2ad3ffa..ae931c0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -113,6 +113,9 @@ designed to make HTTP requests easy for developers. # Unbundle the certificate bundle from mozilla. rm -rf requests/cacert.pem +# env shebang in nonexecutable file +sed -i '/#!\/usr\/.*python/d' requests/certs.py + %build %py2_build %py3_build From 9191e71974b1b7f09db04457b49f854f6d18bdfc Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 5 Jun 2018 23:07:31 -0400 Subject: [PATCH 075/165] Allow urllib3 v1.23 (rhbz 1586311) --- Allow-urllib3-1.23.patch | 27 +++++++++++++++++++++++++++ python-requests.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Allow-urllib3-1.23.patch diff --git a/Allow-urllib3-1.23.patch b/Allow-urllib3-1.23.patch new file mode 100644 index 0000000..50c3e39 --- /dev/null +++ b/Allow-urllib3-1.23.patch @@ -0,0 +1,27 @@ +From 7147b3e8280d2ae245b28e9f6ede1d9210af79ef Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Tue, 5 Jun 2018 23:00:42 -0400 +Subject: [PATCH] Allow urllib3-1.23 + +Signed-off-by: Jeremy Cline +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ed4892d4..e113510c 100755 +--- a/setup.py ++++ b/setup.py +@@ -44,7 +44,7 @@ packages = ['requests'] + requires = [ + 'chardet>=3.0.2,<3.1.0', + 'idna>=2.5,<2.7', +- 'urllib3>=1.21.1,<1.23', ++ 'urllib3>=1.21.1,<1.24', + + ] + test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] + +-- +2.17.1 + diff --git a/python-requests.spec b/python-requests.spec index ae931c0..02fa97e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.18.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -41,6 +41,8 @@ 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 +Patch5: Allow-urllib3-1.23.patch + BuildArch: noarch %description @@ -147,6 +149,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Tue Jun 05 2018 Jeremy Cline - 2.18.4-5 +- Allow urllib3 v1.23 (rhbz 1586311) + * Mon Apr 16 2018 Jeremy Cline - 2.18.4-4 - Stop injecting PyOpenSSL (rhbz 1567862) From c670b3bcc3ff179bc0f270c569a5796927cc0bab Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 8 Jun 2018 12:18:08 -0400 Subject: [PATCH 076/165] Don't print runtime warning about urllib3 v1.23 (rhbz 1589306) Signed-off-by: Jeremy Cline --- Allow-urllib3-1.23.patch | 29 +++++++++++++++++++++++++++++ python-requests.spec | 6 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Allow-urllib3-1.23.patch b/Allow-urllib3-1.23.patch index 50c3e39..1e73484 100644 --- a/Allow-urllib3-1.23.patch +++ b/Allow-urllib3-1.23.patch @@ -25,3 +25,32 @@ index ed4892d4..e113510c 100755 -- 2.17.1 +From 015347ed9622f526f045b2199a82ee57269c1260 Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Thu, 7 Jun 2018 11:58:46 -0400 +Subject: [PATCH] Don't warn about compatibility with urllib3 v1.23 + +Requests allows v1.23 in #4669, but the compatibility check at import +time still looks for 22. Bump the version to 23. + +Signed-off-by: Jeremy Cline +--- + requests/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requests/__init__.py b/requests/__init__.py +index 6fa855df..03decf8c 100644 +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -60,7 +60,7 @@ def check_compatibility(urllib3_version, chardet_version): + # urllib3 >= 1.21.1, <= 1.22 + assert major == 1 + assert minor >= 21 +- assert minor <= 22 ++ assert minor <= 23 + + # Check chardet for compatibility. + major, minor, patch = chardet_version.split('.')[:3] +-- +2.17.1 + diff --git a/python-requests.spec b/python-requests.spec index 02fa97e..af1572c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.18.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -41,6 +41,7 @@ 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 +# Temporary fixes to work with urllib3 until requests-2.19 is tagged upstream Patch5: Allow-urllib3-1.23.patch BuildArch: noarch @@ -149,6 +150,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Fri Jun 08 2018 Jeremy Cline - 2.18.4-6 +- Don't print runtime warning about urllib3 v1.23 (rhbz 1589306) + * Tue Jun 05 2018 Jeremy Cline - 2.18.4-5 - Allow urllib3 v1.23 (rhbz 1586311) From 2455988645f40af302aec699346a8575ae62e19c Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 12 Jun 2018 14:17:56 -0400 Subject: [PATCH 077/165] Update to v2.19.0 --- .gitignore | 1 + Allow-urllib3-1.23.patch | 56 ------------------- Don-t-inject-pyopenssl-into-urllib3.patch | 8 ++- dont-import-OrderedDict-from-urllib3.patch | 27 +++++---- ...certs.py-to-use-the-system-CA-bundle.patch | 4 +- python-requests.spec | 10 ++-- sources | 2 +- 7 files changed, 28 insertions(+), 80 deletions(-) delete mode 100644 Allow-urllib3-1.23.patch diff --git a/.gitignore b/.gitignore index 0089e02..cdc3171 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /requests-v2.18.1.tar.gz /requests-v2.18.2.tar.gz /requests-v2.18.4.tar.gz +/requests-v2.19.0.tar.gz diff --git a/Allow-urllib3-1.23.patch b/Allow-urllib3-1.23.patch deleted file mode 100644 index 1e73484..0000000 --- a/Allow-urllib3-1.23.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7147b3e8280d2ae245b28e9f6ede1d9210af79ef Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Tue, 5 Jun 2018 23:00:42 -0400 -Subject: [PATCH] Allow urllib3-1.23 - -Signed-off-by: Jeremy Cline ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index ed4892d4..e113510c 100755 ---- a/setup.py -+++ b/setup.py -@@ -44,7 +44,7 @@ packages = ['requests'] - requires = [ - 'chardet>=3.0.2,<3.1.0', - 'idna>=2.5,<2.7', -- 'urllib3>=1.21.1,<1.23', -+ 'urllib3>=1.21.1,<1.24', - - ] - test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] - --- -2.17.1 - -From 015347ed9622f526f045b2199a82ee57269c1260 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Thu, 7 Jun 2018 11:58:46 -0400 -Subject: [PATCH] Don't warn about compatibility with urllib3 v1.23 - -Requests allows v1.23 in #4669, but the compatibility check at import -time still looks for 22. Bump the version to 23. - -Signed-off-by: Jeremy Cline ---- - requests/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requests/__init__.py b/requests/__init__.py -index 6fa855df..03decf8c 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -60,7 +60,7 @@ def check_compatibility(urllib3_version, chardet_version): - # urllib3 >= 1.21.1, <= 1.22 - assert major == 1 - assert minor >= 21 -- assert minor <= 22 -+ assert minor <= 23 - - # Check chardet for compatibility. - major, minor, patch = chardet_version.split('.')[:3] --- -2.17.1 - diff --git a/Don-t-inject-pyopenssl-into-urllib3.patch b/Don-t-inject-pyopenssl-into-urllib3.patch index 10a9793..df24810 100644 --- a/Don-t-inject-pyopenssl-into-urllib3.patch +++ b/Don-t-inject-pyopenssl-into-urllib3.patch @@ -12,10 +12,10 @@ Signed-off-by: Jeremy Cline 1 file changed, 7 deletions(-) diff --git a/requests/__init__.py b/requests/__init__.py -index 268e7dcc..45b2c679 100644 +index a5b3c9c3..e312d314 100644 --- a/requests/__init__.py +++ b/requests/__init__.py -@@ -79,13 +79,6 @@ except (AssertionError, ValueError): +@@ -90,17 +90,6 @@ except (AssertionError, ValueError): "version!".format(urllib3.__version__, chardet.__version__), RequestsDependencyWarning) @@ -23,6 +23,10 @@ index 268e7dcc..45b2c679 100644 -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 - diff --git a/dont-import-OrderedDict-from-urllib3.patch b/dont-import-OrderedDict-from-urllib3.patch index 0b0279c..d42d2e3 100644 --- a/dont-import-OrderedDict-from-urllib3.patch +++ b/dont-import-OrderedDict-from-urllib3.patch @@ -1,29 +1,28 @@ -From 75f027ac8bc55ad280f7bf72a25db1ce8c1fc76d Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Mon, 19 Jun 2017 16:19:53 -0400 +From 152550287d6538e5cc7649bcf685a5a0b35058dd Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Tue, 12 Jun 2018 14:06:00 -0400 Subject: [PATCH] Don't import OrderedDict from urllib3 -Signed-off-by: Jeremy Cline +We unbundle urllib3, just use collections (py2.7+) + +Signed-off-by: Jeremy Cline --- - requests/compat.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + requests/compat.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/compat.py b/requests/compat.py -index 5c09ea8..61fa0c8 100644 +index 6b9c6fac..6ba6e460 100644 --- a/requests/compat.py +++ b/requests/compat.py -@@ -46,7 +46,10 @@ if is_py2: - from Cookie import Morsel +@@ -45,7 +45,7 @@ if is_py2: from StringIO import StringIO + from collections import Callable, Mapping, MutableMapping - from urllib3.packages.ordered_dict import OrderedDict -+ try: -+ from collections import OrderedDict # py2.7+ -+ except: -+ from ordereddict import OrderedDict # py2.6 and lower (el6, etc. ++ from collections import OrderedDict # py2.7+ builtin_str = str bytes = str -- -2.9.4 +2.17.1 diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index 06a1e99..d958903 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -38,8 +38,8 @@ index 93a8507..2db9569 100755 +++ b/setup.py @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<3.1.0', - 'idna>=2.5,<2.7', - 'urllib3>=1.21.1,<1.23', + 'idna>=2.5,<2.8', + 'urllib3>=1.21.1,<1.24', - 'certifi>=2017.4.17' ] diff --git a/python-requests.spec b/python-requests.spec index af1572c..9511239 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.18.4 -Release: 6%{?dist} +Version: 2.19.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -41,9 +41,6 @@ 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 -# Temporary fixes to work with urllib3 until requests-2.19 is tagged upstream -Patch5: Allow-urllib3-1.23.patch - BuildArch: noarch %description @@ -150,6 +147,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Tue Jun 12 2018 Jeremy Cline - 2.19.0-1 +- Update to v2.19.0 (rhbz 1590508) + * Fri Jun 08 2018 Jeremy Cline - 2.18.4-6 - Don't print runtime warning about urllib3 v1.23 (rhbz 1589306) diff --git a/sources b/sources index 0e06b51..f6063c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.18.4.tar.gz) = 8ca20fe18d13b8c62977be0c51617f2ae8618d3d002ad4dc554362828855db7359274efbff0cd13e8c5699508913e91205cffcf306221a70321e74ac10b2d4d7 +SHA512 (requests-v2.19.0.tar.gz) = 832ce7e3a67863ed2d241617e9ba983db470f0dbccd78ecb96b5bec2e1d76aa895553d4922bc4c30836e72401213c16ba0098f73dc4e2bc43a8fc36cd4c0ed00 From 6b2c2638bbb496b52e45106c6ece37ad95f5bb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Jun 2018 15:01:44 +0200 Subject: [PATCH 078/165] Bootstrap for Python 3.7 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 9511239..33475b2 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -10,7 +11,7 @@ Name: python-requests Version: 2.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -147,6 +148,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Thu Jun 14 2018 Miro Hrončok - 2.19.0-2 +- Bootstrap for Python 3.7 + * Tue Jun 12 2018 Jeremy Cline - 2.19.0-1 - Update to v2.19.0 (rhbz 1590508) From 50eef463fc049928a5525c1d6d19cc5ae98b50d7 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 14 Jun 2018 22:50:51 -0400 Subject: [PATCH 079/165] Update to v2.19.1 (rhbz 1591531) --- .gitignore | 1 + python-requests.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cdc3171..7f9eb10 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /requests-v2.18.2.tar.gz /requests-v2.18.4.tar.gz /requests-v2.19.0.tar.gz +/requests-v2.19.1.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 33475b2..4331a6c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,8 +10,8 @@ Name: python-requests -Version: 2.19.0 -Release: 2%{?dist} +Version: 2.19.1 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -148,6 +148,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Thu Jun 14 2018 Jeremy Cline - 2.19.1-1 +- Update to v2.19.1 (rhbz 1591531) + * Thu Jun 14 2018 Miro Hrončok - 2.19.0-2 - Bootstrap for Python 3.7 diff --git a/sources b/sources index f6063c3..d55d5ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.19.0.tar.gz) = 832ce7e3a67863ed2d241617e9ba983db470f0dbccd78ecb96b5bec2e1d76aa895553d4922bc4c30836e72401213c16ba0098f73dc4e2bc43a8fc36cd4c0ed00 +SHA512 (requests-v2.19.1.tar.gz) = 00adbbe63c88117fce25e4e2de4ddfb62f87276d627f97aaf8bc4afbf59a921cac57b87f51a0d99167b42d311fe8ca9723b2c5d3a9e04fb0ee318bf90fd9d4ed From 10c32483d0f3924efb87ce3a8376394e9fd3e3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Jun 2018 17:30:07 +0200 Subject: [PATCH 080/165] Rebuilt for Python 3.7 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 4331a6c..f84f402 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -11,7 +10,7 @@ Name: python-requests Version: 2.19.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -148,6 +147,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Mon Jun 18 2018 Miro Hrončok - 2.19.1-2 +- Rebuilt for Python 3.7 + * Thu Jun 14 2018 Jeremy Cline - 2.19.1-1 - Update to v2.19.1 (rhbz 1591531) From a2a25ac3286fdc7fa0c4365794f9cbfb4839f786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 01:53:07 +0000 Subject: [PATCH 081/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index f84f402..771905e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.19.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -147,6 +147,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.19.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jun 18 2018 Miro Hrončok - 2.19.1-2 - Rebuilt for Python 3.7 From ffc9beb883580fdfe24c4d6badf6589d13de32c5 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 29 Oct 2018 13:49:15 -0400 Subject: [PATCH 082/165] Update to v2.20.0 This fixes CVE-2018-18074. --- .gitignore | 1 + dont-import-OrderedDict-from-urllib3.patch | 28 ------------------- ...certs.py-to-use-the-system-CA-bundle.patch | 12 ++++---- python-requests.spec | 19 +++++-------- sources | 2 +- 5 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 dont-import-OrderedDict-from-urllib3.patch diff --git a/.gitignore b/.gitignore index 7f9eb10..ed2dec9 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /requests-v2.18.4.tar.gz /requests-v2.19.0.tar.gz /requests-v2.19.1.tar.gz +/requests-v2.20.0.tar.gz diff --git a/dont-import-OrderedDict-from-urllib3.patch b/dont-import-OrderedDict-from-urllib3.patch deleted file mode 100644 index d42d2e3..0000000 --- a/dont-import-OrderedDict-from-urllib3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 152550287d6538e5cc7649bcf685a5a0b35058dd Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Tue, 12 Jun 2018 14:06:00 -0400 -Subject: [PATCH] Don't import OrderedDict from urllib3 - -We unbundle urllib3, just use collections (py2.7+) - -Signed-off-by: Jeremy Cline ---- - requests/compat.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requests/compat.py b/requests/compat.py -index 6b9c6fac..6ba6e460 100644 ---- a/requests/compat.py -+++ b/requests/compat.py -@@ -45,7 +45,7 @@ if is_py2: - from StringIO import StringIO - from collections import Callable, Mapping, MutableMapping - -- from urllib3.packages.ordered_dict import OrderedDict -+ from collections import OrderedDict # py2.7+ - - builtin_str = str - bytes = str --- -2.17.1 - diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index d958903..a3db03e 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,4 +1,4 @@ -From fd9ab446d8479360d2c1c8252508d97d58ed3e0e Mon Sep 17 00:00:00 2001 +From a8ef690988f92a56226f8b688f1a3638346bca8e Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 19 Jun 2017 16:09:02 -0400 Subject: [PATCH] Patch requests/certs.py to use the system CA bundle @@ -10,7 +10,7 @@ Signed-off-by: Jeremy Cline 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/requests/certs.py b/requests/certs.py -index d1a378d..7b103ba 100644 +index d1a378d7..7b103baf 100644 --- a/requests/certs.py +++ b/requests/certs.py @@ -11,8 +11,17 @@ only one — the one from the certifi package. @@ -33,17 +33,17 @@ index d1a378d..7b103ba 100644 if __name__ == '__main__': print(where()) diff --git a/setup.py b/setup.py -index 93a8507..2db9569 100755 +index 4e2ad936..60de5861 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<3.1.0', 'idna>=2.5,<2.8', - 'urllib3>=1.21.1,<1.24', + 'urllib3>=1.21.1,<1.25', - 'certifi>=2017.4.17' ] - test_requirements = ['pytest-httpbin==0.0.7', 'pytest-cov', 'pytest-mock', 'pytest-xdist', 'PySocks>=1.5.6, !=1.5.7', 'pytest>=2.8.0'] + test_requirements = [ -- -2.9.4 +2.19.1 diff --git a/python-requests.spec b/python-requests.spec index 771905e..769da5d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.19.1 -Release: 3%{?dist} +Version: 2.20.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -20,14 +20,6 @@ Source0: https://github.com/requests/requests/archive/v%{version}/request # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: patch-requests-certs.py-to-use-the-system-CA-bundle.patch -# Remove an unnecessary reference to a bundled compat lib in urllib3 -# Some discussion with upstream: -# - https://twitter.com/sigmavirus24/status/529816751651819520 -# - https://github.com/kennethreitz/requests/issues/1811 -# - https://github.com/kennethreitz/requests/pull/1812 -Patch1: dont-import-OrderedDict-from-urllib3.patch - - # https://bugzilla.redhat.com/show_bug.cgi?id=1450608 Patch2: Remove-tests-that-use-the-tarpit.patch @@ -135,18 +127,21 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %files -n python2-requests %license LICENSE -%doc README.rst HISTORY.rst +%doc README.md HISTORY.md %{python2_sitelib}/*.egg-info %{python2_sitelib}/requests/ %files -n python%{python3_pkgversion}-requests %license LICENSE -%doc README.rst HISTORY.rst +%doc README.md HISTORY.md %{python3_sitelib}/*.egg-info %{python3_sitelib}/requests/ %changelog +* Mon Oct 29 2018 Jeremy Cline - 2.20.0-1 +- Update to v2.20.0 + * Sat Jul 14 2018 Fedora Release Engineering - 2.19.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index d55d5ce..f80c529 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.19.1.tar.gz) = 00adbbe63c88117fce25e4e2de4ddfb62f87276d627f97aaf8bc4afbf59a921cac57b87f51a0d99167b42d311fe8ca9723b2c5d3a9e04fb0ee318bf90fd9d4ed +SHA512 (requests-v2.20.0.tar.gz) = 766c69d1778e7286232fcd750842e89cd9bb6637076e80fe95fb67f3ccb14049bf74a533de91ef9451ac6f397ad0a6d148eb444009f501178138cdeffc5ee7c4 From 33bb8ea0e5032312db8bf140a3af33406ef0c6cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 26 Nov 2018 11:25:10 +0100 Subject: [PATCH 083/165] No pytest-httpbin for Python 2 https://bugzilla.redhat.com/show_bug.cgi?id=1653223 --- python-requests.spec | 9 ++++++-- requests-2.20.0-no-py2-httpbin.patch | 34 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 requests-2.20.0-no-py2-httpbin.patch diff --git a/python-requests.spec b/python-requests.spec index 769da5d..d49fda5 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -33,6 +33,9 @@ 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 +# https://bugzilla.redhat.com/show_bug.cgi?id=1653223 +Patch5: requests-2.20.0-no-py2-httpbin.patch + BuildArch: noarch %description @@ -52,7 +55,6 @@ BuildRequires: python2-idna %if %{with tests} BuildRequires: python2-pytest BuildRequires: python2-pytest-cov -BuildRequires: python2-pytest-httpbin BuildRequires: python2-pytest-mock %endif @@ -139,6 +141,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Mon Nov 26 2018 Miro Hrončok - 2.20.0-2 +- No pytest-httpbin for Python 2 + * Mon Oct 29 2018 Jeremy Cline - 2.20.0-1 - Update to v2.20.0 diff --git a/requests-2.20.0-no-py2-httpbin.patch b/requests-2.20.0-no-py2-httpbin.patch new file mode 100644 index 0000000..c3f60b1 --- /dev/null +++ b/requests-2.20.0-no-py2-httpbin.patch @@ -0,0 +1,34 @@ +diff --git a/tests/conftest.py b/tests/conftest.py +index cd64a76..1d5ddbb 100644 +--- a/tests/conftest.py ++++ b/tests/conftest.py +@@ -14,11 +14,23 @@ def prepare_url(value): + return inner + + +-@pytest.fixture +-def httpbin(httpbin): +- return prepare_url(httpbin) ++import sys + ++if sys.version_info[0] < 3: ++ @pytest.fixture ++ def httpbin(): ++ pytest.skip('No httpbin for Python 2') + +-@pytest.fixture +-def httpbin_secure(httpbin_secure): +- return prepare_url(httpbin_secure) ++ @pytest.fixture ++ def httpbin_secure(): ++ pytest.skip('No httpbin for Python 2') ++ ++else: ++ @pytest.fixture ++ def httpbin(httpbin): ++ return prepare_url(httpbin) ++ ++ ++ @pytest.fixture ++ def httpbin_secure(httpbin_secure): ++ return prepare_url(httpbin_secure) From bfe36edfe23ef8c1cffca4821256472bffa45ad5 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 13 Dec 2018 10:59:21 -0500 Subject: [PATCH 084/165] Update to v2.21.0 Also adjust the patch that forces the system CA bundle to be used so that behavior doesn't change if python-certifi is installed. It's patched to point at the system CA bundle as well, but there's no reason we need to assume that or use it. --- .gitignore | 1 + ...certs.py-to-use-the-system-CA-bundle.patch | 33 +++++++++---------- python-requests.spec | 8 +++-- sources | 1 + 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index ed2dec9..fc73346 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /requests-v2.19.0.tar.gz /requests-v2.19.1.tar.gz /requests-v2.20.0.tar.gz +/requests-v2.21.0.tar.gz diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index a3db03e..dce238d 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,19 +1,19 @@ -From a8ef690988f92a56226f8b688f1a3638346bca8e Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Mon, 19 Jun 2017 16:09:02 -0400 +From d5a4f2908fab5ca16eb59db8b18eda7a94a37b04 Mon Sep 17 00:00:00 2001 +From: Jeremy Cline +Date: Thu, 13 Dec 2018 10:55:29 -0500 Subject: [PATCH] Patch requests/certs.py to use the system CA bundle -Signed-off-by: Jeremy Cline +Signed-off-by: Jeremy Cline --- - requests/certs.py | 11 ++++++++++- - setup.py | 1 - - 2 files changed, 10 insertions(+), 2 deletions(-) + requests/certs.py | 8 +++++++- + setup.py | 1 - + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/requests/certs.py b/requests/certs.py -index d1a378d7..7b103baf 100644 +index d1a378d7..5eb2f1a9 100644 --- a/requests/certs.py +++ b/requests/certs.py -@@ -11,8 +11,17 @@ only one — the one from the certifi package. +@@ -11,8 +11,14 @@ 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,28 +22,25 @@ index d1a378d7..7b103baf 100644 +by the ca-certificates RPM package. """ -from certifi import where -+try: -+ from certifi import where -+except ImportError: -+ def where(): -+ """Return the absolute path to the system CA bundle.""" -+ return '/etc/pki/tls/certs/ca-bundle.crt' ++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 4e2ad936..60de5861 100755 +index 10ce2c62..1f3b2bde 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<3.1.0', - 'idna>=2.5,<2.8', + 'idna>=2.5,<2.9', 'urllib3>=1.21.1,<1.25', - 'certifi>=2017.4.17' ] test_requirements = [ -- -2.19.1 +2.19.2 diff --git a/python-requests.spec b/python-requests.spec index d49fda5..5726f16 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.21.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -141,6 +141,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Thu Dec 13 2018 Jeremy Cline - 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 - 2.20.0-2 - No pytest-httpbin for Python 2 diff --git a/sources b/sources index f80c529..1afe815 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (requests-v2.20.0.tar.gz) = 766c69d1778e7286232fcd750842e89cd9bb6637076e80fe95fb67f3ccb14049bf74a533de91ef9451ac6f397ad0a6d148eb444009f501178138cdeffc5ee7c4 +SHA512 (requests-v2.21.0.tar.gz) = 934c329e6631ec6089577c49651b73265f0c3f0829b9151e1463dea905f35820a03ec3b0ee6a2ab2292d213b715f0b2348110392d60f55ea1cbe4b24fca4f890 From 4b57184559e17d2639b2b147e066f1691d39f59b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 09:02:07 +0000 Subject: [PATCH 085/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 5726f16..64bcffe 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -141,6 +141,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Dec 13 2018 Jeremy Cline - 2.21.0-1 - Update to v2.21.0 - Don't rely on certifi being patched properly to use the system CA bundle From 85a268d1e669e8f0a44c531cc10f10719746eed0 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 23 May 2019 14:35:30 -0400 Subject: [PATCH 086/165] Update to v2.22 --- .gitignore | 1 + patch-requests-certs.py-to-use-the-system-CA-bundle.patch | 2 +- python-requests.spec | 7 +++++-- sources | 3 +-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fc73346..ac8eed4 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /requests-v2.19.1.tar.gz /requests-v2.20.0.tar.gz /requests-v2.21.0.tar.gz +/requests-v2.22.0.tar.gz diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index dce238d..a36a7bf 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -36,7 +36,7 @@ index 10ce2c62..1f3b2bde 100755 @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<3.1.0', 'idna>=2.5,<2.9', - 'urllib3>=1.21.1,<1.25', + 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', - 'certifi>=2017.4.17' ] diff --git a/python-requests.spec b/python-requests.spec index 64bcffe..e146a21 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.21.0 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -141,6 +141,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Thu May 23 2019 Jeremy Cline - 2.22.0-1 +- Update to v2.22.0 + * Sat Feb 02 2019 Fedora Release Engineering - 2.21.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 1afe815..3b9c66a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (requests-v2.20.0.tar.gz) = 766c69d1778e7286232fcd750842e89cd9bb6637076e80fe95fb67f3ccb14049bf74a533de91ef9451ac6f397ad0a6d148eb444009f501178138cdeffc5ee7c4 -SHA512 (requests-v2.21.0.tar.gz) = 934c329e6631ec6089577c49651b73265f0c3f0829b9151e1463dea905f35820a03ec3b0ee6a2ab2292d213b715f0b2348110392d60f55ea1cbe4b24fca4f890 +SHA512 (requests-v2.22.0.tar.gz) = 1259c270e343fc860322b105904232226f26b3b363e9d102d599020fcc7b6e1d524dc6c650181ce3152caebe11d2c60045ddd9c9fc04560294caa284e209c386 From ad843d56150e997e58580970faf76e9abeca9c40 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 23 May 2019 15:46:49 -0400 Subject: [PATCH 087/165] Pick up Miro's pytest 4 fix --- python-requests.spec | 3 +++ support-pytest-4.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 support-pytest-4.patch diff --git a/python-requests.spec b/python-requests.spec index e146a21..d7b17dc 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -36,6 +36,9 @@ Patch4: Don-t-inject-pyopenssl-into-urllib3.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1653223 Patch5: requests-2.20.0-no-py2-httpbin.patch +# https://github.com/kennethreitz/requests/pull/5049 +Patch6: support-pytest-4.patch + BuildArch: noarch %description diff --git a/support-pytest-4.patch b/support-pytest-4.patch new file mode 100644 index 0000000..dd00e4a --- /dev/null +++ b/support-pytest-4.patch @@ -0,0 +1,26 @@ +From 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 8 Apr 2019 18:04:22 +0200 +Subject: [PATCH] Support pytest 4 + +Fixes https://github.com/kennethreitz/requests/issues/5048 + +See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize +--- + tests/test_utils.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletions(-) + +diff --git a/tests/test_utils.py b/tests/test_utils.py +index 59b0b0efa..62c51494d 100644 +--- a/tests/test_utils.py ++++ b/tests/test_utils.py +@@ -33,7 +33,8 @@ class TestSuperLen: + 'stream, value', ( + (StringIO.StringIO, 'Test'), + (BytesIO, b'Test'), +- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')), ++ pytest.param(cStringIO, 'Test', ++ marks=pytest.mark.skipif('cStringIO is None')), + )) + def test_io_streams(self, stream, value): + """Ensures that we properly deal with different kinds of IO streams.""" From 255ca6064a1b275605cb1eabe0cba08f8eea1915 Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Tue, 11 Jun 2019 10:03:19 +0530 Subject: [PATCH 088/165] Add minimum requirement for chardet and urllib3 "requests" imposes minimum requirement for chardet[1] and urllib3[2] and returns warning in case requirement is not met, since these deps can be pre installed, specifying minimum requirement for package, so these deps get's updated when python-requests package is installed or updated. [1] https://github.com/kennethreitz/requests/blob/v2.22.0/requests/__init__.py#L65 [2] https://github.com/kennethreitz/requests/blob/v2.22.0/requests/__init__.py#L60 --- python-requests.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index d7b17dc..2812c32 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -63,8 +63,8 @@ BuildRequires: python2-pytest-mock Requires: ca-certificates -Requires: python2-chardet -Requires: python2-urllib3 +Requires: python2-chardet >= 3.0.2 +Requires: python2-urllib3 >= 1.21.1 Requires: python2-idna %if 0%{?rhel} && 0%{?rhel} <= 6 @@ -94,8 +94,8 @@ BuildRequires: python%{python3_pkgversion}-pytest-httpbin BuildRequires: python%{python3_pkgversion}-pytest-mock %endif -Requires: python%{python3_pkgversion}-chardet -Requires: python%{python3_pkgversion}-urllib3 +Requires: python%{python3_pkgversion}-chardet >= 3.0.2 +Requires: python%{python3_pkgversion}-urllib3 >= 1.21.1 Requires: python%{python3_pkgversion}-idna %description -n python%{python3_pkgversion}-requests @@ -144,6 +144,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Tue Jun 11 2019 Yatin Karel - 2.22.0-2 +- Add minimum requirement for chardet and urllib3 + * Thu May 23 2019 Jeremy Cline - 2.22.0-1 - Update to v2.22.0 From 31013885f4f506af5dcb6f2ec7582bd2ebef7526 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 15:58:28 +0000 Subject: [PATCH 089/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 2812c32..f305504 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.22.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -144,6 +144,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 11 2019 Yatin Karel - 2.22.0-2 - Add minimum requirement for chardet and urllib3 From ee89d35aca024be6a1fd9096c76145a828571834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 17:09:34 +0200 Subject: [PATCH 090/165] Bootstrap for Python 3.8 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index f305504..f7840cc 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -10,7 +11,7 @@ Name: python-requests Version: 2.22.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -144,6 +145,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Thu Aug 15 2019 Miro Hrončok - 2.22.0-4 +- Bootstrap for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 2.22.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 993846bbca672a174de526e3581c2dd7ee0a6404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:43:38 +0200 Subject: [PATCH 091/165] Rebuilt for Python 3.8 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index f7840cc..0c29630 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -11,7 +10,7 @@ Name: python-requests Version: 2.22.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -145,6 +144,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.22.0-5 +- Rebuilt for Python 3.8 + * Thu Aug 15 2019 Miro Hrončok - 2.22.0-4 - Bootstrap for Python 3.8 From ed6a939199413279794a7d0219bf5ef6f511a4e4 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 18 Sep 2019 14:33:35 +0200 Subject: [PATCH 092/165] Python 2: Remove tests and test dependencies --- python-requests.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 0c29630..f713969 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.22.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -55,11 +55,6 @@ BuildRequires: python2-devel BuildRequires: python2-chardet BuildRequires: python2-urllib3 BuildRequires: python2-idna -%if %{with tests} -BuildRequires: python2-pytest -BuildRequires: python2-pytest-cov -BuildRequires: python2-pytest-mock -%endif Requires: ca-certificates @@ -125,7 +120,6 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py %if %{with tests} %check -PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %endif # tests @@ -144,6 +138,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Wed Sep 18 2019 Petr Viktorin - 2.22.0-6 +- Python 2: Remove tests and test dependencies + * Mon Aug 19 2019 Miro Hrončok - 2.22.0-5 - Rebuilt for Python 3.8 From 6f87fd36b099689821ce9f851f1043e48925040e Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 22 Oct 2019 17:43:37 +0200 Subject: [PATCH 093/165] Remove the python2 subpackage (rhbz#1761787) --- python-requests.spec | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index f713969..1db8620 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.22.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -47,32 +47,6 @@ 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 - - -Requires: ca-certificates -Requires: python2-chardet >= 3.0.2 -Requires: python2-urllib3 >= 1.21.1 -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. - %package -n python%{python3_pkgversion}-requests Summary: HTTP library, written in Python, for human beings @@ -109,12 +83,10 @@ rm -rf requests/cacert.pem sed -i '/#!\/usr\/.*python/d' requests/certs.py %build -%py2_build %py3_build %install -%py2_install %py3_install @@ -123,13 +95,6 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %endif # tests - -%files -n python2-requests -%license LICENSE -%doc README.md HISTORY.md -%{python2_sitelib}/*.egg-info -%{python2_sitelib}/requests/ - %files -n python%{python3_pkgversion}-requests %license LICENSE %doc README.md HISTORY.md @@ -138,6 +103,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Tue Oct 22 2019 Charalampos Stratakis - 2.22.0-7 +- Remove the python2 subpackage (rhbz#1761787) + * Wed Sep 18 2019 Petr Viktorin - 2.22.0-6 - Python 2: Remove tests and test dependencies From 2669cc12110b7216175fa565fb5f01521eb55750 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 14:57:48 +0000 Subject: [PATCH 094/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 1db8620..51bd3f8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.22.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -103,6 +103,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.22.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 22 2019 Charalampos Stratakis - 2.22.0-7 - Remove the python2 subpackage (rhbz#1761787) From f9d62a3fa1306bd3744f29b4a4136adfc3de6603 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Fri, 21 Feb 2020 11:30:23 -0500 Subject: [PATCH 095/165] Update to 2.23.0 https://bugzilla.redhat.com/show_bug.cgi?id=1804863 Signed-off-by: Randy Barlow --- .gitignore | 1 + Remove-tests-that-use-the-tarpit.patch | 10 +++---- ...certs.py-to-use-the-system-CA-bundle.patch | 10 +++---- python-requests.spec | 17 ++++++++---- sources | 2 +- support-pytest-4.patch | 26 ------------------- 6 files changed, 24 insertions(+), 42 deletions(-) delete mode 100644 support-pytest-4.patch diff --git a/.gitignore b/.gitignore index ac8eed4..2cbf1f9 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /requests-v2.20.0.tar.gz /requests-v2.21.0.tar.gz /requests-v2.22.0.tar.gz +/requests-v2.23.0.tar.gz diff --git a/Remove-tests-that-use-the-tarpit.patch b/Remove-tests-that-use-the-tarpit.patch index 3b1bcd6..682ab24 100644 --- a/Remove-tests-that-use-the-tarpit.patch +++ b/Remove-tests-that-use-the-tarpit.patch @@ -1,4 +1,4 @@ -From 524cd22fb77e69db9bb3f017bbb1d9782c37b0cd Mon Sep 17 00:00:00 2001 +From bb1c91432c5e9a1f402692db5c80c65136656afb Mon Sep 17 00:00:00 2001 From: Jeremy Cline 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 1 file changed, 25 deletions(-) diff --git a/tests/test_requests.py b/tests/test_requests.py -index b8350cb..46b7e9e 100755 +index 7d4a4eb5..8d1c55fc 100644 --- a/tests/test_requests.py +++ b/tests/test_requests.py -@@ -2049,31 +2049,6 @@ class TestTimeout: +@@ -2186,31 +2186,6 @@ class TestTimeout: except ReadTimeout: pass @@ -48,8 +48,8 @@ index b8350cb..46b7e9e 100755 - pass - def test_encoded_methods(self, httpbin): - """See: https://github.com/requests/requests/issues/2316""" + """See: https://github.com/psf/requests/issues/2316""" r = requests.request(b'GET', httpbin('get')) -- -2.9.4 +2.24.1 diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index a36a7bf..3ff962f 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,4 +1,4 @@ -From d5a4f2908fab5ca16eb59db8b18eda7a94a37b04 Mon Sep 17 00:00:00 2001 +From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 13 Dec 2018 10:55:29 -0500 Subject: [PATCH] Patch requests/certs.py to use the system CA bundle @@ -30,17 +30,17 @@ index d1a378d7..5eb2f1a9 100644 if __name__ == '__main__': print(where()) diff --git a/setup.py b/setup.py -index 10ce2c62..1f3b2bde 100755 +index 2da9ba07..851d9a42 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,6 @@ requires = [ - 'chardet>=3.0.2,<3.1.0', - 'idna>=2.5,<2.9', + 'chardet>=3.0.2,<4', + 'idna>=2.5,<3', 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', - 'certifi>=2017.4.17' ] test_requirements = [ -- -2.19.2 +2.24.1 diff --git a/python-requests.spec b/python-requests.spec index 51bd3f8..acc1bc8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.22.0 -Release: 8%{?dist} +Version: 2.23.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -36,9 +36,6 @@ Patch4: Don-t-inject-pyopenssl-into-urllib3.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1653223 Patch5: requests-2.20.0-no-py2-httpbin.patch -# https://github.com/kennethreitz/requests/pull/5049 -Patch6: support-pytest-4.patch - BuildArch: noarch %description @@ -56,6 +53,7 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-chardet BuildRequires: python%{python3_pkgversion}-urllib3 BuildRequires: python%{python3_pkgversion}-idna +BuildRequires: python%{python3_pkgversion}-pygments %if %{with tests} BuildRequires: python%{python3_pkgversion}-pytest BuildRequires: python%{python3_pkgversion}-pytest-cov @@ -82,6 +80,11 @@ 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 %py3_build @@ -103,6 +106,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Fri Feb 21 2020 Randy Barlow - 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 - 2.22.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 3b9c66a..4ce1ca4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.22.0.tar.gz) = 1259c270e343fc860322b105904232226f26b3b363e9d102d599020fcc7b6e1d524dc6c650181ce3152caebe11d2c60045ddd9c9fc04560294caa284e209c386 +SHA512 (requests-v2.23.0.tar.gz) = a8e670d928fce3531629a6d73ee6b47882f3eba47684841bfce44376781b2b9c5c97186e1750ee582b0c11fa67c983f340f95eb2a4f19042f4cbc77ae090a69c diff --git a/support-pytest-4.patch b/support-pytest-4.patch deleted file mode 100644 index dd00e4a..0000000 --- a/support-pytest-4.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 8 Apr 2019 18:04:22 +0200 -Subject: [PATCH] Support pytest 4 - -Fixes https://github.com/kennethreitz/requests/issues/5048 - -See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize ---- - tests/test_utils.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletions(-) - -diff --git a/tests/test_utils.py b/tests/test_utils.py -index 59b0b0efa..62c51494d 100644 ---- a/tests/test_utils.py -+++ b/tests/test_utils.py -@@ -33,7 +33,8 @@ class TestSuperLen: - 'stream, value', ( - (StringIO.StringIO, 'Test'), - (BytesIO, b'Test'), -- pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')), -+ pytest.param(cStringIO, 'Test', -+ marks=pytest.mark.skipif('cStringIO is None')), - )) - def test_io_streams(self, stream, value): - """Ensures that we properly deal with different kinds of IO streams.""" From f0721ebf64c2d997e5f18369ed6d11a5bbd9ace7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 18:18:59 +0200 Subject: [PATCH 096/165] Bootstrap for Python 3.9 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index acc1bc8..4f46b9a 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -10,7 +11,7 @@ Name: python-requests Version: 2.23.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -106,6 +107,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Fri May 22 2020 Miro Hrončok - 2.23.0-2 +- Bootstrap for Python 3.9 + * Fri Feb 21 2020 Randy Barlow - 2.23.0-1 - Update to 2.23.0 (#1804863). - https://requests.readthedocs.io/en/latest/community/updates/ From 3d4961eadfa0f30856cdd79d5404af5b0ca4e81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 25 May 2020 20:55:45 +0200 Subject: [PATCH 097/165] Rebuilt for Python 3.9 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 4f46b9a..c078459 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -11,7 +10,7 @@ Name: python-requests Version: 2.23.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -107,6 +106,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Mon May 25 2020 Miro Hrončok - 2.23.0-3 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Miro Hrončok - 2.23.0-2 - Bootstrap for Python 3.9 From 11e90b9f64e37a71d4effa3a73ba39cce2d4ed11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 31 May 2020 00:32:08 +0200 Subject: [PATCH 098/165] Test with pytest 4, drop manual requires Also explicitly BR setuptools, assert egg-info is a directory. --- python-requests.spec | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index c078459..0453a01 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.23.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -50,20 +50,19 @@ 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}-chardet -BuildRequires: python%{python3_pkgversion}-urllib3 -BuildRequires: python%{python3_pkgversion}-idna -BuildRequires: python%{python3_pkgversion}-pygments +BuildRequires: python3dist(chardet) +BuildRequires: python3dist(urllib3) +BuildRequires: python3dist(idna) +BuildRequires: python3dist(pygments) +BuildRequires: python3dist(setuptools) %if %{with tests} -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-pytest-cov -BuildRequires: python%{python3_pkgversion}-pytest-httpbin -BuildRequires: python%{python3_pkgversion}-pytest-mock +# https://github.com/psf/requests/issues/5304 (fixed in master) +BuildRequires: python3dist(pytest) < 5 +BuildRequires: python3dist(pytest-cov) +BuildRequires: python3dist(pytest-httpbin) +BuildRequires: python3dist(pytest-mock) %endif -Requires: python%{python3_pkgversion}-chardet >= 3.0.2 -Requires: python%{python3_pkgversion}-urllib3 >= 1.21.1 -Requires: python%{python3_pkgversion}-idna %description -n python%{python3_pkgversion}-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -101,11 +100,14 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %files -n python%{python3_pkgversion}-requests %license LICENSE %doc README.md HISTORY.md -%{python3_sitelib}/*.egg-info +%{python3_sitelib}/*.egg-info/ %{python3_sitelib}/requests/ %changelog +* Sat May 30 2020 Miro Hrončok - 2.23.0-4 +- Test with pytest 4, drop manual requires + * Mon May 25 2020 Miro Hrončok - 2.23.0-3 - Rebuilt for Python 3.9 From cf891452326ab3b35377e4c48b57c338afad0805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 10 Jul 2020 19:55:52 +0200 Subject: [PATCH 099/165] Add requests[security] and requests[socks] subpackages https://fedoraproject.org/wiki/Changes/PythonExtras --- python-requests.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 0453a01..344d8ae 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.23.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -70,6 +70,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. +%{?python_extras_subpkg:%python_extras_subpkg -n python%{python3_pkgversion}-requests -i %{python3_sitelib}/*.egg-info security socks} + %prep %autosetup -p1 -n requests-%{version} @@ -105,6 +107,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v %changelog +* Fri Jul 10 2020 Miro Hrončok - 2.23.0-5 +- Add requests[security] and requests[socks] subpackages + * Sat May 30 2020 Miro Hrončok - 2.23.0-4 - Test with pytest 4, drop manual requires From f176dee1d6a81282e6cee4a48fb64ba09c17be00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 11 Jul 2020 10:33:11 +0200 Subject: [PATCH 100/165] Deselect test_https_warnings See https://bugzilla.redhat.com/show_bug.cgi?id=1676023 and https://github.com/psf/requests/issues/5530 --- python-requests.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 344d8ae..013aaf8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -96,7 +96,8 @@ sed -i 's/ --doctest-modules//' pytest.ini %if %{with tests} %check -PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v +# test_https_warnings: https://github.com/psf/requests/issues/5530 +%pytest -v -k "not test_https_warnings" %endif # tests %files -n python%{python3_pkgversion}-requests From 72789402b3c7634dc081b857981e3172be90d7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 10 Jul 2020 23:49:14 +0200 Subject: [PATCH 101/165] Update to 2.24.0 Remove no longer needed patches: Don-t-inject-pyopenssl-into-urllib3.patch: https://github.com/psf/requests/issues/5443 requests-2.20.0-no-py2-httpbin.patch: python2-requests is no more anyway --- .gitignore | 1 + Don-t-inject-pyopenssl-into-urllib3.patch | 38 ----------------------- python-requests.spec | 14 ++++----- requests-2.20.0-no-py2-httpbin.patch | 34 -------------------- sources | 2 +- 5 files changed, 8 insertions(+), 81 deletions(-) delete mode 100644 Don-t-inject-pyopenssl-into-urllib3.patch delete mode 100644 requests-2.20.0-no-py2-httpbin.patch diff --git a/.gitignore b/.gitignore index 2cbf1f9..1b6eeaa 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /requests-v2.21.0.tar.gz /requests-v2.22.0.tar.gz /requests-v2.23.0.tar.gz +/requests-v2.24.0.tar.gz diff --git a/Don-t-inject-pyopenssl-into-urllib3.patch b/Don-t-inject-pyopenssl-into-urllib3.patch deleted file mode 100644 index df24810..0000000 --- a/Don-t-inject-pyopenssl-into-urllib3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 86b1fa39fdebdb7bc57131c1a198d4d18e104f95 Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -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 ---- - 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 - diff --git a/python-requests.spec b/python-requests.spec index 013aaf8..c046ceb 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.23.0 -Release: 5%{?dist} +Version: 2.24.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -30,12 +30,6 @@ 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 - -# https://bugzilla.redhat.com/show_bug.cgi?id=1653223 -Patch5: requests-2.20.0-no-py2-httpbin.patch - BuildArch: noarch %description @@ -108,6 +102,10 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Fri Jul 10 2020 Miro Hrončok - 2.24.0-1 +- Update to 2.24.0 +- Resolves rhbz#1848104 + * Fri Jul 10 2020 Miro Hrončok - 2.23.0-5 - Add requests[security] and requests[socks] subpackages diff --git a/requests-2.20.0-no-py2-httpbin.patch b/requests-2.20.0-no-py2-httpbin.patch deleted file mode 100644 index c3f60b1..0000000 --- a/requests-2.20.0-no-py2-httpbin.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/tests/conftest.py b/tests/conftest.py -index cd64a76..1d5ddbb 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -14,11 +14,23 @@ def prepare_url(value): - return inner - - --@pytest.fixture --def httpbin(httpbin): -- return prepare_url(httpbin) -+import sys - -+if sys.version_info[0] < 3: -+ @pytest.fixture -+ def httpbin(): -+ pytest.skip('No httpbin for Python 2') - --@pytest.fixture --def httpbin_secure(httpbin_secure): -- return prepare_url(httpbin_secure) -+ @pytest.fixture -+ def httpbin_secure(): -+ pytest.skip('No httpbin for Python 2') -+ -+else: -+ @pytest.fixture -+ def httpbin(httpbin): -+ return prepare_url(httpbin) -+ -+ -+ @pytest.fixture -+ def httpbin_secure(httpbin_secure): -+ return prepare_url(httpbin_secure) diff --git a/sources b/sources index 4ce1ca4..b537dd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.23.0.tar.gz) = a8e670d928fce3531629a6d73ee6b47882f3eba47684841bfce44376781b2b9c5c97186e1750ee582b0c11fa67c983f340f95eb2a4f19042f4cbc77ae090a69c +SHA512 (requests-v2.24.0.tar.gz) = a7ce3775f1f38a98cf6ae445637a46cf27f903fc8aa3f535bac5032d628f1661cbfb10cb1e6bc60e703a9216cc46adcb903dfb8b7a2ff8a8f4f1442d9f2229f1 From c7ebbfef39b12d8de276a77416cab238d6d69fe3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 03:36:15 +0000 Subject: [PATCH 102/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index c046ceb..c95c968 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.24.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -102,6 +102,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Miro Hrončok - 2.24.0-1 - Update to 2.24.0 - Resolves rhbz#1848104 From 5977032a5135cba929b68de97081e59c6c1bb009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 18 Sep 2020 20:53:44 +0200 Subject: [PATCH 103/165] Build with pytest 6, older version is no longer required --- python-requests.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index c95c968..2f71cab 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.24.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -50,8 +50,7 @@ BuildRequires: python3dist(idna) BuildRequires: python3dist(pygments) BuildRequires: python3dist(setuptools) %if %{with tests} -# https://github.com/psf/requests/issues/5304 (fixed in master) -BuildRequires: python3dist(pytest) < 5 +BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-cov) BuildRequires: python3dist(pytest-httpbin) BuildRequires: python3dist(pytest-mock) @@ -102,6 +101,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Fri Sep 18 2020 Miro Hrončok - 2.24.0-3 +- Build with pytest 6, older version is no longer required + * Wed Jul 29 2020 Fedora Release Engineering - 2.24.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 72b7ad559c2f6d770388915192e014fd3cd75160 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 16 Sep 2020 17:20:33 +0200 Subject: [PATCH 104/165] Port to pyproject macros --- python-requests.spec | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 2f71cab..91a30c1 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.24.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -44,11 +44,8 @@ Summary: HTTP library, written in Python, for human beings %{?python_provide:%python_provide python%{python3_pkgversion}-requests} BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python3dist(chardet) -BuildRequires: python3dist(urllib3) -BuildRequires: python3dist(idna) -BuildRequires: python3dist(pygments) -BuildRequires: python3dist(setuptools) +BuildRequires: pyproject-rpm-macros + %if %{with tests} BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-cov) @@ -63,7 +60,15 @@ 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. -%{?python_extras_subpkg:%python_extras_subpkg -n python%{python3_pkgversion}-requests -i %{python3_sitelib}/*.egg-info security socks} +%pyproject_extras_subpkg -n python%{python3_pkgversion}-requests security socks + +%generate_buildrequires +%if %{with tests} +%pyproject_buildrequires -r +%else +%pyproject_buildrequires +%endif + %prep %autosetup -p1 -n requests-%{version} @@ -80,11 +85,12 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py sed -i 's/ --doctest-modules//' pytest.ini %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files requests %if %{with tests} @@ -93,14 +99,16 @@ sed -i 's/ --doctest-modules//' pytest.ini %pytest -v -k "not test_https_warnings" %endif # tests -%files -n python%{python3_pkgversion}-requests + +%files -n python%{python3_pkgversion}-requests -f %{pyproject_files} %license LICENSE %doc README.md HISTORY.md -%{python3_sitelib}/*.egg-info/ -%{python3_sitelib}/requests/ %changelog +* Fri Sep 18 2020 Petr Viktorin - 2.24.0-4 +- Port to pyproject macros + * Fri Sep 18 2020 Miro Hrončok - 2.24.0-3 - Build with pytest 6, older version is no longer required From a2f6bde0d704f8903187f75b9584a11da744b5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Nov 2020 15:19:24 +0100 Subject: [PATCH 105/165] Don't BR pytest-cov --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 91a30c1..bb17031 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.24.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -48,7 +48,6 @@ BuildRequires: pyproject-rpm-macros %if %{with tests} BuildRequires: python3dist(pytest) -BuildRequires: python3dist(pytest-cov) BuildRequires: python3dist(pytest-httpbin) BuildRequires: python3dist(pytest-mock) %endif @@ -106,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Fri Nov 13 2020 Miro Hrončok - 2.24.0-5 +- Don't BR pytest-cov + * Fri Sep 18 2020 Petr Viktorin - 2.24.0-4 - Port to pyproject macros From 7b94c2e14bb6199465406ad0e0699306ad21f599 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 25 Nov 2020 12:43:24 +0100 Subject: [PATCH 106/165] Update to 2.25.0 --- .gitignore | 1 + patch-requests-certs.py-to-use-the-system-CA-bundle.patch | 2 +- python-requests.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1b6eeaa..23cc80f 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /requests-v2.22.0.tar.gz /requests-v2.23.0.tar.gz /requests-v2.24.0.tar.gz +/requests-v2.25.0.tar.gz diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index 3ff962f..9c4519c 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -36,7 +36,7 @@ index 2da9ba07..851d9a42 100755 @@ -45,7 +45,6 @@ requires = [ 'chardet>=3.0.2,<4', 'idna>=2.5,<3', - 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', + 'urllib3>=1.21.1,<1.27', - 'certifi>=2017.4.17' ] diff --git a/python-requests.spec b/python-requests.spec index bb17031..eb0d3d3 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.24.0 -Release: 5%{?dist} +Version: 2.25.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -105,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Wed Nov 25 2020 Petr Viktorin - 2.25.0-1 +- Update to 2.25.0 + * Fri Nov 13 2020 Miro Hrončok - 2.24.0-5 - Don't BR pytest-cov diff --git a/sources b/sources index b537dd4..7bc7a7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.24.0.tar.gz) = a7ce3775f1f38a98cf6ae445637a46cf27f903fc8aa3f535bac5032d628f1661cbfb10cb1e6bc60e703a9216cc46adcb903dfb8b7a2ff8a8f4f1442d9f2229f1 +SHA512 (requests-v2.25.0.tar.gz) = f60d8dbbc7aaebaedc7647ab2cec1fffd01547ea3340b91d9c7fea51fde4cb932aaf81e3b8aac9f4be11243e4fc44c8266a69db5f52c4eb2afb1b7714c150b95 From 21922e1494d9937aaef86a6771bb2bf82763b1ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 13:07:03 +0000 Subject: [PATCH 107/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index eb0d3d3..271766f 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.25.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -105,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.25.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Nov 25 2020 Petr Viktorin - 2.25.0-1 - Update to 2.25.0 From b653ecf80001536f085a47dd5068e3faa279fdd3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 10 Jan 2021 16:39:24 -0800 Subject: [PATCH 108/165] Update to 2.25.1 Signed-off-by: Kevin Fenzi Update 2.25.1. Fix is rhbz#1908487 Signed-off-by: Kevin Fenzi --- .gitignore | 1 + ...certs.py-to-use-the-system-CA-bundle.patch | 35 +++++-------------- python-requests.spec | 9 +++-- sources | 2 +- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 23cc80f..cb0f239 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /requests-v2.23.0.tar.gz /requests-v2.24.0.tar.gz /requests-v2.25.0.tar.gz +/requests-v2.25.1.tar.gz diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index 9c4519c..263006f 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,19 +1,7 @@ -From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Thu, 13 Dec 2018 10:55:29 -0500 -Subject: [PATCH] Patch requests/certs.py to use the system CA bundle - -Signed-off-by: Jeremy Cline ---- - requests/certs.py | 8 +++++++- - setup.py | 1 - - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/requests/certs.py b/requests/certs.py -index d1a378d7..5eb2f1a9 100644 ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -11,8 +11,14 @@ only one — the one from the certifi package. +diff --color -Nur requests-2.25.1.orig/requests/certs.py requests-2.25.1/requests/certs.py +--- requests-2.25.1.orig/requests/certs.py 2021-01-10 16:27:05.027059634 -0800 ++++ requests-2.25.1/requests/certs.py 2021-01-10 16:29:06.973238179 -0800 +@@ -10,8 +10,13 @@ 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. @@ -25,22 +13,17 @@ index d1a378d7..5eb2f1a9 100644 +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 ---- a/setup.py -+++ b/setup.py -@@ -45,7 +45,6 @@ requires = [ - 'chardet>=3.0.2,<4', +diff --color -Nur requests-2.25.1.orig/setup.py requests-2.25.1/setup.py +--- requests-2.25.1.orig/setup.py 2020-12-16 11:34:26.000000000 -0800 ++++ requests-2.25.1/setup.py 2021-01-10 16:29:21.570259552 -0800 +@@ -45,7 +45,6 @@ + 'chardet>=3.0.2,<5', 'idna>=2.5,<3', 'urllib3>=1.21.1,<1.27', - 'certifi>=2017.4.17' ] test_requirements = [ --- -2.24.1 - diff --git a/python-requests.spec b/python-requests.spec index 271766f..231c4c0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.25.0 -Release: 2%{?dist} +Version: 2.25.1 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -96,7 +96,7 @@ sed -i 's/ --doctest-modules//' pytest.ini %check # test_https_warnings: https://github.com/psf/requests/issues/5530 %pytest -v -k "not test_https_warnings" -%endif # tests +%endif %files -n python%{python3_pkgversion}-requests -f %{pyproject_files} @@ -105,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Tue Feb 02 2021 Kevin Fenzi - 2.25.1-1 +- Update 2.25.1. Fix is rhbz#1908487 + * Wed Jan 27 2021 Fedora Release Engineering - 2.25.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 7bc7a7a..53d3f69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.25.0.tar.gz) = f60d8dbbc7aaebaedc7647ab2cec1fffd01547ea3340b91d9c7fea51fde4cb932aaf81e3b8aac9f4be11243e4fc44c8266a69db5f52c4eb2afb1b7714c150b95 +SHA512 (requests-v2.25.1.tar.gz) = e4fc90b229925a2b580e5cd85c39e8b0fe8006e1e49d247efc38616120ffdab319fc200424eeb4fb7175114daf1b6f98ba5c2f4baa00ce17fdc79e880df60ad8 From fb53bbb8089c7b27dc477d224e8a104aba017846 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 20 May 2021 09:15:21 +0200 Subject: [PATCH 109/165] 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 6821c08a3d1e3bc3400434977a6dbb30aa369276 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 18:54:44 +0200 Subject: [PATCH 110/165] Bootstrap for Python 3.10 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 231c4c0..945b31c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -10,7 +11,7 @@ Name: python-requests Version: 2.25.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -105,6 +106,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Wed Jun 02 2021 Python Maint - 2.25.1-2 +- Bootstrap for Python 3.10 + * Tue Feb 02 2021 Kevin Fenzi - 2.25.1-1 - Update 2.25.1. Fix is rhbz#1908487 From 3927751e55f95e5490189b0e765e1666f247be4f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 18:37:08 +0200 Subject: [PATCH 111/165] Rebuilt for Python 3.10 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 945b31c..55e7fe8 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -11,7 +10,7 @@ Name: python-requests Version: 2.25.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -106,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Fri Jun 04 2021 Python Maint - 2.25.1-3 +- Rebuilt for Python 3.10 + * Wed Jun 02 2021 Python Maint - 2.25.1-2 - Bootstrap for Python 3.10 From 04117f977c9677adf9b075989edd37db13569a19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 09:11:23 +0000 Subject: [PATCH 112/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 55e7fe8..f1a4b3c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.25.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -105,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.25.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 2.25.1-3 - Rebuilt for Python 3.10 From 7a45a67128d30aa829a8bcfa0c374d60b5b1c29d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 21 Jul 2021 13:41:17 +0200 Subject: [PATCH 113/165] Update to 2.26.0 --- .gitignore | 1 + ...certs.py-to-use-the-system-CA-bundle.patch | 35 +++++++++++++------ python-requests.spec | 14 ++++++-- sources | 2 +- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index cb0f239..4480cd0 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /requests-v2.24.0.tar.gz /requests-v2.25.0.tar.gz /requests-v2.25.1.tar.gz +/requests-v2.26.0.tar.gz diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch index 263006f..62af510 100644 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch @@ -1,7 +1,18 @@ -diff --color -Nur requests-2.25.1.orig/requests/certs.py requests-2.25.1/requests/certs.py ---- requests-2.25.1.orig/requests/certs.py 2021-01-10 16:27:05.027059634 -0800 -+++ requests-2.25.1/requests/certs.py 2021-01-10 16:29:06.973238179 -0800 -@@ -10,8 +10,13 @@ +From cc1b9954ca7dcd90a694f7e2e9990c883bf7b647 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Wed, 21 Jul 2021 12:05:53 +0200 +Subject: [PATCH] patch-requests-certs.py-to-use-the-system-CA-bundle + +--- + requests/certs.py | 7 ++++++- + setup.py | 1 - + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/requests/certs.py b/requests/certs.py +index a14a7ee..b4957d1 100644 +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -10,8 +10,13 @@ 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. @@ -16,14 +27,18 @@ diff --color -Nur requests-2.25.1.orig/requests/certs.py requests-2.25.1/request if __name__ == '__main__': print(where()) -diff --color -Nur requests-2.25.1.orig/setup.py requests-2.25.1/setup.py ---- requests-2.25.1.orig/setup.py 2020-12-16 11:34:26.000000000 -0800 -+++ requests-2.25.1/setup.py 2021-01-10 16:29:21.570259552 -0800 -@@ -45,7 +45,6 @@ - 'chardet>=3.0.2,<5', - 'idna>=2.5,<3', +diff --git a/setup.py b/setup.py +index ce5e5c8..de86a91 100755 +--- a/setup.py ++++ b/setup.py +@@ -46,7 +46,6 @@ requires = [ + 'idna>=2.5,<3; python_version < "3"', + 'idna>=2.5,<4; python_version >= "3"', 'urllib3>=1.21.1,<1.27', - 'certifi>=2017.4.17' ] test_requirements = [ +-- +2.31.1 + diff --git a/python-requests.spec b/python-requests.spec index f1a4b3c..2ba419c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.25.1 -Release: 4%{?dist} +Version: 2.26.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -50,6 +50,7 @@ BuildRequires: pyproject-rpm-macros BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-httpbin) BuildRequires: python3dist(pytest-mock) +BuildRequires: python3dist(trustme) %endif @@ -95,7 +96,10 @@ sed -i 's/ --doctest-modules//' pytest.ini %if %{with tests} %check # test_https_warnings: https://github.com/psf/requests/issues/5530 -%pytest -v -k "not test_https_warnings" +# test_pyopenssl_redirect fails with: pytest-httpbin server hit +# an exception serving request: [SSL: HTTP_REQUEST] http request (_ssl.c:997) +# not yet sure why +%pytest -v -k "not test_https_warnings and not test_pyopenssl_redirect" %endif @@ -105,6 +109,10 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Sun Jul 25 2021 Lumír Balhar - 2.26.0-1 +- Update to 2.26.0 +Resolves: rhbz#1981856 + * Fri Jul 23 2021 Fedora Release Engineering - 2.25.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 53d3f69..847c0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.25.1.tar.gz) = e4fc90b229925a2b580e5cd85c39e8b0fe8006e1e49d247efc38616120ffdab319fc200424eeb4fb7175114daf1b6f98ba5c2f4baa00ce17fdc79e880df60ad8 +SHA512 (requests-v2.26.0.tar.gz) = df7b3fbef42e600434764b2ae3906546a778f8caab0111d818adef7c747d4d58e9977ac9ae25092e1170a2cde78234e64b779ba4afd84bb2bf7dbce6efb380e9 From dd738e1d80eb4241a14d0128596a55657bef80bb Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 3 Aug 2021 10:06:59 +0200 Subject: [PATCH 114/165] 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 0f46c23ea63ccab6cc330c3ca982bb9c1b08cede Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 4 Jan 2022 10:29:52 -0800 Subject: [PATCH 115/165] Update to 2.27.0, re-enable previously disabled tests --- .gitignore | 1 + python-requests.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4480cd0..fce23a0 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /requests-v2.25.0.tar.gz /requests-v2.25.1.tar.gz /requests-v2.26.0.tar.gz +/requests-v2.27.0.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 2ba419c..bd6de3f 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests -Version: 2.26.0 +Version: 2.27.0 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -95,11 +95,7 @@ sed -i 's/ --doctest-modules//' pytest.ini %if %{with tests} %check -# test_https_warnings: https://github.com/psf/requests/issues/5530 -# test_pyopenssl_redirect fails with: pytest-httpbin server hit -# an exception serving request: [SSL: HTTP_REQUEST] http request (_ssl.c:997) -# not yet sure why -%pytest -v -k "not test_https_warnings and not test_pyopenssl_redirect" +%pytest -v %endif @@ -109,6 +105,11 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Tue Jan 04 2022 Adam Williamson - 2.27.0-1 +- Update to 2.27.0 +- Re-enable test_https_warnings as it works with pytest-httpbin 1.0.0 now +- Re-enable test_pyopenssl_redirect, it seems to work too + * Sun Jul 25 2021 Lumír Balhar - 2.26.0-1 - Update to 2.26.0 Resolves: rhbz#1981856 diff --git a/sources b/sources index 847c0fa..a8c8760 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.26.0.tar.gz) = df7b3fbef42e600434764b2ae3906546a778f8caab0111d818adef7c747d4d58e9977ac9ae25092e1170a2cde78234e64b779ba4afd84bb2bf7dbce6efb380e9 +SHA512 (requests-v2.27.0.tar.gz) = 84c24d31a9aa9af995c24d40ef1c8c85c8c42bc52b3f59ae91206aa6598ca6d468ae3a65929926afb88ea3bf02d0d979907fff61e79f451ed6971c32d05ab6e3 From ae5874a83014f1a639849ac24bc328fb8239be27 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 8 Jan 2022 15:45:11 -0800 Subject: [PATCH 116/165] Update to 2.27.1. Fixes rhbz#2037431 --- .gitignore | 1 + python-requests.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fce23a0..13dd352 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /requests-v2.25.1.tar.gz /requests-v2.26.0.tar.gz /requests-v2.27.0.tar.gz +/requests-v2.27.1.tar.gz diff --git a/python-requests.spec b/python-requests.spec index bd6de3f..5cea77b 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests -Version: 2.27.0 +Version: 2.27.1 Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings @@ -105,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Sat Jan 08 2022 Kevin Fenzi - 2.27.1-1 +- Update to 2.27.1. Fixes rhbz#2037431 + * Tue Jan 04 2022 Adam Williamson - 2.27.0-1 - Update to 2.27.0 - Re-enable test_https_warnings as it works with pytest-httpbin 1.0.0 now diff --git a/sources b/sources index a8c8760..d99f38d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.27.0.tar.gz) = 84c24d31a9aa9af995c24d40ef1c8c85c8c42bc52b3f59ae91206aa6598ca6d468ae3a65929926afb88ea3bf02d0d979907fff61e79f451ed6971c32d05ab6e3 +SHA512 (requests-v2.27.1.tar.gz) = 191f8e0d566d541ab4e0c17bc9a637eb79e841605f6bbb9a0e559bd7bf0f00a71be99e21fa5b5431b9d49cb4a64debd0d7083658f98b723cf976833bb685cb9a From 67a4b380d01255c53ba7daf7c8e51eb9247ae2cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 15:11:49 +0000 Subject: [PATCH 117/165] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 5cea77b..d331ab1 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -105,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.27.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Kevin Fenzi - 2.27.1-1 - Update to 2.27.1. Fixes rhbz#2037431 From 10c79236cc825b126b58508cda6782f707366331 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 17:27:12 +0200 Subject: [PATCH 118/165] Bootstrap for Python 3.11 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index d331ab1..7260327 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -10,7 +11,7 @@ Name: python-requests Version: 2.27.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -105,6 +106,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Mon Jun 13 2022 Python Maint - 2.27.1-3 +- Bootstrap for Python 3.11 + * Fri Jan 21 2022 Fedora Release Engineering - 2.27.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e262d9d35e4c7890ed998d86252a2c27b52ffae5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 14 Jun 2022 11:10:24 +0200 Subject: [PATCH 119/165] Rebuilt for Python 3.11 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 7260327..a9510b6 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?_module_build} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -11,7 +10,7 @@ Name: python-requests Version: 2.27.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -106,6 +105,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Tue Jun 14 2022 Python Maint - 2.27.1-4 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 2.27.1-3 - Bootstrap for Python 3.11 From bafd1c7a9269e54e708fc44f4774b44e1ebc1a88 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 20 Jun 2022 15:20:10 +0200 Subject: [PATCH 120/165] Allow charset_normalizer 2.1.0 and newer up to 3.0.0 --- python-requests.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index a9510b6..e454808 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.27.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -84,6 +84,10 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py # change the docs. Thus, we set pytest not to run doctests at all. sed -i 's/ --doctest-modules//' pytest.ini +# Allow charset_normalizer 2.1.0 and newer up to 3.0.0 +# Backport of: https://github.com/psf/requests/pull/6169 +sed -i "s/charset_normalizer~=2.0.0/charset_normalizer~=2.0/" setup.py + %build %pyproject_wheel @@ -105,6 +109,9 @@ sed -i 's/ --doctest-modules//' pytest.ini %changelog +* Mon Jun 20 2022 Lumír Balhar - 2.27.1-5 +- Allow charset_normalizer 2.1.0 and newer up to 3.0.0 + * Tue Jun 14 2022 Python Maint - 2.27.1-4 - Rebuilt for Python 3.11 From 6522c375f633f21dcced03f58ff43c87cee224ea Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 12 Jul 2022 14:20:31 -0700 Subject: [PATCH 121/165] Update to 2.28.1, rediff patches One patch replaced by a pytest -k arg (more maintainable this way). The charset_normalizer sed isn't needed any more (and didn't do anything any more), upstream changed that dep. Upstream dropped the cert file in 2017 so we don't need to try and remove it any more. --- .gitignore | 1 + Remove-tests-that-use-the-tarpit.patch | 55 ------------------- ...certs.py-to-use-the-system-CA-bundle.patch | 44 --------------- python-requests.spec | 25 ++++----- requests-2.12.4-tests_nonet.patch | 11 ---- requests-2.28.1-system-certs.patch | 37 +++++++++++++ requests-2.28.1-tests_nonet.patch | 11 ++++ sources | 2 +- 8 files changed, 60 insertions(+), 126 deletions(-) delete mode 100644 Remove-tests-that-use-the-tarpit.patch delete mode 100644 patch-requests-certs.py-to-use-the-system-CA-bundle.patch delete mode 100644 requests-2.12.4-tests_nonet.patch create mode 100644 requests-2.28.1-system-certs.patch create mode 100644 requests-2.28.1-tests_nonet.patch diff --git a/.gitignore b/.gitignore index 13dd352..0ccf83c 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /requests-v2.26.0.tar.gz /requests-v2.27.0.tar.gz /requests-v2.27.1.tar.gz +/requests-v2.28.1.tar.gz diff --git a/Remove-tests-that-use-the-tarpit.patch b/Remove-tests-that-use-the-tarpit.patch deleted file mode 100644 index 682ab24..0000000 --- a/Remove-tests-that-use-the-tarpit.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bb1c91432c5e9a1f402692db5c80c65136656afb Mon Sep 17 00:00:00 2001 -From: Jeremy Cline -Date: Tue, 13 Jun 2017 09:08:09 -0400 -Subject: [PATCH] Remove tests that use the tarpit - -The latest version of Mock has started using systemd containers. The -systemd-nspawn command is being run with --private-network, which -immediately kills connections to something other than localhost. These -tests depend on the connection not being killed immediately and that -they are never responded to. - -Signed-off-by: Jeremy Cline ---- - tests/test_requests.py | 25 ------------------------- - 1 file changed, 25 deletions(-) - -diff --git a/tests/test_requests.py b/tests/test_requests.py -index 7d4a4eb5..8d1c55fc 100644 ---- a/tests/test_requests.py -+++ b/tests/test_requests.py -@@ -2186,31 +2186,6 @@ class TestTimeout: - except ReadTimeout: - pass - -- @pytest.mark.parametrize( -- 'timeout', ( -- (0.1, None), -- Urllib3Timeout(connect=0.1, read=None) -- )) -- def test_connect_timeout(self, timeout): -- try: -- requests.get(TARPIT, timeout=timeout) -- pytest.fail('The connect() request should time out.') -- except ConnectTimeout as e: -- assert isinstance(e, ConnectionError) -- assert isinstance(e, Timeout) -- -- @pytest.mark.parametrize( -- 'timeout', ( -- (0.1, 0.1), -- Urllib3Timeout(connect=0.1, read=0.1) -- )) -- def test_total_timeout_connect(self, timeout): -- try: -- requests.get(TARPIT, timeout=timeout) -- pytest.fail('The connect() request should time out.') -- except ConnectTimeout: -- pass -- - def test_encoded_methods(self, httpbin): - """See: https://github.com/psf/requests/issues/2316""" - r = requests.request(b'GET', httpbin('get')) --- -2.24.1 - diff --git a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch b/patch-requests-certs.py-to-use-the-system-CA-bundle.patch deleted file mode 100644 index 62af510..0000000 --- a/patch-requests-certs.py-to-use-the-system-CA-bundle.patch +++ /dev/null @@ -1,44 +0,0 @@ -From cc1b9954ca7dcd90a694f7e2e9990c883bf7b647 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Wed, 21 Jul 2021 12:05:53 +0200 -Subject: [PATCH] patch-requests-certs.py-to-use-the-system-CA-bundle - ---- - requests/certs.py | 7 ++++++- - setup.py | 1 - - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/requests/certs.py b/requests/certs.py -index a14a7ee..b4957d1 100644 ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -10,8 +10,13 @@ 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. -+ -+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided -+by the ca-certificates RPM package. - """ --from certifi import where -+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 ce5e5c8..de86a91 100755 ---- a/setup.py -+++ b/setup.py -@@ -46,7 +46,6 @@ requires = [ - 'idna>=2.5,<3; python_version < "3"', - 'idna>=2.5,<4; python_version >= "3"', - 'urllib3>=1.21.1,<1.27', -- 'certifi>=2017.4.17' - - ] - test_requirements = [ --- -2.31.1 - diff --git a/python-requests.spec b/python-requests.spec index e454808..d851ee3 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.27.1 -Release: 5%{?dist} +Version: 2.28.1 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -18,17 +18,14 @@ URL: https://pypi.io/project/requests Source0: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 -Patch0: patch-requests-certs.py-to-use-the-system-CA-bundle.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1450608 -Patch2: Remove-tests-that-use-the-tarpit.patch +Patch0: requests-2.28.1-system-certs.patch # Use 127.0.0.1 not localhost for socket.bind() in the Server test # class, to fix tests in Koji's no-network environment # This probably isn't really upstreamable, because I guess localhost # could technically be IPv6 or something, and our no-network env is # a pretty odd one so this is a niche requirement. -Patch3: requests-2.12.4-tests_nonet.patch +Patch1: requests-2.28.1-tests_nonet.patch BuildArch: noarch @@ -73,20 +70,14 @@ designed to make HTTP requests easy for developers. %prep %autosetup -p1 -n requests-%{version} -# Unbundle the certificate bundle from mozilla. -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 +sed -i 's/ --doctest-modules//' pyproject.toml -# Allow charset_normalizer 2.1.0 and newer up to 3.0.0 -# Backport of: https://github.com/psf/requests/pull/6169 -sed -i "s/charset_normalizer~=2.0.0/charset_normalizer~=2.0/" setup.py %build %pyproject_wheel @@ -99,7 +90,8 @@ sed -i "s/charset_normalizer~=2.0.0/charset_normalizer~=2.0/" setup.py %if %{with tests} %check -%pytest -v +# Omitted tests use a TARPIT server so require network connection +%pytest -v -k "not (test_connect_timeout or test_total_timeout_connect)" %endif @@ -109,6 +101,9 @@ sed -i "s/charset_normalizer~=2.0.0/charset_normalizer~=2.0/" setup.py %changelog +* Tue Jul 12 2022 Adam Williamson - 2.28.1-1 +- Update to 2.28.1, rediff patches + * Mon Jun 20 2022 Lumír Balhar - 2.27.1-5 - Allow charset_normalizer 2.1.0 and newer up to 3.0.0 diff --git a/requests-2.12.4-tests_nonet.patch b/requests-2.12.4-tests_nonet.patch deleted file mode 100644 index 5e097b1..0000000 --- a/requests-2.12.4-tests_nonet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- requests-2.12.4/tests/testserver/server.py 2016-12-21 11:31:56.000000000 -0800 -+++ requests-2.12.4/tests/testserver/server.py.new 2016-12-30 10:40:06.085995065 -0800 -@@ -27,7 +27,7 @@ - """Dummy server using for unit testing""" - WAIT_EVENT_TIMEOUT = 5 - -- def __init__(self, handler=None, host='localhost', port=0, requests_to_handle=1, wait_to_close_event=None): -+ def __init__(self, handler=None, host='127.0.0.1', port=0, requests_to_handle=1, wait_to_close_event=None): - super(Server, self).__init__() - - self.handler = handler or consume_socket_content diff --git a/requests-2.28.1-system-certs.patch b/requests-2.28.1-system-certs.patch new file mode 100644 index 0000000..58bd6b3 --- /dev/null +++ b/requests-2.28.1-system-certs.patch @@ -0,0 +1,37 @@ +--- requests-2.28.1/requests/certs.py 2022-07-12 13:55:25.378079641 -0700 ++++ requests-2.28.1/requests/certs.py.new 2022-07-12 13:57:03.834621295 -0700 +@@ -9,8 +9,13 @@ + 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. ++ ++This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided ++by the ca-certificates RPM package. + """ +-from certifi import where ++def where(): ++ """Return the absolute path to the system CA bundle.""" ++ return '/etc/pki/tls/certs/ca-bundle.crt' + + if __name__ == "__main__": + print(where()) +--- requests-2.28.1/setup.py 2022-06-29 08:09:11.000000000 -0700 ++++ requests-2.28.1/setup.py.new 2022-07-12 13:58:33.830116402 -0700 +@@ -62,7 +62,6 @@ + "charset_normalizer>=2,<3", + "idna>=2.5,<4", + "urllib3>=1.21.1,<1.27", +- "certifi>=2017.4.17", + ] + test_requirements = [ + "pytest-httpbin==0.0.7", +--- requests-2.28.1/setup.cfg 2022-06-29 08:09:11.000000000 -0700 ++++ requests-2.28.1/setup.cfg.new 2022-07-12 13:58:19.619038220 -0700 +@@ -4,7 +4,6 @@ + socks + use_chardet_on_py3 + requires-dist = +- certifi>=2017.4.17 + charset_normalizer>=2,<3 + idna>=2.5,<4 + urllib3>=1.21.1,<1.27 diff --git a/requests-2.28.1-tests_nonet.patch b/requests-2.28.1-tests_nonet.patch new file mode 100644 index 0000000..32e96ee --- /dev/null +++ b/requests-2.28.1-tests_nonet.patch @@ -0,0 +1,11 @@ +--- requests-2.28.1/tests/testserver/server.py 2022-06-29 08:09:11.000000000 -0700 ++++ requests-2.28.1/tests/testserver/server.py.new 2022-07-12 14:04:30.218077055 -0700 +@@ -29,7 +29,7 @@ + def __init__( + self, + handler=None, +- host="localhost", ++ host="127.0.0.1", + port=0, + requests_to_handle=1, + wait_to_close_event=None, diff --git a/sources b/sources index d99f38d..6918890 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.27.1.tar.gz) = 191f8e0d566d541ab4e0c17bc9a637eb79e841605f6bbb9a0e559bd7bf0f00a71be99e21fa5b5431b9d49cb4a64debd0d7083658f98b723cf976833bb685cb9a +SHA512 (requests-v2.28.1.tar.gz) = caed2d08340c79af9448eefaa1df796f9112a7c8da30b218d5f342326a9629d95928c0978b9600e4bd7f56a297ef41afb088af390738be431b91b8c7429e741b From d0eb4d58af4e51445195b2bbea0ff3fee61e0274 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 21:58:48 +0000 Subject: [PATCH 122/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index d851ee3..24ff321 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.28.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -101,6 +101,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.28.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 12 2022 Adam Williamson - 2.28.1-1 - Update to 2.28.1, rediff patches From 40791ac9da2ba3b16b800397abf785fe78a62b84 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 13 Sep 2022 14:26:58 -0700 Subject: [PATCH 123/165] Enable all tests and drop no longer needed test patch. Signed-off-by: Kevin Fenzi --- python-requests.spec | 15 +++++---------- requests-2.28.1-tests_nonet.patch | 11 ----------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 requests-2.28.1-tests_nonet.patch diff --git a/python-requests.spec b/python-requests.spec index 24ff321..7e7ffb6 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.28.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -20,13 +20,6 @@ Source0: https://github.com/requests/requests/archive/v%{version}/request # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: requests-2.28.1-system-certs.patch -# Use 127.0.0.1 not localhost for socket.bind() in the Server test -# class, to fix tests in Koji's no-network environment -# This probably isn't really upstreamable, because I guess localhost -# could technically be IPv6 or something, and our no-network env is -# a pretty odd one so this is a niche requirement. -Patch1: requests-2.28.1-tests_nonet.patch - BuildArch: noarch %description @@ -90,8 +83,7 @@ sed -i 's/ --doctest-modules//' pyproject.toml %if %{with tests} %check -# Omitted tests use a TARPIT server so require network connection -%pytest -v -k "not (test_connect_timeout or test_total_timeout_connect)" +%pytest -v %endif @@ -101,6 +93,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue Sep 13 2022 Kevin Fenzi - 2.28.1-3 +- Enable all tests and drop no longer needed test patch. + * Fri Jul 22 2022 Fedora Release Engineering - 2.28.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/requests-2.28.1-tests_nonet.patch b/requests-2.28.1-tests_nonet.patch deleted file mode 100644 index 32e96ee..0000000 --- a/requests-2.28.1-tests_nonet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- requests-2.28.1/tests/testserver/server.py 2022-06-29 08:09:11.000000000 -0700 -+++ requests-2.28.1/tests/testserver/server.py.new 2022-07-12 14:04:30.218077055 -0700 -@@ -29,7 +29,7 @@ - def __init__( - self, - handler=None, -- host="localhost", -+ host="127.0.0.1", - port=0, - requests_to_handle=1, - wait_to_close_event=None, From e2cec88d94129efbf5761e67f97d4304b719d25c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 16:53:48 +0000 Subject: [PATCH 124/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 7e7ffb6..238feae 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -10,7 +10,7 @@ Name: python-requests Version: 2.28.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -93,6 +93,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 2.28.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Sep 13 2022 Kevin Fenzi - 2.28.1-3 - Enable all tests and drop no longer needed test patch. From 040845c23cacfa3d11db19cb70e459894fd62af4 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 19 Jan 2023 17:41:17 +0100 Subject: [PATCH 125/165] Update to 2.28.2 --- .gitignore | 1 + python-requests.spec | 9 +++-- requests-2.28.1-system-certs.patch | 37 ------------------- sources | 2 +- system-certs.patch | 57 ++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 41 deletions(-) delete mode 100644 requests-2.28.1-system-certs.patch create mode 100644 system-certs.patch diff --git a/.gitignore b/.gitignore index 0ccf83c..7a32ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /requests-v2.27.0.tar.gz /requests-v2.27.1.tar.gz /requests-v2.28.1.tar.gz +/requests-v2.28.2.tar.gz diff --git a/python-requests.spec b/python-requests.spec index 238feae..662f94e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -9,8 +9,8 @@ Name: python-requests -Version: 2.28.1 -Release: 4%{?dist} +Version: 2.28.2 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -18,7 +18,7 @@ URL: https://pypi.io/project/requests Source0: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 -Patch0: requests-2.28.1-system-certs.patch +Patch0: system-certs.patch BuildArch: noarch @@ -93,6 +93,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Wed Feb 01 2023 Lumír Balhar - 2.28.2-1 +- Update to 2.28.2 (rhbz#2160527) + * Fri Jan 20 2023 Fedora Release Engineering - 2.28.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/requests-2.28.1-system-certs.patch b/requests-2.28.1-system-certs.patch deleted file mode 100644 index 58bd6b3..0000000 --- a/requests-2.28.1-system-certs.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- requests-2.28.1/requests/certs.py 2022-07-12 13:55:25.378079641 -0700 -+++ requests-2.28.1/requests/certs.py.new 2022-07-12 13:57:03.834621295 -0700 -@@ -9,8 +9,13 @@ - 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. -+ -+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided -+by the ca-certificates RPM package. - """ --from certifi import where -+def where(): -+ """Return the absolute path to the system CA bundle.""" -+ return '/etc/pki/tls/certs/ca-bundle.crt' - - if __name__ == "__main__": - print(where()) ---- requests-2.28.1/setup.py 2022-06-29 08:09:11.000000000 -0700 -+++ requests-2.28.1/setup.py.new 2022-07-12 13:58:33.830116402 -0700 -@@ -62,7 +62,6 @@ - "charset_normalizer>=2,<3", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", -- "certifi>=2017.4.17", - ] - test_requirements = [ - "pytest-httpbin==0.0.7", ---- requests-2.28.1/setup.cfg 2022-06-29 08:09:11.000000000 -0700 -+++ requests-2.28.1/setup.cfg.new 2022-07-12 13:58:19.619038220 -0700 -@@ -4,7 +4,6 @@ - socks - use_chardet_on_py3 - requires-dist = -- certifi>=2017.4.17 - charset_normalizer>=2,<3 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 diff --git a/sources b/sources index 6918890..9f2da1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.28.1.tar.gz) = caed2d08340c79af9448eefaa1df796f9112a7c8da30b218d5f342326a9629d95928c0978b9600e4bd7f56a297ef41afb088af390738be431b91b8c7429e741b +SHA512 (requests-v2.28.2.tar.gz) = 88c5a92ea51cd18e7edd49a6259d7b56bc0c17f86067f796b5f668ed35202b8bc1395e4811ee2089350e08893dcd304c9801dbf087abfaff1d14859e31bce8ac diff --git a/system-certs.patch b/system-certs.patch new file mode 100644 index 0000000..1778958 --- /dev/null +++ b/system-certs.patch @@ -0,0 +1,57 @@ +From f21606c102368ad7a6e8bcab5a0c65dcddbbf9e5 Mon Sep 17 00:00:00 2001 +From: Lumir Balhar +Date: Thu, 19 Jan 2023 17:35:02 +0100 +Subject: [PATCH] system certs + +--- + requests/certs.py | 7 ++++++- + setup.cfg | 1 - + setup.py | 1 - + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/requests/certs.py b/requests/certs.py +index 1f30a45..9224f62 100644 +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -9,8 +9,13 @@ 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. ++ ++This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided ++by the ca-certificates RPM package. + """ +-from certifi import where ++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.cfg b/setup.cfg +index bf21c81..906c0f1 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -4,7 +4,6 @@ provides-extra = + socks + use_chardet_on_py3 + requires-dist = +- certifi>=2017.4.17 + charset_normalizer>=2,<4 + idna>=2.5,<4 + urllib3>=1.21.1,<1.27 +diff --git a/setup.py b/setup.py +index 092b40d..c6c0ad5 100755 +--- a/setup.py ++++ b/setup.py +@@ -62,7 +62,6 @@ requires = [ + "charset_normalizer>=2,<4", + "idna>=2.5,<4", + "urllib3>=1.21.1,<1.27", +- "certifi>=2017.4.17", + ] + test_requirements = [ + "pytest-httpbin==0.0.7", +-- +2.39.0 + From 8d03190e2562698b7b1f2a6f735cd152134e371b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 May 2023 17:36:43 -0400 Subject: [PATCH 126/165] 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-requests/-/commit/488327aa0f28e74b9e90c64f3aed8f5a8f1d82fa --- python-requests.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 662f94e..8a67450 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,6 +1,7 @@ -%if 0%{?_module_build} +%if 0%{?_module_build} || 0%{?rhel} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 +# RHEL does not include the test dependencies %bcond_with tests %else # When bootstrapping Python, we cannot test this yet From d9c9c5dd57c680d8dbd84f1b3c6b964994ea2df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 23 May 2023 10:13:09 +0200 Subject: [PATCH 127/165] Security fix for CVE-2023-32681 https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q --- CVE-2023-32681.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++ python-requests.spec | 9 ++++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 CVE-2023-32681.patch diff --git a/CVE-2023-32681.patch b/CVE-2023-32681.patch new file mode 100644 index 0000000..2b4cd79 --- /dev/null +++ b/CVE-2023-32681.patch @@ -0,0 +1,56 @@ +From 74ea7cf7a6a27a4eeb2ae24e162bcc942a6706d5 Mon Sep 17 00:00:00 2001 +From: Nate Prewitt +Date: Mon, 22 May 2023 08:08:57 -0700 +Subject: [PATCH] Merge pull request from GHSA-j8r2-6x86-q33q + +--- + requests/sessions.py | 4 +++- + tests/test_requests.py | 20 ++++++++++++++++++++ + 2 files changed, 23 insertions(+), 1 deletion(-) + +diff --git a/requests/sessions.py b/requests/sessions.py +index 6cb3b4dae3..dbcf2a7b0e 100644 +--- a/requests/sessions.py ++++ b/requests/sessions.py +@@ -324,7 +324,9 @@ def rebuild_proxies(self, prepared_request, proxies): + except KeyError: + username, password = None, None + +- if username and password: ++ # urllib3 handles proxy authorization for us in the standard adapter. ++ # Avoid appending this to TLS tunneled requests where it may be leaked. ++ if not scheme.startswith('https') and username and password: + headers["Proxy-Authorization"] = _basic_auth_str(username, password) + + return new_proxies +diff --git a/tests/test_requests.py b/tests/test_requests.py +index b1c8dd4534..b420c44d73 100644 +--- a/tests/test_requests.py ++++ b/tests/test_requests.py +@@ -647,6 +647,26 @@ def test_proxy_authorization_preserved_on_request(self, httpbin): + + assert sent_headers.get("Proxy-Authorization") == proxy_auth_value + ++ ++ @pytest.mark.parametrize( ++ "url,has_proxy_auth", ++ ( ++ ('http://example.com', True), ++ ('https://example.com', False), ++ ), ++ ) ++ def test_proxy_authorization_not_appended_to_https_request(self, url, has_proxy_auth): ++ session = requests.Session() ++ proxies = { ++ 'http': 'http://test:pass@localhost:8080', ++ 'https': 'http://test:pass@localhost:8090', ++ } ++ req = requests.Request('GET', url) ++ prep = req.prepare() ++ session.rebuild_proxies(prep, proxies) ++ ++ assert ('Proxy-Authorization' in prep.headers) is has_proxy_auth ++ + def test_basicauth_with_netrc(self, httpbin): + auth = ("user", "pass") + wrong_auth = ("wronguser", "wrongpass") diff --git a/python-requests.spec b/python-requests.spec index 8a67450..63c8792 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.28.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -21,6 +21,9 @@ Source0: https://github.com/requests/requests/archive/v%{version}/request # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch0: system-certs.patch +# Security fix for CVE-2023-32681 +Patch1: https://github.com/psf/requests/commit/74ea7cf7a6.patch#/CVE-2023-32681.patch + BuildArch: noarch %description @@ -94,6 +97,10 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue May 23 2023 Miro Hrončok - 2.28.2-2 +- Security fix for CVE-2023-32681 +- https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q + * Wed Feb 01 2023 Lumír Balhar - 2.28.2-1 - Update to 2.28.2 (rhbz#2160527) From f5181bf610de6c2b4010df8f12cffe12dcb1bb32 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 00:12:25 +0200 Subject: [PATCH 128/165] Bootstrap for Python 3.12 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 63c8792..3d78541 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 %if 0%{?_module_build} || 0%{?rhel} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -11,7 +12,7 @@ Name: python-requests Version: 2.28.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -97,6 +98,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue Jun 13 2023 Python Maint - 2.28.2-3 +- Bootstrap for Python 3.12 + * Tue May 23 2023 Miro Hrončok - 2.28.2-2 - Security fix for CVE-2023-32681 - https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q From 375e8589990ba1509fcae6351d4a0dbc4b4dba21 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 1 Jul 2023 13:04:01 +0200 Subject: [PATCH 129/165] Rebuilt for Python 3.12 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 3d78541..cdf383e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 %if 0%{?_module_build} || 0%{?rhel} # Don't run tests on module-build for now # See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 @@ -12,7 +11,7 @@ Name: python-requests Version: 2.28.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -98,6 +97,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Sat Jul 01 2023 Python Maint - 2.28.2-4 +- Rebuilt for Python 3.12 + * Tue Jun 13 2023 Python Maint - 2.28.2-3 - Bootstrap for Python 3.12 From 767bf299586f46e69c74860c491c5468a9dad00c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 13:35:41 +0000 Subject: [PATCH 130/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index cdf383e..8afaa3e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,7 +11,7 @@ Name: python-requests Version: 2.28.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -97,6 +97,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2.28.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jul 01 2023 Python Maint - 2.28.2-4 - Rebuilt for Python 3.12 From 6b892527036031831c378b00a29d77f33ffc7258 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 8 Aug 2023 17:13:42 +0200 Subject: [PATCH 131/165] Declare the license as an SPDX expression --- python-requests.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 8afaa3e..f6e1624 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -11,10 +11,10 @@ Name: python-requests Version: 2.28.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTTP library, written in Python, for human beings -License: ASL 2.0 +License: Apache-2.0 URL: https://pypi.io/project/requests Source0: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. @@ -97,6 +97,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue Aug 08 2023 Karolina Surma - 2.28.2-6 +- Declare the license as an SPDX expression + * Fri Jul 21 2023 Fedora Release Engineering - 2.28.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b3699e581096c31100a997a02bfecb8e7627f384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Oct 2023 13:49:46 +0200 Subject: [PATCH 132/165] Remove redundant things from the spec file - %pyproject_buildrequires -r has been the default for a while now - Sources and Patches don't need to be enumerated - %python_provide is redundant and deprecated - pyproject-rpm-macros does not need to be explicitly BuildRequired - the Summary does not need to be repeated - modularity was retired --- python-requests.spec | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index f6e1624..5b816d6 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,6 +1,4 @@ -%if 0%{?_module_build} || 0%{?rhel} -# Don't run tests on module-build for now -# See: https://bugzilla.redhat.com/show_bug.cgi?id=1450608 +%if 0%{?rhel} # RHEL does not include the test dependencies %bcond_with tests %else @@ -16,13 +14,13 @@ Summary: HTTP library, written in Python, for human beings License: Apache-2.0 URL: https://pypi.io/project/requests -Source0: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz +Source: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 -Patch0: system-certs.patch +Patch: system-certs.patch # Security fix for CVE-2023-32681 -Patch1: https://github.com/psf/requests/commit/74ea7cf7a6.patch#/CVE-2023-32681.patch +Patch: https://github.com/psf/requests/commit/74ea7cf7a6.patch#/CVE-2023-32681.patch BuildArch: noarch @@ -33,12 +31,9 @@ capabilities you should need, but the API is thoroughly broken. This library is designed to make HTTP requests easy for developers. %package -n python%{python3_pkgversion}-requests -Summary: HTTP library, written in Python, for human beings - -%{?python_provide:%python_provide python%{python3_pkgversion}-requests} +Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: pyproject-rpm-macros %if %{with tests} BuildRequires: python3dist(pytest) @@ -57,11 +52,7 @@ designed to make HTTP requests easy for developers. %pyproject_extras_subpkg -n python%{python3_pkgversion}-requests security socks %generate_buildrequires -%if %{with tests} -%pyproject_buildrequires -r -%else %pyproject_buildrequires -%endif %prep From 92130db6320a9758f42e032461a115ab630100aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Oct 2023 13:57:53 +0200 Subject: [PATCH 133/165] Use a newer and more understandable %bcond syntax --- python-requests.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 5b816d6..e1448c0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,11 +1,6 @@ -%if 0%{?rhel} -# RHEL does not include the test dependencies -%bcond_with tests -%else # When bootstrapping Python, we cannot test this yet -%bcond_without tests -%endif - +# RHEL does not include the test dependencies +%bcond tests %{undefined rhel} Name: python-requests Version: 2.28.2 From 85302c38d754b932aab836a5475c5f37bd66c541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Oct 2023 14:04:07 +0200 Subject: [PATCH 134/165] Disable extras on RHEL, explicitly BuildRequire them on Fedora Once urllib3 stops pulling in pysocks by default, a test would fail without an explicit dependency. --- python-requests.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index e1448c0..a95454b 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,10 +1,12 @@ # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %bcond tests %{undefined rhel} +# The extras are disabled on RHEL to avoid pysocks and deprecated requests[security] +%bcond extras %{undefined rhel} Name: python-requests Version: 2.28.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -44,10 +46,12 @@ 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 extras} %pyproject_extras_subpkg -n python%{python3_pkgversion}-requests security socks +%endif %generate_buildrequires -%pyproject_buildrequires +%pyproject_buildrequires %{?with_extras:-x security,socks} %prep @@ -73,7 +77,8 @@ sed -i 's/ --doctest-modules//' pyproject.toml %if %{with tests} %check -%pytest -v +# test_use_proxy_from_environment needs pysocks +%pytest -v %{!?with_extras:-k "not test_use_proxy_from_environment"} %endif @@ -83,6 +88,10 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue Oct 10 2023 Miro Hrončok - 2.28.2-7 +- Do not package requests[security] and requests[socks] on RHEL +- Make the package build even when urllib3 won't pull in pysocks + * Tue Aug 08 2023 Karolina Surma - 2.28.2-6 - Declare the license as an SPDX expression From a5e331ad3f2790bf1249dbbd85957d5fbd47d3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Oct 2023 14:13:33 +0200 Subject: [PATCH 135/165] Always run at least an import check in %check --- python-requests.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index a95454b..46597f3 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -75,8 +75,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %pyproject_save_files requests -%if %{with tests} %check +%pyproject_check_import +%if %{with tests} # test_use_proxy_from_environment needs pysocks %pytest -v %{!?with_extras:-k "not test_use_proxy_from_environment"} %endif From ab88e0da153ae8c2fccdee73878e75a069b74dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Oct 2023 14:08:28 +0200 Subject: [PATCH 136/165] Move lines around to resemble the example Python specfile https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_example_spec_file --- python-requests.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 46597f3..56e98ed 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -12,6 +12,7 @@ Summary: HTTP library, written in Python, for human beings License: Apache-2.0 URL: https://pypi.io/project/requests Source: https://github.com/requests/requests/archive/v%{version}/requests-v%{version}.tar.gz + # Explicitly use the system certificates in ca-certificates. # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch: system-certs.patch @@ -20,18 +21,7 @@ Patch: system-certs.patch Patch: https://github.com/psf/requests/commit/74ea7cf7a6.patch#/CVE-2023-32681.patch BuildArch: noarch - -%description -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. - -%package -n python%{python3_pkgversion}-requests -Summary: %{summary} - BuildRequires: python%{python3_pkgversion}-devel - %if %{with tests} BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-httpbin) @@ -39,6 +29,15 @@ BuildRequires: python3dist(pytest-mock) BuildRequires: python3dist(trustme) %endif +%description +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. + + +%package -n python%{python3_pkgversion}-requests +Summary: %{summary} %description -n python%{python3_pkgversion}-requests Most existing Python modules for sending HTTP requests are extremely verbose and @@ -46,10 +45,12 @@ 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 extras} %pyproject_extras_subpkg -n python%{python3_pkgversion}-requests security socks %endif + %generate_buildrequires %pyproject_buildrequires %{?with_extras:-x security,socks} From 46169880a4284a332635d6552176a4dc1a9441f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Tue, 17 Oct 2023 11:21:31 +0200 Subject: [PATCH 137/165] Update to 2.31.0 --- .gitignore | 1 + CVE-2023-32681.patch | 56 -------------------------------------------- python-requests.spec | 13 +++++----- sources | 2 +- system-certs.patch | 15 ++++++------ 5 files changed, 17 insertions(+), 70 deletions(-) delete mode 100644 CVE-2023-32681.patch diff --git a/.gitignore b/.gitignore index 7a32ee7..67de33d 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /requests-v2.27.1.tar.gz /requests-v2.28.1.tar.gz /requests-v2.28.2.tar.gz +/requests-v2.31.0.tar.gz diff --git a/CVE-2023-32681.patch b/CVE-2023-32681.patch deleted file mode 100644 index 2b4cd79..0000000 --- a/CVE-2023-32681.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 74ea7cf7a6a27a4eeb2ae24e162bcc942a6706d5 Mon Sep 17 00:00:00 2001 -From: Nate Prewitt -Date: Mon, 22 May 2023 08:08:57 -0700 -Subject: [PATCH] Merge pull request from GHSA-j8r2-6x86-q33q - ---- - requests/sessions.py | 4 +++- - tests/test_requests.py | 20 ++++++++++++++++++++ - 2 files changed, 23 insertions(+), 1 deletion(-) - -diff --git a/requests/sessions.py b/requests/sessions.py -index 6cb3b4dae3..dbcf2a7b0e 100644 ---- a/requests/sessions.py -+++ b/requests/sessions.py -@@ -324,7 +324,9 @@ def rebuild_proxies(self, prepared_request, proxies): - except KeyError: - username, password = None, None - -- if username and password: -+ # urllib3 handles proxy authorization for us in the standard adapter. -+ # Avoid appending this to TLS tunneled requests where it may be leaked. -+ if not scheme.startswith('https') and username and password: - headers["Proxy-Authorization"] = _basic_auth_str(username, password) - - return new_proxies -diff --git a/tests/test_requests.py b/tests/test_requests.py -index b1c8dd4534..b420c44d73 100644 ---- a/tests/test_requests.py -+++ b/tests/test_requests.py -@@ -647,6 +647,26 @@ def test_proxy_authorization_preserved_on_request(self, httpbin): - - assert sent_headers.get("Proxy-Authorization") == proxy_auth_value - -+ -+ @pytest.mark.parametrize( -+ "url,has_proxy_auth", -+ ( -+ ('http://example.com', True), -+ ('https://example.com', False), -+ ), -+ ) -+ def test_proxy_authorization_not_appended_to_https_request(self, url, has_proxy_auth): -+ session = requests.Session() -+ proxies = { -+ 'http': 'http://test:pass@localhost:8080', -+ 'https': 'http://test:pass@localhost:8090', -+ } -+ req = requests.Request('GET', url) -+ prep = req.prepare() -+ session.rebuild_proxies(prep, proxies) -+ -+ assert ('Proxy-Authorization' in prep.headers) is has_proxy_auth -+ - def test_basicauth_with_netrc(self, httpbin): - auth = ("user", "pass") - wrong_auth = ("wronguser", "wrongpass") diff --git a/python-requests.spec b/python-requests.spec index 56e98ed..94f1c59 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %bcond extras %{undefined rhel} Name: python-requests -Version: 2.28.2 -Release: 7%{?dist} +Version: 2.31.0 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -17,9 +17,6 @@ Source: https://github.com/requests/requests/archive/v%{version}/request # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch: system-certs.patch -# Security fix for CVE-2023-32681 -Patch: https://github.com/psf/requests/commit/74ea7cf7a6.patch#/CVE-2023-32681.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} @@ -80,7 +77,7 @@ sed -i 's/ --doctest-modules//' pyproject.toml %pyproject_check_import %if %{with tests} # test_use_proxy_from_environment needs pysocks -%pytest -v %{!?with_extras:-k "not test_use_proxy_from_environment"} +%pytest -v tests %{!?with_extras:-k "not test_use_proxy_from_environment"} %endif @@ -90,6 +87,10 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Mon Oct 16 2023 Tomáš Hrnčiar - 2.31.0-1 +- Update to 2.31.0 +- Fixes: rhbz#2189970 + * Tue Oct 10 2023 Miro Hrončok - 2.28.2-7 - Do not package requests[security] and requests[socks] on RHEL - Make the package build even when urllib3 won't pull in pysocks diff --git a/sources b/sources index 9f2da1e..3e4fef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.28.2.tar.gz) = 88c5a92ea51cd18e7edd49a6259d7b56bc0c17f86067f796b5f668ed35202b8bc1395e4811ee2089350e08893dcd304c9801dbf087abfaff1d14859e31bce8ac +SHA512 (requests-v2.31.0.tar.gz) = 43f536bdb2360fcceb24ef98e995ffa66cdefc2c502629f17a5722445bfa9ad8489201958c846c2aaef37e427f95a4d56e321a91095c69754680abfd83b39150 diff --git a/system-certs.patch b/system-certs.patch index 1778958..0e323f8 100644 --- a/system-certs.patch +++ b/system-certs.patch @@ -1,8 +1,9 @@ -From f21606c102368ad7a6e8bcab5a0c65dcddbbf9e5 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Thu, 19 Jan 2023 17:35:02 +0100 +From fbe9d1e38da72d8caac365841794b06614523ac9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= +Date: Tue, 17 Oct 2023 10:44:42 +0200 Subject: [PATCH] system certs +Co-authored-by: Lumir Balhar --- requests/certs.py | 7 ++++++- setup.cfg | 1 - @@ -41,17 +42,17 @@ index bf21c81..906c0f1 100644 idna>=2.5,<4 urllib3>=1.21.1,<1.27 diff --git a/setup.py b/setup.py -index 092b40d..c6c0ad5 100755 +index 0123545..ec3fd1d 100755 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ requires = [ "charset_normalizer>=2,<4", "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", + "urllib3>=1.21.1,<3", - "certifi>=2017.4.17", ] test_requirements = [ - "pytest-httpbin==0.0.7", + "pytest-httpbin==2.0.0", -- -2.39.0 +2.41.0 From 2c49b3aa6338854efc267d5e84fe911c77f78959 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 06:28:29 +0000 Subject: [PATCH 138/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 94f1c59..20d0473 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.31.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -87,6 +87,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 2.31.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 16 2023 Tomáš Hrnčiar - 2.31.0-1 - Update to 2.31.0 - Fixes: rhbz#2189970 From 37f4fc1429d4911351739290719c94cc7d66ea05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 10:08:10 +0000 Subject: [PATCH 139/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 20d0473..ef31a1d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.31.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -87,6 +87,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 2.31.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 2.31.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4d1f850e1f73cdc1fb8523ac4d7598199fcea92b Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Thu, 11 Apr 2024 10:28:48 +0200 Subject: [PATCH 140/165] Fix compatibility with pytest 8 --- python-requests.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index ef31a1d..631990b 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.31.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -63,6 +63,10 @@ sed -i '/#!\/usr\/.*python/d' requests/certs.py # change the docs. Thus, we set pytest not to run doctests at all. sed -i 's/ --doctest-modules//' pyproject.toml +# Fix compatibility with pytest 8 +# Upstream report: https://github.com/psf/requests/issues/6679 +sed -i "/pytest.warns/s/None//" tests/test_requests.py + %build %pyproject_wheel @@ -87,6 +91,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Thu Apr 11 2024 Lumír Balhar - 2.31.0-4 +- Fix compatibility with pytest 8 + * Fri Jan 26 2024 Fedora Release Engineering - 2.31.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 576af2d63fb3cb1d61e07dc3fa195eb383e2f655 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 14 May 2024 18:42:57 +0200 Subject: [PATCH 141/165] Add support for IPv6 CIDR in no_proxy setting --- python-requests.spec | 12 +- support_IPv6_CIDR_in_no_proxy.patch | 272 ++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 support_IPv6_CIDR_in_no_proxy.patch diff --git a/python-requests.spec b/python-requests.spec index 631990b..2fd5d3e 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.31.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -17,6 +17,13 @@ Source: https://github.com/requests/requests/archive/v%{version}/request # https://bugzilla.redhat.com/show_bug.cgi?id=904614 Patch: system-certs.patch +# Add support for IPv6 CIDR in no_proxy setting +# This functionality is needed in Openshift and it has been +# proposed for upstream in 2021 but the PR unfortunately stalled. +# Upstream PR: https://github.com/psf/requests/pull/5953 +# This change is backported also into RHEL 9.4 (via CS) +Patch: support_IPv6_CIDR_in_no_proxy.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} @@ -91,6 +98,9 @@ sed -i "/pytest.warns/s/None//" tests/test_requests.py %changelog +* Tue May 14 2024 Lumír Balhar - 2.31.0-5 +- Add support for IPv6 CIDR in no_proxy setting + * Thu Apr 11 2024 Lumír Balhar - 2.31.0-4 - Fix compatibility with pytest 8 diff --git a/support_IPv6_CIDR_in_no_proxy.patch b/support_IPv6_CIDR_in_no_proxy.patch new file mode 100644 index 0000000..f8b7285 --- /dev/null +++ b/support_IPv6_CIDR_in_no_proxy.patch @@ -0,0 +1,272 @@ +From 4f89a66430e4f701b11fdeb9e253af87e29e6f0b Mon Sep 17 00:00:00 2001 +From: Derek Higgins +Date: Fri, 8 Oct 2021 11:12:27 +0100 +Subject: [PATCH] Add ipv6 support to should_bypass_proxies + +Add support to should_bypass_proxies to support +IPv6 ipaddresses and CIDRs in no_proxy. Includes +adding IPv6 support to various other helper functions. +--- + requests/utils.py | 83 ++++++++++++++++++++++++++++++++++++------- + tests/test_utils.py | 66 +++++++++++++++++++++++++++++++--- + 2 files changed, 132 insertions(+), 17 deletions(-) + +diff --git a/src/requests/utils.py b/src/requests/utils.py +index 1ae77d68ff..6a026e2d32 100644 +--- a/requests/utils.py ++++ b/requests/utils.py +@@ -674,18 +674,46 @@ def requote_uri(uri): + return quote(uri, safe=safe_without_percent) + + ++def _get_mask_bits(mask, totalbits=32): ++ """Converts a mask from /xx format to a int ++ to be used as a mask for IP's in int format ++ ++ Example: if mask is 24 function returns 0xFFFFFF00 ++ if mask is 24 and totalbits=128 function ++ returns 0xFFFFFF00000000000000000000000000 ++ ++ :rtype: int ++ """ ++ bits = ((1 << mask) - 1) << (totalbits - mask) ++ return bits ++ ++ + def address_in_network(ip, net): + """This function allows you to check if an IP belongs to a network subnet + + Example: returns True if ip = 192.168.1.1 and net = 192.168.1.0/24 + returns False if ip = 192.168.1.1 and net = 192.168.100.0/24 ++ returns True if ip = 1:2:3:4::1 and net = 1:2:3:4::/64 + + :rtype: bool + """ +- ipaddr = struct.unpack("=L", socket.inet_aton(ip))[0] + netaddr, bits = net.split("/") +- netmask = struct.unpack("=L", socket.inet_aton(dotted_netmask(int(bits))))[0] +- network = struct.unpack("=L", socket.inet_aton(netaddr))[0] & netmask ++ if is_ipv4_address(ip) and is_ipv4_address(netaddr): ++ ipaddr = struct.unpack(">L", socket.inet_aton(ip))[0] ++ netmask = _get_mask_bits(int(bits)) ++ network = struct.unpack(">L", socket.inet_aton(netaddr))[0] ++ elif is_ipv6_address(ip) and is_ipv6_address(netaddr): ++ ipaddr_msb, ipaddr_lsb = struct.unpack( ++ ">QQ", socket.inet_pton(socket.AF_INET6, ip) ++ ) ++ ipaddr = (ipaddr_msb << 64) ^ ipaddr_lsb ++ netmask = _get_mask_bits(int(bits), 128) ++ network_msb, network_lsb = struct.unpack( ++ ">QQ", socket.inet_pton(socket.AF_INET6, netaddr) ++ ) ++ network = (network_msb << 64) ^ network_lsb ++ else: ++ return False + return (ipaddr & netmask) == (network & netmask) + + +@@ -705,12 +733,39 @@ def is_ipv4_address(string_ip): + :rtype: bool + """ + try: +- socket.inet_aton(string_ip) ++ socket.inet_pton(socket.AF_INET, string_ip) ++ except OSError: ++ return False ++ return True ++ ++ ++def is_ipv6_address(string_ip): ++ """ ++ :rtype: bool ++ """ ++ try: ++ socket.inet_pton(socket.AF_INET6, string_ip) + except OSError: + return False + return True + + ++def compare_ips(a, b): ++ """ ++ Compare 2 IP's, uses socket.inet_pton to normalize IPv6 IPs ++ ++ :rtype: bool ++ """ ++ if a == b: ++ return True ++ try: ++ return socket.inet_pton(socket.AF_INET6, a) == socket.inet_pton( ++ socket.AF_INET6, b ++ ) ++ except OSError: ++ return False ++ ++ + def is_valid_cidr(string_network): + """ + Very simple check of the cidr format in no_proxy variable. +@@ -718,17 +773,19 @@ def is_valid_cidr(string_network): + :rtype: bool + """ + if string_network.count("/") == 1: ++ address, mask = string_network.split("/") + try: +- mask = int(string_network.split("/")[1]) ++ mask = int(mask) + except ValueError: + return False + +- if mask < 1 or mask > 32: +- return False +- +- try: +- socket.inet_aton(string_network.split("/")[0]) +- except OSError: ++ if is_ipv4_address(address): ++ if mask < 1 or mask > 32: ++ return False ++ elif is_ipv6_address(address): ++ if mask < 1 or mask > 128: ++ return False ++ else: + return False + else: + return False +@@ -785,12 +842,12 @@ def get_proxy(key): + # the end of the hostname, both with and without the port. + no_proxy = (host for host in no_proxy.replace(" ", "").split(",") if host) + +- if is_ipv4_address(parsed.hostname): ++ if is_ipv4_address(parsed.hostname) or is_ipv6_address(parsed.hostname): + for proxy_ip in no_proxy: + if is_valid_cidr(proxy_ip): + if address_in_network(parsed.hostname, proxy_ip): + return True +- elif parsed.hostname == proxy_ip: ++ elif compare_ips(parsed.hostname, proxy_ip): + # If no_proxy ip was defined in plain IP notation instead of cidr notation & + # matches the IP of the index + return True +diff --git a/tests/test_utils.py b/tests/test_utils.py +index 8988eaf69c..44a3b790d2 100644 +--- a/tests/test_utils.py ++++ b/tests/test_utils.py +@@ -14,9 +14,11 @@ + from requests.cookies import RequestsCookieJar + from requests.structures import CaseInsensitiveDict + from requests.utils import ( ++ _get_mask_bits, + _parse_content_type_header, + add_dict_to_cookiejar, + address_in_network, ++ compare_ips, + dotted_netmask, + extract_zipped_paths, + get_auth_from_url, +@@ -263,8 +265,15 @@ def test_invalid(self, value): + + + class TestIsValidCIDR: +- def test_valid(self): +- assert is_valid_cidr("192.168.1.0/24") ++ @pytest.mark.parametrize( ++ "value", ++ ( ++ "192.168.1.0/24", ++ "1:2:3:4::/64", ++ ), ++ ) ++ def test_valid(self, value): ++ assert is_valid_cidr(value) + + @pytest.mark.parametrize( + "value", +@@ -274,6 +283,11 @@ def test_valid(self): + "192.168.1.0/128", + "192.168.1.0/-1", + "192.168.1.999/24", ++ "1:2:3:4::1", ++ "1:2:3:4::/a", ++ "1:2:3:4::0/321", ++ "1:2:3:4::/-1", ++ "1:2:3:4::12211/64", + ), + ) + def test_invalid(self, value): +@@ -287,6 +301,12 @@ def test_valid(self): + def test_invalid(self): + assert not address_in_network("172.16.0.1", "192.168.1.0/24") + ++ def test_valid_v6(self): ++ assert address_in_network("1:2:3:4::1111", "1:2:3:4::/64") ++ ++ def test_invalid_v6(self): ++ assert not address_in_network("1:2:3:4:1111", "1:2:3:4::/124") ++ + + class TestGuessFilename: + @pytest.mark.parametrize( +@@ -722,6 +742,11 @@ def test_urldefragauth(url, expected): + ("http://172.16.1.12:5000/", False), + ("http://google.com:5000/v1.0/", False), + ("file:///some/path/on/disk", True), ++ ("http://[1:2:3:4:5:6:7:8]:5000/", True), ++ ("http://[1:2:3:4::1]/", True), ++ ("http://[1:2:3:9::1]/", True), ++ ("http://[1:2:3:9:0:0:0:1]/", True), ++ ("http://[1:2:3:9::2]/", False), + ), + ) + def test_should_bypass_proxies(url, expected, monkeypatch): +@@ -730,11 +755,11 @@ def test_should_bypass_proxies(url, expected, monkeypatch): + """ + monkeypatch.setenv( + "no_proxy", +- "192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1, google.com:6000", ++ "192.168.0.0/24,127.0.0.1,localhost.localdomain,1:2:3:4::/64,1:2:3:9::1,172.16.1.1, google.com:6000", + ) + monkeypatch.setenv( + "NO_PROXY", +- "192.168.0.0/24,127.0.0.1,localhost.localdomain,172.16.1.1, google.com:6000", ++ "192.168.0.0/24,127.0.0.1,localhost.localdomain,1:2:3:4::/64,1:2:3:9::1,172.16.1.1, google.com:6000", + ) + assert should_bypass_proxies(url, no_proxy=None) == expected + +@@ -924,3 +949,36 @@ def test_set_environ_raises_exception(): + raise Exception("Expected exception") + + assert "Expected exception" in str(exception.value) ++ ++ ++@pytest.mark.parametrize( ++ "mask, totalbits, maskbits", ++ ( ++ (24, None, 0xFFFFFF00), ++ (31, None, 0xFFFFFFFE), ++ (0, None, 0x0), ++ (4, 4, 0xF), ++ (24, 128, 0xFFFFFF00000000000000000000000000), ++ ), ++) ++def test__get_mask_bits(mask, totalbits, maskbits): ++ args = {"mask": mask} ++ if totalbits: ++ args["totalbits"] = totalbits ++ assert _get_mask_bits(**args) == maskbits ++ ++ ++@pytest.mark.parametrize( ++ "a, b, expected", ++ ( ++ ("1.2.3.4", "1.2.3.4", True), ++ ("1.2.3.4", "2.2.3.4", False), ++ ("1::4", "1.2.3.4", False), ++ ("1::4", "1::4", True), ++ ("1::4", "1:0:0:0:0:0:0:4", True), ++ ("1::4", "1:0:0:0:0:0::4", True), ++ ("1::4", "1:0:0:0:0:0:1:4", False), ++ ), ++) ++def test_compare_ips(a, b, expected): ++ assert compare_ips(a, b) == expected From a4e6c6d8c000004f225694a59f6b50f2be20e001 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 29 May 2024 15:23:36 +0200 Subject: [PATCH 142/165] Fix FTBFS --- bf24b7.patch | 22 ++++++++++++++++++++++ python-requests.spec | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 bf24b7.patch diff --git a/bf24b7.patch b/bf24b7.patch new file mode 100644 index 0000000..7b5e21d --- /dev/null +++ b/bf24b7.patch @@ -0,0 +1,22 @@ +From bf24b7d8d17da34be720c19e5978b2d3bf94a53b Mon Sep 17 00:00:00 2001 +From: franekmagiera +Date: Sun, 12 May 2024 22:08:24 +0200 +Subject: [PATCH] Use an invalid URI that will not cause httpbin to throw 500 + +--- + tests/test_requests.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test_requests.py b/tests/test_requests.py +index d05febeef5..b4e9fe92ae 100644 +--- a/tests/test_requests.py ++++ b/tests/test_requests.py +@@ -2721,7 +2721,7 @@ def test_preparing_bad_url(self, url): + with pytest.raises(requests.exceptions.InvalidURL): + r.prepare() + +- @pytest.mark.parametrize("url, exception", (("http://localhost:-1", InvalidURL),)) ++ @pytest.mark.parametrize("url, exception", (("http://:1", InvalidURL),)) + def test_redirecting_to_bad_url(self, httpbin, url, exception): + with pytest.raises(exception): + requests.get(httpbin("redirect-to"), params={"url": url}) diff --git a/python-requests.spec b/python-requests.spec index 2fd5d3e..1fd1522 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -24,6 +24,9 @@ Patch: system-certs.patch # This change is backported also into RHEL 9.4 (via CS) Patch: support_IPv6_CIDR_in_no_proxy.patch +# Fix FTBFS (test_redirecting_to_bad_url) +Patch: https://github.com/psf/requests/commit/bf24b7.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} @@ -100,6 +103,7 @@ sed -i "/pytest.warns/s/None//" tests/test_requests.py %changelog * Tue May 14 2024 Lumír Balhar - 2.31.0-5 - Add support for IPv6 CIDR in no_proxy setting +- Fix FTBFS * Thu Apr 11 2024 Lumír Balhar - 2.31.0-4 - Fix compatibility with pytest 8 From 4916dd33717af8e24d107dd59a7c4d4b0ee9dddd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 12:15:06 +0200 Subject: [PATCH 143/165] Bootstrap for Python 3.13 --- python-requests.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 1fd1522..51a5bb5 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %bcond tests %{undefined rhel} @@ -6,7 +7,7 @@ Name: python-requests Version: 2.31.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -101,6 +102,9 @@ sed -i "/pytest.warns/s/None//" tests/test_requests.py %changelog +* Fri Jun 07 2024 Python Maint - 2.31.0-6 +- Bootstrap for Python 3.13 + * Tue May 14 2024 Lumír Balhar - 2.31.0-5 - Add support for IPv6 CIDR in no_proxy setting - Fix FTBFS From 2e1de3d0e8fe81af34f6728901de0254aae64702 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 13:00:54 +0200 Subject: [PATCH 144/165] Rebuilt for Python 3.13 --- python-requests.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 51a5bb5..ebc7e28 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %bcond tests %{undefined rhel} @@ -7,7 +6,7 @@ Name: python-requests Version: 2.31.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -102,6 +101,9 @@ sed -i "/pytest.warns/s/None//" tests/test_requests.py %changelog +* Sun Jun 09 2024 Python Maint - 2.31.0-7 +- Rebuilt for Python 3.13 + * Fri Jun 07 2024 Python Maint - 2.31.0-6 - Bootstrap for Python 3.13 From 89e46163b4f409425db78ab1861234214e0fa10e Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 19 Jun 2024 14:12:29 +0200 Subject: [PATCH 145/165] Update to 2.32.3 (rhbz#2281881) and fix CVE-2024-35195 (rhbz#2282205) --- .gitignore | 1 + bf24b7.patch | 22 ----------- python-requests.spec | 20 +++++----- sources | 2 +- support_IPv6_CIDR_in_no_proxy.patch | 45 +++++++++++---------- system-certs.patch | 61 +++++++++++++++-------------- 6 files changed, 67 insertions(+), 84 deletions(-) delete mode 100644 bf24b7.patch diff --git a/.gitignore b/.gitignore index 67de33d..7c27bec 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /requests-v2.28.1.tar.gz /requests-v2.28.2.tar.gz /requests-v2.31.0.tar.gz +/requests-v2.32.3.tar.gz diff --git a/bf24b7.patch b/bf24b7.patch deleted file mode 100644 index 7b5e21d..0000000 --- a/bf24b7.patch +++ /dev/null @@ -1,22 +0,0 @@ -From bf24b7d8d17da34be720c19e5978b2d3bf94a53b Mon Sep 17 00:00:00 2001 -From: franekmagiera -Date: Sun, 12 May 2024 22:08:24 +0200 -Subject: [PATCH] Use an invalid URI that will not cause httpbin to throw 500 - ---- - tests/test_requests.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test_requests.py b/tests/test_requests.py -index d05febeef5..b4e9fe92ae 100644 ---- a/tests/test_requests.py -+++ b/tests/test_requests.py -@@ -2721,7 +2721,7 @@ def test_preparing_bad_url(self, url): - with pytest.raises(requests.exceptions.InvalidURL): - r.prepare() - -- @pytest.mark.parametrize("url, exception", (("http://localhost:-1", InvalidURL),)) -+ @pytest.mark.parametrize("url, exception", (("http://:1", InvalidURL),)) - def test_redirecting_to_bad_url(self, httpbin, url, exception): - with pytest.raises(exception): - requests.get(httpbin("redirect-to"), params={"url": url}) diff --git a/python-requests.spec b/python-requests.spec index ebc7e28..5006660 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -5,8 +5,8 @@ %bcond extras %{undefined rhel} Name: python-requests -Version: 2.31.0 -Release: 7%{?dist} +Version: 2.32.3 +Release: 1%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -24,9 +24,6 @@ Patch: system-certs.patch # This change is backported also into RHEL 9.4 (via CS) Patch: support_IPv6_CIDR_in_no_proxy.patch -# Fix FTBFS (test_redirecting_to_bad_url) -Patch: https://github.com/psf/requests/commit/bf24b7.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} @@ -66,17 +63,13 @@ designed to make HTTP requests easy for developers. %autosetup -p1 -n requests-%{version} # env shebang in nonexecutable file -sed -i '/#!\/usr\/.*python/d' requests/certs.py +sed -i '/#!\/usr\/.*python/d' src/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//' pyproject.toml -# Fix compatibility with pytest 8 -# Upstream report: https://github.com/psf/requests/issues/6679 -sed -i "/pytest.warns/s/None//" tests/test_requests.py - %build %pyproject_wheel @@ -90,8 +83,9 @@ sed -i "/pytest.warns/s/None//" tests/test_requests.py %check %pyproject_check_import %if %{with tests} +# test_unicode_header_name - reported: https://github.com/psf/requests/issues/6734 # test_use_proxy_from_environment needs pysocks -%pytest -v tests %{!?with_extras:-k "not test_use_proxy_from_environment"} +%pytest -v tests -k "not test_unicode_header_name %{!?with_extras:and not test_use_proxy_from_environment}" %endif @@ -101,6 +95,10 @@ sed -i "/pytest.warns/s/None//" tests/test_requests.py %changelog +* Wed Jun 19 2024 Lumír Balhar - 2.32.3-1 +- Update to 2.32.3 (rhbz#2281881) +- Fix for CVE-2024-35195 (rhbz#2282205) + * Sun Jun 09 2024 Python Maint - 2.31.0-7 - Rebuilt for Python 3.13 diff --git a/sources b/sources index 3e4fef8..2c91835 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.31.0.tar.gz) = 43f536bdb2360fcceb24ef98e995ffa66cdefc2c502629f17a5722445bfa9ad8489201958c846c2aaef37e427f95a4d56e321a91095c69754680abfd83b39150 +SHA512 (requests-v2.32.3.tar.gz) = ea3e85e035efed0fe22bf8640491ffb20c2ac50359bb1e11c9147ed850cac5e4a6a36ab58a48fc6c6d6a44df2b511e8a5d902444c034da6baa6adc5f9417697f diff --git a/support_IPv6_CIDR_in_no_proxy.patch b/support_IPv6_CIDR_in_no_proxy.patch index f8b7285..93bcff9 100644 --- a/support_IPv6_CIDR_in_no_proxy.patch +++ b/support_IPv6_CIDR_in_no_proxy.patch @@ -1,21 +1,23 @@ -From 4f89a66430e4f701b11fdeb9e253af87e29e6f0b Mon Sep 17 00:00:00 2001 +From 91526670ad66e83e799459cb23b031b88bb680b4 Mon Sep 17 00:00:00 2001 From: Derek Higgins -Date: Fri, 8 Oct 2021 11:12:27 +0100 -Subject: [PATCH] Add ipv6 support to should_bypass_proxies +Date: Thu, 30 May 2024 11:15:18 +0200 +Subject: [PATCH 2/2] Add ipv6 support to should_bypass_proxies Add support to should_bypass_proxies to support IPv6 ipaddresses and CIDRs in no_proxy. Includes adding IPv6 support to various other helper functions. + +Co-authored-by: Lumir Balhar --- - requests/utils.py | 83 ++++++++++++++++++++++++++++++++++++------- + src/requests/utils.py | 83 ++++++++++++++++++++++++++++++++++++------- tests/test_utils.py | 66 +++++++++++++++++++++++++++++++--- 2 files changed, 132 insertions(+), 17 deletions(-) diff --git a/src/requests/utils.py b/src/requests/utils.py -index 1ae77d68ff..6a026e2d32 100644 ---- a/requests/utils.py -+++ b/requests/utils.py -@@ -674,18 +674,46 @@ def requote_uri(uri): +index ae6c42f..0363698 100644 +--- a/src/requests/utils.py ++++ b/src/requests/utils.py +@@ -679,18 +679,46 @@ def requote_uri(uri): return quote(uri, safe=safe_without_percent) @@ -65,7 +67,7 @@ index 1ae77d68ff..6a026e2d32 100644 return (ipaddr & netmask) == (network & netmask) -@@ -705,12 +733,39 @@ def is_ipv4_address(string_ip): +@@ -710,12 +738,39 @@ def is_ipv4_address(string_ip): :rtype: bool """ try: @@ -106,7 +108,7 @@ index 1ae77d68ff..6a026e2d32 100644 def is_valid_cidr(string_network): """ Very simple check of the cidr format in no_proxy variable. -@@ -718,17 +773,19 @@ def is_valid_cidr(string_network): +@@ -723,17 +778,19 @@ def is_valid_cidr(string_network): :rtype: bool """ if string_network.count("/") == 1: @@ -133,7 +135,7 @@ index 1ae77d68ff..6a026e2d32 100644 return False else: return False -@@ -785,12 +842,12 @@ def get_proxy(key): +@@ -790,12 +847,12 @@ def should_bypass_proxies(url, no_proxy): # the end of the hostname, both with and without the port. no_proxy = (host for host in no_proxy.replace(" ", "").split(",") if host) @@ -149,10 +151,10 @@ index 1ae77d68ff..6a026e2d32 100644 # matches the IP of the index return True diff --git a/tests/test_utils.py b/tests/test_utils.py -index 8988eaf69c..44a3b790d2 100644 +index 5e9b56e..befbb46 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py -@@ -14,9 +14,11 @@ +@@ -14,9 +14,11 @@ from requests._internal_utils import unicode_is_ascii from requests.cookies import RequestsCookieJar from requests.structures import CaseInsensitiveDict from requests.utils import ( @@ -164,7 +166,7 @@ index 8988eaf69c..44a3b790d2 100644 dotted_netmask, extract_zipped_paths, get_auth_from_url, -@@ -263,8 +265,15 @@ def test_invalid(self, value): +@@ -263,8 +265,15 @@ class TestIsIPv4Address: class TestIsValidCIDR: @@ -182,7 +184,7 @@ index 8988eaf69c..44a3b790d2 100644 @pytest.mark.parametrize( "value", -@@ -274,6 +283,11 @@ def test_valid(self): +@@ -274,6 +283,11 @@ class TestIsValidCIDR: "192.168.1.0/128", "192.168.1.0/-1", "192.168.1.999/24", @@ -194,7 +196,7 @@ index 8988eaf69c..44a3b790d2 100644 ), ) def test_invalid(self, value): -@@ -287,6 +301,12 @@ def test_valid(self): +@@ -287,6 +301,12 @@ class TestAddressInNetwork: def test_invalid(self): assert not address_in_network("172.16.0.1", "192.168.1.0/24") @@ -233,10 +235,10 @@ index 8988eaf69c..44a3b790d2 100644 ) assert should_bypass_proxies(url, no_proxy=None) == expected -@@ -924,3 +949,36 @@ def test_set_environ_raises_exception(): - raise Exception("Expected exception") - - assert "Expected exception" in str(exception.value) +@@ -956,3 +981,36 @@ def test_should_bypass_proxies_win_registry_ProxyOverride_value(monkeypatch): + monkeypatch.setattr(winreg, "OpenKey", OpenKey) + monkeypatch.setattr(winreg, "QueryValueEx", QueryValueEx) + assert should_bypass_proxies("http://example.com/", None) is False + + +@pytest.mark.parametrize( @@ -270,3 +272,6 @@ index 8988eaf69c..44a3b790d2 100644 +) +def test_compare_ips(a, b, expected): + assert compare_ips(a, b) == expected +-- +2.45.1 + diff --git a/system-certs.patch b/system-certs.patch index 0e323f8..efc0010 100644 --- a/system-certs.patch +++ b/system-certs.patch @@ -1,36 +1,17 @@ -From fbe9d1e38da72d8caac365841794b06614523ac9 Mon Sep 17 00:00:00 2001 +From bb733473e91e71b812ada46bc110f607630f9327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= -Date: Tue, 17 Oct 2023 10:44:42 +0200 -Subject: [PATCH] system certs +Date: Thu, 30 May 2024 11:10:29 +0200 +Subject: [PATCH 1/2] system certs Co-authored-by: Lumir Balhar --- - requests/certs.py | 7 ++++++- - setup.cfg | 1 - - setup.py | 1 - - 3 files changed, 6 insertions(+), 3 deletions(-) + setup.cfg | 1 - + setup.py | 1 - + src/requests/certs.py | 8 +++++++- + 3 files changed, 7 insertions(+), 3 deletions(-) -diff --git a/requests/certs.py b/requests/certs.py -index 1f30a45..9224f62 100644 ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -9,8 +9,13 @@ 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. -+ -+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided -+by the ca-certificates RPM package. - """ --from certifi import where -+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.cfg b/setup.cfg -index bf21c81..906c0f1 100644 +index 8d44e0e..fa10a53 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,6 @@ provides-extra = @@ -40,9 +21,9 @@ index bf21c81..906c0f1 100644 - certifi>=2017.4.17 charset_normalizer>=2,<4 idna>=2.5,<4 - urllib3>=1.21.1,<1.27 + urllib3>=1.21.1,<3 diff --git a/setup.py b/setup.py -index 0123545..ec3fd1d 100755 +index 1b0eb37..03d19b0 100755 --- a/setup.py +++ b/setup.py @@ -62,7 +62,6 @@ requires = [ @@ -53,6 +34,26 @@ index 0123545..ec3fd1d 100755 ] test_requirements = [ "pytest-httpbin==2.0.0", +diff --git a/src/requests/certs.py b/src/requests/certs.py +index be422c3..9aee713 100644 +--- a/src/requests/certs.py ++++ b/src/requests/certs.py +@@ -10,8 +10,14 @@ 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. ++ ++This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided ++by the ca-certificates RPM package. + """ +-from certifi import where ++ ++def where(): ++ """Return the absolute path to the system CA bundle.""" ++ return '/etc/pki/tls/certs/ca-bundle.crt' + + if __name__ == "__main__": + print(where()) -- -2.41.0 +2.45.1 From bb3f7150b77abf41c00094918d898aac6e7040a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 15:22:55 +0000 Subject: [PATCH 146/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 5006660..d2e69d7 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.32.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -95,6 +95,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 2.32.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Lumír Balhar - 2.32.3-1 - Update to 2.32.3 (rhbz#2281881) - Fix for CVE-2024-35195 (rhbz#2282205) From 5c20e1e89b2087acba07195be52a4b6f1c63bc1f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 1 Aug 2024 13:08:06 -0700 Subject: [PATCH 147/165] Backport PR #6781 to fix crash on import (#2297632) --- ...ault-SSLContext-if-CA-bundle-isn-t-p.patch | 36 +++++++++++++++++++ python-requests.spec | 10 +++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch diff --git a/0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch b/0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch new file mode 100644 index 0000000..14ca3a1 --- /dev/null +++ b/0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch @@ -0,0 +1,36 @@ +From 08e863f94fe93b4b3bd2e8267234be7a23350b1d Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 1 Aug 2024 12:58:38 -0700 +Subject: [PATCH] Don't create default SSLContext if CA bundle isn't present + +Similar to e18879932287c2bf4bcee4ddf6ccb8a69b6fc656 , this also +skips creation of the default SSLContext on FileNotFoundError, +which is raised if DEFAULT_CA_BUNDLE_PATH does not exist. + +See: https://bugzilla.redhat.com/show_bug.cgi?id=2297632 + +Signed-off-by: Adam Williamson +--- + src/requests/adapters.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/requests/adapters.py b/src/requests/adapters.py +index 9a58b160..fb151a95 100644 +--- a/src/requests/adapters.py ++++ b/src/requests/adapters.py +@@ -81,9 +81,10 @@ try: + _preloaded_ssl_context.load_verify_locations( + extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH) + ) +-except ImportError: ++except (ImportError, FileNotFoundError): + # Bypass default SSLContext creation when Python +- # interpreter isn't built with the ssl module. ++ # interpreter isn't built with the ssl module, or ++ # DEFAULT_CA_BUNDLE_PATH isn't present + _preloaded_ssl_context = None + + +-- +2.45.2 + diff --git a/python-requests.spec b/python-requests.spec index d2e69d7..ce41620 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ Name: python-requests Version: 2.32.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -24,6 +24,11 @@ Patch: system-certs.patch # This change is backported also into RHEL 9.4 (via CS) Patch: support_IPv6_CIDR_in_no_proxy.patch +# Fix crash on import if /etc/pki/tls/certs/ca-bundle.crt is missing +# https://bugzilla.redhat.com/show_bug.cgi?id=2297632 +# https://github.com/psf/requests/pull/6781 +Patch: 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} @@ -95,6 +100,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Thu Aug 01 2024 Adam Williamson - 2.32.3-3 +- Backport PR #6781 to fix crash on import if CA cert bundle is missing (#2297632) + * Fri Jul 19 2024 Fedora Release Engineering - 2.32.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 15fe6d3df847daf840e28eeade6461b72d4b0d71 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 1 Aug 2024 13:36:56 -0700 Subject: [PATCH 148/165] Add a note that PR #6781 should be superseded by #6767 --- python-requests.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-requests.spec b/python-requests.spec index ce41620..0c455c0 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -27,6 +27,8 @@ Patch: support_IPv6_CIDR_in_no_proxy.patch # Fix crash on import if /etc/pki/tls/certs/ca-bundle.crt is missing # https://bugzilla.redhat.com/show_bug.cgi?id=2297632 # https://github.com/psf/requests/pull/6781 +# Note: this can be replaced by https://github.com/psf/requests/pull/6767 +# when it is ready, or dropped in a release where that is merged Patch: 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch BuildArch: noarch From 37d17a50d9fb192898601aa899e73d7de39e139e Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 6 Aug 2024 13:58:54 +0200 Subject: [PATCH 149/165] CI: Add the tmt plan and metadata --- .fmf/version | 1 + plan.fmf | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 .fmf/version create mode 100644 plan.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/plan.fmf b/plan.fmf new file mode 100644 index 0000000..32fd69f --- /dev/null +++ b/plan.fmf @@ -0,0 +1,5 @@ +execute: + how: tmt +discover: + how: fmf + From 4b98833b9fcd478bbc995c4c72aa35e509786028 Mon Sep 17 00:00:00 2001 From: Adam Kolar Date: Tue, 6 Aug 2024 13:49:33 +0200 Subject: [PATCH 150/165] Import CI smoke test from RHEL This is taken and edited from RHEL distgit tests/python-requests, directory Sanity/smoke. The commit hash this was copied from: 050c2979f27cc70506ddf669f9e0803a7b67c2d5 Only the necessary files were kept. Co-authored-by: Lukas Zachar --- tests/smoke/main.fmf | 6 +++++ tests/smoke/runtest.sh | 54 ++++++++++++++++++++++++++++++++++++++++++ tests/smoke/test.py | 11 +++++++++ 3 files changed, 71 insertions(+) create mode 100644 tests/smoke/main.fmf create mode 100755 tests/smoke/runtest.sh create mode 100644 tests/smoke/test.py diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..b10b038 --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,6 @@ +summary: Basic sanity test for python-requests +test: ./runtest.sh +framework: beakerlib +require: + - python3-requests +duration: 5m diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100755 index 0000000..3a28ed0 --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,54 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/python-requests/Sanity/smoke +# Description: Basic sanity test for python-requests module. +# Author: Adam Kolar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2013 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGES=${PACKAGES:-"python3-requests"} + +PYTHON=${PYTHON:-"python"} +TEST="test.py" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm --all + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "cp $TEST $TmpDir" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest + rlRun "$PYTHON $TEST" 0 "Running sanity test for python requests" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/smoke/test.py b/tests/smoke/test.py new file mode 100644 index 0000000..e296ef0 --- /dev/null +++ b/tests/smoke/test.py @@ -0,0 +1,11 @@ +import requests +from requests import * + +class ExceptionRequests(Exception): + pass + +if __name__=="__main__": + r=requests.get('https://redhat.com') + if r.status_code!=200 or \ + not r.text or r.encoding.lower() != 'utf-8': + raise ExceptionRequests("Sanity error") From 8cc6ff985774cad944e9ad3f93367d4875565377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Tue, 6 Aug 2024 13:57:28 +0200 Subject: [PATCH 151/165] Import CI ipv6-noproxy-cidr test from RHEL This is from RHEL distgit tests/python-requests, directory Sanity/ipv6-noproxy-cidr. The commit hash this was copied from: 050c2979f27cc70506ddf669f9e0803a7b67c2d5 Only the necessary files were kept. --- tests/ipv6-noproxy-cidr/main.fmf | 7 +++ tests/ipv6-noproxy-cidr/repro.py | 74 +++++++++++++++++++++++++++++++ tests/ipv6-noproxy-cidr/server.py | 25 +++++++++++ 3 files changed, 106 insertions(+) create mode 100644 tests/ipv6-noproxy-cidr/main.fmf create mode 100644 tests/ipv6-noproxy-cidr/repro.py create mode 100644 tests/ipv6-noproxy-cidr/server.py diff --git a/tests/ipv6-noproxy-cidr/main.fmf b/tests/ipv6-noproxy-cidr/main.fmf new file mode 100644 index 0000000..d1fbe51 --- /dev/null +++ b/tests/ipv6-noproxy-cidr/main.fmf @@ -0,0 +1,7 @@ +require: +- nmap-ncat +- python3 +- python3-requests + +test: "${PYTHON:-python3} repro.py" +tty: "true" diff --git a/tests/ipv6-noproxy-cidr/repro.py b/tests/ipv6-noproxy-cidr/repro.py new file mode 100644 index 0000000..000ca17 --- /dev/null +++ b/tests/ipv6-noproxy-cidr/repro.py @@ -0,0 +1,74 @@ +import subprocess +import requests +import os +import time +import atexit + +subprocesses = [] + +python = os.environ.get("PYTHON","python3") +server_url = os.environ.get("SERVER_URL", None) +testing_no_proxy = os.environ.get("TESTING_NO_PROXY", None) + +# Clean up +@atexit.register +def cleanup(): + print("Cleaning up subprocesses") + for process in subprocesses: + process.terminate() + + time.sleep(1) + + for process in subprocesses: + process.wait() + +# Part one, assert that everything works +if server_url is None: + print("starting server") + p = subprocess.Popen([python, "server.py"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + subprocesses.append(p) + time.sleep(1) + server_url = "http://[::1]:8888" + no_proxy = "::1/128" +else: + print(f"using provided {server_url} as server") + print(f"using provided {testing_no_proxy} as NO_PROXY value") + assert testing_no_proxy, "TESTING_NO_PROXY envar missing" + +# Send request and check the response + +print("sending first request") +assert requests.get(server_url, timeout=2).text.startswith("Hello") + + +# Part two, dummy proxy causes timeout, that's fine + +# Start proxy +print("starting proxy") +p = subprocess.Popen(["nc", "-k", "-l", "10000"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocesses.append(p) +time.sleep(1) + +# Set proxy to environment +os.environ["HTTP_PROXY"] = "http://127.0.0.1:10000" + +# Send request, expect timeout because proxy is dummy and do not respond +print("Sending request via proxy") +try: + requests.get(server_url, timeout=2) +except requests.exceptions.ReadTimeout: + print("timeout is fine, expected") + pass + +# Part three, NO_PROXY bypass the proxy and the request should work as before + +os.environ["NO_PROXY"] = testing_no_proxy or no_proxy + +print("sending last request") +try: + assert requests.get(server_url, timeout=2).text.startswith("Hello") +except requests.exceptions.ReadTimeout: + print("PROBLEM - the last request timed out, NO_PROXY setting does not work!") + raise SystemExit(1) +else: + print("OK - NO_PROXY setting works fine - the last request bypassed proxy") diff --git a/tests/ipv6-noproxy-cidr/server.py b/tests/ipv6-noproxy-cidr/server.py new file mode 100644 index 0000000..2d2c603 --- /dev/null +++ b/tests/ipv6-noproxy-cidr/server.py @@ -0,0 +1,25 @@ +from http.server import SimpleHTTPRequestHandler, HTTPServer +import socket +import sys +class IPv6OnlyHandler(SimpleHTTPRequestHandler): + def do_GET(self): + client_address = self.client_address[0] + # Check if the client address is an IPv6 address + if ":" in client_address: + self.send_response(200) + self.send_header('Content-type', 'text/plain') + self.end_headers() + self.wfile.write(b'Hello') + else: + # Raise a RuntimeError if the client address is an IPv4 address + raise SystemExit(f"IPv4 address ({client_address}) detected. Only IPv6 addresses are allowed.") + +class HTTPServerV6(HTTPServer): + address_family = socket.AF_INET6 + +if __name__ == '__main__': + # Use IPv6 address and port 8080 + server_address = ('::', 8888) + httpd = HTTPServerV6(server_address, IPv6OnlyHandler) + print('Server running on port 8888...') + httpd.serve_forever() From c5fddd17930c997e57fc64b8c394608e939cf1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Tue, 6 Aug 2024 13:54:29 +0200 Subject: [PATCH 152/165] Import CI upstream test from RHEL This is cherry-picked and edited from RHEL distgit tests/python-requests, directory Sanity/upstream. The commit hash this was copied from: 050c2979f27cc70506ddf669f9e0803a7b67c2d5 Only the necessary files were kept. python3-httpbin is installed from Fedora repositories, as installing it from PyPI requires compiling greenlet which doesn't have wheels for Python 3.13 yet. --- tests/upstream/main.fmf | 14 +++++++ tests/upstream/runtest.sh | 80 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 tests/upstream/main.fmf create mode 100755 tests/upstream/runtest.sh diff --git a/tests/upstream/main.fmf b/tests/upstream/main.fmf new file mode 100644 index 0000000..d5d026a --- /dev/null +++ b/tests/upstream/main.fmf @@ -0,0 +1,14 @@ +summary: Runs upstream test suite +require: + - python3-requests + - python3-pip + - python3-pytest + - python3-cryptography + - python3-devel + - python3-httpbin + - rpm-build + - gcc + - gcc-c++ +test: ./runtest.sh +framework: beakerlib +duration: 30m diff --git a/tests/upstream/runtest.sh b/tests/upstream/runtest.sh new file mode 100755 index 0000000..b57824e --- /dev/null +++ b/tests/upstream/runtest.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/python-requests/Sanity/upstream +# Description: Runs upstream test suite +# Author: Lukas Zachar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2019 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGES="${PACKAGES:-python3-requests}" +PYTHON="${PYTHON:-python}" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm --all + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + rlRun "pushd $TmpDir" + + # So we can inject version of srpm + if [[ -z "$FORCE_SRPM" ]]; then + rlRun "rlFetchSrcForInstalled $(rpm --qf '%{name}' -qf $($PYTHON -c 'import requests;print(requests.__file__)'))" + else + rlRun "rlRpmDownload $FORCE_SRPM" + fi + rlRun "rpm -i --define '_topdir $TmpDir' --nodeps *rpm" + rlRun "rpmbuild -bp --define '_topdir $TmpDir' --nodeps $TmpDir/SPECS/*" + + # Remove module from extracted sources so installed one is used + rlRun "rm -rf $TmpDir/BUILD/*requests*/requests*/src" + + # pip-install libraries not in the repos + # pytest is installed in fmf requirement + rlRun "$PYTHON -m pip install pytest-mock==3.12.0 trustme==1.1.0 werkzeug==3.0.3 \ + pytest-httpbin==2.0.0" + + # Move to test dir, print what is there + rlRun "cd $(dirname $TmpDir/BUILD/*requests*/requests*/tests)" + rlRun "touch tests/requirements-dev.txt" + rlRun "find . -type f" + rlRun "yum repolist" + rlRun "$PYTHON -m pip list" + rlPhaseEnd + + rlPhaseStartTest "$EXTRA_PARAMS" + # test_unicode_header_name hangs with urllib3 < 2 + rlRun 'pytest -v -p no:warnings --junit-xml $TmpDir/result.xml -k "not test_use_proxy_from_environment and not test_unicode_header_name"' + + rlAssertGrep ' Date: Sun, 11 Aug 2024 22:02:15 -0400 Subject: [PATCH 153/165] 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. azure-cli). 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-requests.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 0c455c0..950ebc7 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -2,7 +2,8 @@ # RHEL does not include the test dependencies %bcond tests %{undefined rhel} # The extras are disabled on RHEL to avoid pysocks and deprecated requests[security] -%bcond extras %{undefined rhel} +%bcond extras %[%{undefined rhel} || %{defined eln}] +%bcond extradeps %{undefined rhel} Name: python-requests Version: 2.32.3 @@ -63,7 +64,7 @@ designed to make HTTP requests easy for developers. %generate_buildrequires -%pyproject_buildrequires %{?with_extras:-x security,socks} +%pyproject_buildrequires %{?with_extradeps:-x security,socks} %prep @@ -92,7 +93,7 @@ sed -i 's/ --doctest-modules//' pyproject.toml %if %{with tests} # test_unicode_header_name - reported: https://github.com/psf/requests/issues/6734 # test_use_proxy_from_environment needs pysocks -%pytest -v tests -k "not test_unicode_header_name %{!?with_extras:and not test_use_proxy_from_environment}" +%pytest -v tests -k "not test_unicode_header_name %{!?with_extradeps:and not test_use_proxy_from_environment}" %endif From 003986f6c0d0517b1629242f362d4d9e9e758cc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 18:48:49 +0000 Subject: [PATCH 154/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- python-requests.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 950ebc7..5514b4a 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,7 +7,7 @@ Name: python-requests Version: 2.32.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -103,6 +103,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 2.32.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Aug 01 2024 Adam Williamson - 2.32.3-3 - Backport PR #6781 to fix crash on import if CA cert bundle is missing (#2297632) From 97f1d2362881b1af5206dce981af54e8de79640a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 15 Apr 2025 10:47:10 -0400 Subject: [PATCH 155/165] Backport test-cert. fixes for urllib3 2.4.0 compatibility --- ...09661335bd3dd8a7e39f04d07b42e519becc.patch | 31 + 6924.patch | 55 ++ ...bdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch | 685 ++++++++++++++++++ python-requests.spec | 28 +- 4 files changed, 798 insertions(+), 1 deletion(-) create mode 100644 507409661335bd3dd8a7e39f04d07b42e519becc.patch create mode 100644 6924.patch create mode 100644 9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch diff --git a/507409661335bd3dd8a7e39f04d07b42e519becc.patch b/507409661335bd3dd8a7e39f04d07b42e519becc.patch new file mode 100644 index 0000000..13b0001 --- /dev/null +++ b/507409661335bd3dd8a7e39f04d07b42e519becc.patch @@ -0,0 +1,31 @@ +From 507409661335bd3dd8a7e39f04d07b42e519becc Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Mon, 17 Feb 2025 00:39:07 +0000 +Subject: [PATCH] Add CA constraint to test CA + +Otherwise recent versions of OpenSSL reject it as an invalid CA +certificate (at least once the test certificates are regenerated). + +Fixes: #6896 +--- + tests/certs/expired/ca/ca.cnf | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/certs/expired/ca/ca.cnf b/tests/certs/expired/ca/ca.cnf +index 8c4b823053..1443cb9374 100644 +--- a/tests/certs/expired/ca/ca.cnf ++++ b/tests/certs/expired/ca/ca.cnf +@@ -4,9 +4,13 @@ prompt = no + default_md = sha256 + encrypt_key = no + distinguished_name = dn ++x509_extensions = v3_ca + + [dn] + C = US # country code + O = Python Software Foundation # organization + OU = python-requests # organization unit/department + CN = Self-Signed Root CA # common name / your cert name ++ ++[v3_ca] ++basicConstraints = critical, CA:true diff --git a/6924.patch b/6924.patch new file mode 100644 index 0000000..02bf4e7 --- /dev/null +++ b/6924.patch @@ -0,0 +1,55 @@ +From 2019450b43511289d45c6b3e7376f2813e1c27b4 Mon Sep 17 00:00:00 2001 +From: Richard van den Berg +Date: Sat, 29 Mar 2025 14:53:45 +0100 +Subject: [PATCH] Add key usage extension to test ca.crt + +--- + tests/certs/expired/ca/ca.cnf | 1 + + tests/certs/expired/ca/ca.crt | 20 ++++++++++---------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +diff --git a/tests/certs/expired/ca/ca.cnf b/tests/certs/expired/ca/ca.cnf +index 1443cb9374..09fcb6de1c 100644 +--- a/tests/certs/expired/ca/ca.cnf ++++ b/tests/certs/expired/ca/ca.cnf +@@ -14,3 +14,4 @@ CN = Self-Signed Root CA # common name / your cert name + + [v3_ca] + basicConstraints = critical, CA:true ++keyUsage = critical, cRLSign, digitalSignature, keyCertSign +diff --git a/tests/certs/expired/ca/ca.crt b/tests/certs/expired/ca/ca.crt +index f08b2d67a5..2c8ebd44ae 100644 +--- a/tests/certs/expired/ca/ca.crt ++++ b/tests/certs/expired/ca/ca.crt +@@ -1,8 +1,8 @@ + -----BEGIN CERTIFICATE----- +-MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL ++MIIDpDCCAoygAwIBAgIUQt0yyZmppkHKNx4aXRrmD5tvjbswDQYJKoZIhvcNAQEL + BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu + ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt +-U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMzI5MTM1MTQ1WhcNNDUwMzI0MTM1MTQ1WjBq + MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp + b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu + ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ +@@ -11,12 +11,12 @@ dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe + ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ + C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz + zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 +-/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU +-CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG +-0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ +-wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG +-Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum +-b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb +-UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb +-KOWpOS3fbsI= ++/kqHpCgUwUc4Dq0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E ++BAMCAYYwHQYDVR0OBBYEFAhGiD3+10LBrdMW3+j/ceXMXSqcMA0GCSqGSIb3DQEB ++CwUAA4IBAQBRT21cyZ0Jx0JLA2ilYTLvpMsSryGyWrCOXlmRlBt1MAhmxdTRgCmu ++UB3UU2pfnrC16UeMVVS411lhzjowFXkXrjAqSUBRcetUIYHlpnGgDdUl4dV/X5kx ++HxD9VUBx/QwGeyzFhjzjeN89M2v9kPnhU/kkVfcsafwYiHdC6pwN6zeZNz7JP+GS ++rmI+KVpm5C+Nz6ekm3TR8rFgPIsiDTbY3qj/DNYX2+NhpU1DZfm687vhOr3Ekljx ++NHNu9++STEjGpirrI8EqQnK+FP2fRJ5D82YZM0d++8tmHKpY0+FRCr8//459sgun ++CojmhIobDa2NuF81Jx6Cc7lagCPG3/Ts + -----END CERTIFICATE----- diff --git a/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch b/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch new file mode 100644 index 0000000..003973f --- /dev/null +++ b/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch @@ -0,0 +1,685 @@ +From 9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Mon, 17 Feb 2025 00:41:30 +0000 +Subject: [PATCH] Regenerate test certificates + +Created using the following command with OpenSSL 3.4.0: + + for cert in expired mtls valid/server; do + make -C tests/certs/$cert clean all + done +--- + tests/certs/expired/ca/ca-private.key | 52 +++++++++--------- + tests/certs/expired/ca/ca.crt | 38 ++++++------- + tests/certs/expired/ca/ca.srl | 2 +- + tests/certs/expired/server/server.csr | 24 ++++----- + tests/certs/expired/server/server.key | 52 +++++++++--------- + tests/certs/expired/server/server.pem | 77 ++++++++++++++------------- + tests/certs/mtls/client/client.csr | 24 ++++----- + tests/certs/mtls/client/client.key | 52 +++++++++--------- + tests/certs/mtls/client/client.pem | 77 ++++++++++++++------------- + tests/certs/valid/server/server.csr | 24 ++++----- + tests/certs/valid/server/server.key | 52 +++++++++--------- + tests/certs/valid/server/server.pem | 77 +++++++++++++-------------- + 12 files changed, 279 insertions(+), 272 deletions(-) + +diff --git a/tests/certs/expired/ca/ca-private.key b/tests/certs/expired/ca/ca-private.key +index 507b1f5623..8aa400e043 100644 +--- a/tests/certs/expired/ca/ca-private.key ++++ b/tests/certs/expired/ca/ca-private.key +@@ -1,28 +1,28 @@ + -----BEGIN PRIVATE KEY----- +-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHlIhe7GLCeSk8 +-RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He +-mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK +-na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 +-fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm +-zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy +-e6lzFyWnAgMBAAECggEAFwzHhzcD3PQDWCus85PwZoxTeQ817BmUBGpBBOKM0gLG +-GCsT7XsmGP2NjICBy9OK+QTKawmb/wR5XK0OMUWDHXqtWn+NFIyojyo8+HEeCf8n +-4ZleTFHLnJ+d2N1etbc2qc9mY3tjpaurq8/0Tol9YH06ock1TY2+lO+a5HvMURnY +-hcWs70CamL+5B/6n67DhjzMtIW3dIXuEEceM1BW/jW8SKq0JHpQ3t+OJwID7zFaJ +-bLyOwAVheMzVGvN3yphf8tll3tMA65bNjdOzgOfZSjAy7EGjW3DyAolDw9jKLRyu +-E0gw/exNGe618oMIeUDv0KParlL4RjdiUP8l0xYOwQKBgQD3eYj9rWeqZquI9vKP +-gaSv6urb2UJLngShZUpEZRNJgBO+Ewiof0w8tpQdsnuMvWudxMLbzgiUNA+NyC/K +-CpzIXFkWnWx+A/pxs8ZO8moOfajVRayJgeOLsQZb7c4fXGsVGApbN4+cPNhTNG6d +-ucErv6tae/SzAzcLc5Vkw/ELxwKBgQDOdJ5Wl5JeKAvU/3kF6+MYWCrXxZqMjoHS +-y1BtyMX5RbdaWTCfDUu1aV3qJOJjjWQ9DJdJQcEsrTjOpD4bVdZx4w/XEG0JXAa3 +-jRypVHGdeG/TjhUGJA8U+KX3a1DkcdqM9pqFYRw5Ie95Wz9YRroI+YkixqpK8d7W +-C+5BodxXIQKBgCk8Lv9V7XgPM3XW8APJbk+BrTCEuu8unUbnQcCztssAdEmvkjnB +-PErBgVyRaNTCmzPmnTFS20sWgaD2QkBAFG+uM4n5ISK+NvTLJ7fv3IwdlAw1V9Jx +-uiCElrKqpTXEiHMzVkZss5ks6j6y9duCIBXSEhM5pERPvNRDphjsLTXxAoGARSNC +-nyb1Kjjo9XR0V+pNy6pC9q1C+00B5tCVZ55zxe114Hi70pfGQcM+YxnlAoeoCNW9 +-mBfAFDESNAlGjyrovIzYkiH7EcZSrYdBEOepgJ2DfWo4Wi0bK9+03K2AknAaS1iO +-GJqTtAJMSuymwu40gKroJNA42Q40nKO0LyCARGECgYEAiFRHkblBtStv22SpZxNC +-jim9yuM0ikh7Ij1lEHysc/GWb2RQNxQVk54BU2kQ0d9xwMZQTKvpF3VE9t7uGdwt +-AasWPr/tWYt35Ud0D4bNlagJJ4Xdslf8n1nkq3qqqDQbd7kkQRgwGzVr0uVg7ZfS +-26qSPQ0/aF9nagb5eHX3AuU= ++MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCfZUh82dF/r9GW ++89IN2vqOiMMuikIAO3SEI3+uSGCdWT13C+NnrFJ7XF/D6UGy1mvm8KfhSnapWoAk ++toyPXSc/GNzJzCwZool7xE+rm/0vbu1XbUcQcqB8nQRLzTChDIGuuD8DHs7bmen1 ++9sT5kZy0CIqac383cQxR8W1Fs48xEBJfuBBmyl+bz4ugPci96H4DIuAD2QvP2KKg ++Gqs4yyDPSmf86k9+okOsLMQVwGnHety+TPJawCn2aCXl+rmMTSCH2sUEc81cXaVQ ++Yxyf6HaqGncCs1O2MzeRbPugEzb5K4ZVM4NYtDMkxrQnZFCALf4XOma1uv5Kh6Qo ++FMFHOA6tAgMBAAECgf9YadXLawbJzLx0/smE5fIVHccmCYqSlmgK46XvBjaREO8H ++GZEJ8IvP4W09PiUzDbzMXLDCRouLZKevtZJB82nRlfjh9l5/2aho/nsytVO6+8yq ++sfK5LNvYQ0Aey7ItosJMJ+bL1ErphHZB+J9Jz3scYaCAC5CFMC+lREVYZEEI9QD4 ++P2D5QbmaSeu8jmL/H3fWHjNXWDprue3W/MIf96NZa3qJew45go4TAYYMe5i757KW ++Ja40VNfmsgbz4uI9oDXaYL/NkWUaQP1lnh+Mfrm1YnBe2wsLcP/WuM5h0bYzJW/1 ++ZeSrZM3fqCMW6SJyrVE1qzqvtw1xQBlrq0B6q0ECgYEA0fi4+ySFGR+mL6k5UjP1 ++roREqQgKaLgdhOvD88EnO93Nl6tJ3Qk8LyzPUNbxe1/xTUEKMtglBKOoxCHJJZlg ++xXnKBAQUtlmrLFKIGe+UCD+r+wfSpS6Sl7BUDmeCSczG9dPN5vnyZA4ixUke2SCC ++k4Eb9Q0AHyNnbXv928r0sfkCgYEAwlZRYmGTVva6cY2YEmMrqbWy4Wxm2Zmdo+Uq ++Xu1RZF9a3tGzNbGsyYdeLNY7vVZoVOm1paMJCA8ScNLFtCux2jEPqwqd1OZ8OLhA ++1VF3/kYtUSdqwLzWoS1RdD6mZCAHeOE+N0pone4lt3A2o8wtpHsaDA+XSTw2rHLR ++LVS+b1UCgYEAtezJ4Ze31pfMdrkpmCa69JVXpBj6Y9c6hGN+aWFuq/k22/WmTuRk ++h/9MNR+3JQ1w1l3HB1ytXkKqxBz92hz1csReG3Kpu4EfxYxQriAdY7Q/P4Z8pXAf ++xVwayEw439aUgIQef8UKllSFHeiH2NrJKCKSZZT5CQG06HCo+Fn1/4kCgYAYuwtY ++TbqGUpefY7l6fYxM6IZ/EWB1SIs7FCq0MdctwsS5nk4EAzxN2SAu7IRlr91PEP7A ++uWKo1+Is4WWva/ASKDQqPAuh0EL2pNv7SYbPoPabYTzAkkdt82puNJrQGxNYWrGk ++L5/omSnLkkghyBX23IOQDVvfQf5jK6la73HckQKBgAI+iLECAkle9HvnJ3flicau ++9FAU1/9pOdM+WogSanhYQ/P2rAwRiyCIkqu62/OoZR5g4kLxWqOOmVvsK3j+gs5F ++FtwN7gauq06MAHnWr6qC8ZltzMsGZTVDvqSH2vgV4T1V6ovVpTBPKQ1gWtABEmpm ++dyfeA6HHeRAHx8VRGpL6 + -----END PRIVATE KEY----- +diff --git a/tests/certs/expired/ca/ca.crt b/tests/certs/expired/ca/ca.crt +index c332b7cb7b..f08b2d67a5 100644 +--- a/tests/certs/expired/ca/ca.crt ++++ b/tests/certs/expired/ca/ca.crt +@@ -1,20 +1,22 @@ + -----BEGIN CERTIFICATE----- +-MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox +-CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv +-bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l +-ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG +-A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw +-FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv +-b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 +-RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He +-mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK +-na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 +-fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm +-zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy +-e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV +-GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws +-Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn +-9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ +-rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ +-6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= ++MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL ++BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu ++ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq ++MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp ++b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu ++ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ ++0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK ++dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe ++ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ ++C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz ++zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 ++/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU ++CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG ++0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ ++wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG ++Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum ++b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb ++UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb ++KOWpOS3fbsI= + -----END CERTIFICATE----- +diff --git a/tests/certs/expired/ca/ca.srl b/tests/certs/expired/ca/ca.srl +index fab68405ed..0d6f69d6fe 100644 +--- a/tests/certs/expired/ca/ca.srl ++++ b/tests/certs/expired/ca/ca.srl +@@ -1 +1 @@ +-4F36C3A7E075BA6452D10EEB81E7F189FF489B74 ++4F36C3A7E075BA6452D10EEB81E7F189FF489B83 +diff --git a/tests/certs/expired/server/server.csr b/tests/certs/expired/server/server.csr +index 5e3c177647..d8ba3a5bf2 100644 +--- a/tests/certs/expired/server/server.csr ++++ b/tests/certs/expired/server/server.csr +@@ -2,18 +2,18 @@ + MIIDHjCCAgYCAQAwbTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQK + DBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJl + cXVlc3RzMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB +-DwAwggEKAoIBAQCKulIMpo633iCgbkKv1UoiLC4sQt5xWpgguujywu3hLYwmPFp9 +-kvPt//imqtl8FhuhKqJ8FCGrVl2YIGj1RJIB3GW7MSPNCuIBFL/gwNi35LxDPtoA +-IPyXytIR7VH9+ch9DFInJaoA/BekMuKvbXk54VW9whpHbwkXSG2lBS2vKL0XemYh +-9VjvtuRDji2iOZpznlVE2PEN80bojArp6oYKakv2kYzgzgxAJiI/NZGvC7mbSI4e +-ja7ad3R9G0kB1FzNj36jrNO5WtxHO/mrRiXSpDeyUbitYvt0HKoM0vhTnOR+BspP +-IltfwOQh8qq2Q2AaMHNcVjMH3gHCZADfhk/zAgMBAAGgbDBqBgkqhkiG9w0BCQ4x ++DwAwggEKAoIBAQDcRRwk8IU1YoNu8CHzB5Vh8HP/yLfBtU69LLZq+7rDG31JlR5s ++lmcwLLoZ8opUQ5rg8JMRZ7toh5zB4Uc0B4Sg8RhQMSOZYBIJkXdHuqQkciR0vWnN ++vD/5CkWEhnj4dxE7xTbDufBlxmwAthC/u72UIsZHavAyLCBqsONa7xuTiogz/d+3 ++G+525JrfVr05hhJpT4Ypx5YY+ABkIOuOk/XuudbGm5SquuX6BgjmgaGtDjAuE/Rn ++BnliIavCDrG0v3KGbG3Xxt7lFTu+98foForwGCbbQBraty27oZrzAtLltfIHlJRn ++jPz0JA9akNDhAihxEsTUhk2d7jFszsd0Ev7DAgMBAAGgbDBqBgkqhkiG9w0BCQ4x + XTBbMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMB + MCwGA1UdEQQlMCOCCWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAAATAN +-BgkqhkiG9w0BAQsFAAOCAQEAfAhEhrulsZae71YFqgvzwJHm/hzXh47hErtgDXVJ +-mFqAxgF6XrnzYujlt3XQXUx/8vdrU7jH+Pe8WO1rDvFwRPMDGoBF3RX29SzyX/2F +-e102egnoRR+Hlf0Ixqu0CuTjEVnD+g4mRgXhV7LPKP4W6qGwzcVbaJ3c/zRcfqNR +-g9gN6Q6Qt4fXDc7wlx2T3nOszBLQ2XCsIyzVtOJ2sSuadqKH9Aj+mrkrLBdzVFHD +-FHnTMJ0t0+anZwd+AWDNsCr5lIwBGL634zw7/yJepMHuPFd2X24S3u8EaWPkfVQn +-lV6rLQMGjXYTe2xuYzlUCUYnKvkyPTMjSXDkxWa+WSNwyQ== ++BgkqhkiG9w0BAQsFAAOCAQEAVVIxJlDrgeG0bOSufgVVRqDQx7XSd15mGlT+CynM ++lEFJ3Q9k98T2vRNNGVYYYZAnbdSOW9ACwWGcYm2bzIjbgZV0H2Kz0dLD/GrNuEY+ ++O9j6K2toFKc57G7UUkve+N74ldq+hkR4zbb6FQmTlnL2YaPp2dv5TxdMKfHEfPNf ++Bg8xpbXdoRc7CYW1ZACme+d2U063GVqQsrIfwGJ+BtE6aNo62T/oEm+G4Wy5iBay ++jNv/imwf+JKQ75bTvha9YLUg2scqdYwJj8JlBw7cvkBIHW8GydA3fX4dtV9YBbFi ++8RTlWhhLgCXpYbLoDGOqF6f/MuPSIGkV1wVhCUfYA+p+Gw== + -----END CERTIFICATE REQUEST----- +diff --git a/tests/certs/expired/server/server.key b/tests/certs/expired/server/server.key +index 27ddafd1ca..c48457b39a 100644 +--- a/tests/certs/expired/server/server.key ++++ b/tests/certs/expired/server/server.key +@@ -1,28 +1,28 @@ + -----BEGIN PRIVATE KEY----- +-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCKulIMpo633iCg +-bkKv1UoiLC4sQt5xWpgguujywu3hLYwmPFp9kvPt//imqtl8FhuhKqJ8FCGrVl2Y +-IGj1RJIB3GW7MSPNCuIBFL/gwNi35LxDPtoAIPyXytIR7VH9+ch9DFInJaoA/Bek +-MuKvbXk54VW9whpHbwkXSG2lBS2vKL0XemYh9VjvtuRDji2iOZpznlVE2PEN80bo +-jArp6oYKakv2kYzgzgxAJiI/NZGvC7mbSI4eja7ad3R9G0kB1FzNj36jrNO5WtxH +-O/mrRiXSpDeyUbitYvt0HKoM0vhTnOR+BspPIltfwOQh8qq2Q2AaMHNcVjMH3gHC +-ZADfhk/zAgMBAAECggEAFSF9RvUFzyb0BEvXN44+/QaKv+4tkMmSW4Xs3rFnZ4G3 +-E8nkpLUCF9ICD2z9tKNvcPScDFdKq5z7o6ToJ9faf5MRIdrBz8UlGLIO6g6l1Bjw +-vjNwJE3h+8MGjXl/IDbwXW/HgbQAeabsePPRSJRdvz2+ACn1M8VLdrLvFJA93ayW +-+n3Bk0bXdsrzqBGdoDiNzmIHI3WqdONiR9TymuJe41NJtMKxQDF+c6Y1n/X1OtBk +-s9L+u9Xr+R3H72xSYrf1KH1mFZJfTnIPoOmdEU2tVZnZj03rZhT7p8R1fVNX6OHu +-NX1Dy9VA6J7dbcqdPvTI743ByQeb+hNnqI/3hmV5eQKBgQC++1Wn3v/dxtczjA+I +-tN4a7zyjhazpB25lde55HVfCQPxmYxIYct+j6S0JkMaoLrjiEDb4pnu4Gt4MDqZa +-r0Xm8t3wD1YKUUbhpBEGvsMhAEZEIsBOcwkTiEwsoF0mKFa2mTyqAImgIQa8uFt8 +-Y/oTj55XFe1x6pZKEJRg+K+QSwKBgQC59ONVkMSBirLGS+G+b2kqiBdwZB/3s3wr +-feS1xTa+deL3AChnKT9+MsVqOkxdE2TRj/mAeF+5Woa5bPMvgr9Kl7u8bulTH80l +-YA/N6FneO11/ncnkgK9wN54kd5TiOtGsGB5S5t/nEAIMUIwWrM/cRau72xNEWOhT +-Tvw7TOSF+QKBgQCa/texeiYmE24sA4vH4yIuseKAw8hlBwbtiRyVZt8GZD9zyQuy +-k+g02tUWYk0XyXN65LX4bwURkZyMJIeWKZGNsaW1YnzturDQB5tZ4g/zBIoCWkHA +-aVQAaimIPk3a3foiD5NQVUdckfEp0GVPOsSGg5R6EO23+i8mxPXnDW1OqQKBgGvf +-lelTO8tyLFdAOcqBUt6rZ/1499p3snaAZ6bSqvk95dYnr0h48y5AQaln/FiaIYg4 +-HyLZsZ4S18jFXSWYkWOyNeQP6yafciBWY5StT0TN52VaoX3+8McGXKUHAcVjHbLZ +-ou2wpP6jmKyQJVQaF9LOT9uAMOMbOFrrnQLBjmfxAoGAQAnUhMFG5mwi9Otxt6Mz +-g+Gr+3JTlzwC3L7UwGdlFc3G2vSdGx/yOrfzpxPImfIBS95mibDfdvEBMer26pvw +-a/ycqybyX9d/5nPDIaJ1lc4M4cbHC/cB52JI6avr/1g8OMK7lR7b/FsPVHS1w8kl +-n6uwEjVt2+gP2o9DFTGs158= ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDcRRwk8IU1YoNu ++8CHzB5Vh8HP/yLfBtU69LLZq+7rDG31JlR5slmcwLLoZ8opUQ5rg8JMRZ7toh5zB ++4Uc0B4Sg8RhQMSOZYBIJkXdHuqQkciR0vWnNvD/5CkWEhnj4dxE7xTbDufBlxmwA ++thC/u72UIsZHavAyLCBqsONa7xuTiogz/d+3G+525JrfVr05hhJpT4Ypx5YY+ABk ++IOuOk/XuudbGm5SquuX6BgjmgaGtDjAuE/RnBnliIavCDrG0v3KGbG3Xxt7lFTu+ ++98foForwGCbbQBraty27oZrzAtLltfIHlJRnjPz0JA9akNDhAihxEsTUhk2d7jFs ++zsd0Ev7DAgMBAAECggEAUZjCX8a/ufJ3+OE42lQdWO4fsonS1I3LENYe70u4OC2X ++QGpenmAq8pQnDpSj/KocliZYfLKeII9YGRRQcaw1S/9z/8TsSJVnqSa7dpVj1+J2 ++sc43AxEw65sL/Jdp+bT169vXOTNIpBMYkDzhwH0WMemd5Pfu6c8h5RQI7Pc1knYn ++nPNY848qSYCWOUjZS3QmBik/gp9X//yxVCyvxB3xVnb1cpvc952D90Va6nFIWfgN ++ix4NgFgAvwIxCFpWI2z7JF8uBdAHPeFAx8pFukQpAzwhaEILlgt3WbvEob9CsdP5 ++E39SUkzxiIfVM1du+hRquk9SJ/X56OSLnEjxLarSIQKBgQDyVU00yrv7lG7TJLZ5 ++YyfE20A7eUtYdcfatTKfsxKO4KVV+p0mGsNnFhhKziuT5/xtVunbUNFEOaUfmTUP ++dCjy4XkDbE/ufxzIm1WTSqknUluVoJRWKmLI5gbDFxu/XGRQNLxQbMK54l3N69PT ++EO4kz/jqBYbd4aEmtaSx2R8JowKBgQDosUTgBGDxDE2ODPVoXc+YjReOmVHvGMKK ++tA+KDBEs4spxaqhH0OFh6mewx3jA4VHbcIgM50STXrq1VL/QqYclDlY9/VWzkmqp ++2Ekc4NoAl3H022pgcbmXx3qapC4Z3hokNFOlbtD9xQf9NMx6c5djTKMYTBrBBWXH ++oFhSz6PIYQKBgQCMGqkydmvMffq89CLTd3JMq/4s5GmdUSsk1VHZZuy50kOEvAoT ++N7H1bZ7J0Pz83Eji5jb6Z3U1nqZK6Ib20k/CbH1Mb1ifKLp5eOU27Rly9Hiiv15D ++munWALe0Hy4Zqs8MWBDv5pGGasuU/F1RUB5/BgaBNoTMz2AeQzJe6Iq7RQKBgCca ++Ku3OLpAzNhEp4k9wfEMxaoT/BMK+EWsHiRj0oCo/zi8y8iZnVoiCwHv3eTZIZt4O ++Uf6BGof9QjjYjgc9hcVXXGy8Vpt/fkceXmLo8hlpWbAA8yZT1hFIZzT3Y/va09/D ++n07MiXgrlQUay0XEiOsZ5Mpfd5t6EblzG4SG+gnhAoGAZ+shbacxhji7cUUYJLrO ++9uZJCDCZiyq8yZ+lMzX1kILQwaP6VmSvF4TzKrkrCuD2HzUYcqebko/TvckeTp/a ++oYC2put3zt0CHBf/keeeJwjhff19qVyE9mpZwoo7PuS5zmM7pQOLxzCyAM9MdsCz ++kmnbborcfh74fkfRcwXm6G8= + -----END PRIVATE KEY----- +diff --git a/tests/certs/expired/server/server.pem b/tests/certs/expired/server/server.pem +index 05a2a4dac8..8304c04e49 100644 +--- a/tests/certs/expired/server/server.pem ++++ b/tests/certs/expired/server/server.pem +@@ -1,41 +1,44 @@ + -----BEGIN CERTIFICATE----- +-MIIDXjCCAkYCFE82w6fgdbpkUtEO64Hn8Yn/SJt0MA0GCSqGSIb3DQEBCwUAMGox +-CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv +-bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l +-ZCBSb290IENBMB4XDTI0MDMxMzIxMTQ0NVoXDTI0MDMxMzIxMTQ0NVowbTELMAkG +-A1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUg +-Rm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRIwEAYDVQQDDAls +-b2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKulIMpo63 +-3iCgbkKv1UoiLC4sQt5xWpgguujywu3hLYwmPFp9kvPt//imqtl8FhuhKqJ8FCGr +-Vl2YIGj1RJIB3GW7MSPNCuIBFL/gwNi35LxDPtoAIPyXytIR7VH9+ch9DFInJaoA +-/BekMuKvbXk54VW9whpHbwkXSG2lBS2vKL0XemYh9VjvtuRDji2iOZpznlVE2PEN +-80bojArp6oYKakv2kYzgzgxAJiI/NZGvC7mbSI4eja7ad3R9G0kB1FzNj36jrNO5 +-WtxHO/mrRiXSpDeyUbitYvt0HKoM0vhTnOR+BspPIltfwOQh8qq2Q2AaMHNcVjMH +-3gHCZADfhk/zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGeQdB4+iDbJ78eKhCMV +-49Cm8nyYi9215rRRJ24Bw6BtVw1ECwymxLVOEB0gHCu8kKdsFnniFBtChts/ilFg +-blIyPKTsb3+kQW9YV9QwVdFdC4mTIljujCSQ4HNUC/Vjfnz85SDKf9/3PMKRr36+ +-GtSLIozudPvkNmCv68jy3RRXyCwWHc43BLMSZKPD/W+DEuXShI9OIpIlSLBx16Hz +-4ce3/1pGuITWcsw6UcRqW31oPR31QmNs5fsq5ZCojDNFzEFCA1t9LiR6UOftFUKy +-yOZWfZeAGGdK75U+XDqS9Xkr5/ic5jE0I5rT7e7r3lpvQdgIj8lSx493fczLOGHr +-YA0= ++MIIDpzCCAo+gAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im4EwDQYJKoZIhvcNAQEL ++BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu ++ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNMjUwMjE3MDAzODIyWjBt ++MQswCQYDVQQGEwJVUzELMAkGA1UECAwCREUxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0 ++d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxEjAQBgNV ++BAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxF ++HCTwhTVig27wIfMHlWHwc//It8G1Tr0stmr7usMbfUmVHmyWZzAsuhnyilRDmuDw ++kxFnu2iHnMHhRzQHhKDxGFAxI5lgEgmRd0e6pCRyJHS9ac28P/kKRYSGePh3ETvF ++NsO58GXGbAC2EL+7vZQixkdq8DIsIGqw41rvG5OKiDP937cb7nbkmt9WvTmGEmlP ++hinHlhj4AGQg646T9e651sablKq65foGCOaBoa0OMC4T9GcGeWIhq8IOsbS/coZs ++bdfG3uUVO773x+gWivAYJttAGtq3LbuhmvMC0uW18geUlGeM/PQkD1qQ0OECKHES ++xNSGTZ3uMWzOx3QS/sMCAwEAAaNCMEAwHQYDVR0OBBYEFFK1WmMqRSzUD2isk8TL ++M3JfsVczMB8GA1UdIwQYMBaAFAhGiD3+10LBrdMW3+j/ceXMXSqcMA0GCSqGSIb3 ++DQEBCwUAA4IBAQCekjxplL/AI32WtODgw7FpTXNXdyNy8PWEhn3ufL0MqiyseYOZ ++bIa0PAecsArlKs5hXJzB7p/hu5CZdvaCButw1jyWQBySCpeJXn3FmGdTkBvhwBHv ++y6npmBoy/nbLkIRNRcoLbALlfn/0iGWfmDTRblT7vRNWJmZCZCTA/+ILXJ36ItbF ++3JCs3ARF6XWORuZs5Y8cNloOy2brAC/4EHnTfOZBQf8cL8CfHlcNa+nbG1j+wVNO ++60e/0v9zTxa2wNzdnLBCW4rqJFJ44aGClxat5tWuypv0snA/0xrqIYWTQGXZPVT6 ++rET47dfVbj1QxmW3sAyuy5PskZA9T7pOhcjR + -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- +-MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox +-CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv +-bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l +-ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG +-A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw +-FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv +-b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 +-RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He +-mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK +-na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 +-fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm +-zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy +-e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV +-GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws +-Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn +-9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ +-rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ +-6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= ++MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL ++BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu ++ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq ++MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp ++b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu ++ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ ++0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK ++dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe ++ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ ++C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz ++zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 ++/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU ++CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG ++0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ ++wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG ++Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum ++b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb ++UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb ++KOWpOS3fbsI= + -----END CERTIFICATE----- +diff --git a/tests/certs/mtls/client/client.csr b/tests/certs/mtls/client/client.csr +index 9a5713d5c7..35c8c2f325 100644 +--- a/tests/certs/mtls/client/client.csr ++++ b/tests/certs/mtls/client/client.csr +@@ -2,12 +2,12 @@ + MIIEGjCCAwICAQAwbDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQK + DBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJl + cXVlc3RzMREwDwYDVQQDDAhyZXF1ZXN0czCCASIwDQYJKoZIhvcNAQEBBQADggEP +-ADCCAQoCggEBAMn3iQycTjUzpKJChRNkcm33UB282cUwpxeqKN4ahHxBpS09HRhk +-cQYO7yErEUQwzQnBQEcIpzzeIMZIqHuCkgnySjeEJd95AIzNzGyoLLkS51TcJwgR +-v83AvT8ljA88s9h38qGTy4/TCxJgf76pfHIuC1qoKVQh3AuHj9nOxIZLUsrdDbWF +-WoLqKSVyTby+RXvSAppAR+cuBCaWStQ6xFORn48RHfc6t30ggD4rDAjyU6Vz6oR8 +-ot3XmGdK0h42UdqidUWkRJajEbpkCnQSXS21IvfXKxF5sFqAXJrj9iVbUfpNPpaa +-W8IrHByngyV8amazGZrASstUVRFtWrnrcWECAwEAAaCCAWcwggFjBgkqhkiG9w0B ++ADCCAQoCggEBAJrdvu5kvCy5g6w67gczETk/u6K0UBmf6Mv0lqXCp3Voyt5fv6SI ++/OPWrFV1+m4imNe5bLM7JUoUfkqkmULsjTTh7sxVLjW226vLSYOWWy7PA+OSwUTN ++LjydF1dazlPedHPYdmhVShCmyoOd1pUCDQn0/4cEA/WW4mtzZImmoCf/pyAM3XAC ++9RBcSSJRywOTe6n9LY6Ko0YUW94ay2M4ClVblDxswDemaAsLFuciKmi53gKx4H/l ++areo8p60dgubooiMbcc4E9bzp0oJpfh7xhwKeJtCNEpOik1AiiQIZtwqmkkIHvtI ++Go3SZ7WAQU9Eh2r+u3E6aSl+N0PMXK4Y4JsCAwEAAaCCAWcwggFjBgkqhkiG9w0B + CQ4xggFUMIIBUDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggr + BgEFBQcDAjCCAR8GA1UdEQSCARYwggESggsqLmxvY2FsaG9zdIcEfwAAAYcQAAAA + AAAAAAAAAAAAAAAAAYZNc3BpZmZlOi8vdHJ1c3QucHl0aG9uLm9yZy92MC9tYWlu +@@ -15,10 +15,10 @@ dGFpbmVyL3NpZ21hdmlydXMyNC9wcm9qZWN0L3JlcXVlc3RzL29yZy9wc2aGTXNw + aWZmZTovL3RydXN0LnB5dGhvbi5vcmcvdjEvbWFpbnRhaW5lcjpzaWdtYXZpcnVz + MjQvcHJvamVjdDpyZXF1ZXN0cy9vcmc6cHNmhk1zcGlmZmU6Ly90cnVzdC5weXRo + b24ub3JnL3YxL21haW50YWluZXI9c2lnbWF2aXJ1czI0L3Byb2plY3Q9cmVxdWVz +-dHMvb3JnPXBzZjANBgkqhkiG9w0BAQsFAAOCAQEAwP1KJ+Evddn2RV1FM6BFkoDK +-MPDO9qwb8ea3j57SIJXZlpw168DljmuGzxJw9oys2O6FYcspbHIocAkfFwiYgVAr +-NEog6xlCdPxNBJgC3YFIKwnmBjMPG6ZCWiJn940qTbaJ/j6ZviN17uW4K7Sl+THp +-IkMv29uQTWkfg+GbZ9q1hm2m2GHhYLGLAUdJdtv7JI+yq5uxdsWaCANpH6kc8SnK +-2rik6D3iItDhHCmToHBpdEnP8J+KDzf5pJrv/g3WH8XVrl4ZzBsOhmciWF4C3Hbf +-9eu8eAsp1AsIrZOEGTfClBd7vFCES5DmI0/iRs4czQooqZPnHjOw3Azp/LujrA== ++dHMvb3JnPXBzZjANBgkqhkiG9w0BAQsFAAOCAQEAMOwYPyq+OpMRQUAgoRjfxTQO ++DiqfBzCsjUsPAacLTtebbWBx8y6TkLSb+/Qn3amq3ESo4iBqKpmVwdlAS4P486GD ++9f78W3zkZ29jGcnQ+XHb7WvPvzBRoXImE276F9JGqJ+9q39Cbxzh0U2+ofBx2iGY ++sSutzU0B/l/FKZRc8thuFoeKqHwVePLGD9p2+2nYI9I08QoGqEokTcFAq0tZ858F ++9PdxBZYOKOMpnLZhiJ8qZo23v3ycBXPOjg5ILtQ9EzHoNEA5Mxx/mfNLKJ0NktZD ++KXANLWKbXm+w9gTcBLtCPWNeqj5DIGPsHSfq/Bmjbp/o+uOJs6oq3s5rA7WrAA== + -----END CERTIFICATE REQUEST----- +diff --git a/tests/certs/mtls/client/client.key b/tests/certs/mtls/client/client.key +index 8107125399..b6cea90813 100644 +--- a/tests/certs/mtls/client/client.key ++++ b/tests/certs/mtls/client/client.key +@@ -1,28 +1,28 @@ + -----BEGIN PRIVATE KEY----- +-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDJ94kMnE41M6Si +-QoUTZHJt91AdvNnFMKcXqijeGoR8QaUtPR0YZHEGDu8hKxFEMM0JwUBHCKc83iDG +-SKh7gpIJ8ko3hCXfeQCMzcxsqCy5EudU3CcIEb/NwL0/JYwPPLPYd/Khk8uP0wsS +-YH++qXxyLgtaqClUIdwLh4/ZzsSGS1LK3Q21hVqC6iklck28vkV70gKaQEfnLgQm +-lkrUOsRTkZ+PER33Ord9IIA+KwwI8lOlc+qEfKLd15hnStIeNlHaonVFpESWoxG6 +-ZAp0El0ttSL31ysRebBagFya4/YlW1H6TT6WmlvCKxwcp4MlfGpmsxmawErLVFUR +-bVq563FhAgMBAAECggEABhWX97JJxN6JFNOjhgGzqiPA3R8lrFlv3zhNbODS9u9U +-q404xYBZIKaYhkucLzgNJUBrevhZbsL+V8WJQIH0JlU57nw5ATIjAHA+uqiXraen +-zRhTcLHK28b1AeRUA4LU+YN7jWnnawN075kf9WgjtfOJ0gcDimOkE7uCFjyyvPJA +-LG9bG+8enGjvUleKXNgmwP4Sq/GlEdGz9Qy+8ga3mtfAULUWe8haFNZXK8CN3xPp +-wmVqy7QzgH2TGN1p6Dyxib9ksSN/lOg0dShL8zgu+QXDNx2VwmVrI8Vr02vmB//0 +-bYxCo5pfICPIFLjLl5yo30dvrUfYqF29PperStHGlQKBgQD/TdemlLjJNP0fvSs7 +-KEVJj/22YuHK+wurNr2ZFbSdcF3v9sfiwysllmEyGr5cNYA56uUbfG+8VSw7kDll +-G+6BKK2UdlPH++6RahqWLqo4k6rsNrkq7elj8xG4gIjR5qzu2uLpjNwp2BGmIoUI +-eb1NcLfTlMcNCooV8RHjm1Z5WwKBgQDKhHkUPDcJm2/9Ltq2NZQMrCS7o4LV2uAI +-GhGpISfY+SfHkQQNZ9Fvbe6hrFeZs31nAvlTDpPEg/LGSVKA5I2EZT9gwzAQU1TD +-Cyol4xqqWFWlwze7w+RLYqX5LtXf7NJg2m5p+ZOoOzzqvTVpodDxqTlCNp2/6ICP +-vAIvWhbA8wKBgAYlr62ZIyHlHrsm6OWRwKlWyDseAmXKyasjtEj9Vs37qKdgf8ub +-+2v6RPjZ3/+EYkQCveV9h4s3WctNW7Rtib6eZh+PAdFs5X+m2GEJWpvmIlVxs9+u +-vtHjRmf04FZ9gWh26MPK2no/c51Wc3GSzNYSgrqbeHd963k/xrh+QwTFAoGAZZjb +-3UjwG4O9RPjyhCKQ6WKa8v9urbamWaoqXfziLrmgOUAJFmiU6x/tbXI2aEdhjAIz +-7nULsLS5YLx8BWmjjV3106dYP3hut4KsXGF4iSjTnts25J27tA4DUeUrKrF2QVyT +-s9qfNvCw+Np/J0Uku3e33/3iWdpcVL9vIS5C5/0CgYBEuxb3dffNRqEiNkpOUrCD +-mQTqbO3X+hin9zT3GrxQE+7KpfCfdDIqdK6c5UWHirR3HUjUPZmIFLSx8msfLl3k +-hgQw37NMV+asg0Wy3P908qbtnEA2P6aDOMQeHJoC7qEHIDOcOQ1KP3FMvOrdscwS +-f0IIDygTH6fYr329s0iXjg== ++MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCa3b7uZLwsuYOs ++Ou4HMxE5P7uitFAZn+jL9Jalwqd1aMreX7+kiPzj1qxVdfpuIpjXuWyzOyVKFH5K ++pJlC7I004e7MVS41ttury0mDllsuzwPjksFEzS48nRdXWs5T3nRz2HZoVUoQpsqD ++ndaVAg0J9P+HBAP1luJrc2SJpqAn/6cgDN1wAvUQXEkiUcsDk3up/S2OiqNGFFve ++GstjOApVW5Q8bMA3pmgLCxbnIipoud4CseB/5Wq3qPKetHYLm6KIjG3HOBPW86dK ++CaX4e8YcCnibQjRKTopNQIokCGbcKppJCB77SBqN0me1gEFPRIdq/rtxOmkpfjdD ++zFyuGOCbAgMBAAECggEABHa5xyNOLTfXrMIyFDELoQvOO71YxbRPQHm3UeXPb9nq ++Zwh5fKOaLnMEmp4A7uW+ZBFrKatdwsnebgZaiIxK8ahFesxFvbScllIQt2NBE5NR +++GBFg9cqKwMYJiNu6Qnzb1dg6lbzAJHeKncFNVxOxeey6dBa0NxdgF1eG32bBiwT ++yIr6JO7cK5JfcExls5yxdZMZiW08quaeFMQR6Wocod2caDgJUBVbZwivEoNI3ak4 ++/kzQaxvRoDMM8uN3LrVH2YUJgURUxSbpOLu8ycZtfg8JRArprUYI0P0OD6iDlly1 ++3FhJXqBEY0dWQPmZKP/Elt3ywC1oncW+AqPh9cchiQKBgQDMriOKoBrTmplw0kbo ++EEuxTU1A23BqcZfn2+PoUww6UxOvStL/s7iupjl3g4CXw0RgIfyOuJQldLdq7mh6 ++W7BpK855fH2CLy1VMdIFY1umHSgJ5Bayd5NmyKdfORUw88PTFFSARYyr5DDqufWg ++jI77BMjqHtbyujQKspV+9U66ZwKBgQDBsi5YptfaqMdzh343G5zAtCiGCd3m9NZO ++atEEvgq9LKqEVwvJ/FD+3QPAS1MN+ms9KcfJ3G05VUhhEsPGRKibgcE0FNA/VBDO ++jS2HK6kZ1M0clC5kHmQfLZxp1q3tA5nW6zqjVFdqYzJsis7G5YxFKhnzui0lgP6V ++I1Io+3QvrQKBgQCK6D+sq92o8AnkfICsq6qDCKA+PO68/pyGOUAiAoKQ7qK0W0Z5 ++TMIwnRTxHCjgViAIUehx/6hjByQXiPcU2zcNGTLGVgtjl5rfb7FGANlJEg6DL+2L ++bwV1QwX75OSR1U136hsy9oByg6oDEvM040+B4gxsf0OHdYEuJWa5w8eLTwKBgCJt ++CM+416SFWu2tp0EkJzgYzRsFpermmTBWy8+L91yoE6Zx0iaUMdEadxA2Uwyo9WZp ++hpjaFI+cGMEoFKOokE8TQMOA74JR7qrHbNAZcnSk3c+2hohE3oasFKC7By6Y9T69 ++kC53TxIZj1y7TwUKx2ODmBk5fcysoJLhNDkUeBIBAoGAQ/YMeMN/pSvTDCPhubbk ++9bF0SwoN6DWrzw7gzMMhHlVSPM4fjdBA+wXbhnYF7hiNan7uShtRHVhwyfj+glBz ++KIkDxETjxTWx5mbo3tNf8xEMsbHZBe8KPlKxizdAOvShLvkpthTCPiyqn6XTvbs4 ++vC0zZrsQWCYT4Wbm7gcOOAU= + -----END PRIVATE KEY----- +diff --git a/tests/certs/mtls/client/client.pem b/tests/certs/mtls/client/client.pem +index 0a11d4d472..0e3091d0e4 100644 +--- a/tests/certs/mtls/client/client.pem ++++ b/tests/certs/mtls/client/client.pem +@@ -1,41 +1,44 @@ + -----BEGIN CERTIFICATE----- +-MIIDXTCCAkUCFE82w6fgdbpkUtEO64Hn8Yn/SJtzMA0GCSqGSIb3DQEBCwUAMGox +-CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv +-bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l +-ZCBSb290IENBMB4XDTI0MDMxMzE4MzUwNFoXDTI2MDMxMzE4MzUwNFowbDELMAkG +-A1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUg +-Rm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMREwDwYDVQQDDAhy +-ZXF1ZXN0czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn3iQycTjUz +-pKJChRNkcm33UB282cUwpxeqKN4ahHxBpS09HRhkcQYO7yErEUQwzQnBQEcIpzze +-IMZIqHuCkgnySjeEJd95AIzNzGyoLLkS51TcJwgRv83AvT8ljA88s9h38qGTy4/T +-CxJgf76pfHIuC1qoKVQh3AuHj9nOxIZLUsrdDbWFWoLqKSVyTby+RXvSAppAR+cu +-BCaWStQ6xFORn48RHfc6t30ggD4rDAjyU6Vz6oR8ot3XmGdK0h42UdqidUWkRJaj +-EbpkCnQSXS21IvfXKxF5sFqAXJrj9iVbUfpNPpaaW8IrHByngyV8amazGZrASstU +-VRFtWrnrcWECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHHgMckLDRV72p1FEVmCh +-AAPZjCswiPZFrwGPN57JqSWjoRB9ilKvo87aPosEO7vfa05OD/qkM/T9Qykuhati +-I1T1T7qX4Ymb5kTJIBouuflAO3uKVaq+ga2Q/HLlU5w/VoMU4RuK7+RaiRUEE3xL +-iPSMBvZpoMj695LnzcGrT5oLkFI0bTIlpQt1SFjDpHFtOj/ZdwgSbZYLoTCBXQK3 +-7Y29qAj/XwEiCH63n8tJKvZcD8/ssMIMIdWhNmu+0jOWica/3WSih9Geoy6Ydtxi +-I5t9vRjC4LIipMUAF86AJIfvHJyI6aCNT420LaR6NRW0FQn5CPTHPAsKg3JkAywn +-Ew== ++MIIDpjCCAo6gAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im4IwDQYJKoZIhvcNAQEL ++BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu ++ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIzWhcNMjcwMjE3MDAzODIzWjBs ++MQswCQYDVQQGEwJVUzELMAkGA1UECAwCREUxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0 ++d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxETAPBgNV ++BAMMCHJlcXVlc3RzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmt2+ ++7mS8LLmDrDruBzMROT+7orRQGZ/oy/SWpcKndWjK3l+/pIj849asVXX6biKY17ls ++szslShR+SqSZQuyNNOHuzFUuNbbbq8tJg5ZbLs8D45LBRM0uPJ0XV1rOU950c9h2 ++aFVKEKbKg53WlQINCfT/hwQD9Zbia3NkiaagJ/+nIAzdcAL1EFxJIlHLA5N7qf0t ++joqjRhRb3hrLYzgKVVuUPGzAN6ZoCwsW5yIqaLneArHgf+Vqt6jynrR2C5uiiIxt ++xzgT1vOnSgml+HvGHAp4m0I0Sk6KTUCKJAhm3CqaSQge+0gajdJntYBBT0SHav67 ++cTppKX43Q8xcrhjgmwIDAQABo0IwQDAdBgNVHQ4EFgQU3Ujw+VSuTzPgHqU+KFwO ++T4t2MHswHwYDVR0jBBgwFoAUCEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcN ++AQELBQADggEBAEvrKXWHRRDIf26j2fH9hanx0nh+lxvI4jSWYmK0rJXZA3htEvWn ++gcoUspmhmLlgmRMP88lGINMjTsogUubu2j6WF/WuKxAWWvl/hUgK8NzOwOHvByPB ++lhO/rSNGdOWGlnaW1TVO4kI8w6c6LwzOCpY8WvOZLW+v7duLhKUdhaJMR9X77Tbt ++ohHkyYm0gV79izaFRpA6mdYoyHOR4gyWAKaj942doU794fT4gqQacRNifl/kUbWI ++lilktTLyLnmBJgrxHVBxcGe8kwnPafA1k3Gb1w7mY5BSoGKglKjutTfqR3uTjAQb ++vskS4SGXmsEIjLrXYWFNHyoC3pCBXWhX6Kc= + -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- +-MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox +-CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv +-bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l +-ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG +-A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw +-FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv +-b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 +-RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He +-mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK +-na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 +-fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm +-zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy +-e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV +-GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws +-Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn +-9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ +-rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ +-6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= ++MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL ++BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu ++ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq ++MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp ++b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu ++ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ ++0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK ++dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe ++ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ ++C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz ++zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 ++/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU ++CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG ++0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ ++wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG ++Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum ++b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb ++UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb ++KOWpOS3fbsI= + -----END CERTIFICATE----- +diff --git a/tests/certs/valid/server/server.csr b/tests/certs/valid/server/server.csr +index 000d1facb2..60d082e8ef 100644 +--- a/tests/certs/valid/server/server.csr ++++ b/tests/certs/valid/server/server.csr +@@ -2,18 +2,18 @@ + MIIDKjCCAhICAQAwbTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQK + DBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJl + cXVlc3RzMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB +-DwAwggEKAoIBAQChEKOx377ymuDg23By5Re1DHi2RiBKSHr85/ZTZuwP/69lHN7q +-TQEO//EMEFZ9+ZwezeJJsejjP2HO5lQZbcsWok3hbM0wVT+vApkogPvJ8WNFFWFe +-ZBnGLi/1WM9cSZpUsDJ0XCsG0RTtO27wfgZQlKQMZxTkfi971oPYxNVSjTm2JcLT +-kvwYIwxjJXPDTOgRo9TEAY3cWkCrBJN4w74GWBTM5KDDA230T7WwLuv81XD2LvYj +-YYdMBGcxPr5tYTIlp3LncbcrDRNk3pbYQk0bRJgkw2vUkteiRGjkt+dgVnLc6+MI +-W+VLXEpj+zsOZ5/R4d1pofqj9sDyDPhtNr1JAgMBAAGgeDB2BgkqhkiG9w0BCQ4x ++DwAwggEKAoIBAQDD3OzTz9TgOiJp/STy/au8G1EDVUuP3HWKAX5ZpkWSTYZfc7FF ++pgPQvBq83oh/K1+9Rw0/529N1+KeTp1i9vUBUM2wJ3EzykJP4rMFh+J/Nt6VFfJh ++05pTQiHnc85l4U8Qz7fHS6Lc9EG/Yp6yDxt5OeK8QAkNYjvxVhVdpif3GlnICx1e ++y1EcPxb9rslERyz0eiL6+BtVbhlSvup/rz2skvaYxoh/pP1RVwbu8VtS0it046Fm ++U0TnIdsjrdFjHXNJ2JSs5g6FDB9QEFhYdDOonL4KMcAkXxBLYXpjJ5fj8/X4LFkU ++FINry+Q2zdFKYsghCxlW98hmJVJTscVWznqpAgMBAAGgeDB2BgkqhkiG9w0BCQ4x + aTBnMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgWgMBYGA1UdJQEB/wQMMAoG + CCsGAQUFBwMBMC8GA1UdEQEB/wQlMCOCCWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAA +-AAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAQEAFTlFTn5Mn8JXtqB5bGjuiChe +-ClA6Y32Co4l7N0CtAlf+bExwLdpLOleTX3WnryIPALl9uBUI/67dy/STn/J1Yn86 +-jWPEFwpmYNSKgQljYWcwtBdYLWfIsJO11kKdaAkOUHBEN5DKrXJ46Vs4918bD1/Q +-6ztqdrThiKc646u9xB58Hg7F0IyMWbHfs0x16ZpcN9otrIkbqOE2wzTmc65O1t1i +-HDljcSk7OnNy3a9wtLEnyPiyMqHf2k/bTlmiDRVe3cSy9xieoqmzHTnOCSASe1y9 +-7lcEBQild18Jo4nACV4vCYOUwrMi/58LWW+lD6OmMnPiWUqOvMbgMffMNDpWPA== ++AAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAQEAn8TdRWYAGL7L8JKpkX2FRMMY ++EuFOEeJ2UaQLRbVtb1RhkIkMT6UYulQ16K45dbFe4k8DT59/mHrTl0bJ6pqVPawa ++vo7vmKCrSYEz8GrImh1+i6lHaFiqbkAs1mJ6z86dZUofMYwfTPVh64ztamUqwBk7 ++Dey+MzWUQvpTVqoaP7cLgzMy+XfcyGuWSoL6pX5XKkt4+A2wiCTsHul1sXOn4vQz ++4xY96AUVnkKosXMWXvhbMkncLNH+gs+ZeQI0MekakuMa42N+0BAad3Zx60lifG3N ++ugyVUmvVI0Fq6QUlYp3YV6QQj3FDjbgOVsSJNh+2s4SIARJsb/k//Tddzxei7g== + -----END CERTIFICATE REQUEST----- +diff --git a/tests/certs/valid/server/server.key b/tests/certs/valid/server/server.key +index d6afaf59fe..387d5d67f1 100644 +--- a/tests/certs/valid/server/server.key ++++ b/tests/certs/valid/server/server.key +@@ -1,28 +1,28 @@ + -----BEGIN PRIVATE KEY----- +-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQChEKOx377ymuDg +-23By5Re1DHi2RiBKSHr85/ZTZuwP/69lHN7qTQEO//EMEFZ9+ZwezeJJsejjP2HO +-5lQZbcsWok3hbM0wVT+vApkogPvJ8WNFFWFeZBnGLi/1WM9cSZpUsDJ0XCsG0RTt +-O27wfgZQlKQMZxTkfi971oPYxNVSjTm2JcLTkvwYIwxjJXPDTOgRo9TEAY3cWkCr +-BJN4w74GWBTM5KDDA230T7WwLuv81XD2LvYjYYdMBGcxPr5tYTIlp3LncbcrDRNk +-3pbYQk0bRJgkw2vUkteiRGjkt+dgVnLc6+MIW+VLXEpj+zsOZ5/R4d1pofqj9sDy +-DPhtNr1JAgMBAAECggEAIuLzBfXgCvXzlBjL2kMXd7p4EgkN+PEKnKmUr/t40b1Q +-zR6sBQWBX3GeET4fseElSQHQzCQaPNCve4xltm1S4jftFREHP7sTVHHEYWLQxuy/ +-Uwkewj5927CI6ERgg82YfVP91bjaA/u5I+pt7O7rKLyNbPdN7fEMEW+FNuhpiVvg +-JMrcK1BCFL6pmIT21LyTwkacMKZSPko58pWE24MA9aSCHk6cXdwQWQK0AfQT3XGT +-C4I0hRed7LgqMH+gMuhpakiO13t8yTwxt2iQC9+aa4oSHD3BOi/CwIWfe1mHwmlr +-cj4Kof1JSnK4SVTD16T++PlnWZkF6oaLUNg+/c2C9QKBgQDOFSYIY7+HzinT2hbI +-yTIJCHpp+Iee+WVvvxjdZIPMDINrlIiHcMfXb0itUdcUO6tz0KYDMDLRC9CSP0ar +-6mBWUTHfAKF2S4JpI9JYI4PNtIpOP1NiYuyJlnh5+ytU1yIeIvl39hmLcRwI9mgz +-njy/D7yEoDCrG1dhcltubKpNXQKBgQDIFAVg0A7MNcxBZDLlk1NAME2JKOSszX8E +-VNucvZD+9l+L9V9BmwwPQdzYifv/dNp3nYn+lxRPPgze3ZWu4+PeDuGudxu0I6ll +-beFdbIcp1wbeQguzHYLjBYJqsMb4Pao5HPInjPu/HWfZlg9oZpJbKVucQwbonJLX +-lgca9KaE3QKBgA+OUx+g/+0tZ8ThGoUvgsJhzHPBWeNrKfgEcckMdFJrw2PUg3XN +-0pf1g4PpwJV7Z5bHcjCda8iR3r2bXydM+tapLF2L+6QlUQPEu3UBwUo+zY3Yg9/S +-Xc6I+DEk/4FY9+9UboZaolT/RcF7cCQtVqKJeo58VRAlcTQe4L32H+jVAoGALXX3 +-Ht9HbXkP1w/YTLej4+LVy0OCag0rPiW13LBqALSkUx3GrhZ3sAPMFVuM6ad4eFNQ +-ZouXbsXvkLgSabGYNf11o/mmTtEHjWdhHKQrNgOIqPmixOkAs2quDmXqX79LLTz5 +-fKkZDny0+wiQqa0cth/4k9HbAQGKj/ej16kdKPUCgYAz08Y39NnJYxRNz3tu/7C6 +-jKyXKxhuZCZCt3cSWto5Tg0mVVB+2Jk2GhG1hCfZoRCP25R3FFBR1HOJgOc59T7C +-LL67FdO0+7mj/WNzHj3+9gyOYQyQgPVDaTmsJLbuzT2S+GpR94ZNliwL2NEa5baG +-B/Nb2ruRNj0GgZVw48N4XQ== ++MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDD3OzTz9TgOiJp ++/STy/au8G1EDVUuP3HWKAX5ZpkWSTYZfc7FFpgPQvBq83oh/K1+9Rw0/529N1+Ke ++Tp1i9vUBUM2wJ3EzykJP4rMFh+J/Nt6VFfJh05pTQiHnc85l4U8Qz7fHS6Lc9EG/ ++Yp6yDxt5OeK8QAkNYjvxVhVdpif3GlnICx1ey1EcPxb9rslERyz0eiL6+BtVbhlS ++vup/rz2skvaYxoh/pP1RVwbu8VtS0it046FmU0TnIdsjrdFjHXNJ2JSs5g6FDB9Q ++EFhYdDOonL4KMcAkXxBLYXpjJ5fj8/X4LFkUFINry+Q2zdFKYsghCxlW98hmJVJT ++scVWznqpAgMBAAECggEACY98I+6uJm/QBDpuFkpZmqn+r1n3gUMynZTrFPcvyC9u ++krQ0AAFViFfWOkfmg8abOsMAG5FxdmxGTJHrzsvdM748/A9A0FVcHUgkku2KGcmU ++3dQfa7UHgG7m9sRJW+G+mUR6ZQkFHyHxH6Vxt6FTJvyzW5sIlhWodWRNUK/unXoe ++5QNIh/PM9Mkg91wKVeg8AGdY27zfuUV0KLwhV052hCSwckayi7pjYrH2xDL8fahi ++Z/F43N1SI6Q7PTW6izDs2KrlGyexn97jOV+cooSXXaDvivTaB2K4RoidrPt+UAW4 ++/e1zw/LbeBvQXX4vsyC9vLO+Av1gYo2PxAZ/ezc5gQKBgQDvY/kgUud6stdMs73N ++Qavu9o/Ul4oeQa4fsmfUwj43OjquxpXbfV9sNTLFxFbsl5ADGkpqsR3WhP2090TK ++62vkyCBiaYZjyMY6WLDATEvrpfbc74ATEzTU+r9T1rEByq/atbWPZq/zoMo8aAdg ++Qk2X7gQO3pTpPeEpetYG42Di+QKBgQDRc9IqPeELQugXEuI0RZ8rsfGRSFKVRelQ ++Rz/KpD/S8SsE7ERL0w/w5KgE0IPPbh/SYX2KYxafCqTrPWDNaoguROvUoUJQvf4a ++uOMTCRkqdqj8j70zaPj2ohuIIZ3GZHyaXgl/isWtuZ5OeaoY5h3r+4gk5mO41Llz ++YikB71SRMQKBgGBNG18BetVFNI9Kj0QO8xeCYIHpJErfqShfIJ3aNiUJa6n7gTV2 ++zfg9vlsIjN9IaUqWPPGGprYxcc5m2mm3IwQ57a0pPkLN9dBq9U+mYbQ+Y3ylbCRA ++SbST2nvjlflejDezeYJikM21FSYPw0fZ5FUGDuPcbpMVrYp+O7MxrTwhAoGAcjQq ++xemTiWZj0iDzwfisP1D5HHRIwyepfaI7wCwquMPS5w5EduuQZ5LloipnlHTBWR7b ++Kte4f+N35OREofySYFgoFnoPBKNzp/Jjrf9p/2NP5NYjHaMBDMl7JZDezEwCPNFF ++cIukGYN6M+PWwVjHu+Ica7JLcX5b1/QP1ARBIiECgYAsdDa0CoYTVWMeqMq9GjF3 ++BElBKCLp6iYqpElWyKTj39LCnLhzRICyYQpblM8zZgtQIvRGT8DYh2HA1Q29yPzt ++Rgrz9yfFACdT5gUM5D6sx7L37xbtMQQ7YYOxEAfCUZ0qnMJgpNTJ8/ECkjGJZaif ++CXrx6XCdvrM/evZW2JZbyg== + -----END PRIVATE KEY----- +diff --git a/tests/certs/valid/server/server.pem b/tests/certs/valid/server/server.pem +index 0168cd3e3f..b4ad4c650d 100644 +--- a/tests/certs/valid/server/server.pem ++++ b/tests/certs/valid/server/server.pem +@@ -1,47 +1,46 @@ + -----BEGIN CERTIFICATE----- +-MIIEhTCCA22gAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im3wwDQYJKoZIhvcNAQEL ++MIIEEDCCAvigAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im4MwDQYJKoZIhvcNAQEL + BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu + ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt +-U2lnbmVkIFJvb3QgQ0EwHhcNMjQwMzE0MDAxMDAzWhcNNDMxMTMwMDAxMDAzWjBt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIzWhcNNDQxMTA0MDAzODIzWjBt + MQswCQYDVQQGEwJVUzELMAkGA1UECAwCREUxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0 + d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxEjAQBgNV +-BAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKEQ +-o7HfvvKa4ODbcHLlF7UMeLZGIEpIevzn9lNm7A//r2Uc3upNAQ7/8QwQVn35nB7N +-4kmx6OM/Yc7mVBltyxaiTeFszTBVP68CmSiA+8nxY0UVYV5kGcYuL/VYz1xJmlSw +-MnRcKwbRFO07bvB+BlCUpAxnFOR+L3vWg9jE1VKNObYlwtOS/BgjDGMlc8NM6BGj +-1MQBjdxaQKsEk3jDvgZYFMzkoMMDbfRPtbAu6/zVcPYu9iNhh0wEZzE+vm1hMiWn +-cudxtysNE2TelthCTRtEmCTDa9SS16JEaOS352BWctzr4whb5UtcSmP7Ow5nn9Hh +-3Wmh+qP2wPIM+G02vUkCAwEAAaOCAR4wggEaMAwGA1UdEwEB/wQCMAAwDgYDVR0P +-AQH/BAQDAgWgMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMBMC8GA1UdEQEB/wQlMCOC +-CWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAAATAdBgNVHQ4EFgQUJ90a +-UnXKPP13yDprLhG39fUrnu8wgZEGA1UdIwSBiTCBhqFupGwwajELMAkGA1UEBhMC +-VVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQL +-DA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJvb3QgQ0GC +-FA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAA4IBAQCVh4hiraRv +-JzYbS/TombP//xfVEWHXDBEYsT5GgWf7GPJ/QtSvv6uJFsK7heqLzf9f+r4Z5xMh +-YAkb0oe/Ge0T30Mo1YaBEqkKuQL9lOMcP69S9uFz2VT6I/76I8qqAu2AFhu74p8f +-qudwmQyRYo1Ryg4R/SgRhSJKF/ST/2wOusNWSsBe1s8S2PmtOb4dr3cMBGihrUzS +-DmCQpWjuiuE23HXnnYDc/EUAnEEPkLDgCsE9iLq37FPUHcHjqdYIAhmImPBpv2EL +-ftXeRWfxN2hRHpS5Fn3QuAOwfJw5tUcVXojJCJfSpL+Ac97iSjxNaDIPlyomauKw +-1rgbUkSw+9JQ ++BAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPc ++7NPP1OA6Imn9JPL9q7wbUQNVS4/cdYoBflmmRZJNhl9zsUWmA9C8GrzeiH8rX71H ++DT/nb03X4p5OnWL29QFQzbAncTPKQk/iswWH4n823pUV8mHTmlNCIedzzmXhTxDP ++t8dLotz0Qb9inrIPG3k54rxACQ1iO/FWFV2mJ/caWcgLHV7LURw/Fv2uyURHLPR6 ++Ivr4G1VuGVK+6n+vPayS9pjGiH+k/VFXBu7xW1LSK3TjoWZTROch2yOt0WMdc0nY ++lKzmDoUMH1AQWFh0M6icvgoxwCRfEEthemMnl+Pz9fgsWRQUg2vL5DbN0UpiyCEL ++GVb3yGYlUlOxxVbOeqkCAwEAAaOBqjCBpzAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB ++/wQEAwIFoDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDATAvBgNVHREBAf8EJTAjggls ++b2NhbGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFGg5Q9Ll ++ADkONmo02kmPg9+aiOxQMB8GA1UdIwQYMBaAFAhGiD3+10LBrdMW3+j/ceXMXSqc ++MA0GCSqGSIb3DQEBCwUAA4IBAQA1RlUI34tXrIdsRiALD8iLDFhh816B7qUi+F1j ++3dOkTNgYw0CnQ+Vm4wrQjCEVSDQ/9sry5DOfXeGziDpFlZmQ0UuAeM1EJJD5/42l ++C/eKquA09+IMEq2U03GPhijrC68sFCfr5wgoB/4HmcZ1c3kLYvRaJhEK7AHDgenY ++knKbvuKAiRbCd584eG8HFOW7xv+YqGZ257Ic9flbarkPrazmAJg2P709w7/fP83x ++7lnkPZY09jS3lcIpEdtWvzfm+anGF190hKA1yfPdO5bYPvUcEMxXdMtQ6/pbZd5i ++F6t95o9CPCqI/lLIn5jAf9Z+Iil3GmKefEZYIGmKJ85HGUqE + -----END CERTIFICATE----- + -----BEGIN CERTIFICATE----- +-MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox +-CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv +-bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l +-ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG +-A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw +-FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv +-b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 +-RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He +-mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK +-na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 +-fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm +-zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy +-e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV +-GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws +-Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn +-9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ +-rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ +-6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= ++MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL ++BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu ++ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt ++U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq ++MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp ++b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu ++ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ ++0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK ++dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe ++ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ ++C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz ++zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 ++/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU ++CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG ++0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ ++wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG ++Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum ++b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb ++UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb ++KOWpOS3fbsI= + -----END CERTIFICATE----- diff --git a/python-requests.spec b/python-requests.spec index 5514b4a..5e470eb 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,7 +7,7 @@ Name: python-requests Version: 2.32.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -32,6 +32,29 @@ Patch: support_IPv6_CIDR_in_no_proxy.patch # when it is ready, or dropped in a release where that is merged Patch: 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch +# Add CA constraint to test CA +# +# Otherwise recent versions of OpenSSL reject it as an invalid CA certificate +# (at least once the test certificates are regenerated). +# +# https://github.com/psf/requests/commit/507409661335bd3dd8a7e39f04d07b42e519becc +Patch: https://github.com/psf/requests/commit/507409661335bd3dd8a7e39f04d07b42e519becc.patch +# Regenerate test certificates +# https://github.com/psf/requests/commit/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4 +Patch: https://github.com/psf/requests/commit/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch +# Add key usage extension to test ca.crt +# https://github.com/psf/requests/pull/6924 +Patch: https://github.com/psf/requests/pull/6924.patch +# Together, these three patches fix one of the three regressions reported in +# the following issue, and the only one that we see downstream: +# +# Test regressions with urllib3 2.4.0 on Python 3.13 +# https://github.com/psf/requests/issues/6934 +# +# See also: +# +# https://github.com/urllib3/urllib3/pull/3577#issuecomment-2765190031 + BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} @@ -103,6 +126,9 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog +* Tue Apr 15 2025 Benjamin A. Beasley - 2.32.3-5 +- Backport test-cert. fixes for urllib3 2.4.0 compatibility + * Sat Jan 18 2025 Fedora Release Engineering - 2.32.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ddd9aacc2328840d42ae683215a3e5ef7378876f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 16 Apr 2025 12:41:19 +0200 Subject: [PATCH 156/165] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 469 ++++++++++++++++++++++++++++++++++++++++++ python-requests.spec | 472 +------------------------------------------ 2 files changed, 471 insertions(+), 470 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..c8f4a2c --- /dev/null +++ b/changelog @@ -0,0 +1,469 @@ +* Tue Apr 15 2025 Benjamin A. Beasley - 2.32.3-5 +- Backport test-cert. fixes for urllib3 2.4.0 compatibility + +* Sat Jan 18 2025 Fedora Release Engineering - 2.32.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Aug 01 2024 Adam Williamson - 2.32.3-3 +- Backport PR #6781 to fix crash on import if CA cert bundle is missing (#2297632) + +* Fri Jul 19 2024 Fedora Release Engineering - 2.32.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 19 2024 Lumír Balhar - 2.32.3-1 +- Update to 2.32.3 (rhbz#2281881) +- Fix for CVE-2024-35195 (rhbz#2282205) + +* Sun Jun 09 2024 Python Maint - 2.31.0-7 +- Rebuilt for Python 3.13 + +* Fri Jun 07 2024 Python Maint - 2.31.0-6 +- Bootstrap for Python 3.13 + +* Tue May 14 2024 Lumír Balhar - 2.31.0-5 +- Add support for IPv6 CIDR in no_proxy setting +- Fix FTBFS + +* Thu Apr 11 2024 Lumír Balhar - 2.31.0-4 +- Fix compatibility with pytest 8 + +* Fri Jan 26 2024 Fedora Release Engineering - 2.31.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.31.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 16 2023 Tomáš Hrnčiar - 2.31.0-1 +- Update to 2.31.0 +- Fixes: rhbz#2189970 + +* Tue Oct 10 2023 Miro Hrončok - 2.28.2-7 +- Do not package requests[security] and requests[socks] on RHEL +- Make the package build even when urllib3 won't pull in pysocks + +* Tue Aug 08 2023 Karolina Surma - 2.28.2-6 +- Declare the license as an SPDX expression + +* Fri Jul 21 2023 Fedora Release Engineering - 2.28.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jul 01 2023 Python Maint - 2.28.2-4 +- Rebuilt for Python 3.12 + +* Tue Jun 13 2023 Python Maint - 2.28.2-3 +- Bootstrap for Python 3.12 + +* Tue May 23 2023 Miro Hrončok - 2.28.2-2 +- Security fix for CVE-2023-32681 +- https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q + +* Wed Feb 01 2023 Lumír Balhar - 2.28.2-1 +- Update to 2.28.2 (rhbz#2160527) + +* Fri Jan 20 2023 Fedora Release Engineering - 2.28.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 13 2022 Kevin Fenzi - 2.28.1-3 +- Enable all tests and drop no longer needed test patch. + +* Fri Jul 22 2022 Fedora Release Engineering - 2.28.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jul 12 2022 Adam Williamson - 2.28.1-1 +- Update to 2.28.1, rediff patches + +* Mon Jun 20 2022 Lumír Balhar - 2.27.1-5 +- Allow charset_normalizer 2.1.0 and newer up to 3.0.0 + +* Tue Jun 14 2022 Python Maint - 2.27.1-4 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 2.27.1-3 +- Bootstrap for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 2.27.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jan 08 2022 Kevin Fenzi - 2.27.1-1 +- Update to 2.27.1. Fixes rhbz#2037431 + +* Tue Jan 04 2022 Adam Williamson - 2.27.0-1 +- Update to 2.27.0 +- Re-enable test_https_warnings as it works with pytest-httpbin 1.0.0 now +- Re-enable test_pyopenssl_redirect, it seems to work too + +* Sun Jul 25 2021 Lumír Balhar - 2.26.0-1 +- Update to 2.26.0 +Resolves: rhbz#1981856 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.25.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.25.1-3 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 2.25.1-2 +- Bootstrap for Python 3.10 + +* Tue Feb 02 2021 Kevin Fenzi - 2.25.1-1 +- Update 2.25.1. Fix is rhbz#1908487 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.25.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 25 2020 Petr Viktorin - 2.25.0-1 +- Update to 2.25.0 + +* Fri Nov 13 2020 Miro Hrončok - 2.24.0-5 +- Don't BR pytest-cov + +* Fri Sep 18 2020 Petr Viktorin - 2.24.0-4 +- Port to pyproject macros + +* Fri Sep 18 2020 Miro Hrončok - 2.24.0-3 +- Build with pytest 6, older version is no longer required + +* Wed Jul 29 2020 Fedora Release Engineering - 2.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Miro Hrončok - 2.24.0-1 +- Update to 2.24.0 +- Resolves rhbz#1848104 + +* Fri Jul 10 2020 Miro Hrončok - 2.23.0-5 +- Add requests[security] and requests[socks] subpackages + +* Sat May 30 2020 Miro Hrončok - 2.23.0-4 +- Test with pytest 4, drop manual requires + +* Mon May 25 2020 Miro Hrončok - 2.23.0-3 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 2.23.0-2 +- Bootstrap for Python 3.9 + +* Fri Feb 21 2020 Randy Barlow - 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 - 2.22.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 22 2019 Charalampos Stratakis - 2.22.0-7 +- Remove the python2 subpackage (rhbz#1761787) + +* Wed Sep 18 2019 Petr Viktorin - 2.22.0-6 +- Python 2: Remove tests and test dependencies + +* Mon Aug 19 2019 Miro Hrončok - 2.22.0-5 +- Rebuilt for Python 3.8 + +* Thu Aug 15 2019 Miro Hrončok - 2.22.0-4 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 2.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 11 2019 Yatin Karel - 2.22.0-2 +- Add minimum requirement for chardet and urllib3 + +* Thu May 23 2019 Jeremy Cline - 2.22.0-1 +- Update to v2.22.0 + +* Sat Feb 02 2019 Fedora Release Engineering - 2.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Dec 13 2018 Jeremy Cline - 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 - 2.20.0-2 +- No pytest-httpbin for Python 2 + +* Mon Oct 29 2018 Jeremy Cline - 2.20.0-1 +- Update to v2.20.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 2.19.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Miro Hrončok - 2.19.1-2 +- Rebuilt for Python 3.7 + +* Thu Jun 14 2018 Jeremy Cline - 2.19.1-1 +- Update to v2.19.1 (rhbz 1591531) + +* Thu Jun 14 2018 Miro Hrončok - 2.19.0-2 +- Bootstrap for Python 3.7 + +* Tue Jun 12 2018 Jeremy Cline - 2.19.0-1 +- Update to v2.19.0 (rhbz 1590508) + +* Fri Jun 08 2018 Jeremy Cline - 2.18.4-6 +- Don't print runtime warning about urllib3 v1.23 (rhbz 1589306) + +* Tue Jun 05 2018 Jeremy Cline - 2.18.4-5 +- Allow urllib3 v1.23 (rhbz 1586311) + +* Mon Apr 16 2018 Jeremy Cline - 2.18.4-4 +- Stop injecting PyOpenSSL (rhbz 1567862) + +* Fri Feb 09 2018 Fedora Release Engineering - 2.18.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Dec 11 2017 Iryna Shcherbina - 2.18.4-2 +- Fix ambiguous Python 2 dependency declarations + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Fri Aug 18 2017 Jeremy Cline - 2.18.4-1 +- Update to 2.18.4 + +* Wed Jul 26 2017 Igor Gnatenko - 2.18.2-1 +- Update to 2.18.2 + +* Tue Jun 20 2017 Jeremy Cline - 2.18.1-2 +- Drop the dependency on certifi in setup.py + +* Mon Jun 19 2017 Jeremy Cline - 2.18.1-1 +- Update to 2.18.1 (#1449432) +- Remove tests that require non-local network (#1450608) + +* Wed May 17 2017 Jeremy Cline - 2.14.2-1 +- Update to 2.14.2 (#1449432) +- Switch to autosetup to apply patches + +* Sun May 14 2017 Stephen Gallagher - 2.13.0-2 +- Don't run tests when building as a module + +* Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 +- Update to 2.13.0 (#1418138) + +* Fri Dec 30 2016 Adam Williamson - 2.12.4-3 +- Include and enable tests (now python-pytest-httpbin is packaged) + +* Wed Dec 21 2016 Kevin Fenzi - 2.12.4-2 +- Rebuild for Python 3.6 again. + +* Tue Dec 20 2016 Jeremy Cline - 2.12.4-1 +- Update to 2.12.4. Fixes #1404680 + +* Tue Dec 13 2016 Stratakis Charalampos - 2.12.3-2 +- Rebuild for Python 3.6 + +* Thu Dec 01 2016 Jeremy Cline - 2.12.3-1 +- Update to 2.12.3. Fixes #1400601 + +* Wed Nov 30 2016 Jeremy Cline - 2.12.2-1 +- Update to 2.12.2 + +* Wed Nov 23 2016 Jeremy Cline - 2.12.1-2 +- Backport #3713. Fixes #1397149 + +* Thu Nov 17 2016 Jeremy Cline - 2.12.1-1 +- Update to 2.12.1. Fixes #1395469 +- Unbundle idna, a new upstream dependency + +* Sat Aug 27 2016 Kevin Fenzi - 2.11.1-1 +- Update to 2.11.1. Fixes #1370814 + +* Wed Aug 10 2016 Kevin Fenzi - 2.11.0-1 +- Update to 2.11.0. Fixes #1365332 + +* Tue Jul 19 2016 Fedora Release Engineering - 2.10.0-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Jul 15 2016 Ralph Bean - 2.10.0-3 +- Update python2 packaging. + +* Thu Jun 02 2016 Ralph Bean - 2.10.0-2 +- Fix python2 subpackage to comply with guidelines. + +* Thu Feb 04 2016 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 21 2015 Ralph Bean - 2.9.1-1 +- new version + +* Fri Dec 18 2015 Ralph Bean - 2.9.0-1 +- new version + +* Mon Dec 14 2015 Ralph Bean - 2.8.1-1 +- Latest upstream. +- Bump hard dep on urllib3 to 1.12. + +* Mon Nov 02 2015 Robert Kuska - 2.7.0-8 +- Rebuilt for Python3.5 rebuild + +* Sat Oct 10 2015 Ralph Bean - 2.7.0-7 +- Tell setuptools about what version of urllib3 we're unbundling + for https://github.com/kennethreitz/requests/issues/2816 + +* Thu Sep 17 2015 Ralph Bean - 2.7.0-6 +- Replace the provides macro with a plain provides field for now until we can + re-organize this package into two different subpackages. + +* Thu Sep 17 2015 Ralph Bean - 2.7.0-5 +- Remove 'provides: python2-requests' from the python3 subpackage, obviously. + +* Tue Sep 15 2015 Ralph Bean - 2.7.0-4 +- Employ %%python_provides macro to provide python2-requests. + +* Fri Sep 04 2015 Ralph Bean - 2.7.0-3 +- Lock down the python-urllib3 version to the specific version we unbundled. + https://bugzilla.redhat.com/show_bug.cgi?id=1253823 + +* Thu Jun 18 2015 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon May 04 2015 Ralph Bean - 2.7.0-1 +- new version + +* Wed Apr 29 2015 Ralph Bean - 2.6.2-1 +- new version + +* Thu Apr 23 2015 Ralph Bean - 2.6.1-1 +- new version + +* Wed Apr 22 2015 Ralph Bean - 2.6.0-1 +- new version +- Remove patch for CVE-2015-2296, now included in the upstream release. + +* Mon Mar 16 2015 Ralph Bean - 2.5.3-2 +- Backport fix for CVE-2015-2296. + +* Thu Feb 26 2015 Ralph Bean - 2.5.3-1 +- new version + +* Wed Feb 18 2015 Ralph Bean - 2.5.1-1 +- new version + +* Tue Dec 16 2014 Ralph Bean - 2.5.0-3 +- Pin python-urllib3 requirement at 1.10. +- Fix requirement pinning syntax. + +* Thu Dec 11 2014 Ralph Bean - 2.5.0-2 +- Do the most basic of tests in the check section. + +* Thu Dec 11 2014 Ralph Bean - 2.5.0-1 +- Latest upstream, 2.5.0 for #1171068 + +* Wed Nov 05 2014 Ralph Bean - 2.4.3-1 +- Latest upstream, 2.4.3 for #1136283 + +* Wed Nov 05 2014 Ralph Bean - 2.3.0-4 +- Re-do unbundling by symlinking system libs into the requests/packages/ dir. + +* Sun Aug 3 2014 Tom Callaway - 2.3.0-3 +- fix license handling + +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Arun S A G - 2.3.0-1 +- Latest upstream + +* Wed May 14 2014 Bohuslav Kabrda - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Wed Sep 25 2013 Ralph Bean - 2.0.0-1 +- Latest upstream. +- Add doc macro to the python3 files section. +- Require python-urllib3 greater than or at 1.7.1. + +* Mon Aug 26 2013 Rex Dieter 1.2.3-5 +- fix versioned dep on python-urllib3 + +* Mon Aug 26 2013 Ralph Bean - 1.2.3-4 +- Explicitly versioned the requirements on python-urllib3. + +* Thu Aug 22 2013 Ralph Bean - 1.2.3-3 +- Release bump for a coupled update with python-urllib3. + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 01 2013 Ralph Bean - 1.2.3-1 +- Latest upstream. +- Fixed bogus date in changelog. + +* Tue Jun 11 2013 Ralph Bean - 1.1.0-4 +- Correct a rhel conditional on python-ordereddict + +* Thu Feb 28 2013 Ralph Bean - 1.1.0-3 +- Unbundled python-urllib3. Using system python-urllib3 now. +- Conditionally include python-ordereddict for el6. + +* Wed Feb 27 2013 Ralph Bean - 1.1.0-2 +- Unbundled python-charade/chardet. Using system python-chardet now. +- Removed deprecated comments and actions against oauthlib unbundling. + Those are no longer necessary in 1.1.0. +- Added links to bz tickets over Patch declarations. + +* Tue Feb 26 2013 Ralph Bean - 1.1.0-1 +- Latest upstream. +- Relicense to ASL 2.0 with upstream. +- Removed cookie handling patch (fixed in upstream tarball). +- Updated cert unbundling patch to match upstream. +- Added check section, but left it commented out for koji. + +* Fri Feb 8 2013 Toshio Kuratomi - 0.14.1-4 +- Let brp_python_bytecompile run again, take care of the non-python{2,3} modules + by removing them from the python{,3}-requests package that they did not belong + in. +- Use the certificates in the ca-certificates package instead of the bundled one + + https://bugzilla.redhat.com/show_bug.cgi?id=904614 +- Fix a problem with cookie handling + + https://bugzilla.redhat.com/show_bug.cgi?id=906924 + +* Mon Oct 22 2012 Arun S A G 0.14.1-1 +- Updated to latest upstream release + +* Sun Jun 10 2012 Arun S A G 0.13.1-1 +- Updated to latest upstream release 0.13.1 +- Use system provided ca-certificates +- No more async requests use grrequests https://github.com/kennethreitz/grequests +- Remove gevent as it is no longer required by requests + +* Sun Apr 01 2012 Arun S A G 0.11.1-1 +- Updated to upstream release 0.11.1 + +* Thu Mar 29 2012 Arun S A G 0.10.6-3 +- Support building package for EL6 + +* Tue Mar 27 2012 Rex Dieter 0.10.6-2 +- +python3-requests pkg + +* Sat Mar 3 2012 Arun SAG - 0.10.6-1 +- Updated to new upstream version + +* Sat Jan 21 2012 Arun SAG - 0.9.3-1 +- Updated to new upstream version 0.9.3 +- Include python-gevent as a dependency for requests.async +- Clean up shebangs in requests/setup.py,test_requests.py and test_requests_ext.py + +* Sat Jan 14 2012 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Nov 27 2011 Arun SAG - 0.8.2-1 +- New upstream version +- keep alive support +- complete removal of cookiejar and urllib2 + +* Thu Nov 10 2011 Arun SAG - 0.7.6-1 +- Updated to new upstream release 0.7.6 + +* Thu Oct 20 2011 Arun SAG - 0.6.6-1 +- Updated to version 0.6.6 + +* Fri Aug 26 2011 Arun SAG - 0.6.1-1 +- Updated to version 0.6.1 + +* Sat Aug 20 2011 Arun SAG - 0.6.0-1 +- Updated to latest version 0.6.0 + +* Mon Aug 15 2011 Arun SAG - 0.5.1-2 +- Remove OPT_FLAGS from build section since it is a noarch package +- Fix use of mixed tabs and space +- Remove extra space around the word cumbersome in description + +* Sun Aug 14 2011 Arun SAG - 0.5.1-1 +- Initial package diff --git a/python-requests.spec b/python-requests.spec index 5e470eb..1efa0bf 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -7,7 +7,7 @@ Name: python-requests Version: 2.32.3 -Release: 5%{?dist} +Release: %autorelease Summary: HTTP library, written in Python, for human beings License: Apache-2.0 @@ -126,472 +126,4 @@ sed -i 's/ --doctest-modules//' pyproject.toml %changelog -* Tue Apr 15 2025 Benjamin A. Beasley - 2.32.3-5 -- Backport test-cert. fixes for urllib3 2.4.0 compatibility - -* Sat Jan 18 2025 Fedora Release Engineering - 2.32.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Aug 01 2024 Adam Williamson - 2.32.3-3 -- Backport PR #6781 to fix crash on import if CA cert bundle is missing (#2297632) - -* Fri Jul 19 2024 Fedora Release Engineering - 2.32.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 19 2024 Lumír Balhar - 2.32.3-1 -- Update to 2.32.3 (rhbz#2281881) -- Fix for CVE-2024-35195 (rhbz#2282205) - -* Sun Jun 09 2024 Python Maint - 2.31.0-7 -- Rebuilt for Python 3.13 - -* Fri Jun 07 2024 Python Maint - 2.31.0-6 -- Bootstrap for Python 3.13 - -* Tue May 14 2024 Lumír Balhar - 2.31.0-5 -- Add support for IPv6 CIDR in no_proxy setting -- Fix FTBFS - -* Thu Apr 11 2024 Lumír Balhar - 2.31.0-4 -- Fix compatibility with pytest 8 - -* Fri Jan 26 2024 Fedora Release Engineering - 2.31.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 2.31.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 16 2023 Tomáš Hrnčiar - 2.31.0-1 -- Update to 2.31.0 -- Fixes: rhbz#2189970 - -* Tue Oct 10 2023 Miro Hrončok - 2.28.2-7 -- Do not package requests[security] and requests[socks] on RHEL -- Make the package build even when urllib3 won't pull in pysocks - -* Tue Aug 08 2023 Karolina Surma - 2.28.2-6 -- Declare the license as an SPDX expression - -* Fri Jul 21 2023 Fedora Release Engineering - 2.28.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jul 01 2023 Python Maint - 2.28.2-4 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 2.28.2-3 -- Bootstrap for Python 3.12 - -* Tue May 23 2023 Miro Hrončok - 2.28.2-2 -- Security fix for CVE-2023-32681 -- https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q - -* Wed Feb 01 2023 Lumír Balhar - 2.28.2-1 -- Update to 2.28.2 (rhbz#2160527) - -* Fri Jan 20 2023 Fedora Release Engineering - 2.28.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Sep 13 2022 Kevin Fenzi - 2.28.1-3 -- Enable all tests and drop no longer needed test patch. - -* Fri Jul 22 2022 Fedora Release Engineering - 2.28.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jul 12 2022 Adam Williamson - 2.28.1-1 -- Update to 2.28.1, rediff patches - -* Mon Jun 20 2022 Lumír Balhar - 2.27.1-5 -- Allow charset_normalizer 2.1.0 and newer up to 3.0.0 - -* Tue Jun 14 2022 Python Maint - 2.27.1-4 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 2.27.1-3 -- Bootstrap for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 2.27.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jan 08 2022 Kevin Fenzi - 2.27.1-1 -- Update to 2.27.1. Fixes rhbz#2037431 - -* Tue Jan 04 2022 Adam Williamson - 2.27.0-1 -- Update to 2.27.0 -- Re-enable test_https_warnings as it works with pytest-httpbin 1.0.0 now -- Re-enable test_pyopenssl_redirect, it seems to work too - -* Sun Jul 25 2021 Lumír Balhar - 2.26.0-1 -- Update to 2.26.0 -Resolves: rhbz#1981856 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.25.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2.25.1-3 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 2.25.1-2 -- Bootstrap for Python 3.10 - -* Tue Feb 02 2021 Kevin Fenzi - 2.25.1-1 -- Update 2.25.1. Fix is rhbz#1908487 - -* Wed Jan 27 2021 Fedora Release Engineering - 2.25.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Nov 25 2020 Petr Viktorin - 2.25.0-1 -- Update to 2.25.0 - -* Fri Nov 13 2020 Miro Hrončok - 2.24.0-5 -- Don't BR pytest-cov - -* Fri Sep 18 2020 Petr Viktorin - 2.24.0-4 -- Port to pyproject macros - -* Fri Sep 18 2020 Miro Hrončok - 2.24.0-3 -- Build with pytest 6, older version is no longer required - -* Wed Jul 29 2020 Fedora Release Engineering - 2.24.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Miro Hrončok - 2.24.0-1 -- Update to 2.24.0 -- Resolves rhbz#1848104 - -* Fri Jul 10 2020 Miro Hrončok - 2.23.0-5 -- Add requests[security] and requests[socks] subpackages - -* Sat May 30 2020 Miro Hrončok - 2.23.0-4 -- Test with pytest 4, drop manual requires - -* Mon May 25 2020 Miro Hrončok - 2.23.0-3 -- Rebuilt for Python 3.9 - -* Fri May 22 2020 Miro Hrončok - 2.23.0-2 -- Bootstrap for Python 3.9 - -* Fri Feb 21 2020 Randy Barlow - 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 - 2.22.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Oct 22 2019 Charalampos Stratakis - 2.22.0-7 -- Remove the python2 subpackage (rhbz#1761787) - -* Wed Sep 18 2019 Petr Viktorin - 2.22.0-6 -- Python 2: Remove tests and test dependencies - -* Mon Aug 19 2019 Miro Hrončok - 2.22.0-5 -- Rebuilt for Python 3.8 - -* Thu Aug 15 2019 Miro Hrončok - 2.22.0-4 -- Bootstrap for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 2.22.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 11 2019 Yatin Karel - 2.22.0-2 -- Add minimum requirement for chardet and urllib3 - -* Thu May 23 2019 Jeremy Cline - 2.22.0-1 -- Update to v2.22.0 - -* Sat Feb 02 2019 Fedora Release Engineering - 2.21.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 13 2018 Jeremy Cline - 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 - 2.20.0-2 -- No pytest-httpbin for Python 2 - -* Mon Oct 29 2018 Jeremy Cline - 2.20.0-1 -- Update to v2.20.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 2.19.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Miro Hrončok - 2.19.1-2 -- Rebuilt for Python 3.7 - -* Thu Jun 14 2018 Jeremy Cline - 2.19.1-1 -- Update to v2.19.1 (rhbz 1591531) - -* Thu Jun 14 2018 Miro Hrončok - 2.19.0-2 -- Bootstrap for Python 3.7 - -* Tue Jun 12 2018 Jeremy Cline - 2.19.0-1 -- Update to v2.19.0 (rhbz 1590508) - -* Fri Jun 08 2018 Jeremy Cline - 2.18.4-6 -- Don't print runtime warning about urllib3 v1.23 (rhbz 1589306) - -* Tue Jun 05 2018 Jeremy Cline - 2.18.4-5 -- Allow urllib3 v1.23 (rhbz 1586311) - -* Mon Apr 16 2018 Jeremy Cline - 2.18.4-4 -- Stop injecting PyOpenSSL (rhbz 1567862) - -* Fri Feb 09 2018 Fedora Release Engineering - 2.18.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 11 2017 Iryna Shcherbina - 2.18.4-2 -- Fix ambiguous Python 2 dependency declarations - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Aug 18 2017 Jeremy Cline - 2.18.4-1 -- Update to 2.18.4 - -* Wed Jul 26 2017 Igor Gnatenko - 2.18.2-1 -- Update to 2.18.2 - -* Tue Jun 20 2017 Jeremy Cline - 2.18.1-2 -- Drop the dependency on certifi in setup.py - -* Mon Jun 19 2017 Jeremy Cline - 2.18.1-1 -- Update to 2.18.1 (#1449432) -- Remove tests that require non-local network (#1450608) - -* Wed May 17 2017 Jeremy Cline - 2.14.2-1 -- Update to 2.14.2 (#1449432) -- Switch to autosetup to apply patches - -* Sun May 14 2017 Stephen Gallagher - 2.13.0-2 -- Don't run tests when building as a module - -* Thu Feb 09 2017 Jeremy Cline - 2.13.0-1 -- Update to 2.13.0 (#1418138) - -* Fri Dec 30 2016 Adam Williamson - 2.12.4-3 -- Include and enable tests (now python-pytest-httpbin is packaged) - -* Wed Dec 21 2016 Kevin Fenzi - 2.12.4-2 -- Rebuild for Python 3.6 again. - -* Tue Dec 20 2016 Jeremy Cline - 2.12.4-1 -- Update to 2.12.4. Fixes #1404680 - -* Tue Dec 13 2016 Stratakis Charalampos - 2.12.3-2 -- Rebuild for Python 3.6 - -* Thu Dec 01 2016 Jeremy Cline - 2.12.3-1 -- Update to 2.12.3. Fixes #1400601 - -* Wed Nov 30 2016 Jeremy Cline - 2.12.2-1 -- Update to 2.12.2 - -* Wed Nov 23 2016 Jeremy Cline - 2.12.1-2 -- Backport #3713. Fixes #1397149 - -* Thu Nov 17 2016 Jeremy Cline - 2.12.1-1 -- Update to 2.12.1. Fixes #1395469 -- Unbundle idna, a new upstream dependency - -* Sat Aug 27 2016 Kevin Fenzi - 2.11.1-1 -- Update to 2.11.1. Fixes #1370814 - -* Wed Aug 10 2016 Kevin Fenzi - 2.11.0-1 -- Update to 2.11.0. Fixes #1365332 - -* Tue Jul 19 2016 Fedora Release Engineering - 2.10.0-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Jul 15 2016 Ralph Bean - 2.10.0-3 -- Update python2 packaging. - -* Thu Jun 02 2016 Ralph Bean - 2.10.0-2 -- Fix python2 subpackage to comply with guidelines. - -* Thu Feb 04 2016 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 21 2015 Ralph Bean - 2.9.1-1 -- new version - -* Fri Dec 18 2015 Ralph Bean - 2.9.0-1 -- new version - -* Mon Dec 14 2015 Ralph Bean - 2.8.1-1 -- Latest upstream. -- Bump hard dep on urllib3 to 1.12. - -* Mon Nov 02 2015 Robert Kuska - 2.7.0-8 -- Rebuilt for Python3.5 rebuild - -* Sat Oct 10 2015 Ralph Bean - 2.7.0-7 -- Tell setuptools about what version of urllib3 we're unbundling - for https://github.com/kennethreitz/requests/issues/2816 - -* Thu Sep 17 2015 Ralph Bean - 2.7.0-6 -- Replace the provides macro with a plain provides field for now until we can - re-organize this package into two different subpackages. - -* Thu Sep 17 2015 Ralph Bean - 2.7.0-5 -- Remove 'provides: python2-requests' from the python3 subpackage, obviously. - -* Tue Sep 15 2015 Ralph Bean - 2.7.0-4 -- Employ %%python_provides macro to provide python2-requests. - -* Fri Sep 04 2015 Ralph Bean - 2.7.0-3 -- Lock down the python-urllib3 version to the specific version we unbundled. - https://bugzilla.redhat.com/show_bug.cgi?id=1253823 - -* Thu Jun 18 2015 Fedora Release Engineering - 2.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 04 2015 Ralph Bean - 2.7.0-1 -- new version - -* Wed Apr 29 2015 Ralph Bean - 2.6.2-1 -- new version - -* Thu Apr 23 2015 Ralph Bean - 2.6.1-1 -- new version - -* Wed Apr 22 2015 Ralph Bean - 2.6.0-1 -- new version -- Remove patch for CVE-2015-2296, now included in the upstream release. - -* Mon Mar 16 2015 Ralph Bean - 2.5.3-2 -- Backport fix for CVE-2015-2296. - -* Thu Feb 26 2015 Ralph Bean - 2.5.3-1 -- new version - -* Wed Feb 18 2015 Ralph Bean - 2.5.1-1 -- new version - -* Tue Dec 16 2014 Ralph Bean - 2.5.0-3 -- Pin python-urllib3 requirement at 1.10. -- Fix requirement pinning syntax. - -* Thu Dec 11 2014 Ralph Bean - 2.5.0-2 -- Do the most basic of tests in the check section. - -* Thu Dec 11 2014 Ralph Bean - 2.5.0-1 -- Latest upstream, 2.5.0 for #1171068 - -* Wed Nov 05 2014 Ralph Bean - 2.4.3-1 -- Latest upstream, 2.4.3 for #1136283 - -* Wed Nov 05 2014 Ralph Bean - 2.3.0-4 -- Re-do unbundling by symlinking system libs into the requests/packages/ dir. - -* Sun Aug 3 2014 Tom Callaway - 2.3.0-3 -- fix license handling - -* Sat Jun 07 2014 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Arun S A G - 2.3.0-1 -- Latest upstream - -* Wed May 14 2014 Bohuslav Kabrda - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Wed Sep 25 2013 Ralph Bean - 2.0.0-1 -- Latest upstream. -- Add doc macro to the python3 files section. -- Require python-urllib3 greater than or at 1.7.1. - -* Mon Aug 26 2013 Rex Dieter 1.2.3-5 -- fix versioned dep on python-urllib3 - -* Mon Aug 26 2013 Ralph Bean - 1.2.3-4 -- Explicitly versioned the requirements on python-urllib3. - -* Thu Aug 22 2013 Ralph Bean - 1.2.3-3 -- Release bump for a coupled update with python-urllib3. - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 01 2013 Ralph Bean - 1.2.3-1 -- Latest upstream. -- Fixed bogus date in changelog. - -* Tue Jun 11 2013 Ralph Bean - 1.1.0-4 -- Correct a rhel conditional on python-ordereddict - -* Thu Feb 28 2013 Ralph Bean - 1.1.0-3 -- Unbundled python-urllib3. Using system python-urllib3 now. -- Conditionally include python-ordereddict for el6. - -* Wed Feb 27 2013 Ralph Bean - 1.1.0-2 -- Unbundled python-charade/chardet. Using system python-chardet now. -- Removed deprecated comments and actions against oauthlib unbundling. - Those are no longer necessary in 1.1.0. -- Added links to bz tickets over Patch declarations. - -* Tue Feb 26 2013 Ralph Bean - 1.1.0-1 -- Latest upstream. -- Relicense to ASL 2.0 with upstream. -- Removed cookie handling patch (fixed in upstream tarball). -- Updated cert unbundling patch to match upstream. -- Added check section, but left it commented out for koji. - -* Fri Feb 8 2013 Toshio Kuratomi - 0.14.1-4 -- Let brp_python_bytecompile run again, take care of the non-python{2,3} modules - by removing them from the python{,3}-requests package that they did not belong - in. -- Use the certificates in the ca-certificates package instead of the bundled one - + https://bugzilla.redhat.com/show_bug.cgi?id=904614 -- Fix a problem with cookie handling - + https://bugzilla.redhat.com/show_bug.cgi?id=906924 - -* Mon Oct 22 2012 Arun S A G 0.14.1-1 -- Updated to latest upstream release - -* Sun Jun 10 2012 Arun S A G 0.13.1-1 -- Updated to latest upstream release 0.13.1 -- Use system provided ca-certificates -- No more async requests use grrequests https://github.com/kennethreitz/grequests -- Remove gevent as it is no longer required by requests - -* Sun Apr 01 2012 Arun S A G 0.11.1-1 -- Updated to upstream release 0.11.1 - -* Thu Mar 29 2012 Arun S A G 0.10.6-3 -- Support building package for EL6 - -* Tue Mar 27 2012 Rex Dieter 0.10.6-2 -- +python3-requests pkg - -* Sat Mar 3 2012 Arun SAG - 0.10.6-1 -- Updated to new upstream version - -* Sat Jan 21 2012 Arun SAG - 0.9.3-1 -- Updated to new upstream version 0.9.3 -- Include python-gevent as a dependency for requests.async -- Clean up shebangs in requests/setup.py,test_requests.py and test_requests_ext.py - -* Sat Jan 14 2012 Fedora Release Engineering - 0.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Nov 27 2011 Arun SAG - 0.8.2-1 -- New upstream version -- keep alive support -- complete removal of cookiejar and urllib2 - -* Thu Nov 10 2011 Arun SAG - 0.7.6-1 -- Updated to new upstream release 0.7.6 - -* Thu Oct 20 2011 Arun SAG - 0.6.6-1 -- Updated to version 0.6.6 - -* Fri Aug 26 2011 Arun SAG - 0.6.1-1 -- Updated to version 0.6.1 - -* Sat Aug 20 2011 Arun SAG - 0.6.0-1 -- Updated to latest version 0.6.0 - -* Mon Aug 15 2011 Arun SAG - 0.5.1-2 -- Remove OPT_FLAGS from build section since it is a noarch package -- Fix use of mixed tabs and space -- Remove extra space around the word cumbersome in description - -* Sun Aug 14 2011 Arun SAG - 0.5.1-1 -- Initial package +%autochangelog From d78a94dfe49e53f410fd3ecbc7b460c2b1f044b7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 10:26:13 +0200 Subject: [PATCH 157/165] Bootstrap for Python 3.14 --- python-requests.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-requests.spec b/python-requests.spec index 1efa0bf..6a3bb4d 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,3 +1,4 @@ +%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %bcond tests %{undefined rhel} From 96f8226c90fff5ab4ebf293dbf3cd97f0167d269 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 13:32:12 +0200 Subject: [PATCH 158/165] Rebuilt for Python 3.14 --- python-requests.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-requests.spec b/python-requests.spec index 6a3bb4d..1efa0bf 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,4 +1,3 @@ -%global _without_tests 1 # When bootstrapping Python, we cannot test this yet # RHEL does not include the test dependencies %bcond tests %{undefined rhel} From e4b73fd858cd66e4735d3dea7393a237dc773fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Jul 2025 11:59:04 +0200 Subject: [PATCH 159/165] Package %license via %pyproject_save_files [skip changelog] --- python-requests.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 1efa0bf..26734bd 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -108,7 +108,7 @@ sed -i 's/ --doctest-modules//' pyproject.toml %install %pyproject_install -%pyproject_save_files requests +%pyproject_save_files -l requests %check @@ -121,7 +121,6 @@ sed -i 's/ --doctest-modules//' pyproject.toml %files -n python%{python3_pkgversion}-requests -f %{pyproject_files} -%license LICENSE %doc README.md HISTORY.md From 8607c2fb6581a3f649be34ed5adb77bd1c67fc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Jul 2025 12:12:42 +0200 Subject: [PATCH 160/165] Update to 2.32.4 - Security fix for CVE-2024-47081: .netrc credentials leak via malicious URLs --- .gitignore | 1 + ...09661335bd3dd8a7e39f04d07b42e519becc.patch | 31 - 6924.patch | 55 -- ...bdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch | 685 ------------------ python-requests.spec | 25 +- sources | 2 +- system-certs.patch | 12 +- tests/upstream/runtest.sh | 4 +- 8 files changed, 11 insertions(+), 804 deletions(-) delete mode 100644 507409661335bd3dd8a7e39f04d07b42e519becc.patch delete mode 100644 6924.patch delete mode 100644 9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch diff --git a/.gitignore b/.gitignore index 7c27bec..da16a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /requests-v2.28.2.tar.gz /requests-v2.31.0.tar.gz /requests-v2.32.3.tar.gz +/requests-v2.32.4.tar.gz diff --git a/507409661335bd3dd8a7e39f04d07b42e519becc.patch b/507409661335bd3dd8a7e39f04d07b42e519becc.patch deleted file mode 100644 index 13b0001..0000000 --- a/507409661335bd3dd8a7e39f04d07b42e519becc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 507409661335bd3dd8a7e39f04d07b42e519becc Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Mon, 17 Feb 2025 00:39:07 +0000 -Subject: [PATCH] Add CA constraint to test CA - -Otherwise recent versions of OpenSSL reject it as an invalid CA -certificate (at least once the test certificates are regenerated). - -Fixes: #6896 ---- - tests/certs/expired/ca/ca.cnf | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/certs/expired/ca/ca.cnf b/tests/certs/expired/ca/ca.cnf -index 8c4b823053..1443cb9374 100644 ---- a/tests/certs/expired/ca/ca.cnf -+++ b/tests/certs/expired/ca/ca.cnf -@@ -4,9 +4,13 @@ prompt = no - default_md = sha256 - encrypt_key = no - distinguished_name = dn -+x509_extensions = v3_ca - - [dn] - C = US # country code - O = Python Software Foundation # organization - OU = python-requests # organization unit/department - CN = Self-Signed Root CA # common name / your cert name -+ -+[v3_ca] -+basicConstraints = critical, CA:true diff --git a/6924.patch b/6924.patch deleted file mode 100644 index 02bf4e7..0000000 --- a/6924.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2019450b43511289d45c6b3e7376f2813e1c27b4 Mon Sep 17 00:00:00 2001 -From: Richard van den Berg -Date: Sat, 29 Mar 2025 14:53:45 +0100 -Subject: [PATCH] Add key usage extension to test ca.crt - ---- - tests/certs/expired/ca/ca.cnf | 1 + - tests/certs/expired/ca/ca.crt | 20 ++++++++++---------- - 2 files changed, 11 insertions(+), 10 deletions(-) - -diff --git a/tests/certs/expired/ca/ca.cnf b/tests/certs/expired/ca/ca.cnf -index 1443cb9374..09fcb6de1c 100644 ---- a/tests/certs/expired/ca/ca.cnf -+++ b/tests/certs/expired/ca/ca.cnf -@@ -14,3 +14,4 @@ CN = Self-Signed Root CA # common name / your cert name - - [v3_ca] - basicConstraints = critical, CA:true -+keyUsage = critical, cRLSign, digitalSignature, keyCertSign -diff --git a/tests/certs/expired/ca/ca.crt b/tests/certs/expired/ca/ca.crt -index f08b2d67a5..2c8ebd44ae 100644 ---- a/tests/certs/expired/ca/ca.crt -+++ b/tests/certs/expired/ca/ca.crt -@@ -1,8 +1,8 @@ - -----BEGIN CERTIFICATE----- --MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL -+MIIDpDCCAoygAwIBAgIUQt0yyZmppkHKNx4aXRrmD5tvjbswDQYJKoZIhvcNAQEL - BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu - ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt --U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMzI5MTM1MTQ1WhcNNDUwMzI0MTM1MTQ1WjBq - MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp - b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu - ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ -@@ -11,12 +11,12 @@ dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe - ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ - C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz - zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 --/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU --CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG --0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ --wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG --Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum --b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb --UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb --KOWpOS3fbsI= -+/kqHpCgUwUc4Dq0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E -+BAMCAYYwHQYDVR0OBBYEFAhGiD3+10LBrdMW3+j/ceXMXSqcMA0GCSqGSIb3DQEB -+CwUAA4IBAQBRT21cyZ0Jx0JLA2ilYTLvpMsSryGyWrCOXlmRlBt1MAhmxdTRgCmu -+UB3UU2pfnrC16UeMVVS411lhzjowFXkXrjAqSUBRcetUIYHlpnGgDdUl4dV/X5kx -+HxD9VUBx/QwGeyzFhjzjeN89M2v9kPnhU/kkVfcsafwYiHdC6pwN6zeZNz7JP+GS -+rmI+KVpm5C+Nz6ekm3TR8rFgPIsiDTbY3qj/DNYX2+NhpU1DZfm687vhOr3Ekljx -+NHNu9++STEjGpirrI8EqQnK+FP2fRJ5D82YZM0d++8tmHKpY0+FRCr8//459sgun -+CojmhIobDa2NuF81Jx6Cc7lagCPG3/Ts - -----END CERTIFICATE----- diff --git a/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch b/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch deleted file mode 100644 index 003973f..0000000 --- a/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch +++ /dev/null @@ -1,685 +0,0 @@ -From 9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Mon, 17 Feb 2025 00:41:30 +0000 -Subject: [PATCH] Regenerate test certificates - -Created using the following command with OpenSSL 3.4.0: - - for cert in expired mtls valid/server; do - make -C tests/certs/$cert clean all - done ---- - tests/certs/expired/ca/ca-private.key | 52 +++++++++--------- - tests/certs/expired/ca/ca.crt | 38 ++++++------- - tests/certs/expired/ca/ca.srl | 2 +- - tests/certs/expired/server/server.csr | 24 ++++----- - tests/certs/expired/server/server.key | 52 +++++++++--------- - tests/certs/expired/server/server.pem | 77 ++++++++++++++------------- - tests/certs/mtls/client/client.csr | 24 ++++----- - tests/certs/mtls/client/client.key | 52 +++++++++--------- - tests/certs/mtls/client/client.pem | 77 ++++++++++++++------------- - tests/certs/valid/server/server.csr | 24 ++++----- - tests/certs/valid/server/server.key | 52 +++++++++--------- - tests/certs/valid/server/server.pem | 77 +++++++++++++-------------- - 12 files changed, 279 insertions(+), 272 deletions(-) - -diff --git a/tests/certs/expired/ca/ca-private.key b/tests/certs/expired/ca/ca-private.key -index 507b1f5623..8aa400e043 100644 ---- a/tests/certs/expired/ca/ca-private.key -+++ b/tests/certs/expired/ca/ca-private.key -@@ -1,28 +1,28 @@ - -----BEGIN PRIVATE KEY----- --MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHlIhe7GLCeSk8 --RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He --mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK --na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 --fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm --zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy --e6lzFyWnAgMBAAECggEAFwzHhzcD3PQDWCus85PwZoxTeQ817BmUBGpBBOKM0gLG --GCsT7XsmGP2NjICBy9OK+QTKawmb/wR5XK0OMUWDHXqtWn+NFIyojyo8+HEeCf8n --4ZleTFHLnJ+d2N1etbc2qc9mY3tjpaurq8/0Tol9YH06ock1TY2+lO+a5HvMURnY --hcWs70CamL+5B/6n67DhjzMtIW3dIXuEEceM1BW/jW8SKq0JHpQ3t+OJwID7zFaJ --bLyOwAVheMzVGvN3yphf8tll3tMA65bNjdOzgOfZSjAy7EGjW3DyAolDw9jKLRyu --E0gw/exNGe618oMIeUDv0KParlL4RjdiUP8l0xYOwQKBgQD3eYj9rWeqZquI9vKP --gaSv6urb2UJLngShZUpEZRNJgBO+Ewiof0w8tpQdsnuMvWudxMLbzgiUNA+NyC/K --CpzIXFkWnWx+A/pxs8ZO8moOfajVRayJgeOLsQZb7c4fXGsVGApbN4+cPNhTNG6d --ucErv6tae/SzAzcLc5Vkw/ELxwKBgQDOdJ5Wl5JeKAvU/3kF6+MYWCrXxZqMjoHS --y1BtyMX5RbdaWTCfDUu1aV3qJOJjjWQ9DJdJQcEsrTjOpD4bVdZx4w/XEG0JXAa3 --jRypVHGdeG/TjhUGJA8U+KX3a1DkcdqM9pqFYRw5Ie95Wz9YRroI+YkixqpK8d7W --C+5BodxXIQKBgCk8Lv9V7XgPM3XW8APJbk+BrTCEuu8unUbnQcCztssAdEmvkjnB --PErBgVyRaNTCmzPmnTFS20sWgaD2QkBAFG+uM4n5ISK+NvTLJ7fv3IwdlAw1V9Jx --uiCElrKqpTXEiHMzVkZss5ks6j6y9duCIBXSEhM5pERPvNRDphjsLTXxAoGARSNC --nyb1Kjjo9XR0V+pNy6pC9q1C+00B5tCVZ55zxe114Hi70pfGQcM+YxnlAoeoCNW9 --mBfAFDESNAlGjyrovIzYkiH7EcZSrYdBEOepgJ2DfWo4Wi0bK9+03K2AknAaS1iO --GJqTtAJMSuymwu40gKroJNA42Q40nKO0LyCARGECgYEAiFRHkblBtStv22SpZxNC --jim9yuM0ikh7Ij1lEHysc/GWb2RQNxQVk54BU2kQ0d9xwMZQTKvpF3VE9t7uGdwt --AasWPr/tWYt35Ud0D4bNlagJJ4Xdslf8n1nkq3qqqDQbd7kkQRgwGzVr0uVg7ZfS --26qSPQ0/aF9nagb5eHX3AuU= -+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQCfZUh82dF/r9GW -+89IN2vqOiMMuikIAO3SEI3+uSGCdWT13C+NnrFJ7XF/D6UGy1mvm8KfhSnapWoAk -+toyPXSc/GNzJzCwZool7xE+rm/0vbu1XbUcQcqB8nQRLzTChDIGuuD8DHs7bmen1 -+9sT5kZy0CIqac383cQxR8W1Fs48xEBJfuBBmyl+bz4ugPci96H4DIuAD2QvP2KKg -+Gqs4yyDPSmf86k9+okOsLMQVwGnHety+TPJawCn2aCXl+rmMTSCH2sUEc81cXaVQ -+Yxyf6HaqGncCs1O2MzeRbPugEzb5K4ZVM4NYtDMkxrQnZFCALf4XOma1uv5Kh6Qo -+FMFHOA6tAgMBAAECgf9YadXLawbJzLx0/smE5fIVHccmCYqSlmgK46XvBjaREO8H -+GZEJ8IvP4W09PiUzDbzMXLDCRouLZKevtZJB82nRlfjh9l5/2aho/nsytVO6+8yq -+sfK5LNvYQ0Aey7ItosJMJ+bL1ErphHZB+J9Jz3scYaCAC5CFMC+lREVYZEEI9QD4 -+P2D5QbmaSeu8jmL/H3fWHjNXWDprue3W/MIf96NZa3qJew45go4TAYYMe5i757KW -+Ja40VNfmsgbz4uI9oDXaYL/NkWUaQP1lnh+Mfrm1YnBe2wsLcP/WuM5h0bYzJW/1 -+ZeSrZM3fqCMW6SJyrVE1qzqvtw1xQBlrq0B6q0ECgYEA0fi4+ySFGR+mL6k5UjP1 -+roREqQgKaLgdhOvD88EnO93Nl6tJ3Qk8LyzPUNbxe1/xTUEKMtglBKOoxCHJJZlg -+xXnKBAQUtlmrLFKIGe+UCD+r+wfSpS6Sl7BUDmeCSczG9dPN5vnyZA4ixUke2SCC -+k4Eb9Q0AHyNnbXv928r0sfkCgYEAwlZRYmGTVva6cY2YEmMrqbWy4Wxm2Zmdo+Uq -+Xu1RZF9a3tGzNbGsyYdeLNY7vVZoVOm1paMJCA8ScNLFtCux2jEPqwqd1OZ8OLhA -+1VF3/kYtUSdqwLzWoS1RdD6mZCAHeOE+N0pone4lt3A2o8wtpHsaDA+XSTw2rHLR -+LVS+b1UCgYEAtezJ4Ze31pfMdrkpmCa69JVXpBj6Y9c6hGN+aWFuq/k22/WmTuRk -+h/9MNR+3JQ1w1l3HB1ytXkKqxBz92hz1csReG3Kpu4EfxYxQriAdY7Q/P4Z8pXAf -+xVwayEw439aUgIQef8UKllSFHeiH2NrJKCKSZZT5CQG06HCo+Fn1/4kCgYAYuwtY -+TbqGUpefY7l6fYxM6IZ/EWB1SIs7FCq0MdctwsS5nk4EAzxN2SAu7IRlr91PEP7A -+uWKo1+Is4WWva/ASKDQqPAuh0EL2pNv7SYbPoPabYTzAkkdt82puNJrQGxNYWrGk -+L5/omSnLkkghyBX23IOQDVvfQf5jK6la73HckQKBgAI+iLECAkle9HvnJ3flicau -+9FAU1/9pOdM+WogSanhYQ/P2rAwRiyCIkqu62/OoZR5g4kLxWqOOmVvsK3j+gs5F -+FtwN7gauq06MAHnWr6qC8ZltzMsGZTVDvqSH2vgV4T1V6ovVpTBPKQ1gWtABEmpm -+dyfeA6HHeRAHx8VRGpL6 - -----END PRIVATE KEY----- -diff --git a/tests/certs/expired/ca/ca.crt b/tests/certs/expired/ca/ca.crt -index c332b7cb7b..f08b2d67a5 100644 ---- a/tests/certs/expired/ca/ca.crt -+++ b/tests/certs/expired/ca/ca.crt -@@ -1,20 +1,22 @@ - -----BEGIN CERTIFICATE----- --MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox --CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv --bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l --ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG --A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw --FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv --b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 --RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He --mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK --na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 --fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm --zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy --e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV --GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws --Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn --9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ --rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ --6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= -+MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL -+BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu -+ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq -+MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp -+b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu -+ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ -+0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK -+dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe -+ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ -+C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz -+zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 -+/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU -+CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG -+0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ -+wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG -+Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum -+b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb -+UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb -+KOWpOS3fbsI= - -----END CERTIFICATE----- -diff --git a/tests/certs/expired/ca/ca.srl b/tests/certs/expired/ca/ca.srl -index fab68405ed..0d6f69d6fe 100644 ---- a/tests/certs/expired/ca/ca.srl -+++ b/tests/certs/expired/ca/ca.srl -@@ -1 +1 @@ --4F36C3A7E075BA6452D10EEB81E7F189FF489B74 -+4F36C3A7E075BA6452D10EEB81E7F189FF489B83 -diff --git a/tests/certs/expired/server/server.csr b/tests/certs/expired/server/server.csr -index 5e3c177647..d8ba3a5bf2 100644 ---- a/tests/certs/expired/server/server.csr -+++ b/tests/certs/expired/server/server.csr -@@ -2,18 +2,18 @@ - MIIDHjCCAgYCAQAwbTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQK - DBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJl - cXVlc3RzMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB --DwAwggEKAoIBAQCKulIMpo633iCgbkKv1UoiLC4sQt5xWpgguujywu3hLYwmPFp9 --kvPt//imqtl8FhuhKqJ8FCGrVl2YIGj1RJIB3GW7MSPNCuIBFL/gwNi35LxDPtoA --IPyXytIR7VH9+ch9DFInJaoA/BekMuKvbXk54VW9whpHbwkXSG2lBS2vKL0XemYh --9VjvtuRDji2iOZpznlVE2PEN80bojArp6oYKakv2kYzgzgxAJiI/NZGvC7mbSI4e --ja7ad3R9G0kB1FzNj36jrNO5WtxHO/mrRiXSpDeyUbitYvt0HKoM0vhTnOR+BspP --IltfwOQh8qq2Q2AaMHNcVjMH3gHCZADfhk/zAgMBAAGgbDBqBgkqhkiG9w0BCQ4x -+DwAwggEKAoIBAQDcRRwk8IU1YoNu8CHzB5Vh8HP/yLfBtU69LLZq+7rDG31JlR5s -+lmcwLLoZ8opUQ5rg8JMRZ7toh5zB4Uc0B4Sg8RhQMSOZYBIJkXdHuqQkciR0vWnN -+vD/5CkWEhnj4dxE7xTbDufBlxmwAthC/u72UIsZHavAyLCBqsONa7xuTiogz/d+3 -+G+525JrfVr05hhJpT4Ypx5YY+ABkIOuOk/XuudbGm5SquuX6BgjmgaGtDjAuE/Rn -+BnliIavCDrG0v3KGbG3Xxt7lFTu+98foForwGCbbQBraty27oZrzAtLltfIHlJRn -+jPz0JA9akNDhAihxEsTUhk2d7jFszsd0Ev7DAgMBAAGgbDBqBgkqhkiG9w0BCQ4x - XTBbMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMB - MCwGA1UdEQQlMCOCCWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAAATAN --BgkqhkiG9w0BAQsFAAOCAQEAfAhEhrulsZae71YFqgvzwJHm/hzXh47hErtgDXVJ --mFqAxgF6XrnzYujlt3XQXUx/8vdrU7jH+Pe8WO1rDvFwRPMDGoBF3RX29SzyX/2F --e102egnoRR+Hlf0Ixqu0CuTjEVnD+g4mRgXhV7LPKP4W6qGwzcVbaJ3c/zRcfqNR --g9gN6Q6Qt4fXDc7wlx2T3nOszBLQ2XCsIyzVtOJ2sSuadqKH9Aj+mrkrLBdzVFHD --FHnTMJ0t0+anZwd+AWDNsCr5lIwBGL634zw7/yJepMHuPFd2X24S3u8EaWPkfVQn --lV6rLQMGjXYTe2xuYzlUCUYnKvkyPTMjSXDkxWa+WSNwyQ== -+BgkqhkiG9w0BAQsFAAOCAQEAVVIxJlDrgeG0bOSufgVVRqDQx7XSd15mGlT+CynM -+lEFJ3Q9k98T2vRNNGVYYYZAnbdSOW9ACwWGcYm2bzIjbgZV0H2Kz0dLD/GrNuEY+ -+O9j6K2toFKc57G7UUkve+N74ldq+hkR4zbb6FQmTlnL2YaPp2dv5TxdMKfHEfPNf -+Bg8xpbXdoRc7CYW1ZACme+d2U063GVqQsrIfwGJ+BtE6aNo62T/oEm+G4Wy5iBay -+jNv/imwf+JKQ75bTvha9YLUg2scqdYwJj8JlBw7cvkBIHW8GydA3fX4dtV9YBbFi -+8RTlWhhLgCXpYbLoDGOqF6f/MuPSIGkV1wVhCUfYA+p+Gw== - -----END CERTIFICATE REQUEST----- -diff --git a/tests/certs/expired/server/server.key b/tests/certs/expired/server/server.key -index 27ddafd1ca..c48457b39a 100644 ---- a/tests/certs/expired/server/server.key -+++ b/tests/certs/expired/server/server.key -@@ -1,28 +1,28 @@ - -----BEGIN PRIVATE KEY----- --MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCKulIMpo633iCg --bkKv1UoiLC4sQt5xWpgguujywu3hLYwmPFp9kvPt//imqtl8FhuhKqJ8FCGrVl2Y --IGj1RJIB3GW7MSPNCuIBFL/gwNi35LxDPtoAIPyXytIR7VH9+ch9DFInJaoA/Bek --MuKvbXk54VW9whpHbwkXSG2lBS2vKL0XemYh9VjvtuRDji2iOZpznlVE2PEN80bo --jArp6oYKakv2kYzgzgxAJiI/NZGvC7mbSI4eja7ad3R9G0kB1FzNj36jrNO5WtxH --O/mrRiXSpDeyUbitYvt0HKoM0vhTnOR+BspPIltfwOQh8qq2Q2AaMHNcVjMH3gHC --ZADfhk/zAgMBAAECggEAFSF9RvUFzyb0BEvXN44+/QaKv+4tkMmSW4Xs3rFnZ4G3 --E8nkpLUCF9ICD2z9tKNvcPScDFdKq5z7o6ToJ9faf5MRIdrBz8UlGLIO6g6l1Bjw --vjNwJE3h+8MGjXl/IDbwXW/HgbQAeabsePPRSJRdvz2+ACn1M8VLdrLvFJA93ayW --+n3Bk0bXdsrzqBGdoDiNzmIHI3WqdONiR9TymuJe41NJtMKxQDF+c6Y1n/X1OtBk --s9L+u9Xr+R3H72xSYrf1KH1mFZJfTnIPoOmdEU2tVZnZj03rZhT7p8R1fVNX6OHu --NX1Dy9VA6J7dbcqdPvTI743ByQeb+hNnqI/3hmV5eQKBgQC++1Wn3v/dxtczjA+I --tN4a7zyjhazpB25lde55HVfCQPxmYxIYct+j6S0JkMaoLrjiEDb4pnu4Gt4MDqZa --r0Xm8t3wD1YKUUbhpBEGvsMhAEZEIsBOcwkTiEwsoF0mKFa2mTyqAImgIQa8uFt8 --Y/oTj55XFe1x6pZKEJRg+K+QSwKBgQC59ONVkMSBirLGS+G+b2kqiBdwZB/3s3wr --feS1xTa+deL3AChnKT9+MsVqOkxdE2TRj/mAeF+5Woa5bPMvgr9Kl7u8bulTH80l --YA/N6FneO11/ncnkgK9wN54kd5TiOtGsGB5S5t/nEAIMUIwWrM/cRau72xNEWOhT --Tvw7TOSF+QKBgQCa/texeiYmE24sA4vH4yIuseKAw8hlBwbtiRyVZt8GZD9zyQuy --k+g02tUWYk0XyXN65LX4bwURkZyMJIeWKZGNsaW1YnzturDQB5tZ4g/zBIoCWkHA --aVQAaimIPk3a3foiD5NQVUdckfEp0GVPOsSGg5R6EO23+i8mxPXnDW1OqQKBgGvf --lelTO8tyLFdAOcqBUt6rZ/1499p3snaAZ6bSqvk95dYnr0h48y5AQaln/FiaIYg4 --HyLZsZ4S18jFXSWYkWOyNeQP6yafciBWY5StT0TN52VaoX3+8McGXKUHAcVjHbLZ --ou2wpP6jmKyQJVQaF9LOT9uAMOMbOFrrnQLBjmfxAoGAQAnUhMFG5mwi9Otxt6Mz --g+Gr+3JTlzwC3L7UwGdlFc3G2vSdGx/yOrfzpxPImfIBS95mibDfdvEBMer26pvw --a/ycqybyX9d/5nPDIaJ1lc4M4cbHC/cB52JI6avr/1g8OMK7lR7b/FsPVHS1w8kl --n6uwEjVt2+gP2o9DFTGs158= -+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDcRRwk8IU1YoNu -+8CHzB5Vh8HP/yLfBtU69LLZq+7rDG31JlR5slmcwLLoZ8opUQ5rg8JMRZ7toh5zB -+4Uc0B4Sg8RhQMSOZYBIJkXdHuqQkciR0vWnNvD/5CkWEhnj4dxE7xTbDufBlxmwA -+thC/u72UIsZHavAyLCBqsONa7xuTiogz/d+3G+525JrfVr05hhJpT4Ypx5YY+ABk -+IOuOk/XuudbGm5SquuX6BgjmgaGtDjAuE/RnBnliIavCDrG0v3KGbG3Xxt7lFTu+ -+98foForwGCbbQBraty27oZrzAtLltfIHlJRnjPz0JA9akNDhAihxEsTUhk2d7jFs -+zsd0Ev7DAgMBAAECggEAUZjCX8a/ufJ3+OE42lQdWO4fsonS1I3LENYe70u4OC2X -+QGpenmAq8pQnDpSj/KocliZYfLKeII9YGRRQcaw1S/9z/8TsSJVnqSa7dpVj1+J2 -+sc43AxEw65sL/Jdp+bT169vXOTNIpBMYkDzhwH0WMemd5Pfu6c8h5RQI7Pc1knYn -+nPNY848qSYCWOUjZS3QmBik/gp9X//yxVCyvxB3xVnb1cpvc952D90Va6nFIWfgN -+ix4NgFgAvwIxCFpWI2z7JF8uBdAHPeFAx8pFukQpAzwhaEILlgt3WbvEob9CsdP5 -+E39SUkzxiIfVM1du+hRquk9SJ/X56OSLnEjxLarSIQKBgQDyVU00yrv7lG7TJLZ5 -+YyfE20A7eUtYdcfatTKfsxKO4KVV+p0mGsNnFhhKziuT5/xtVunbUNFEOaUfmTUP -+dCjy4XkDbE/ufxzIm1WTSqknUluVoJRWKmLI5gbDFxu/XGRQNLxQbMK54l3N69PT -+EO4kz/jqBYbd4aEmtaSx2R8JowKBgQDosUTgBGDxDE2ODPVoXc+YjReOmVHvGMKK -+tA+KDBEs4spxaqhH0OFh6mewx3jA4VHbcIgM50STXrq1VL/QqYclDlY9/VWzkmqp -+2Ekc4NoAl3H022pgcbmXx3qapC4Z3hokNFOlbtD9xQf9NMx6c5djTKMYTBrBBWXH -+oFhSz6PIYQKBgQCMGqkydmvMffq89CLTd3JMq/4s5GmdUSsk1VHZZuy50kOEvAoT -+N7H1bZ7J0Pz83Eji5jb6Z3U1nqZK6Ib20k/CbH1Mb1ifKLp5eOU27Rly9Hiiv15D -+munWALe0Hy4Zqs8MWBDv5pGGasuU/F1RUB5/BgaBNoTMz2AeQzJe6Iq7RQKBgCca -+Ku3OLpAzNhEp4k9wfEMxaoT/BMK+EWsHiRj0oCo/zi8y8iZnVoiCwHv3eTZIZt4O -+Uf6BGof9QjjYjgc9hcVXXGy8Vpt/fkceXmLo8hlpWbAA8yZT1hFIZzT3Y/va09/D -+n07MiXgrlQUay0XEiOsZ5Mpfd5t6EblzG4SG+gnhAoGAZ+shbacxhji7cUUYJLrO -+9uZJCDCZiyq8yZ+lMzX1kILQwaP6VmSvF4TzKrkrCuD2HzUYcqebko/TvckeTp/a -+oYC2put3zt0CHBf/keeeJwjhff19qVyE9mpZwoo7PuS5zmM7pQOLxzCyAM9MdsCz -+kmnbborcfh74fkfRcwXm6G8= - -----END PRIVATE KEY----- -diff --git a/tests/certs/expired/server/server.pem b/tests/certs/expired/server/server.pem -index 05a2a4dac8..8304c04e49 100644 ---- a/tests/certs/expired/server/server.pem -+++ b/tests/certs/expired/server/server.pem -@@ -1,41 +1,44 @@ - -----BEGIN CERTIFICATE----- --MIIDXjCCAkYCFE82w6fgdbpkUtEO64Hn8Yn/SJt0MA0GCSqGSIb3DQEBCwUAMGox --CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv --bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l --ZCBSb290IENBMB4XDTI0MDMxMzIxMTQ0NVoXDTI0MDMxMzIxMTQ0NVowbTELMAkG --A1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUg --Rm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRIwEAYDVQQDDAls --b2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKulIMpo63 --3iCgbkKv1UoiLC4sQt5xWpgguujywu3hLYwmPFp9kvPt//imqtl8FhuhKqJ8FCGr --Vl2YIGj1RJIB3GW7MSPNCuIBFL/gwNi35LxDPtoAIPyXytIR7VH9+ch9DFInJaoA --/BekMuKvbXk54VW9whpHbwkXSG2lBS2vKL0XemYh9VjvtuRDji2iOZpznlVE2PEN --80bojArp6oYKakv2kYzgzgxAJiI/NZGvC7mbSI4eja7ad3R9G0kB1FzNj36jrNO5 --WtxHO/mrRiXSpDeyUbitYvt0HKoM0vhTnOR+BspPIltfwOQh8qq2Q2AaMHNcVjMH --3gHCZADfhk/zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGeQdB4+iDbJ78eKhCMV --49Cm8nyYi9215rRRJ24Bw6BtVw1ECwymxLVOEB0gHCu8kKdsFnniFBtChts/ilFg --blIyPKTsb3+kQW9YV9QwVdFdC4mTIljujCSQ4HNUC/Vjfnz85SDKf9/3PMKRr36+ --GtSLIozudPvkNmCv68jy3RRXyCwWHc43BLMSZKPD/W+DEuXShI9OIpIlSLBx16Hz --4ce3/1pGuITWcsw6UcRqW31oPR31QmNs5fsq5ZCojDNFzEFCA1t9LiR6UOftFUKy --yOZWfZeAGGdK75U+XDqS9Xkr5/ic5jE0I5rT7e7r3lpvQdgIj8lSx493fczLOGHr --YA0= -+MIIDpzCCAo+gAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im4EwDQYJKoZIhvcNAQEL -+BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu -+ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNMjUwMjE3MDAzODIyWjBt -+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCREUxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0 -+d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxEjAQBgNV -+BAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxF -+HCTwhTVig27wIfMHlWHwc//It8G1Tr0stmr7usMbfUmVHmyWZzAsuhnyilRDmuDw -+kxFnu2iHnMHhRzQHhKDxGFAxI5lgEgmRd0e6pCRyJHS9ac28P/kKRYSGePh3ETvF -+NsO58GXGbAC2EL+7vZQixkdq8DIsIGqw41rvG5OKiDP937cb7nbkmt9WvTmGEmlP -+hinHlhj4AGQg646T9e651sablKq65foGCOaBoa0OMC4T9GcGeWIhq8IOsbS/coZs -+bdfG3uUVO773x+gWivAYJttAGtq3LbuhmvMC0uW18geUlGeM/PQkD1qQ0OECKHES -+xNSGTZ3uMWzOx3QS/sMCAwEAAaNCMEAwHQYDVR0OBBYEFFK1WmMqRSzUD2isk8TL -+M3JfsVczMB8GA1UdIwQYMBaAFAhGiD3+10LBrdMW3+j/ceXMXSqcMA0GCSqGSIb3 -+DQEBCwUAA4IBAQCekjxplL/AI32WtODgw7FpTXNXdyNy8PWEhn3ufL0MqiyseYOZ -+bIa0PAecsArlKs5hXJzB7p/hu5CZdvaCButw1jyWQBySCpeJXn3FmGdTkBvhwBHv -+y6npmBoy/nbLkIRNRcoLbALlfn/0iGWfmDTRblT7vRNWJmZCZCTA/+ILXJ36ItbF -+3JCs3ARF6XWORuZs5Y8cNloOy2brAC/4EHnTfOZBQf8cL8CfHlcNa+nbG1j+wVNO -+60e/0v9zTxa2wNzdnLBCW4rqJFJ44aGClxat5tWuypv0snA/0xrqIYWTQGXZPVT6 -+rET47dfVbj1QxmW3sAyuy5PskZA9T7pOhcjR - -----END CERTIFICATE----- - -----BEGIN CERTIFICATE----- --MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox --CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv --bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l --ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG --A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw --FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv --b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 --RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He --mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK --na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 --fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm --zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy --e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV --GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws --Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn --9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ --rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ --6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= -+MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL -+BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu -+ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq -+MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp -+b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu -+ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ -+0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK -+dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe -+ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ -+C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz -+zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 -+/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU -+CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG -+0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ -+wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG -+Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum -+b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb -+UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb -+KOWpOS3fbsI= - -----END CERTIFICATE----- -diff --git a/tests/certs/mtls/client/client.csr b/tests/certs/mtls/client/client.csr -index 9a5713d5c7..35c8c2f325 100644 ---- a/tests/certs/mtls/client/client.csr -+++ b/tests/certs/mtls/client/client.csr -@@ -2,12 +2,12 @@ - MIIEGjCCAwICAQAwbDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQK - DBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJl - cXVlc3RzMREwDwYDVQQDDAhyZXF1ZXN0czCCASIwDQYJKoZIhvcNAQEBBQADggEP --ADCCAQoCggEBAMn3iQycTjUzpKJChRNkcm33UB282cUwpxeqKN4ahHxBpS09HRhk --cQYO7yErEUQwzQnBQEcIpzzeIMZIqHuCkgnySjeEJd95AIzNzGyoLLkS51TcJwgR --v83AvT8ljA88s9h38qGTy4/TCxJgf76pfHIuC1qoKVQh3AuHj9nOxIZLUsrdDbWF --WoLqKSVyTby+RXvSAppAR+cuBCaWStQ6xFORn48RHfc6t30ggD4rDAjyU6Vz6oR8 --ot3XmGdK0h42UdqidUWkRJajEbpkCnQSXS21IvfXKxF5sFqAXJrj9iVbUfpNPpaa --W8IrHByngyV8amazGZrASstUVRFtWrnrcWECAwEAAaCCAWcwggFjBgkqhkiG9w0B -+ADCCAQoCggEBAJrdvu5kvCy5g6w67gczETk/u6K0UBmf6Mv0lqXCp3Voyt5fv6SI -+/OPWrFV1+m4imNe5bLM7JUoUfkqkmULsjTTh7sxVLjW226vLSYOWWy7PA+OSwUTN -+LjydF1dazlPedHPYdmhVShCmyoOd1pUCDQn0/4cEA/WW4mtzZImmoCf/pyAM3XAC -+9RBcSSJRywOTe6n9LY6Ko0YUW94ay2M4ClVblDxswDemaAsLFuciKmi53gKx4H/l -+areo8p60dgubooiMbcc4E9bzp0oJpfh7xhwKeJtCNEpOik1AiiQIZtwqmkkIHvtI -+Go3SZ7WAQU9Eh2r+u3E6aSl+N0PMXK4Y4JsCAwEAAaCCAWcwggFjBgkqhkiG9w0B - CQ4xggFUMIIBUDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggr - BgEFBQcDAjCCAR8GA1UdEQSCARYwggESggsqLmxvY2FsaG9zdIcEfwAAAYcQAAAA - AAAAAAAAAAAAAAAAAYZNc3BpZmZlOi8vdHJ1c3QucHl0aG9uLm9yZy92MC9tYWlu -@@ -15,10 +15,10 @@ dGFpbmVyL3NpZ21hdmlydXMyNC9wcm9qZWN0L3JlcXVlc3RzL29yZy9wc2aGTXNw - aWZmZTovL3RydXN0LnB5dGhvbi5vcmcvdjEvbWFpbnRhaW5lcjpzaWdtYXZpcnVz - MjQvcHJvamVjdDpyZXF1ZXN0cy9vcmc6cHNmhk1zcGlmZmU6Ly90cnVzdC5weXRo - b24ub3JnL3YxL21haW50YWluZXI9c2lnbWF2aXJ1czI0L3Byb2plY3Q9cmVxdWVz --dHMvb3JnPXBzZjANBgkqhkiG9w0BAQsFAAOCAQEAwP1KJ+Evddn2RV1FM6BFkoDK --MPDO9qwb8ea3j57SIJXZlpw168DljmuGzxJw9oys2O6FYcspbHIocAkfFwiYgVAr --NEog6xlCdPxNBJgC3YFIKwnmBjMPG6ZCWiJn940qTbaJ/j6ZviN17uW4K7Sl+THp --IkMv29uQTWkfg+GbZ9q1hm2m2GHhYLGLAUdJdtv7JI+yq5uxdsWaCANpH6kc8SnK --2rik6D3iItDhHCmToHBpdEnP8J+KDzf5pJrv/g3WH8XVrl4ZzBsOhmciWF4C3Hbf --9eu8eAsp1AsIrZOEGTfClBd7vFCES5DmI0/iRs4czQooqZPnHjOw3Azp/LujrA== -+dHMvb3JnPXBzZjANBgkqhkiG9w0BAQsFAAOCAQEAMOwYPyq+OpMRQUAgoRjfxTQO -+DiqfBzCsjUsPAacLTtebbWBx8y6TkLSb+/Qn3amq3ESo4iBqKpmVwdlAS4P486GD -+9f78W3zkZ29jGcnQ+XHb7WvPvzBRoXImE276F9JGqJ+9q39Cbxzh0U2+ofBx2iGY -+sSutzU0B/l/FKZRc8thuFoeKqHwVePLGD9p2+2nYI9I08QoGqEokTcFAq0tZ858F -+9PdxBZYOKOMpnLZhiJ8qZo23v3ycBXPOjg5ILtQ9EzHoNEA5Mxx/mfNLKJ0NktZD -+KXANLWKbXm+w9gTcBLtCPWNeqj5DIGPsHSfq/Bmjbp/o+uOJs6oq3s5rA7WrAA== - -----END CERTIFICATE REQUEST----- -diff --git a/tests/certs/mtls/client/client.key b/tests/certs/mtls/client/client.key -index 8107125399..b6cea90813 100644 ---- a/tests/certs/mtls/client/client.key -+++ b/tests/certs/mtls/client/client.key -@@ -1,28 +1,28 @@ - -----BEGIN PRIVATE KEY----- --MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDJ94kMnE41M6Si --QoUTZHJt91AdvNnFMKcXqijeGoR8QaUtPR0YZHEGDu8hKxFEMM0JwUBHCKc83iDG --SKh7gpIJ8ko3hCXfeQCMzcxsqCy5EudU3CcIEb/NwL0/JYwPPLPYd/Khk8uP0wsS --YH++qXxyLgtaqClUIdwLh4/ZzsSGS1LK3Q21hVqC6iklck28vkV70gKaQEfnLgQm --lkrUOsRTkZ+PER33Ord9IIA+KwwI8lOlc+qEfKLd15hnStIeNlHaonVFpESWoxG6 --ZAp0El0ttSL31ysRebBagFya4/YlW1H6TT6WmlvCKxwcp4MlfGpmsxmawErLVFUR --bVq563FhAgMBAAECggEABhWX97JJxN6JFNOjhgGzqiPA3R8lrFlv3zhNbODS9u9U --q404xYBZIKaYhkucLzgNJUBrevhZbsL+V8WJQIH0JlU57nw5ATIjAHA+uqiXraen --zRhTcLHK28b1AeRUA4LU+YN7jWnnawN075kf9WgjtfOJ0gcDimOkE7uCFjyyvPJA --LG9bG+8enGjvUleKXNgmwP4Sq/GlEdGz9Qy+8ga3mtfAULUWe8haFNZXK8CN3xPp --wmVqy7QzgH2TGN1p6Dyxib9ksSN/lOg0dShL8zgu+QXDNx2VwmVrI8Vr02vmB//0 --bYxCo5pfICPIFLjLl5yo30dvrUfYqF29PperStHGlQKBgQD/TdemlLjJNP0fvSs7 --KEVJj/22YuHK+wurNr2ZFbSdcF3v9sfiwysllmEyGr5cNYA56uUbfG+8VSw7kDll --G+6BKK2UdlPH++6RahqWLqo4k6rsNrkq7elj8xG4gIjR5qzu2uLpjNwp2BGmIoUI --eb1NcLfTlMcNCooV8RHjm1Z5WwKBgQDKhHkUPDcJm2/9Ltq2NZQMrCS7o4LV2uAI --GhGpISfY+SfHkQQNZ9Fvbe6hrFeZs31nAvlTDpPEg/LGSVKA5I2EZT9gwzAQU1TD --Cyol4xqqWFWlwze7w+RLYqX5LtXf7NJg2m5p+ZOoOzzqvTVpodDxqTlCNp2/6ICP --vAIvWhbA8wKBgAYlr62ZIyHlHrsm6OWRwKlWyDseAmXKyasjtEj9Vs37qKdgf8ub --+2v6RPjZ3/+EYkQCveV9h4s3WctNW7Rtib6eZh+PAdFs5X+m2GEJWpvmIlVxs9+u --vtHjRmf04FZ9gWh26MPK2no/c51Wc3GSzNYSgrqbeHd963k/xrh+QwTFAoGAZZjb --3UjwG4O9RPjyhCKQ6WKa8v9urbamWaoqXfziLrmgOUAJFmiU6x/tbXI2aEdhjAIz --7nULsLS5YLx8BWmjjV3106dYP3hut4KsXGF4iSjTnts25J27tA4DUeUrKrF2QVyT --s9qfNvCw+Np/J0Uku3e33/3iWdpcVL9vIS5C5/0CgYBEuxb3dffNRqEiNkpOUrCD --mQTqbO3X+hin9zT3GrxQE+7KpfCfdDIqdK6c5UWHirR3HUjUPZmIFLSx8msfLl3k --hgQw37NMV+asg0Wy3P908qbtnEA2P6aDOMQeHJoC7qEHIDOcOQ1KP3FMvOrdscwS --f0IIDygTH6fYr329s0iXjg== -+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCa3b7uZLwsuYOs -+Ou4HMxE5P7uitFAZn+jL9Jalwqd1aMreX7+kiPzj1qxVdfpuIpjXuWyzOyVKFH5K -+pJlC7I004e7MVS41ttury0mDllsuzwPjksFEzS48nRdXWs5T3nRz2HZoVUoQpsqD -+ndaVAg0J9P+HBAP1luJrc2SJpqAn/6cgDN1wAvUQXEkiUcsDk3up/S2OiqNGFFve -+GstjOApVW5Q8bMA3pmgLCxbnIipoud4CseB/5Wq3qPKetHYLm6KIjG3HOBPW86dK -+CaX4e8YcCnibQjRKTopNQIokCGbcKppJCB77SBqN0me1gEFPRIdq/rtxOmkpfjdD -+zFyuGOCbAgMBAAECggEABHa5xyNOLTfXrMIyFDELoQvOO71YxbRPQHm3UeXPb9nq -+Zwh5fKOaLnMEmp4A7uW+ZBFrKatdwsnebgZaiIxK8ahFesxFvbScllIQt2NBE5NR -++GBFg9cqKwMYJiNu6Qnzb1dg6lbzAJHeKncFNVxOxeey6dBa0NxdgF1eG32bBiwT -+yIr6JO7cK5JfcExls5yxdZMZiW08quaeFMQR6Wocod2caDgJUBVbZwivEoNI3ak4 -+/kzQaxvRoDMM8uN3LrVH2YUJgURUxSbpOLu8ycZtfg8JRArprUYI0P0OD6iDlly1 -+3FhJXqBEY0dWQPmZKP/Elt3ywC1oncW+AqPh9cchiQKBgQDMriOKoBrTmplw0kbo -+EEuxTU1A23BqcZfn2+PoUww6UxOvStL/s7iupjl3g4CXw0RgIfyOuJQldLdq7mh6 -+W7BpK855fH2CLy1VMdIFY1umHSgJ5Bayd5NmyKdfORUw88PTFFSARYyr5DDqufWg -+jI77BMjqHtbyujQKspV+9U66ZwKBgQDBsi5YptfaqMdzh343G5zAtCiGCd3m9NZO -+atEEvgq9LKqEVwvJ/FD+3QPAS1MN+ms9KcfJ3G05VUhhEsPGRKibgcE0FNA/VBDO -+jS2HK6kZ1M0clC5kHmQfLZxp1q3tA5nW6zqjVFdqYzJsis7G5YxFKhnzui0lgP6V -+I1Io+3QvrQKBgQCK6D+sq92o8AnkfICsq6qDCKA+PO68/pyGOUAiAoKQ7qK0W0Z5 -+TMIwnRTxHCjgViAIUehx/6hjByQXiPcU2zcNGTLGVgtjl5rfb7FGANlJEg6DL+2L -+bwV1QwX75OSR1U136hsy9oByg6oDEvM040+B4gxsf0OHdYEuJWa5w8eLTwKBgCJt -+CM+416SFWu2tp0EkJzgYzRsFpermmTBWy8+L91yoE6Zx0iaUMdEadxA2Uwyo9WZp -+hpjaFI+cGMEoFKOokE8TQMOA74JR7qrHbNAZcnSk3c+2hohE3oasFKC7By6Y9T69 -+kC53TxIZj1y7TwUKx2ODmBk5fcysoJLhNDkUeBIBAoGAQ/YMeMN/pSvTDCPhubbk -+9bF0SwoN6DWrzw7gzMMhHlVSPM4fjdBA+wXbhnYF7hiNan7uShtRHVhwyfj+glBz -+KIkDxETjxTWx5mbo3tNf8xEMsbHZBe8KPlKxizdAOvShLvkpthTCPiyqn6XTvbs4 -+vC0zZrsQWCYT4Wbm7gcOOAU= - -----END PRIVATE KEY----- -diff --git a/tests/certs/mtls/client/client.pem b/tests/certs/mtls/client/client.pem -index 0a11d4d472..0e3091d0e4 100644 ---- a/tests/certs/mtls/client/client.pem -+++ b/tests/certs/mtls/client/client.pem -@@ -1,41 +1,44 @@ - -----BEGIN CERTIFICATE----- --MIIDXTCCAkUCFE82w6fgdbpkUtEO64Hn8Yn/SJtzMA0GCSqGSIb3DQEBCwUAMGox --CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv --bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l --ZCBSb290IENBMB4XDTI0MDMxMzE4MzUwNFoXDTI2MDMxMzE4MzUwNFowbDELMAkG --A1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUg --Rm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMREwDwYDVQQDDAhy --ZXF1ZXN0czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn3iQycTjUz --pKJChRNkcm33UB282cUwpxeqKN4ahHxBpS09HRhkcQYO7yErEUQwzQnBQEcIpzze --IMZIqHuCkgnySjeEJd95AIzNzGyoLLkS51TcJwgRv83AvT8ljA88s9h38qGTy4/T --CxJgf76pfHIuC1qoKVQh3AuHj9nOxIZLUsrdDbWFWoLqKSVyTby+RXvSAppAR+cu --BCaWStQ6xFORn48RHfc6t30ggD4rDAjyU6Vz6oR8ot3XmGdK0h42UdqidUWkRJaj --EbpkCnQSXS21IvfXKxF5sFqAXJrj9iVbUfpNPpaaW8IrHByngyV8amazGZrASstU --VRFtWrnrcWECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAHHgMckLDRV72p1FEVmCh --AAPZjCswiPZFrwGPN57JqSWjoRB9ilKvo87aPosEO7vfa05OD/qkM/T9Qykuhati --I1T1T7qX4Ymb5kTJIBouuflAO3uKVaq+ga2Q/HLlU5w/VoMU4RuK7+RaiRUEE3xL --iPSMBvZpoMj695LnzcGrT5oLkFI0bTIlpQt1SFjDpHFtOj/ZdwgSbZYLoTCBXQK3 --7Y29qAj/XwEiCH63n8tJKvZcD8/ssMIMIdWhNmu+0jOWica/3WSih9Geoy6Ydtxi --I5t9vRjC4LIipMUAF86AJIfvHJyI6aCNT420LaR6NRW0FQn5CPTHPAsKg3JkAywn --Ew== -+MIIDpjCCAo6gAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im4IwDQYJKoZIhvcNAQEL -+BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu -+ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIzWhcNMjcwMjE3MDAzODIzWjBs -+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCREUxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0 -+d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxETAPBgNV -+BAMMCHJlcXVlc3RzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmt2+ -+7mS8LLmDrDruBzMROT+7orRQGZ/oy/SWpcKndWjK3l+/pIj849asVXX6biKY17ls -+szslShR+SqSZQuyNNOHuzFUuNbbbq8tJg5ZbLs8D45LBRM0uPJ0XV1rOU950c9h2 -+aFVKEKbKg53WlQINCfT/hwQD9Zbia3NkiaagJ/+nIAzdcAL1EFxJIlHLA5N7qf0t -+joqjRhRb3hrLYzgKVVuUPGzAN6ZoCwsW5yIqaLneArHgf+Vqt6jynrR2C5uiiIxt -+xzgT1vOnSgml+HvGHAp4m0I0Sk6KTUCKJAhm3CqaSQge+0gajdJntYBBT0SHav67 -+cTppKX43Q8xcrhjgmwIDAQABo0IwQDAdBgNVHQ4EFgQU3Ujw+VSuTzPgHqU+KFwO -+T4t2MHswHwYDVR0jBBgwFoAUCEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcN -+AQELBQADggEBAEvrKXWHRRDIf26j2fH9hanx0nh+lxvI4jSWYmK0rJXZA3htEvWn -+gcoUspmhmLlgmRMP88lGINMjTsogUubu2j6WF/WuKxAWWvl/hUgK8NzOwOHvByPB -+lhO/rSNGdOWGlnaW1TVO4kI8w6c6LwzOCpY8WvOZLW+v7duLhKUdhaJMR9X77Tbt -+ohHkyYm0gV79izaFRpA6mdYoyHOR4gyWAKaj942doU794fT4gqQacRNifl/kUbWI -+lilktTLyLnmBJgrxHVBxcGe8kwnPafA1k3Gb1w7mY5BSoGKglKjutTfqR3uTjAQb -+vskS4SGXmsEIjLrXYWFNHyoC3pCBXWhX6Kc= - -----END CERTIFICATE----- - -----BEGIN CERTIFICATE----- --MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox --CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv --bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l --ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG --A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw --FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv --b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 --RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He --mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK --na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 --fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm --zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy --e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV --GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws --Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn --9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ --rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ --6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= -+MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL -+BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu -+ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq -+MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp -+b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu -+ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ -+0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK -+dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe -+ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ -+C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz -+zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 -+/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU -+CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG -+0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ -+wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG -+Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum -+b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb -+UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb -+KOWpOS3fbsI= - -----END CERTIFICATE----- -diff --git a/tests/certs/valid/server/server.csr b/tests/certs/valid/server/server.csr -index 000d1facb2..60d082e8ef 100644 ---- a/tests/certs/valid/server/server.csr -+++ b/tests/certs/valid/server/server.csr -@@ -2,18 +2,18 @@ - MIIDKjCCAhICAQAwbTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkRFMSMwIQYDVQQK - DBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UECwwPcHl0aG9uLXJl - cXVlc3RzMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB --DwAwggEKAoIBAQChEKOx377ymuDg23By5Re1DHi2RiBKSHr85/ZTZuwP/69lHN7q --TQEO//EMEFZ9+ZwezeJJsejjP2HO5lQZbcsWok3hbM0wVT+vApkogPvJ8WNFFWFe --ZBnGLi/1WM9cSZpUsDJ0XCsG0RTtO27wfgZQlKQMZxTkfi971oPYxNVSjTm2JcLT --kvwYIwxjJXPDTOgRo9TEAY3cWkCrBJN4w74GWBTM5KDDA230T7WwLuv81XD2LvYj --YYdMBGcxPr5tYTIlp3LncbcrDRNk3pbYQk0bRJgkw2vUkteiRGjkt+dgVnLc6+MI --W+VLXEpj+zsOZ5/R4d1pofqj9sDyDPhtNr1JAgMBAAGgeDB2BgkqhkiG9w0BCQ4x -+DwAwggEKAoIBAQDD3OzTz9TgOiJp/STy/au8G1EDVUuP3HWKAX5ZpkWSTYZfc7FF -+pgPQvBq83oh/K1+9Rw0/529N1+KeTp1i9vUBUM2wJ3EzykJP4rMFh+J/Nt6VFfJh -+05pTQiHnc85l4U8Qz7fHS6Lc9EG/Yp6yDxt5OeK8QAkNYjvxVhVdpif3GlnICx1e -+y1EcPxb9rslERyz0eiL6+BtVbhlSvup/rz2skvaYxoh/pP1RVwbu8VtS0it046Fm -+U0TnIdsjrdFjHXNJ2JSs5g6FDB9QEFhYdDOonL4KMcAkXxBLYXpjJ5fj8/X4LFkU -+FINry+Q2zdFKYsghCxlW98hmJVJTscVWznqpAgMBAAGgeDB2BgkqhkiG9w0BCQ4x - aTBnMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgWgMBYGA1UdJQEB/wQMMAoG - CCsGAQUFBwMBMC8GA1UdEQEB/wQlMCOCCWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAA --AAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAQEAFTlFTn5Mn8JXtqB5bGjuiChe --ClA6Y32Co4l7N0CtAlf+bExwLdpLOleTX3WnryIPALl9uBUI/67dy/STn/J1Yn86 --jWPEFwpmYNSKgQljYWcwtBdYLWfIsJO11kKdaAkOUHBEN5DKrXJ46Vs4918bD1/Q --6ztqdrThiKc646u9xB58Hg7F0IyMWbHfs0x16ZpcN9otrIkbqOE2wzTmc65O1t1i --HDljcSk7OnNy3a9wtLEnyPiyMqHf2k/bTlmiDRVe3cSy9xieoqmzHTnOCSASe1y9 --7lcEBQild18Jo4nACV4vCYOUwrMi/58LWW+lD6OmMnPiWUqOvMbgMffMNDpWPA== -+AAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAQEAn8TdRWYAGL7L8JKpkX2FRMMY -+EuFOEeJ2UaQLRbVtb1RhkIkMT6UYulQ16K45dbFe4k8DT59/mHrTl0bJ6pqVPawa -+vo7vmKCrSYEz8GrImh1+i6lHaFiqbkAs1mJ6z86dZUofMYwfTPVh64ztamUqwBk7 -+Dey+MzWUQvpTVqoaP7cLgzMy+XfcyGuWSoL6pX5XKkt4+A2wiCTsHul1sXOn4vQz -+4xY96AUVnkKosXMWXvhbMkncLNH+gs+ZeQI0MekakuMa42N+0BAad3Zx60lifG3N -+ugyVUmvVI0Fq6QUlYp3YV6QQj3FDjbgOVsSJNh+2s4SIARJsb/k//Tddzxei7g== - -----END CERTIFICATE REQUEST----- -diff --git a/tests/certs/valid/server/server.key b/tests/certs/valid/server/server.key -index d6afaf59fe..387d5d67f1 100644 ---- a/tests/certs/valid/server/server.key -+++ b/tests/certs/valid/server/server.key -@@ -1,28 +1,28 @@ - -----BEGIN PRIVATE KEY----- --MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQChEKOx377ymuDg --23By5Re1DHi2RiBKSHr85/ZTZuwP/69lHN7qTQEO//EMEFZ9+ZwezeJJsejjP2HO --5lQZbcsWok3hbM0wVT+vApkogPvJ8WNFFWFeZBnGLi/1WM9cSZpUsDJ0XCsG0RTt --O27wfgZQlKQMZxTkfi971oPYxNVSjTm2JcLTkvwYIwxjJXPDTOgRo9TEAY3cWkCr --BJN4w74GWBTM5KDDA230T7WwLuv81XD2LvYjYYdMBGcxPr5tYTIlp3LncbcrDRNk --3pbYQk0bRJgkw2vUkteiRGjkt+dgVnLc6+MIW+VLXEpj+zsOZ5/R4d1pofqj9sDy --DPhtNr1JAgMBAAECggEAIuLzBfXgCvXzlBjL2kMXd7p4EgkN+PEKnKmUr/t40b1Q --zR6sBQWBX3GeET4fseElSQHQzCQaPNCve4xltm1S4jftFREHP7sTVHHEYWLQxuy/ --Uwkewj5927CI6ERgg82YfVP91bjaA/u5I+pt7O7rKLyNbPdN7fEMEW+FNuhpiVvg --JMrcK1BCFL6pmIT21LyTwkacMKZSPko58pWE24MA9aSCHk6cXdwQWQK0AfQT3XGT --C4I0hRed7LgqMH+gMuhpakiO13t8yTwxt2iQC9+aa4oSHD3BOi/CwIWfe1mHwmlr --cj4Kof1JSnK4SVTD16T++PlnWZkF6oaLUNg+/c2C9QKBgQDOFSYIY7+HzinT2hbI --yTIJCHpp+Iee+WVvvxjdZIPMDINrlIiHcMfXb0itUdcUO6tz0KYDMDLRC9CSP0ar --6mBWUTHfAKF2S4JpI9JYI4PNtIpOP1NiYuyJlnh5+ytU1yIeIvl39hmLcRwI9mgz --njy/D7yEoDCrG1dhcltubKpNXQKBgQDIFAVg0A7MNcxBZDLlk1NAME2JKOSszX8E --VNucvZD+9l+L9V9BmwwPQdzYifv/dNp3nYn+lxRPPgze3ZWu4+PeDuGudxu0I6ll --beFdbIcp1wbeQguzHYLjBYJqsMb4Pao5HPInjPu/HWfZlg9oZpJbKVucQwbonJLX --lgca9KaE3QKBgA+OUx+g/+0tZ8ThGoUvgsJhzHPBWeNrKfgEcckMdFJrw2PUg3XN --0pf1g4PpwJV7Z5bHcjCda8iR3r2bXydM+tapLF2L+6QlUQPEu3UBwUo+zY3Yg9/S --Xc6I+DEk/4FY9+9UboZaolT/RcF7cCQtVqKJeo58VRAlcTQe4L32H+jVAoGALXX3 --Ht9HbXkP1w/YTLej4+LVy0OCag0rPiW13LBqALSkUx3GrhZ3sAPMFVuM6ad4eFNQ --ZouXbsXvkLgSabGYNf11o/mmTtEHjWdhHKQrNgOIqPmixOkAs2quDmXqX79LLTz5 --fKkZDny0+wiQqa0cth/4k9HbAQGKj/ej16kdKPUCgYAz08Y39NnJYxRNz3tu/7C6 --jKyXKxhuZCZCt3cSWto5Tg0mVVB+2Jk2GhG1hCfZoRCP25R3FFBR1HOJgOc59T7C --LL67FdO0+7mj/WNzHj3+9gyOYQyQgPVDaTmsJLbuzT2S+GpR94ZNliwL2NEa5baG --B/Nb2ruRNj0GgZVw48N4XQ== -+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDD3OzTz9TgOiJp -+/STy/au8G1EDVUuP3HWKAX5ZpkWSTYZfc7FFpgPQvBq83oh/K1+9Rw0/529N1+Ke -+Tp1i9vUBUM2wJ3EzykJP4rMFh+J/Nt6VFfJh05pTQiHnc85l4U8Qz7fHS6Lc9EG/ -+Yp6yDxt5OeK8QAkNYjvxVhVdpif3GlnICx1ey1EcPxb9rslERyz0eiL6+BtVbhlS -+vup/rz2skvaYxoh/pP1RVwbu8VtS0it046FmU0TnIdsjrdFjHXNJ2JSs5g6FDB9Q -+EFhYdDOonL4KMcAkXxBLYXpjJ5fj8/X4LFkUFINry+Q2zdFKYsghCxlW98hmJVJT -+scVWznqpAgMBAAECggEACY98I+6uJm/QBDpuFkpZmqn+r1n3gUMynZTrFPcvyC9u -+krQ0AAFViFfWOkfmg8abOsMAG5FxdmxGTJHrzsvdM748/A9A0FVcHUgkku2KGcmU -+3dQfa7UHgG7m9sRJW+G+mUR6ZQkFHyHxH6Vxt6FTJvyzW5sIlhWodWRNUK/unXoe -+5QNIh/PM9Mkg91wKVeg8AGdY27zfuUV0KLwhV052hCSwckayi7pjYrH2xDL8fahi -+Z/F43N1SI6Q7PTW6izDs2KrlGyexn97jOV+cooSXXaDvivTaB2K4RoidrPt+UAW4 -+/e1zw/LbeBvQXX4vsyC9vLO+Av1gYo2PxAZ/ezc5gQKBgQDvY/kgUud6stdMs73N -+Qavu9o/Ul4oeQa4fsmfUwj43OjquxpXbfV9sNTLFxFbsl5ADGkpqsR3WhP2090TK -+62vkyCBiaYZjyMY6WLDATEvrpfbc74ATEzTU+r9T1rEByq/atbWPZq/zoMo8aAdg -+Qk2X7gQO3pTpPeEpetYG42Di+QKBgQDRc9IqPeELQugXEuI0RZ8rsfGRSFKVRelQ -+Rz/KpD/S8SsE7ERL0w/w5KgE0IPPbh/SYX2KYxafCqTrPWDNaoguROvUoUJQvf4a -+uOMTCRkqdqj8j70zaPj2ohuIIZ3GZHyaXgl/isWtuZ5OeaoY5h3r+4gk5mO41Llz -+YikB71SRMQKBgGBNG18BetVFNI9Kj0QO8xeCYIHpJErfqShfIJ3aNiUJa6n7gTV2 -+zfg9vlsIjN9IaUqWPPGGprYxcc5m2mm3IwQ57a0pPkLN9dBq9U+mYbQ+Y3ylbCRA -+SbST2nvjlflejDezeYJikM21FSYPw0fZ5FUGDuPcbpMVrYp+O7MxrTwhAoGAcjQq -+xemTiWZj0iDzwfisP1D5HHRIwyepfaI7wCwquMPS5w5EduuQZ5LloipnlHTBWR7b -+Kte4f+N35OREofySYFgoFnoPBKNzp/Jjrf9p/2NP5NYjHaMBDMl7JZDezEwCPNFF -+cIukGYN6M+PWwVjHu+Ica7JLcX5b1/QP1ARBIiECgYAsdDa0CoYTVWMeqMq9GjF3 -+BElBKCLp6iYqpElWyKTj39LCnLhzRICyYQpblM8zZgtQIvRGT8DYh2HA1Q29yPzt -+Rgrz9yfFACdT5gUM5D6sx7L37xbtMQQ7YYOxEAfCUZ0qnMJgpNTJ8/ECkjGJZaif -+CXrx6XCdvrM/evZW2JZbyg== - -----END PRIVATE KEY----- -diff --git a/tests/certs/valid/server/server.pem b/tests/certs/valid/server/server.pem -index 0168cd3e3f..b4ad4c650d 100644 ---- a/tests/certs/valid/server/server.pem -+++ b/tests/certs/valid/server/server.pem -@@ -1,47 +1,46 @@ - -----BEGIN CERTIFICATE----- --MIIEhTCCA22gAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im3wwDQYJKoZIhvcNAQEL -+MIIEEDCCAvigAwIBAgIUTzbDp+B1umRS0Q7rgefxif9Im4MwDQYJKoZIhvcNAQEL - BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu - ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt --U2lnbmVkIFJvb3QgQ0EwHhcNMjQwMzE0MDAxMDAzWhcNNDMxMTMwMDAxMDAzWjBt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIzWhcNNDQxMTA0MDAzODIzWjBt - MQswCQYDVQQGEwJVUzELMAkGA1UECAwCREUxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0 - d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxEjAQBgNV --BAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKEQ --o7HfvvKa4ODbcHLlF7UMeLZGIEpIevzn9lNm7A//r2Uc3upNAQ7/8QwQVn35nB7N --4kmx6OM/Yc7mVBltyxaiTeFszTBVP68CmSiA+8nxY0UVYV5kGcYuL/VYz1xJmlSw --MnRcKwbRFO07bvB+BlCUpAxnFOR+L3vWg9jE1VKNObYlwtOS/BgjDGMlc8NM6BGj --1MQBjdxaQKsEk3jDvgZYFMzkoMMDbfRPtbAu6/zVcPYu9iNhh0wEZzE+vm1hMiWn --cudxtysNE2TelthCTRtEmCTDa9SS16JEaOS352BWctzr4whb5UtcSmP7Ow5nn9Hh --3Wmh+qP2wPIM+G02vUkCAwEAAaOCAR4wggEaMAwGA1UdEwEB/wQCMAAwDgYDVR0P --AQH/BAQDAgWgMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMBMC8GA1UdEQEB/wQlMCOC --CWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAAATAdBgNVHQ4EFgQUJ90a --UnXKPP13yDprLhG39fUrnu8wgZEGA1UdIwSBiTCBhqFupGwwajELMAkGA1UEBhMC --VVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgwFgYDVQQL --DA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJvb3QgQ0GC --FA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAA4IBAQCVh4hiraRv --JzYbS/TombP//xfVEWHXDBEYsT5GgWf7GPJ/QtSvv6uJFsK7heqLzf9f+r4Z5xMh --YAkb0oe/Ge0T30Mo1YaBEqkKuQL9lOMcP69S9uFz2VT6I/76I8qqAu2AFhu74p8f --qudwmQyRYo1Ryg4R/SgRhSJKF/ST/2wOusNWSsBe1s8S2PmtOb4dr3cMBGihrUzS --DmCQpWjuiuE23HXnnYDc/EUAnEEPkLDgCsE9iLq37FPUHcHjqdYIAhmImPBpv2EL --ftXeRWfxN2hRHpS5Fn3QuAOwfJw5tUcVXojJCJfSpL+Ac97iSjxNaDIPlyomauKw --1rgbUkSw+9JQ -+BAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPc -+7NPP1OA6Imn9JPL9q7wbUQNVS4/cdYoBflmmRZJNhl9zsUWmA9C8GrzeiH8rX71H -+DT/nb03X4p5OnWL29QFQzbAncTPKQk/iswWH4n823pUV8mHTmlNCIedzzmXhTxDP -+t8dLotz0Qb9inrIPG3k54rxACQ1iO/FWFV2mJ/caWcgLHV7LURw/Fv2uyURHLPR6 -+Ivr4G1VuGVK+6n+vPayS9pjGiH+k/VFXBu7xW1LSK3TjoWZTROch2yOt0WMdc0nY -+lKzmDoUMH1AQWFh0M6icvgoxwCRfEEthemMnl+Pz9fgsWRQUg2vL5DbN0UpiyCEL -+GVb3yGYlUlOxxVbOeqkCAwEAAaOBqjCBpzAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB -+/wQEAwIFoDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDATAvBgNVHREBAf8EJTAjggls -+b2NhbGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFGg5Q9Ll -+ADkONmo02kmPg9+aiOxQMB8GA1UdIwQYMBaAFAhGiD3+10LBrdMW3+j/ceXMXSqc -+MA0GCSqGSIb3DQEBCwUAA4IBAQA1RlUI34tXrIdsRiALD8iLDFhh816B7qUi+F1j -+3dOkTNgYw0CnQ+Vm4wrQjCEVSDQ/9sry5DOfXeGziDpFlZmQ0UuAeM1EJJD5/42l -+C/eKquA09+IMEq2U03GPhijrC68sFCfr5wgoB/4HmcZ1c3kLYvRaJhEK7AHDgenY -+knKbvuKAiRbCd584eG8HFOW7xv+YqGZ257Ic9flbarkPrazmAJg2P709w7/fP83x -+7lnkPZY09jS3lcIpEdtWvzfm+anGF190hKA1yfPdO5bYPvUcEMxXdMtQ6/pbZd5i -+F6t95o9CPCqI/lLIn5jAf9Z+Iil3GmKefEZYIGmKJ85HGUqE - -----END CERTIFICATE----- - -----BEGIN CERTIFICATE----- --MIIDWzCCAkMCFA9wdtNh/V99DRwYp8vXjPxSjJnWMA0GCSqGSIb3DQEBCwUAMGox --CzAJBgNVBAYTAlVTMSMwIQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlv --bjEYMBYGA1UECwwPcHl0aG9uLXJlcXVlc3RzMRwwGgYDVQQDDBNTZWxmLVNpZ25l --ZCBSb290IENBMB4XDTI0MDMxMjIxMDQwM1oXDTQ0MDMwNzIxMDQwM1owajELMAkG --A1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMRgw --FgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYtU2lnbmVkIFJv --b3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHlIhe7GLCeSk8 --RZOKdtmyKns6KdZgGw/LcxPkYvQlu1g0zV8X0DqVr2LdMumWUTNCc9sPdSlAG+He --mQp2TMoWUMumMuwDtit9RT0Sb6Eh9svWgjY9ferovPJRfCWUTsA2Ug8uoh0wyEXK --na7X6fHt5E3B9vj0+b9a4vDibdBXV11FheLT02/uEmAEJDdP/zeBgvVbhcVyumO6 --fAGMIWzR2ukhe8z/ma5H9zoi4gZA8nsK6reZUD8+6affnPe+jIt/AdzggtV9jkWm --zSpr+RHeZ0y+q4eik2ZNUGg4XcF6JsJ9yu/AqLBXxd38uLdFfgyhP2y6K628yzgy --e6lzFyWnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGymNVTsKSAq8Ju6zV+AWAyV --GcUNBmLpgzDA0e7pkVYhHTdWKlGH4GnrRcp0nvnSbr6iq1Ob/8yEUUoRzK55Flws --Kt1OLwnZyhfRoSUesoEqpP68vzWEgiYv0QuIWvzNt0YfAAvEgGoc3iri44MelKLn --9ZMT8m91nVamA35R8ZjfeAkNp2xcz0a67V0ww6o4wSXrG7o5ZRXyjqZ/9K7SfwUJ --rV9RciccsjH/MzKbfrx73QwsbPWiFmjzHopdasIO0lDlmgm/r9gKfkbzfKoGCgLZ --6an6FlmLftLSXijf/QwtqeSP9fODeE3dzBmnTM3jdoVS53ZegUDWNl14o25v2Kg= -+MIIDlDCCAnygAwIBAgIUG/CTOPIQbH2BI36TyThUChQyR8wwDQYJKoZIhvcNAQEL -+BQAwajELMAkGA1UEBhMCVVMxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3Vu -+ZGF0aW9uMRgwFgYDVQQLDA9weXRob24tcmVxdWVzdHMxHDAaBgNVBAMME1NlbGYt -+U2lnbmVkIFJvb3QgQ0EwHhcNMjUwMjE3MDAzODIyWhcNNDUwMjEyMDAzODIyWjBq -+MQswCQYDVQQGEwJVUzEjMCEGA1UECgwaUHl0aG9uIFNvZnR3YXJlIEZvdW5kYXRp -+b24xGDAWBgNVBAsMD3B5dGhvbi1yZXF1ZXN0czEcMBoGA1UEAwwTU2VsZi1TaWdu -+ZWQgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9lSHzZ -+0X+v0Zbz0g3a+o6Iwy6KQgA7dIQjf65IYJ1ZPXcL42esUntcX8PpQbLWa+bwp+FK -+dqlagCS2jI9dJz8Y3MnMLBmiiXvET6ub/S9u7VdtRxByoHydBEvNMKEMga64PwMe -+ztuZ6fX2xPmRnLQIippzfzdxDFHxbUWzjzEQEl+4EGbKX5vPi6A9yL3ofgMi4APZ -+C8/YoqAaqzjLIM9KZ/zqT36iQ6wsxBXAacd63L5M8lrAKfZoJeX6uYxNIIfaxQRz -+zVxdpVBjHJ/odqoadwKzU7YzN5Fs+6ATNvkrhlUzg1i0MyTGtCdkUIAt/hc6ZrW6 -+/kqHpCgUwUc4Dq0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU -+CEaIPf7XQsGt0xbf6P9x5cxdKpwwDQYJKoZIhvcNAQELBQADggEBAHMgyQNA3DQG -+0l9eX8RMl4YNwhAXChU/wOTcvD+F4OsJcPqzy6QHFh1AbBBGOI9/HN7du+EiKwGZ -+wE+69FEsSbhSv22XidPm+kHPTguWl1eKveeWrrT5MPl9F48s14lKb/8yMEa1/ryG -+Iu8NQ6ZL91JbTXdkLoBDya9HZqyXjwcGkXLE8fSqTibJ7EhWS5Q3Ic7WPgUoGAum -+b5ygoxqhm+SEyXC2/LAktwmFawkv1SsMeYpT790VIFqJ/TVVnUl+gQ2RjSEl2WLb -+UO4Hwq4FZbWF9NrY6JVThLmbcr8eW6+UxWfiXHLw/qTRre4/3367QAUQRt7EuEsb -+KOWpOS3fbsI= - -----END CERTIFICATE----- diff --git a/python-requests.spec b/python-requests.spec index 26734bd..044ccfb 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ %bcond extradeps %{undefined rhel} Name: python-requests -Version: 2.32.3 +Version: 2.32.4 Release: %autorelease Summary: HTTP library, written in Python, for human beings @@ -32,29 +32,6 @@ Patch: support_IPv6_CIDR_in_no_proxy.patch # when it is ready, or dropped in a release where that is merged Patch: 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch -# Add CA constraint to test CA -# -# Otherwise recent versions of OpenSSL reject it as an invalid CA certificate -# (at least once the test certificates are regenerated). -# -# https://github.com/psf/requests/commit/507409661335bd3dd8a7e39f04d07b42e519becc -Patch: https://github.com/psf/requests/commit/507409661335bd3dd8a7e39f04d07b42e519becc.patch -# Regenerate test certificates -# https://github.com/psf/requests/commit/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4 -Patch: https://github.com/psf/requests/commit/9ebebdef98a6aacfbedcf2ca61ba0eaecc2563f4.patch -# Add key usage extension to test ca.crt -# https://github.com/psf/requests/pull/6924 -Patch: https://github.com/psf/requests/pull/6924.patch -# Together, these three patches fix one of the three regressions reported in -# the following issue, and the only one that we see downstream: -# -# Test regressions with urllib3 2.4.0 on Python 3.13 -# https://github.com/psf/requests/issues/6934 -# -# See also: -# -# https://github.com/urllib3/urllib3/pull/3577#issuecomment-2765190031 - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} diff --git a/sources b/sources index 2c91835..1372986 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.32.3.tar.gz) = ea3e85e035efed0fe22bf8640491ffb20c2ac50359bb1e11c9147ed850cac5e4a6a36ab58a48fc6c6d6a44df2b511e8a5d902444c034da6baa6adc5f9417697f +SHA512 (requests-v2.32.4.tar.gz) = 7638061283a5e66c51f26107f5a88d090d35feecbf5a9075af842b67c0abd727af855346e2385130fa79738395a3821107be300e3de60a9a0e84fe69904288cd diff --git a/system-certs.patch b/system-certs.patch index efc0010..96f097e 100644 --- a/system-certs.patch +++ b/system-certs.patch @@ -1,7 +1,7 @@ -From bb733473e91e71b812ada46bc110f607630f9327 Mon Sep 17 00:00:00 2001 +From e0ce6c20989a205489df47f8abaff5369ed588ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Thu, 30 May 2024 11:10:29 +0200 -Subject: [PATCH 1/2] system certs +Subject: [PATCH] system certs Co-authored-by: Lumir Balhar --- @@ -23,17 +23,17 @@ index 8d44e0e..fa10a53 100644 idna>=2.5,<4 urllib3>=1.21.1,<3 diff --git a/setup.py b/setup.py -index 1b0eb37..03d19b0 100755 +index 7d9b52b..17da826 100755 --- a/setup.py +++ b/setup.py -@@ -62,7 +62,6 @@ requires = [ +@@ -37,7 +37,6 @@ requires = [ "charset_normalizer>=2,<4", "idna>=2.5,<4", "urllib3>=1.21.1,<3", - "certifi>=2017.4.17", ] test_requirements = [ - "pytest-httpbin==2.0.0", + "pytest-httpbin==2.1.0", diff --git a/src/requests/certs.py b/src/requests/certs.py index be422c3..9aee713 100644 --- a/src/requests/certs.py @@ -55,5 +55,5 @@ index be422c3..9aee713 100644 if __name__ == "__main__": print(where()) -- -2.45.1 +2.50.0 diff --git a/tests/upstream/runtest.sh b/tests/upstream/runtest.sh index b57824e..5254bd6 100755 --- a/tests/upstream/runtest.sh +++ b/tests/upstream/runtest.sh @@ -52,8 +52,8 @@ rlJournalStart # pip-install libraries not in the repos # pytest is installed in fmf requirement - rlRun "$PYTHON -m pip install pytest-mock==3.12.0 trustme==1.1.0 werkzeug==3.0.3 \ - pytest-httpbin==2.0.0" + rlRun "$PYTHON -m pip install pytest-mock==3.14.0 trustme==1.2.0 werkzeug==3.1.3 \ + pytest-httpbin==2.1.0" # Move to test dir, print what is there rlRun "cd $(dirname $TmpDir/BUILD/*requests*/requests*/tests)" From 9d9296cdb3fd96f23f42c88ffd51584c2ab36319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 25 Mar 2025 15:12:58 +0100 Subject: [PATCH 161/165] Use /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem - https://fedoraproject.org/wiki/Changes/dropingOfCertPemFile - Fixes: rhbz#2337320 --- python-requests.spec | 2 +- system-certs.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python-requests.spec b/python-requests.spec index 044ccfb..5164d3c 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -25,7 +25,7 @@ Patch: system-certs.patch # This change is backported also into RHEL 9.4 (via CS) Patch: support_IPv6_CIDR_in_no_proxy.patch -# Fix crash on import if /etc/pki/tls/certs/ca-bundle.crt is missing +# Fix crash on import if /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem is missing # https://bugzilla.redhat.com/show_bug.cgi?id=2297632 # https://github.com/psf/requests/pull/6781 # Note: this can be replaced by https://github.com/psf/requests/pull/6767 diff --git a/system-certs.patch b/system-certs.patch index 96f097e..42b8213 100644 --- a/system-certs.patch +++ b/system-certs.patch @@ -43,14 +43,14 @@ index be422c3..9aee713 100644 environment, you can change the definition of where() to return a separately packaged CA bundle. + -+This Fedora-patched package returns "/etc/pki/tls/certs/ca-bundle.crt" provided ++This Fedora-patched package returns "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" provided +by the ca-certificates RPM package. """ -from certifi import where + +def where(): + """Return the absolute path to the system CA bundle.""" -+ return '/etc/pki/tls/certs/ca-bundle.crt' ++ return '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem' if __name__ == "__main__": print(where()) From 15b4c097f298c881fe92ca831486a96cec535bc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 10:09:23 +0000 Subject: [PATCH 162/165] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 13de5714ceaa96d0cacfd0da1307948c91da46f8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:45:16 +0200 Subject: [PATCH 163/165] Rebuilt for Python 3.14.0rc2 bytecode From 0f0415395c621805e131989c0dcdf3bbb93d947e Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 19 Aug 2025 10:58:29 +0200 Subject: [PATCH 164/165] Update to 2.32.5 (rhbz#2389307) --- .gitignore | 1 + ...ault-SSLContext-if-CA-bundle-isn-t-p.patch | 36 ------------------- python-requests.spec | 9 +---- sources | 2 +- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch diff --git a/.gitignore b/.gitignore index da16a7b..2a551fe 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /requests-v2.31.0.tar.gz /requests-v2.32.3.tar.gz /requests-v2.32.4.tar.gz +/requests-v2.32.5.tar.gz diff --git a/0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch b/0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch deleted file mode 100644 index 14ca3a1..0000000 --- a/0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 08e863f94fe93b4b3bd2e8267234be7a23350b1d Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 1 Aug 2024 12:58:38 -0700 -Subject: [PATCH] Don't create default SSLContext if CA bundle isn't present - -Similar to e18879932287c2bf4bcee4ddf6ccb8a69b6fc656 , this also -skips creation of the default SSLContext on FileNotFoundError, -which is raised if DEFAULT_CA_BUNDLE_PATH does not exist. - -See: https://bugzilla.redhat.com/show_bug.cgi?id=2297632 - -Signed-off-by: Adam Williamson ---- - src/requests/adapters.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/requests/adapters.py b/src/requests/adapters.py -index 9a58b160..fb151a95 100644 ---- a/src/requests/adapters.py -+++ b/src/requests/adapters.py -@@ -81,9 +81,10 @@ try: - _preloaded_ssl_context.load_verify_locations( - extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH) - ) --except ImportError: -+except (ImportError, FileNotFoundError): - # Bypass default SSLContext creation when Python -- # interpreter isn't built with the ssl module. -+ # interpreter isn't built with the ssl module, or -+ # DEFAULT_CA_BUNDLE_PATH isn't present - _preloaded_ssl_context = None - - --- -2.45.2 - diff --git a/python-requests.spec b/python-requests.spec index 5164d3c..4a7f997 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -6,7 +6,7 @@ %bcond extradeps %{undefined rhel} Name: python-requests -Version: 2.32.4 +Version: 2.32.5 Release: %autorelease Summary: HTTP library, written in Python, for human beings @@ -25,13 +25,6 @@ Patch: system-certs.patch # This change is backported also into RHEL 9.4 (via CS) Patch: support_IPv6_CIDR_in_no_proxy.patch -# Fix crash on import if /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem is missing -# https://bugzilla.redhat.com/show_bug.cgi?id=2297632 -# https://github.com/psf/requests/pull/6781 -# Note: this can be replaced by https://github.com/psf/requests/pull/6767 -# when it is ready, or dropped in a release where that is merged -Patch: 0001-Don-t-create-default-SSLContext-if-CA-bundle-isn-t-p.patch - BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel %if %{with tests} diff --git a/sources b/sources index 1372986..e2adddc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (requests-v2.32.4.tar.gz) = 7638061283a5e66c51f26107f5a88d090d35feecbf5a9075af842b67c0abd727af855346e2385130fa79738395a3821107be300e3de60a9a0e84fe69904288cd +SHA512 (requests-v2.32.5.tar.gz) = ca73dcaec9a12ecd7d16d5f30a9213fc520b9b9d659bd6d35e6f05f7b823e1bf6209c7ae48d5e301974794d92dbc8facb937ce99e22180b28dd80f6f2afa13ae From 5482485d62e5871f6a1b3baebb19dc4022d39228 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:19:18 +0200 Subject: [PATCH 165/165] Rebuilt for Python 3.14.0rc3 bytecode