Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2015-03-09 10:03:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python" Changes: -------- python-doc.changes: same change --- /work/SRC/openSUSE:Factory/python/python.changes 2014-12-21 12:02:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2015-03-09 10:03:17.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 25 16:31:37 UTC 2015 - [email protected] + +- python-2.7.9-ssl_ca_path.patch - reintroduce support for CA directory path + +------------------------------------------------------------------- New: ---- python-2.7.9-ssl_ca_path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.BNow5a/_old 2015-03-09 10:03:18.000000000 +0100 +++ /var/tmp/diff_new_pack.BNow5a/_new 2015-03-09 10:03:18.000000000 +0100 @@ -52,6 +52,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM remove unconditional "import ssl" from test Patch32: python-2.7-urllib2-localnet-ssl.patch +# PATCH-FIX-UPSTREAM accept directory-based CA paths as well +Patch33: python-2.7.9-ssl_ca_path.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -141,6 +143,7 @@ %patch24 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.BNow5a/_old 2015-03-09 10:03:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BNow5a/_new 2015-03-09 10:03:19.000000000 +0100 @@ -52,6 +52,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM remove unconditional "import ssl" from test Patch32: python-2.7-urllib2-localnet-ssl.patch +# PATCH-FIX-UPSTREAM accept directory-based CA paths as well +Patch33: python-2.7.9-ssl_ca_path.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -95,6 +97,7 @@ %patch24 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.BNow5a/_old 2015-03-09 10:03:19.000000000 +0100 +++ /var/tmp/diff_new_pack.BNow5a/_new 2015-03-09 10:03:19.000000000 +0100 @@ -56,6 +56,8 @@ Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM remove unconditional "import ssl" from test Patch32: python-2.7-urllib2-localnet-ssl.patch +# PATCH-FIX-UPSTREAM accept directory-based CA paths as well +Patch33: python-2.7.9-ssl_ca_path.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -175,6 +177,7 @@ %patch24 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac ++++++ python-2.7.9-ssl_ca_path.patch ++++++ Index: Python-2.7.9/Lib/ssl.py =================================================================== --- Python-2.7.9.orig/Lib/ssl.py 2014-12-10 16:59:40.000000000 +0100 +++ Python-2.7.9/Lib/ssl.py 2015-02-25 17:28:19.538808314 +0100 @@ -504,7 +504,15 @@ self._context = SSLContext(ssl_version) self._context.verify_mode = cert_reqs if ca_certs: - self._context.load_verify_locations(ca_certs) + capath = None + cafile = None + if os.path.isdir(ca_certs): + capath = ca_certs + else: + cafile = ca_certs + self._context.load_verify_locations(cafile=cafile, capath=capath) + elif cert_reqs != CERT_NONE: + self._context.set_default_verify_paths() if certfile: self._context.load_cert_chain(certfile, keyfile) if npn_protocols: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
