bfe36edfe2
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.
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From d5a4f2908fab5ca16eb59db8b18eda7a94a37b04 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Cline <jcline@redhat.com>
|
|
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 <jcline@redhat.com>
|
|
---
|
|
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.
|
|
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 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.9',
|
|
'urllib3>=1.21.1,<1.25',
|
|
- 'certifi>=2017.4.17'
|
|
|
|
]
|
|
test_requirements = [
|
|
--
|
|
2.19.2
|
|
|