Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2017-09-28 12:32:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python" Thu Sep 28 12:32:34 2017 rev:123 rq:527332 version:2.7.13 Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2017-08-29 11:36:04.451932339 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2017-09-28 12:32:34.879211279 +0200 @@ -6,0 +7,6 @@ +Mon May 15 14:03:01 UTC 2017 - [email protected] + +- obsolete/provide python-argparse and provide python2-argparse, + because the argparse module is available from python 2.7 up + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python.changes 2017-08-29 11:36:04.499925596 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2017-09-28 12:32:34.915206218 +0200 @@ -1,0 +2,11 @@ +Thu Sep 14 14:12:38 UTC 2017 - [email protected] + +- Fix test broken with OpenSSL 1.1 (bsc#1042670) + * add 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch + +------------------------------------------------------------------- +Mon Aug 28 13:28:46 UTC 2017 - [email protected] + +- drop SUSE_ASNEEDED=0 as it is not needed anymore + +------------------------------------------------------------------- New: ---- 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.UknfGk/_old 2017-09-28 12:32:36.674958782 +0200 +++ /var/tmp/diff_new_pack.UknfGk/_new 2017-09-28 12:32:36.678958219 +0200 @@ -58,6 +58,7 @@ Patch37: python-2.7.12-makeopcode.patch # PATCH-FIX-UPSTREAM [email protected] -- allow python packages to build reproducibly Patch38: reproducible.patch +Patch39: 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -80,6 +81,9 @@ %endif Provides: python-ctypes = 1.1.0 Obsoletes: python-ctypes < 1.1.0 +Provides: python-argparse = 1.4.0.1 +Obsoletes: python-argparse < 1.4.0.1 +Provides: python2-argparse = 1.4.0.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: python2-base = %{version} @@ -160,6 +164,7 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.UknfGk/_old 2017-09-28 12:32:36.710953721 +0200 +++ /var/tmp/diff_new_pack.UknfGk/_new 2017-09-28 12:32:36.714953158 +0200 @@ -59,6 +59,7 @@ Patch37: python-2.7.12-makeopcode.patch # PATCH-FIX-UPSTREAM [email protected] -- allow python packages to build reproducibly Patch38: reproducible.patch +Patch39: 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -110,6 +111,7 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.UknfGk/_old 2017-09-28 12:32:36.746948660 +0200 +++ /var/tmp/diff_new_pack.UknfGk/_new 2017-09-28 12:32:36.750948097 +0200 @@ -64,6 +64,7 @@ Patch37: python-2.7.12-makeopcode.patch # PATCH-FIX-UPSTREAM [email protected] -- allow python packages to build reproducibly Patch38: reproducible.patch +Patch39: 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -216,6 +217,7 @@ %patch36 -p1 %patch37 -p1 %patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac @@ -226,9 +228,6 @@ %endif %build -# necessary for correct linking with GDBM: -export SUSE_ASNEEDED=0 - export OPT="%{optflags} -DOPENSSL_LOAD_CONF -fwrapv" autoreconf -f -i . # Modules/_ctypes/libffi ++++++ 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch ++++++ >From 05b7d9c6675b71d17f5fcf379b3888fba431f14e Mon Sep 17 00:00:00 2001 From: Christian Heimes <[email protected]> Date: Tue, 15 Aug 2017 10:55:03 +0200 Subject: [PATCH] [2.7] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#3094) OpenSSL 1.1.0 to 1.1.0e aborted the handshake when server and client could not agree on a protocol using ALPN. OpenSSL 1.1.0f changed that. The most recent version now behaves like OpenSSL 1.0.2 again. The ALPN callback can pretend to not been set. See https://github.com/openssl/openssl/pull/3158 for more details Signed-off-by: Christian Heimes <[email protected]> (cherry picked from commit a5c1bab352671e043645163ca50c5211aa657acd) --- Doc/library/ssl.rst | 5 +++-- Lib/test/test_ssl.py | 5 +++-- Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst Index: Python-2.7.13/Doc/library/ssl.rst =================================================================== --- Python-2.7.13.orig/Doc/library/ssl.rst 2016-12-17 21:05:05.000000000 +0100 +++ Python-2.7.13/Doc/library/ssl.rst 2017-09-14 16:14:26.733996348 +0200 @@ -1158,8 +1158,9 @@ to speed up repeated connections from th This method will raise :exc:`NotImplementedError` if :data:`HAS_ALPN` is False. - OpenSSL 1.1.0+ will abort the handshake and raise :exc:`SSLError` when - both sides support ALPN but cannot agree on a protocol. + OpenSSL 1.1.0 to 1.1.0e will abort the handshake and raise :exc:`SSLError` + when both sides support ALPN but cannot agree on a protocol. 1.1.0f+ + behaves like 1.0.2, :meth:`SSLSocket.selected_alpn_protocol` returns None. .. versionadded:: 2.7.10 Index: Python-2.7.13/Lib/test/test_ssl.py =================================================================== --- Python-2.7.13.orig/Lib/test/test_ssl.py 2016-12-17 21:05:06.000000000 +0100 +++ Python-2.7.13/Lib/test/test_ssl.py 2017-09-14 16:14:26.733996348 +0200 @@ -2963,8 +2963,9 @@ else: except ssl.SSLError as e: stats = e - if expected is None and IS_OPENSSL_1_1: - # OpenSSL 1.1.0 raises handshake error + if (expected is None and IS_OPENSSL_1_1 + and ssl.OPENSSL_VERSION_INFO < (1, 1, 0, 6)): + # OpenSSL 1.1.0 to 1.1.0e raises handshake error self.assertIsInstance(stats, ssl.SSLError) else: msg = "failed trying %s (s) and %s (c).\n" \ Index: Python-2.7.13/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ Python-2.7.13/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst 2017-09-14 16:14:26.733996348 +0200 @@ -0,0 +1,2 @@ +Address ALPN callback changes for OpenSSL 1.1.0f. The latest version behaves +like OpenSSL 1.0.2 and no longer aborts handshake.
