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