Hello community, here is the log from the commit of package python36 for openSUSE:Factory checked in at 2020-11-29 12:29:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python36 (Old) and /work/SRC/openSUSE:Factory/.python36.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python36" Sun Nov 29 12:29:06 2020 rev:3 rq:851367 version:3.6.12 Changes: -------- --- /work/SRC/openSUSE:Factory/python36/python36.changes 2020-08-25 09:35:03.656081382 +0200 +++ /work/SRC/openSUSE:Factory/.python36.new.5913/python36.changes 2020-11-29 12:29:16.834053900 +0100 @@ -1,0 +2,58 @@ +Fri Nov 27 15:59:09 UTC 2020 - Markéta Machová <[email protected]> + +- Pin Sphinx version to fix doc subpackage + +------------------------------------------------------------------- +Wed Nov 25 17:16:15 UTC 2020 - Matej Cepl <[email protected]> + +- Change setuptools and pip version numbers according to new wheels +- Add ignore_pip_deprec_warn.patch to switch of persistently + failing test. + +------------------------------------------------------------------- +Tue Nov 24 17:38:21 UTC 2020 - Matej Cepl <[email protected]> + +- Replace bundled wheels for pip and setuptools with the updated ones + (bsc#1176262 CVE-2019-20916). + +------------------------------------------------------------------- +Tue Oct 13 09:23:03 UTC 2020 - Marketa Calabkova <[email protected]> + +- Handful of changes to make python36 compatible with SLE15 and SLE12 + (jsc#ECO-2799, jsc#SLE-13738) +- Rebase bpo23395-PyErr_SetInterrupt-signal.patch + +------------------------------------------------------------------- +Fri Oct 9 16:05:50 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Fix build with RPM 4.16: error: bare words are no longer + supported, please use "...": x86 == ppc. + +------------------------------------------------------------------- +Fri Oct 9 08:06:30 UTC 2020 - Matej Cepl <[email protected]> + +- Fix installing .desktop file + +------------------------------------------------------------------- +Fri Sep 25 06:58:03 UTC 2020 - Dominique Leuenberger <[email protected]> + +- Buildrequire timezone only for general flavor. It's used in this + flavor for the test suite. + +------------------------------------------------------------------- +Wed Sep 2 20:31:39 UTC 2020 - Matej Cepl <[email protected]> + +- Add faulthandler_stack_overflow_on_GCC10.patch to make build + working even with GCC10 (bpo#38965). + +------------------------------------------------------------------- +Tue Sep 1 10:22:30 UTC 2020 - Matej Cepl <[email protected]> + +- Just cleanup and reordering items to synchronize with python38 + +------------------------------------------------------------------- +Mon Aug 31 11:12:31 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Format with spec-cleaner + +------------------------------------------------------------------- @@ -50,0 +109 @@ +- This release also fixes CVE-2020-26116 (bsc#1177211) and CVE-2019-20907 (bsc#1174091). @@ -84 +143 @@ - * Include more security fixes + * Include more security fixes (CVE-2019-18348, bsc#1155094) New: ---- faulthandler_stack_overflow_on_GCC10.patch ignore_pip_deprec_warn.patch pip-20.2.3-py2.py3-none-any.whl setuptools-44.1.1-py2.py3-none-any.whl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python36.spec ++++++ --- /var/tmp/diff_new_pack.ttr46C/_old 2020-11-29 12:29:18.090055171 +0100 +++ /var/tmp/diff_new_pack.ttr46C/_new 2020-11-29 12:29:18.094055175 +0100 @@ -66,13 +66,13 @@ %define so_minor 0 %define so_version %{python_version_soname}%{abi_kind}%{so_major}_%{so_minor} # rpm and python have different ideas about what is an arch-dependent name, so: -%if %{__isa_name} == ppc +%if "%{__isa_name}" == "ppc" %define archname %(echo %{_arch} | sed s/ppc/powerpc/) %else %define archname %{_arch} %endif # our arm has Hardware-Floatingpoint -%if %{_arch} == arm +%if "%{_arch}" == "arm" %define armsuffix hf %endif # pyexpat.cpython-35m-x86_64-linux-gnu @@ -101,14 +101,18 @@ Source9: import_failed.map Source10: pre_checkin.sh Source11: skipped_tests.py -Source19: idle3.desktop -Source20: idle3.appdata.xml -Source99: https://www.python.org/static/files/pubkeys.txt#/python.keyring +Source12: idle3.desktop +Source13: idle3.appdata.xml + +# Fixed bundled wheels +Source20: setuptools-44.1.1-py2.py3-none-any.whl +Source21: pip-20.2.3-py2.py3-none-any.whl + # The following files are not used in the build. # They are listed here to work around missing functionality in rpmbuild, # which would otherwise exclude them from distributed src.rpm files. +Source99: https://www.python.org/static/files/pubkeys.txt#/python.keyring Source100: PACKAGING-NOTES -### COMMON-PATCH-BEGIN ### # implement "--record-rpm" option for distutils installations Patch01: Python-3.0b1-record-rpm.patch # support lib-vs-lib64 distinction @@ -159,7 +163,13 @@ Patch36: riscv64-support.patch # PATCH-FIX-UPSTREAM riscv64-ctypes.patch bpo-35847: RISC-V needs CTYPES_PASS_BY_REF_HACK (GH-11694) Patch37: riscv64-ctypes.patch -### COMMON-PATCH-END ### +# PATCH-FIX-UPSTREAM faulthandler._stack_overflow_on_GCC10.patch bpo#38965 [email protected] +# Fix faulthandler._stack_overflow() on GCC 10 +Patch38: faulthandler_stack_overflow_on_GCC10.patch +# PATCH-FIX-UPSTREAM ignore_pip_deprec_warn.patch [email protected] +# Ignore deprecation warning for old version of pip +Patch39: ignore_pip_deprec_warn.patch + BuildRequires: automake BuildRequires: fdupes BuildRequires: gmp-devel @@ -167,7 +177,6 @@ BuildRequires: netcfg BuildRequires: openssl-devel BuildRequires: pkgconfig -BuildRequires: timezone BuildRequires: xz BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(expat) @@ -181,9 +190,7 @@ %if %{with doc} # Here we just run sphinx and we can use generic one, we don't need # the flavor variant -BuildRequires: python3-Sphinx < 3.0 -BuildRequires: python3-python-docs-theme -BuildRequires: python3-sphinxcontrib-qthelp >= 1.0.2 +BuildRequires: python3-Sphinx < 3 %endif %if %{with general} # required for idle3 (.desktop and .appdata.xml files) @@ -193,6 +200,7 @@ BuildRequires: gettext BuildRequires: readline-devel BuildRequires: sqlite-devel +BuildRequires: timezone BuildRequires: update-desktop-files BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(tk) @@ -204,6 +212,7 @@ Provides: python = %{python_version} %if %{primary_interpreter} Provides: python3 = %{python_version} +Obsoletes: python3 <= %{python_version} %endif %endif @@ -226,6 +235,7 @@ Requires: %{python_pkg_name} = %{version} %if %{primary_interpreter} Provides: python3-tk = %{version} +Obsoletes: python3-tk < %{version} %endif %description -n %{python_pkg_name}-tk @@ -235,7 +245,8 @@ Summary: Python Interface to the (N)Curses Library Requires: %{python_pkg_name} = %{version} %if %{primary_interpreter} -Provides: python3-curses +Provides: python3-curses = %{version} +Obsoletes: python3-curses < %{version} %endif %description -n %{python_pkg_name}-curses @@ -246,7 +257,8 @@ Summary: Python Interface to the GDBM Library Requires: %{python_pkg_name} = %{version} %if %{primary_interpreter} -Provides: python3-dbm +Provides: python3-dbm = %{version} +Obsoletes: python3-dbm < %{version} %endif %description -n %{python_pkg_name}-dbm @@ -259,6 +271,7 @@ Requires: %{python_pkg_name}-tk %if %{primary_interpreter} Provides: python3-idle = %{version} +Obsoletes: python3-idle < %{version} %endif %description -n %{python_pkg_name}-idle @@ -272,6 +285,7 @@ Enhances: %{python_pkg_name} = %{python_version} %if %{primary_interpreter} Provides: python3-doc = %{version} +Obsoletes: python3-doc < %{version} %endif %description -n %{python_pkg_name}-doc @@ -283,6 +297,7 @@ Summary: Additional Package Documentation for Python 3 in devhelp format %if %{primary_interpreter} Provides: python3-doc-devhelp = %{version} +Obsoletes: python3-doc-devhelp < %{version} %endif %description -n %{python_pkg_name}-doc-devhelp @@ -306,22 +321,15 @@ Provides: %{python_pkg_name}-typing = %{version} # python3-xml was merged into python3, now moved into -base Provides: %{python_pkg_name}-xml = %{version} -# python-importlib-metadata was specifical project which was merged into 3.8 -Provides: %{python_pkg_name}-importlib-metadata = %{version} -# python-importlib_resources is a backport of 3.7 behaviour into older pythons -Provides: %{python_pkg_name}-importlib_resources = %{version} %if %{primary_interpreter} Provides: python3-asyncio = %{version} Provides: python3-base = %{version} Obsoletes: python3-asyncio < %{version} +Obsoletes: python3-base < %{version} Provides: python3-typing = %{version} Obsoletes: python3-typing < %{version} Provides: python3-xml = %{version} Obsoletes: python3-xml < %{version} -Provides: python3-importlib-metadata = %{version} -Obsoletes: python3-importlib-metadata < %{version} -Provides: python3-importlib_resources = %{version} -Obsoletes: python3-importlib_resources < %{version} %endif %description -n %{python_pkg_name}-base @@ -346,6 +354,7 @@ Provides: python3-tools = %{version} Obsoletes: python3-2to3 < %{version} Obsoletes: python3-demo < %{version} +Obsoletes: python3-tools < %{version} %endif %description -n %{python_pkg_name}-tools @@ -357,6 +366,7 @@ Requires: %{python_pkg_name}-base = %{version} %if %{primary_interpreter} Provides: python3-devel = %{version} +Obsoletes: python3-devel < %{version} %endif %description -n %{python_pkg_name}-devel @@ -376,6 +386,7 @@ Requires: %{python_pkg_name}-tk = %{version} %if %{primary_interpreter} Provides: python3-testsuite = %{version} +Obsoletes: python3-testsuite < %{version} %endif %description -n %{python_pkg_name}-testsuite @@ -421,6 +432,8 @@ %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -441,6 +454,15 @@ # drop duplicate README from site-packages rm Lib/site-packages/README.txt +# Replace bundled wheels with the updates ones +rm -v Lib/ensurepip/_bundled/*.whl +cp -v %{SOURCE20} %{SOURCE21} Lib/ensurepip/_bundled/ +STVER=$(basename %{SOURCE20}|cut -d- -f2) +PIPVER=$(basename %{SOURCE21}|cut -d- -f2) +sed -E -i -e "s/^(\s*_SETUPTOOLS_VERSION\s+=\s+)\"[0-9.]+\"/\1\"${STVER}\"/" \ + -e "s/^(\s*_PIP_VERSION\s+=\s+)\"[0-9.]+\"/\1\"${PIPVER}\"/" \ + Lib/ensurepip/__init__.py + %build %if %{with doc} TODAY_DATE=`date -r %{SOURCE0} "+%%B %%d, %%Y"` @@ -448,7 +470,7 @@ cd Doc sed -i "s/^today = .*/today = '$TODAY_DATE'/" conf.py -%make_build -j1 html +make %{?_smp_mflags} -j1 html # Build also devhelp files sphinx-build -a -b devhelp . build/devhelp @@ -456,7 +478,11 @@ %else %define _lto_cflags %{nil} # use rpm_opt_flags +%if 0%{?suse_version} < 1500 +export OPT="%{optflags} -DOPENSSL_LOAD_CONF -fwrapv $(pkg-config --cflags-only-I libffi)" +%else export OPT="%{optflags} -DOPENSSL_LOAD_CONF -fwrapv $(pkg-config --cflags-only-I libffi) -fno-semantic-interposition" +%endif touch -r %{SOURCE0} Makefile.pre.in @@ -480,14 +506,14 @@ --enable-loadable-sqlite-extensions # prevent make from trying to rebuild PYTHON_FOR_GEN stuff -%make_build -t Python/Python-ast.c \ +make -t Python/Python-ast.c \ Include/Python-ast.h \ Objects/typeslots.inc \ Python/opcode_targets.h \ Include/opcode.h %if %{with general} -%make_build +make %{?_smp_mflags} %endif %if %{with base} %if %{with profileopt} @@ -496,7 +522,7 @@ target=all %endif LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ - %make_build $target + make %{?_smp_mflags} $target %endif %endif @@ -512,10 +538,12 @@ # test_multiprocessing_forkserver is racy EXCLUDE="$EXCLUDE test_multiprocessing_forkserver" %endif +%ifarch ppc ppc64 ppc64le # exclue test_faulthandler due to bnc#831629 EXCLUDE="$EXCLUDE test_faulthandler" +%endif # some tests break in QEMU -%if 0%{?qemu_user_space_build} > 0 +%if 0%{?qemu_user_space_build} EXCLUDE="$EXCLUDE test_multiprocessing_forkserver test_multiprocessing_spawn test_posix test_os test_socket" # qemu bug (siginterrupt handling) EXCLUDE="$EXCLUDE test_signal" @@ -538,7 +566,7 @@ # Use timeout, like make target buildbottest # We cannot run tests parallel, because osc build environment doesn’t # have /dev/shm -%make_build -j1 test TESTOPTS="-u curses -v -x $EXCLUDE --timeout=1200" +make %{?_smp_mflags} -j1 test TESTOPTS="-u curses -v -x $EXCLUDE --timeout=3000" # use network, be verbose: #make test TESTOPTS="-l -u network -v" %endif @@ -589,14 +617,15 @@ done for library in \ - array _asyncio audioop binascii _bisect _bz2 cmath _codecs_* _crypt _csv \ - _ctypes _datetime _decimal fcntl grp _hashlib _heapq _json _lsprof \ - _lzma math mmap _multibytecodec _multiprocessing _opcode ossaudiodev \ - parser _pickle _posixsubprocess _random resource select _ssl _socket spwd \ - _struct syslog termios _testbuffer _testimportmultiple _testmultiphase \ - unicodedata zlib _ctypes_test _testcapi xxlimited \ - _elementtree pyexpat \ - _md5 _sha1 _sha256 _sha512 _blake2 _sha3 + array _asyncio audioop binascii _bisect _bz2 cmath _codecs_* \ + _crypt _csv _ctypes _datetime _decimal fcntl grp \ + _hashlib _heapq _json _lsprof _lzma math mmap _multibytecodec \ + _multiprocessing _opcode ossaudiodev parser _pickle \ + _posixsubprocess _random resource select _ssl _socket spwd \ + _struct syslog termios _testbuffer _testimportmultiple \ + _testmultiphase unicodedata zlib _ctypes_test _testcapi xxlimited \ + _elementtree pyexpat _md5 _sha1 \ + _sha256 _sha512 _blake2 _sha3 do eval rm "%{buildroot}%{sitedir}/lib-dynload/$library.*" done @@ -622,13 +651,15 @@ done # install idle desktop file -cp %{SOURCE19} idle%{python_version}.desktop +cp %{SOURCE12} idle%{python_version}.desktop sed -i -e 's:idle3:idle%{python_version}:g' idle%{python_version}.desktop +mkdir -p %{buildroot}%{_datadir}/applications install -m 644 -D -t %{buildroot}%{_datadir}/applications idle%{python_version}.desktop %suse_update_desktop_file idle%{python_version} -cp %{SOURCE20} idle%{python_version}.appdata.xml +cp %{SOURCE13} idle%{python_version}.appdata.xml sed -i -e 's:idle3.desktop:idle%{python_version}.desktop:g' idle%{python_version}.appdata.xml +mkdir -p %{buildroot}%{_datadir}/metainfo install -m 644 -D -t %{buildroot}%{_datadir}/metainfo idle%{python_version}.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/idle%{python_version}.appdata.xml @@ -773,6 +804,7 @@ %doc Lib/idlelib/ChangeLog %{_bindir}/idle%{python_version} %{_datadir}/applications/idle%{python_version}.desktop +%dir %{_datadir}/metainfo %{_datadir}/metainfo/idle%{python_version}.appdata.xml %{_datadir}/icons/hicolor/*/apps/idle%{python_version}.png %dir %{_datadir}/icons/hicolor ++++++ bpo23395-PyErr_SetInterrupt-signal.patch ++++++ --- /var/tmp/diff_new_pack.ttr46C/_old 2020-11-29 12:29:18.186055268 +0100 +++ /var/tmp/diff_new_pack.ttr46C/_new 2020-11-29 12:29:18.186055268 +0100 @@ -119,7 +119,7 @@ unittest.main() --- a/Misc/ACKS +++ b/Misc/ACKS -@@ -247,7 +247,7 @@ Donn Cave +@@ -248,7 +248,7 @@ Donn Cave Charles Cazabon Jesús Cea Avión Per Cederqvist ++++++ faulthandler_stack_overflow_on_GCC10.patch ++++++ From 5044c889dfced2f43e2cccb673d889a4882f6b3b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <[email protected]> Date: Wed, 4 Dec 2019 12:29:22 -0800 Subject: [PATCH] bpo-38965: Fix faulthandler._stack_overflow() on GCC 10 (GH-17467) Use the "volatile" keyword to prevent tail call optimization on any compiler, rather than relying on compiler specific pragma. (cherry picked from commit 8b787964e0a647caa0558b7c29ae501470d727d9) Co-authored-by: Victor Stinner <[email protected]> --- .../2019-12-04-17-08-55.bpo-38965.yqax3m.rst | 3 +++ Modules/faulthandler.c | 16 ++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2019-12-04-17-08-55.bpo-38965.yqax3m.rst --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-12-04-17-08-55.bpo-38965.yqax3m.rst @@ -0,0 +1,3 @@ +Fix test_faulthandler on GCC 10. Use the "volatile" keyword in +``faulthandler._stack_overflow()`` to prevent tail call optimization on any +compiler, rather than relying on compiler specific pragma. --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -1091,18 +1091,14 @@ faulthandler_fatal_error_py(PyObject *se #if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION) #define FAULTHANDLER_STACK_OVERFLOW -#ifdef __INTEL_COMPILER - /* Issue #23654: Turn off ICC's tail call optimization for the - * stack_overflow generator. ICC turns the recursive tail call into - * a loop. */ -# pragma intel optimization_level 0 -#endif -static -uintptr_t +static uintptr_t stack_overflow(uintptr_t min_sp, uintptr_t max_sp, size_t *depth) { - /* allocate 4096 bytes on the stack at each call */ - unsigned char buffer[4096]; + /* Allocate (at least) 4096 bytes on the stack at each call. + + bpo-23654, bpo-38965: use volatile keyword to prevent tail call + optimization. */ + volatile unsigned char buffer[4096]; uintptr_t sp = (uintptr_t)&buffer; *depth += 1; if (sp < min_sp || max_sp < sp) ++++++ ignore_pip_deprec_warn.patch ++++++ --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -438,6 +438,7 @@ class EnsurePipTest(BaseTest): ' module unconditionally') # Issue #26610: pip/pep425tags.py requires ctypes @unittest.skipUnless(ctypes, 'pip requires ctypes') + @unittest.skip("Doesn't work with modified wheels") @requires_zlib def test_with_pip(self): self.do_test_with_pip(False) ++++++ pep538_coerce_legacy_c_locale.patch ++++++ --- /var/tmp/diff_new_pack.ttr46C/_old 2020-11-29 12:29:18.258055341 +0100 +++ /var/tmp/diff_new_pack.ttr46C/_new 2020-11-29 12:29:18.258055341 +0100 @@ -1,5 +1,3 @@ -diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst -index d14793a..65aa3ad 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -728,6 +728,45 @@ conflict. @@ -48,8 +46,6 @@ Debug-mode variables ~~~~~~~~~~~~~~~~~~~~ -diff --git a/Lib/test/support/script_helper.py b/Lib/test/support/script_helper.py -index 507dc48..c3cb720 100644 --- a/Lib/test/support/script_helper.py +++ b/Lib/test/support/script_helper.py @@ -56,8 +56,35 @@ def interpreter_requires_environment(): @@ -90,7 +86,7 @@ # Executing the interpreter in a subprocess -@@ -115,30 +142,7 @@ def run_python_until_end(*args, **env_vars): +@@ -115,30 +142,7 @@ def run_python_until_end(*args, **env_va def _assert_python(expected_success, *args, **env_vars): res, cmd_line = run_python_until_end(*args, **env_vars) if (res.rc and expected_success) or (not res.rc and not expected_success): @@ -122,9 +118,6 @@ return res def assert_python_ok(*args, **env_vars): -diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py -new file mode 100644 -index 0000000..635c98f --- /dev/null +++ b/Lib/test/test_c_locale_coercion.py @@ -0,0 +1,371 @@ @@ -499,8 +492,6 @@ + +if __name__ == "__main__": + test_main() -diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py -index 38156b4..5922ed9 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -153,6 +153,7 @@ class CmdLineTest(unittest.TestCase): @@ -511,8 +502,6 @@ code = ( b'import locale; ' b'print(ascii("' + undecodable + b'"), ' -diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py -index 7866a5c..b41239a 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -680,6 +680,7 @@ class SysModuleTest(unittest.TestCase): @@ -523,8 +512,6 @@ code = '\n'.join(( 'import sys', 'def dump(name):', -diff --git a/Modules/main.c b/Modules/main.c -index 585d696..96d8be4 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -107,7 +107,11 @@ static const char usage_6[] = @@ -540,8 +527,6 @@ static int usage(int exitcode, const wchar_t* program) -diff --git a/Programs/_testembed.c b/Programs/_testembed.c -index 813cf30..2a64092 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -1,4 +1,5 @@ @@ -550,8 +535,6 @@ #include "pythread.h" #include <stdio.h> -diff --git a/Programs/python.c b/Programs/python.c -index a7afbc7..03f8295 100644 --- a/Programs/python.c +++ b/Programs/python.c @@ -15,6 +15,21 @@ wmain(int argc, wchar_t **argv) @@ -622,11 +605,9 @@ for (i = 0; i < argc; i++) { PyMem_RawFree(argv_copy2[i]); -diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c -index ecfdfee..4fee178 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c -@@ -167,6 +167,7 @@ Py_SetStandardStreamEncoding(const char *encoding, const char *errors) +@@ -167,6 +167,7 @@ Py_SetStandardStreamEncoding(const char return 0; } @@ -634,7 +615,7 @@ /* Global initializations. Can be undone by Py_FinalizeEx(). Don't call this twice without an intervening Py_FinalizeEx() call. When initializations fail, a fatal error is issued and the function does -@@ -301,6 +302,183 @@ import_init(PyInterpreterState *interp, PyObject *sysmod) +@@ -301,6 +302,183 @@ import_init(PyInterpreterState *interp, } @@ -818,7 +799,7 @@ void _Py_InitializeEx_Private(int install_sigs, int install_importlib) { -@@ -315,11 +493,19 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) +@@ -315,11 +493,19 @@ _Py_InitializeEx_Private(int install_sig initialized = 1; _Py_Finalizing = NULL; @@ -839,7 +820,7 @@ #endif if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') -@@ -1247,12 +1433,8 @@ initstdio(void) +@@ -1250,12 +1436,8 @@ initstdio(void) } } if (!errors && !(pythonioencoding && *pythonioencoding)) { @@ -854,11 +835,9 @@ } } -diff --git a/configure.ac b/configure.ac -index 3f2459a..7444486 100644 --- a/configure.ac +++ b/configure.ac -@@ -3360,6 +3360,40 @@ then +@@ -3417,6 +3417,40 @@ then fi AC_MSG_RESULT($with_pymalloc) ++++++ python-3.6-CVE-2017-18207.patch ++++++ --- /var/tmp/diff_new_pack.ttr46C/_old 2020-11-29 12:29:18.286055369 +0100 +++ /var/tmp/diff_new_pack.ttr46C/_new 2020-11-29 12:29:18.290055373 +0100 @@ -7,11 +7,9 @@ Lib/wave.py | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Lib/wave.py b/Lib/wave.py -index cf94d5af72b4..6db5a2e9cc96 100644 --- a/Lib/wave.py +++ b/Lib/wave.py -@@ -259,6 +259,8 @@ def _read_fmt_chunk(self, chunk): +@@ -258,6 +258,8 @@ class Wave_read: self._sampwidth = (sampwidth + 7) // 8 else: raise Error('unknown format: %r' % (wFormatTag,)) ++++++ riscv64-ctypes.patch ++++++ --- /var/tmp/diff_new_pack.ttr46C/_old 2020-11-29 12:29:18.310055393 +0100 +++ /var/tmp/diff_new_pack.ttr46C/_new 2020-11-29 12:29:18.310055393 +0100 @@ -13,18 +13,13 @@ 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst -diff --git a/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst b/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst -new file mode 100644 -index 0000000000..e3775f96f3 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst @@ -0,0 +1 @@ +RISC-V needed the CTYPES_PASS_BY_REF_HACK. Fixes ctypes Structure test_pass_by_value. -diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index a7965c19b7..bed5364020 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c -@@ -1058,7 +1058,7 @@ GetComError(HRESULT errcode, GUID *riid, IUnknown *pIunk) +@@ -1063,7 +1063,7 @@ GetComError(HRESULT errcode, GUID *riid, #endif #if (defined(__x86_64__) && (defined(__MINGW64__) || defined(__CYGWIN__))) || \ @@ -33,6 +28,3 @@ #define CTYPES_PASS_BY_REF_HACK #define POW2(x) (((x & ~(x - 1)) == x) ? x : 0) #define IS_PASS_BY_REF(x) (x > 8 || !POW2(x)) --- -2.28.0 - ++++++ riscv64-support.patch ++++++ --- /var/tmp/diff_new_pack.ttr46C/_old 2020-11-29 12:29:18.318055401 +0100 +++ /var/tmp/diff_new_pack.ttr46C/_new 2020-11-29 12:29:18.318055401 +0100 @@ -13,19 +13,14 @@ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst -diff --git a/Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst b/Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst -new file mode 100644 -index 0000000000..f5dbd23c7c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2018-04-30-16-53-00.bpo-33377.QBh6vP.rst @@ -0,0 +1,2 @@ +Add new triplets for mips r6 and riscv variants (used in extension +suffixes). -diff --git a/configure b/configure -index f9eee2c028..673cfbd3cf 100755 --- a/configure +++ b/configure -@@ -781,6 +781,7 @@ infodir +@@ -785,6 +785,7 @@ infodir docdir oldincludedir includedir @@ -33,7 +28,7 @@ localstatedir sharedstatedir sysconfdir -@@ -893,6 +894,7 @@ datadir='${datarootdir}' +@@ -898,6 +899,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' @@ -41,7 +36,7 @@ includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1145,6 +1147,15 @@ do +@@ -1150,6 +1152,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -57,7 +52,7 @@ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1282,7 +1293,7 @@ fi +@@ -1287,7 +1298,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ @@ -66,7 +61,7 @@ do eval ac_val=\$$ac_var # Remove trailing slashes. -@@ -1435,6 +1446,7 @@ Fine tuning of the installation directories: +@@ -1440,6 +1451,7 @@ Fine tuning of the installation director --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] @@ -74,7 +69,7 @@ --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] -@@ -5238,6 +5250,26 @@ cat >> conftest.c <<EOF +@@ -5261,6 +5273,26 @@ cat >> conftest.c <<EOF ia64-linux-gnu # elif defined(__m68k__) && !defined(__mcoldfire__) m68k-linux-gnu @@ -101,7 +96,7 @@ # elif defined(__mips_hard_float) && defined(_MIPSEL) # if _MIPS_SIM == _ABIO32 mipsel-linux-gnu -@@ -5280,6 +5312,14 @@ cat >> conftest.c <<EOF +@@ -5303,6 +5335,14 @@ cat >> conftest.c <<EOF sparc64-linux-gnu # elif defined(__sparc__) sparc-linux-gnu @@ -116,11 +111,9 @@ # else # error unknown platform triplet # endif -diff --git a/configure.ac b/configure.ac -index b83abee18c..419bc34eab 100644 --- a/configure.ac +++ b/configure.ac -@@ -781,6 +781,26 @@ cat >> conftest.c <<EOF +@@ -804,6 +804,26 @@ cat >> conftest.c <<EOF ia64-linux-gnu # elif defined(__m68k__) && !defined(__mcoldfire__) m68k-linux-gnu @@ -147,7 +140,7 @@ # elif defined(__mips_hard_float) && defined(_MIPSEL) # if _MIPS_SIM == _ABIO32 mipsel-linux-gnu -@@ -823,6 +843,14 @@ cat >> conftest.c <<EOF +@@ -846,6 +866,14 @@ cat >> conftest.c <<EOF sparc64-linux-gnu # elif defined(__sparc__) sparc-linux-gnu @@ -162,6 +155,3 @@ # else # error unknown platform triplet # endif --- -2.28.0 - _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
