Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2017-09-21 12:28:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3" Thu Sep 21 12:28:43 2017 rev:76 rq:527324 version:3.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2017-09-14 21:09:01.670832442 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes 2017-09-21 12:28:46.242550315 +0200 @@ -1,0 +2,6 @@ +Thu Sep 14 13:23:10 UTC 2017 - [email protected] + +- Fix test broken with OpenSSL 1.1 (bsc#1042670) + * add 0001-3.6-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3093.patch + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3-doc.changes 2017-09-14 21:09:01.834809379 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-doc.changes 2017-09-21 12:28:49.262125558 +0200 @@ -1,0 +2,5 @@ +Tue Sep 5 11:47:05 UTC 2017 - [email protected] + +- Update RPM group for python documentation. + +------------------------------------------------------------------- New: ---- 0001-3.6-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3093.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.ALK8jz/_old 2017-09-21 12:28:52.093727242 +0200 +++ /var/tmp/diff_new_pack.ALK8jz/_new 2017-09-21 12:28:52.093727242 +0200 @@ -168,6 +168,8 @@ Patch21: 0001-allow-for-reproducible-builds-of-python-packages.patch # PATCH-FEATURE-OPENSUSE order files for compilation until the underlying cause of bsc#1049186 is resolved Patch22: distutils-reproducible-compile.patch +# PATCH-FIX-UPSTREAM https://github.com/python/cpython/commit/7f6a13bd562ff6a265fc63a991327feaecb07a77 +Patch23: 0001-3.6-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3093.patch ### COMMON-PATCH-END ### %description @@ -262,6 +264,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.ALK8jz/_old 2017-09-21 12:28:52.113724430 +0200 +++ /var/tmp/diff_new_pack.ALK8jz/_new 2017-09-21 12:28:52.113724430 +0200 @@ -58,7 +58,7 @@ Release: 0 Summary: Additional Package Documentation for Python 3 License: Python-2.0 -Group: Development/Languages/Python +Group: Documentation/HTML Url: http://www.python.org/ Source0: http://www.python.org/ftp/python/%{tarversion}/%{tarname}.tar.xz BuildRequires: libqt5-qttools @@ -92,6 +92,8 @@ Patch21: 0001-allow-for-reproducible-builds-of-python-packages.patch # PATCH-FEATURE-OPENSUSE order files for compilation until the underlying cause of bsc#1049186 is resolved Patch22: distutils-reproducible-compile.patch +# PATCH-FIX-UPSTREAM https://github.com/python/cpython/commit/7f6a13bd562ff6a265fc63a991327feaecb07a77 +Patch23: 0001-3.6-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3093.patch ### COMMON-PATCH-END ### %description @@ -116,6 +118,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.ALK8jz/_old 2017-09-21 12:28:52.145719928 +0200 +++ /var/tmp/diff_new_pack.ALK8jz/_new 2017-09-21 12:28:52.149719367 +0200 @@ -129,6 +129,8 @@ Patch21: 0001-allow-for-reproducible-builds-of-python-packages.patch # PATCH-FEATURE-OPENSUSE order files for compilation until the underlying cause of bsc#1049186 is resolved Patch22: distutils-reproducible-compile.patch +# PATCH-FIX-UPSTREAM https://github.com/python/cpython/commit/7f6a13bd562ff6a265fc63a991327feaecb07a77 +Patch23: 0001-3.6-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3093.patch ### COMMON-PATCH-END ### %description @@ -187,6 +189,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ 0001-3.6-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3093.patch ++++++ >From 7f6a13bd562ff6a265fc63a991327feaecb07a77 Mon Sep 17 00:00:00 2001 From: Christian Heimes <[email protected]> Date: Tue, 15 Aug 2017 10:45:40 +0200 Subject: [PATCH] [3.6] bpo-30714: ALPN changes for OpenSSL 1.1.0f (#3093) 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 diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 6c30a74a09..357f65a3fa 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -1442,8 +1442,9 @@ to speed up repeated connections from the same clients. 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:: 3.5 diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 85c59a618c..3fdbba1370 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -3258,8 +3258,9 @@ if _have_threads: 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" \ diff --git a/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst new file mode 100644 index 0000000000..88394e585c --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2017-07-25-15-27-44.bpo-30715.Sp7bTF.rst @@ -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. -- 2.13.5
