Hello community, here is the log from the commit of package python3-requests for openSUSE:Factory checked in at 2016-02-25 21:51:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-requests (Old) and /work/SRC/openSUSE:Factory/.python3-requests.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-requests" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-requests/python3-requests.changes 2015-12-23 09:57:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-requests.new/python3-requests.changes 2016-02-25 21:51:12.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 17 14:47:12 UTC 2016 - [email protected] + +- Modify no-default-cacert.patch: + + output /etc/ssl/ca-bundle.pem instead of neither NULL nor + /etc/ssl/certs/ as a path to cacerts bundle (boo#967128). + + don't patch bundled urllib3, as it's being removed. +- Require ca-certificates package (but not on SLE). +- Remove no-default-cacert-sles.patch: is more compatible to use + the bundled cacert bundle on SLE. +- Copy requires from python-requests (added by Dirk Mueller). + +------------------------------------------------------------------- Old: ---- no-default-cacert-sles.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-requests.spec ++++++ --- /var/tmp/diff_new_pack.gWK1zs/_old 2016-02-25 21:51:13.000000000 +0100 +++ /var/tmp/diff_new_pack.gWK1zs/_new 2016-02-25 21:51:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-requests # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,25 +22,32 @@ Summary: Awesome Python HTTP Library That's Actually Usable License: Apache-2.0 Group: Development/Languages/Python -Url: http://python-requests.org +Url: http://python-requests.org/ Source: http://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz # PATCH-FIX-OPENSUSE no-default-cacert.patch -- Completely ignore the internal CA bundle. Patch0: no-default-cacert.patch -# PATCH-FIX-SLE no-default-cacert-sles.patch -- Completely ignore the internal CA bundle (SLE version). -Patch1: no-default-cacert-sles.patch # PATCH-FIX-OPENSUSE requests-do-not-use-bundle.patch -- Use system libraries instead of bundled ones. -Patch2: requests-do-not-use-bundle.patch +Patch1: requests-do-not-use-bundle.patch +BuildRequires: ca-certificates BuildRequires: python3 BuildRequires: python3-chardet BuildRequires: python3-devel BuildRequires: python3-py -BuildRequires: python3-pytest BuildRequires: python3-setuptools BuildRequires: python3-urllib3 +Requires: ca-certificates Requires: python3-chardet Requires: python3-py +# Really needed? +#Requires: python3-ndg-httpsclient +Requires: python3-pyOpenSSL +Requires: python3-pyasn1 Requires: python3-urllib3 BuildArch: noarch +%if !(0%{?suse_version} == 1315 && !0%{?is_opensuse}) +BuildRequires: ca-certificates +Requires: ca-certificates +%endif %description Requests is an ISC Licensed HTTP library, written in Python, for @@ -67,15 +74,11 @@ %prep %setup -q -n requests-%{version} -# For rpmlint warning: remove shebang from python library: -sed -i '/^#!/d' ./requests/certs.py -%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} -%patch1 -p1 -%else +%if !(0%{?suse_version} == 1315 && !0%{?is_opensuse}) %patch0 -p1 -%endif -%patch2 -p1 rm -f requests/cacert.pem +%endif +%patch1 -p1 %build python3 setup.py build @@ -85,7 +88,7 @@ --root=%{buildroot} --prefix=%{_prefix} rm -rf %{buildroot}%{python3_sitelib}/requests/packages/ -# Tests require network access +# Tests require network access. # %check # python3 test_requests.py ++++++ no-default-cacert.patch ++++++ --- /var/tmp/diff_new_pack.gWK1zs/_old 2016-02-25 21:51:13.000000000 +0100 +++ /var/tmp/diff_new_pack.gWK1zs/_new 2016-02-25 21:51:13.000000000 +0100 @@ -23,20 +23,9 @@ """Return the preferred certificate bundle.""" - # vendored bundle inside Requests - return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ # in openSUSE we rely on openssl's default instead of -+ # hardcoding stuff elsewhere -+ return None ++ # in openSUSE we rely on ca-certificates instead of ++ # having an another bundle ++ return '/etc/ssl/ca-bundle.pem' if __name__ == '__main__': print(where()) ---- a/requests/packages/urllib3/util/ssl_.py -+++ b/requests/packages/urllib3/util/ssl_.py -@@ -298,6 +298,8 @@ 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)
