Hello community, here is the log from the commit of package python-requests for openSUSE:Factory checked in at 2015-07-14 17:43:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-requests (Old) and /work/SRC/openSUSE:Factory/.python-requests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-requests" Changes: -------- --- /work/SRC/openSUSE:Factory/python-requests/python-requests.changes 2015-04-21 10:53:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-requests.new/python-requests.changes 2015-07-14 17:44:57.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 30 08:39:24 UTC 2015 - [email protected] + +- update no-default-cacert.patch to not hardcode a ca cert location + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ no-default-cacert.patch ++++++ --- /var/tmp/diff_new_pack.a0BuaQ/_old 2015-07-14 17:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.a0BuaQ/_new 2015-07-14 17:44:58.000000000 +0200 @@ -1,6 +1,8 @@ ---- a/requests/adapters.py -+++ b/requests/adapters.py -@@ -132,9 +132,6 @@ +Index: requests-2.6.0/requests/adapters.py +=================================================================== +--- requests-2.6.0.orig/requests/adapters.py ++++ requests-2.6.0/requests/adapters.py +@@ -177,9 +177,6 @@ class HTTPAdapter(BaseAdapter): if not cert_loc: cert_loc = DEFAULT_CA_BUNDLE_PATH @@ -10,20 +12,40 @@ conn.cert_reqs = 'CERT_REQUIRED' conn.ca_certs = cert_loc else: ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -19,7 +19,7 @@ +Index: requests-2.6.0/requests/certs.py +=================================================================== +--- requests-2.6.0.orig/requests/certs.py ++++ requests-2.6.0/requests/certs.py +@@ -18,8 +18,9 @@ try: + except ImportError: def where(): """Return the preferred certificate bundle.""" - # vendored bundle inside Requests +- # vendored bundle inside Requests - return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return '/etc/ssl/certs/' ++ # in openSUSE we rely on openssl's default instead of ++ # hardcoding stuff elsewhere ++ return None if __name__ == '__main__': print(where()) ---- a/MANIFEST.in -+++ b/MANIFEST.in +Index: requests-2.6.0/MANIFEST.in +=================================================================== +--- requests-2.6.0.orig/MANIFEST.in ++++ requests-2.6.0/MANIFEST.in @@ -1 +1 @@ -include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem +include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt - +Index: requests-2.6.0/requests/packages/urllib3/util/ssl_.py +=================================================================== +--- requests-2.6.0.orig/requests/packages/urllib3/util/ssl_.py ++++ requests-2.6.0/requests/packages/urllib3/util/ssl_.py +@@ -259,6 +259,9 @@ def ssl_wrap_socket(sock, keyfile=None, + if e.errno == errno.ENOENT: + raise SSLError(e) + raise ++ elif cert_reqs != CERT_NONE: ++ context.set_default_verify_paths() ++ + if certfile: + context.load_cert_chain(certfile, keyfile) + if HAS_SNI: # Platform-specific: OpenSSL with enabled SNI
