From 1e548f3452adc5ee2ee89efd9464d0d00e7c2ab99e765a5c0eb0bc99bdd09049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 22 May 2018 08:06:13 +0000 Subject: [PATCH] Accepting request 611078 from home:stroeder:branches:devel:languages:python:Factory update to 2.7.15 OBS-URL: https://build.opensuse.org/request/show/611078 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=229 --- Python-2.7.14.tar.xz | 3 -- Python-2.7.14.tar.xz.asc | 16 ----------- Python-2.7.15.tar.xz | 3 ++ Python-2.7.15.tar.xz.asc | 16 +++++++++++ do-not-use-non-ascii-in-test_ssl.patch | 11 +++++++ gcc8-miscompilation-fix.patch | 33 --------------------- python-2.7.14-docs-pdf-a4.tar.bz2 | 3 -- python-2.7.14-docs-pdf-letter.tar.bz2 | 3 -- python-2.7.15-docs-pdf-a4.tar.bz2 | 3 ++ python-2.7.15-docs-pdf-letter.tar.bz2 | 3 ++ python-base.changes | 9 ++++++ python-base.spec | 11 ++----- python-doc.changes | 9 ++++++ python-doc.spec | 9 ++---- python-fix-shebang.patch | 20 ------------- python-ncurses-6.0-accessors.patch | 40 -------------------------- python.changes | 9 ++++++ python.spec | 9 ++---- 18 files changed, 72 insertions(+), 138 deletions(-) delete mode 100644 Python-2.7.14.tar.xz delete mode 100644 Python-2.7.14.tar.xz.asc create mode 100644 Python-2.7.15.tar.xz create mode 100644 Python-2.7.15.tar.xz.asc create mode 100644 do-not-use-non-ascii-in-test_ssl.patch delete mode 100644 gcc8-miscompilation-fix.patch delete mode 100644 python-2.7.14-docs-pdf-a4.tar.bz2 delete mode 100644 python-2.7.14-docs-pdf-letter.tar.bz2 create mode 100644 python-2.7.15-docs-pdf-a4.tar.bz2 create mode 100644 python-2.7.15-docs-pdf-letter.tar.bz2 delete mode 100644 python-fix-shebang.patch delete mode 100644 python-ncurses-6.0-accessors.patch diff --git a/Python-2.7.14.tar.xz b/Python-2.7.14.tar.xz deleted file mode 100644 index d8523b7..0000000 --- a/Python-2.7.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66 -size 12576112 diff --git a/Python-2.7.14.tar.xz.asc b/Python-2.7.14.tar.xz.asc deleted file mode 100644 index caea0bb..0000000 --- a/Python-2.7.14.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCAAGBQJZvWXWAAoJEATDZ8IYrdT/8IgQAJwkDGd3oUY2WWhlh7kUnOIs -X0hEqSvMM2itL/DpNVTTcCyviqPXPxH4XkCn6E4g9cPiMKYID5KL8V5CK+rSHaZY -ckJ9FKZ5Hv6bF0hEF2gUN0vtd9w2qh7lnvjGLtMcXwfe3cN1qg6X07+a5dZvxYWw -EhPtdEHi2u+2UBlhEjCGb2njZ9SDbNqx0KjcuO0hTxEfzpqWCTzIwNJwQS8RYX1r -LBdqID+xQqLaX19tAkyxa3F8F1bF1esvEWJyyLy1LVvAfL8QYzAObOYOb+dlohUU -/BCCP2J8Nn+O49vF4VSo35xU2ngHajDKL2xMMes5JLd5oVHEWfdATADv3gXNINy9 -9zQowUNwV/bsQFHncHl1i6O1jAZbiSeYw8+ZVo6H2jxWwTAbEgMmx5oldzqB8FiQ -kDGEr0130686GrkOFVYI2Ttj4bIhminwCJk3/w22Pe6sxh5ZbFKj0gnQ1vLhzXPy -EH52KcOi+9kn3w6yYQmOZHkwheY1Gkgl23VifkZVCkz7iZZxlbD2WyuzvDPh9U6o -aVzbnOaBniNeAYcXcb8GGVCz5L4um75BpTtky2eufZhf377HfmCZ9Xo38nuWqN4T -qZj+bto4UtWcbQXVi+dz//v1jVPIOWbhS/TTDI/Ht45m2gktfZegB/m6NwBnvtuC -SgD09Q4KFLCWJKp62vNI -=FnWM ------END PGP SIGNATURE----- diff --git a/Python-2.7.15.tar.xz b/Python-2.7.15.tar.xz new file mode 100644 index 0000000..e143983 --- /dev/null +++ b/Python-2.7.15.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 +size 12642436 diff --git a/Python-2.7.15.tar.xz.asc b/Python-2.7.15.tar.xz.asc new file mode 100644 index 0000000..e8cb116 --- /dev/null +++ b/Python-2.7.15.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJa5lMMAAoJEATDZ8IYrdT/kZoP/jxQcZQLglI/4Vor+bzGuvad ++uCJFnI37p98ByUdzqcF6ryKzbWoCkswr5+HMT2gVnxIfUV37rBa/cPLaHlTG+ZI +dqFo87XCNeLiPNnAFk32Vq+NHFw1OhmlZfP7UnxYtomAtF2U2qUi1rfU3KHNpQuR +rxsYD1A+5Sy5nWvpCOJ6x8tG6FFgCeHLfbrg6KtB10MqByXKXiOcp9VgdMBr0TwW +Kesq0PuTr88lOQ9qIAS44SsCu2dfls1l+YLf41JtH0zBQryQyxDgfHnNf13PqRzH +CekC3GwcV2Yw5MiSmsqEQtOag3RDggE+8mV5JAs1YmRMQ8wt3fit6EIhmATEwc4Z +LfNxJrwhD8NoTTZ4jOI9hZW0BPBfdf0ezZa38ImWsOymP7m9Z+GrX1LMPxCn+68X +PWxLS+sbLIyPD4XXPCeoMyX8cUz6/Z4XT8vtg1+Tud+nXjs8xA6i3eFt0MzxNGqg +yixVnYp8ZMwImkF31g4tOAbEue0BXWRzm3GDGfOkiCN6YZ7BruC7YylgLMaXMrMV +BoJN4bDcNgoyoqhYY1pV62Yu+n3WrBD4ch3kPtmJG1Gk5jCDXuH+y9tWetWrLqTZ +EJA8GAGVLz9qdm+yfvWGYpRezb3ErH/fOF8qXvoOY/B5jEyh1xPgnqmOYuIsPZLX +mihaoYBkGZpfDfCGutcm +=2GQo +-----END PGP SIGNATURE----- diff --git a/do-not-use-non-ascii-in-test_ssl.patch b/do-not-use-non-ascii-in-test_ssl.patch new file mode 100644 index 0000000..aba3f07 --- /dev/null +++ b/do-not-use-non-ascii-in-test_ssl.patch @@ -0,0 +1,11 @@ +--- Python-2.7.15.orig/Lib/test/test_ssl.py 2018-04-30 00:47:33.000000000 +0200 ++++ Python-2.7.15/Lib/test/test_ssl.py 2018-05-21 21:23:23.905940795 +0200 +@@ -1001,7 +1001,7 @@ + with self.assertRaises(ssl.SSLError) as cm: + ctx.load_dh_params(CERTFILE) + with support.temp_dir() as d: +- fname = os.path.join(d, u'dhpäräm.pem') ++ fname = os.path.join(d, u'dhparam.pem') + shutil.copy(DHFILE, fname) + ctx.load_dh_params(fname) + diff --git a/gcc8-miscompilation-fix.patch b/gcc8-miscompilation-fix.patch deleted file mode 100644 index 3c5da6c..0000000 --- a/gcc8-miscompilation-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Include/objimpl.h b/Include/objimpl.h -index 55e83eced6..aa906144dc 100644 ---- a/Include/objimpl.h -+++ b/Include/objimpl.h -@@ -248,6 +248,18 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); - /* for source compatibility with 2.2 */ - #define _PyObject_GC_Del PyObject_GC_Del - -+/* Former over-aligned definition of PyGC_Head, used to compute the -+ size of the padding for the new version below. */ -+union _gc_head; -+union _gc_head_old { -+ struct { -+ union _gc_head *gc_next; -+ union _gc_head *gc_prev; -+ Py_ssize_t gc_refs; -+ } gc; -+ long double dummy; -+}; -+ - /* GC information is stored BEFORE the object structure. */ - typedef union _gc_head { - struct { -@@ -255,7 +267,8 @@ typedef union _gc_head { - union _gc_head *gc_prev; - Py_ssize_t gc_refs; - } gc; -- long double dummy; /* force worst-case alignment */ -+ double dummy; /* force worst-case alignment */ -+ char dummy_padding[sizeof(union _gc_head_old)]; - } PyGC_Head; - - extern PyGC_Head *_PyGC_generation0; diff --git a/python-2.7.14-docs-pdf-a4.tar.bz2 b/python-2.7.14-docs-pdf-a4.tar.bz2 deleted file mode 100644 index 296feb6..0000000 --- a/python-2.7.14-docs-pdf-a4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce4db77abd28c7067cc2de1aecea6d8939b735dd8451f310f4f4cf163fb78fa6 -size 9343063 diff --git a/python-2.7.14-docs-pdf-letter.tar.bz2 b/python-2.7.14-docs-pdf-letter.tar.bz2 deleted file mode 100644 index 125067c..0000000 --- a/python-2.7.14-docs-pdf-letter.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb93a147705b771c91798aa512fa836e3ae38736b4df4fa10eb518e96fec8060 -size 9343109 diff --git a/python-2.7.15-docs-pdf-a4.tar.bz2 b/python-2.7.15-docs-pdf-a4.tar.bz2 new file mode 100644 index 0000000..1fbdf54 --- /dev/null +++ b/python-2.7.15-docs-pdf-a4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbf77aefc548510b72b18f20be35543754a2f0be4fb3139362166f76ba16d846 +size 11453397 diff --git a/python-2.7.15-docs-pdf-letter.tar.bz2 b/python-2.7.15-docs-pdf-letter.tar.bz2 new file mode 100644 index 0000000..b50d45a --- /dev/null +++ b/python-2.7.15-docs-pdf-letter.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc0c23f8c232fa60e0f1183269b30a4e995cdb2ff1a5b212c5ef96a0486b8edf +size 11453167 diff --git a/python-base.changes b/python-base.changes index cbc3c08..e029974 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 21 18:41:43 UTC 2018 - michael@stroeder.com + +- update to 2.7.15 +- removed obsolete patches: + * python-ncurses-6.0-accessors.patch + * python-fix-shebang.patch + * gcc8-miscompilation-fix.patch + ------------------------------------------------------------------- Fri Apr 6 10:11:22 UTC 2018 - mliska@suse.cz diff --git a/python-base.spec b/python-base.spec index 3c823a4..3559eb1 100644 --- a/python-base.spec +++ b/python-base.spec @@ -17,7 +17,7 @@ Name: python-base -Version: 2.7.14 +Version: 2.7.15 Release: 0 Summary: Python Interpreter base package License: Python-2.0 @@ -52,17 +52,14 @@ Patch24: python-bsddb6.diff Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch -# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 -Patch35: python-ncurses-6.0-accessors.patch +# PATCH-FIX-UPSTREAM do not use non-ASCII filename in test_ssl.py +Patch35: do-not-use-non-ascii-in-test_ssl.patch # PATCH-FIX-UPSTREAM bmwiedemann@suse.de -- allow python packages to build reproducibly Patch38: reproducible.patch -# PATCH-FIX-UPSTREAM taken from upstream fix py3 shebang -Patch39: python-fix-shebang.patch # bypass boo#1078485 random failing tests Patch40: python-skip_random_failing_tests.patch # PATCH-FIX-UPSTREAM sorted tar https://github.com/python/cpython/pull/2263 Patch41: python-sorted_tar.patch -Patch42: gcc8-miscompilation-fix.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -166,12 +163,10 @@ other applications. %endif %patch35 -p1 %patch38 -p1 -%patch39 -p1 %ifarch ppc ppc64 ppc64le %patch40 -p1 %endif %patch41 -p1 -%patch42 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-doc.changes b/python-doc.changes index 158ece7..34742b0 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 21 18:41:43 UTC 2018 - michael@stroeder.com + +- update to 2.7.15 +- removed obsolete patches: + * python-ncurses-6.0-accessors.patch + * python-fix-shebang.patch + * gcc8-miscompilation-fix.patch + ------------------------------------------------------------------- Mon Nov 20 16:11:48 UTC 2017 - jmatejek@suse.com diff --git a/python-doc.spec b/python-doc.spec index 1e0afdb..7e5a681 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -17,7 +17,7 @@ Name: python-doc -Version: 2.7.14 +Version: 2.7.15 Release: 0 Summary: Additional Package Documentation for Python License: Python-2.0 @@ -53,12 +53,10 @@ Patch24: python-bsddb6.diff Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch -# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 -Patch35: python-ncurses-6.0-accessors.patch +# PATCH-FIX-UPSTREAM do not use non-ASCII filename in test_ssl.py +Patch35: do-not-use-non-ascii-in-test_ssl.patch # PATCH-FIX-UPSTREAM bmwiedemann@suse.de -- allow python packages to build reproducibly Patch38: reproducible.patch -# PATCH-FIX-UPSTREAM taken from upstream fix py3 shebang -Patch39: python-fix-shebang.patch # bypass boo#1078485 random failing tests Patch40: python-skip_random_failing_tests.patch # PATCH-FIX-UPSTREAM sorted tar https://github.com/python/cpython/pull/2263 @@ -112,7 +110,6 @@ Python, and Macintosh Module Reference in PDF format. %endif %patch35 -p1 %patch38 -p1 -%patch39 -p1 %ifarch ppc ppc64 ppc64le %patch40 -p1 %endif diff --git a/python-fix-shebang.patch b/python-fix-shebang.patch deleted file mode 100644 index e7de566..0000000 --- a/python-fix-shebang.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 448c6739877a4143a2c3599f041fa6127f354044 Mon Sep 17 00:00:00 2001 -From: Victor Stinner -Date: Thu, 23 Nov 2017 17:04:34 +0100 -Subject: [PATCH] bpo-29512: Fix Lib/test/bisect.py shebang (#4522) - -Replace python3 with python2. ---- - Lib/test/bisect.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/test/bisect.py b/Lib/test/bisect.py -index 6fc561890262..1bf32ef06dd9 100755 ---- a/Lib/test/bisect.py -+++ b/Lib/test/bisect.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/env python2 - """ - Command line tool to bisect failing CPython tests. - diff --git a/python-ncurses-6.0-accessors.patch b/python-ncurses-6.0-accessors.patch deleted file mode 100644 index 9df1176..0000000 --- a/python-ncurses-6.0-accessors.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: Python-2.7.10/Modules/_cursesmodule.c -=================================================================== ---- Python-2.7.10.orig/Modules/_cursesmodule.c -+++ Python-2.7.10/Modules/_cursesmodule.c -@@ -807,7 +807,7 @@ PyCursesWindow_EchoChar(PyCursesWindowOb - } - - #ifdef WINDOW_HAS_FLAGS -- if (self->win->_flags & _ISPAD) -+ if (is_pad(self->win)) - return PyCursesCheckERR(pechochar(self->win, ch | attr), - "echochar"); - else -@@ -1237,7 +1237,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWind - #ifndef WINDOW_HAS_FLAGS - if (0) - #else -- if (self->win->_flags & _ISPAD) -+ if (is_pad(self->win)) - #endif - { - switch(PyTuple_Size(args)) { -@@ -1380,7 +1380,7 @@ PyCursesWindow_Refresh(PyCursesWindowObj - #ifndef WINDOW_HAS_FLAGS - if (0) - #else -- if (self->win->_flags & _ISPAD) -+ if (is_pad(self->win)) - #endif - { - switch(PyTuple_Size(args)) { -@@ -1447,7 +1447,7 @@ PyCursesWindow_SubWin(PyCursesWindowObje - - /* printf("Subwin: %i %i %i %i \n", nlines, ncols, begin_y, begin_x); */ - #ifdef WINDOW_HAS_FLAGS -- if (self->win->_flags & _ISPAD) -+ if (is_pad(self->win)) - win = subpad(self->win, nlines, ncols, begin_y, begin_x); - else - #endif diff --git a/python.changes b/python.changes index 0c0733a..4caa7b1 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 21 18:41:43 UTC 2018 - michael@stroeder.com + +- update to 2.7.15 +- removed obsolete patches: + * python-ncurses-6.0-accessors.patch + * python-fix-shebang.patch + * gcc8-miscompilation-fix.patch + ------------------------------------------------------------------- Mon Nov 20 16:11:48 UTC 2017 - jmatejek@suse.com diff --git a/python.spec b/python.spec index 35a2e8a..e33e854 100644 --- a/python.spec +++ b/python.spec @@ -17,7 +17,7 @@ Name: python -Version: 2.7.14 +Version: 2.7.15 Release: 0 Summary: Python Interpreter License: Python-2.0 @@ -58,12 +58,10 @@ Patch24: python-bsddb6.diff Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch -# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 -Patch35: python-ncurses-6.0-accessors.patch +# PATCH-FIX-UPSTREAM do not use non-ASCII filename in test_ssl.py +Patch35: do-not-use-non-ascii-in-test_ssl.patch # PATCH-FIX-UPSTREAM bmwiedemann@suse.de -- allow python packages to build reproducibly Patch38: reproducible.patch -# PATCH-FIX-UPSTREAM taken from upstream fix py3 shebang -Patch39: python-fix-shebang.patch # bypass boo#1078485 random failing tests Patch40: python-skip_random_failing_tests.patch # PATCH-FIX-UPSTREAM sorted tar https://github.com/python/cpython/pull/2263 @@ -218,7 +216,6 @@ that rely on earlier non-verification behavior. %endif %patch35 -p1 %patch38 -p1 -%patch39 -p1 %ifarch ppc ppc64 ppc64le %patch40 -p1 %endif