Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5482485d62 | ||
|
|
0f0415395c | ||
|
|
13de5714ce | ||
|
|
15b4c097f2 | ||
|
|
9d9296cdb3 |
5 changed files with 5 additions and 47 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
From 08e863f94fe93b4b3bd2e8267234be7a23350b1d Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
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 <awilliam@redhat.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -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/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
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
%if %{with tests}
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (requests-v2.32.4.tar.gz) = 7638061283a5e66c51f26107f5a88d090d35feecbf5a9075af842b67c0abd727af855346e2385130fa79738395a3821107be300e3de60a9a0e84fe69904288cd
|
||||
SHA512 (requests-v2.32.5.tar.gz) = ca73dcaec9a12ecd7d16d5f30a9213fc520b9b9d659bd6d35e6f05f7b823e1bf6209c7ae48d5e301974794d92dbc8facb937ce99e22180b28dd80f6f2afa13ae
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue