diff --git a/00153-fix-test_gdb-noise.patch b/00153-fix-test_gdb-noise.patch deleted file mode 100644 index 227a977e10e14ab73e1313c53321c5f97572e176..0000000000000000000000000000000000000000 --- a/00153-fix-test_gdb-noise.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Lib/test/test_gdb.py.old 2012-04-11 21:04:01.367073855 -0400 -+++ b/Lib/test/test_gdb.py 2012-04-12 08:52:58.320288761 -0400 -@@ -211,6 +211,10 @@ - # ignore all warnings - 'warning: ', - ) -+ ignore_patterns += ('warning: Unable to open', -+ 'Missing separate debuginfo for', -+ 'Try: yum --disablerepo=', -+ 'Undefined set print command') - for line in errlines: - if not line: - continue diff --git a/00157-uid-gid-overflows.patch b/00157-uid-gid-overflows.patch deleted file mode 100644 index a31c98af6677667768c04df03e2330c9c7fab10a..0000000000000000000000000000000000000000 --- a/00157-uid-gid-overflows.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/test/test_os.py ---- Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400 -+++ Python-2.7.3/Lib/test/test_os.py 2012-06-26 14:51:36.000817929 -0400 -@@ -677,30 +677,36 @@ if sys.platform != 'win32': - def test_setuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setuid, 0) -+ self.assertRaises(TypeError, os.setuid, 'not an int') - self.assertRaises(OverflowError, os.setuid, 1<<32) - - @unittest.skipUnless(hasattr(os, 'setgid'), 'test needs os.setgid()') - def test_setgid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setgid, 0) -+ self.assertRaises(TypeError, os.setgid, 'not an int') - self.assertRaises(OverflowError, os.setgid, 1<<32) - - @unittest.skipUnless(hasattr(os, 'seteuid'), 'test needs os.seteuid()') - def test_seteuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.seteuid, 0) -+ self.assertRaises(TypeError, os.seteuid, 'not an int') - self.assertRaises(OverflowError, os.seteuid, 1<<32) - - @unittest.skipUnless(hasattr(os, 'setegid'), 'test needs os.setegid()') - def test_setegid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setegid, 0) -+ self.assertRaises(TypeError, os.setegid, 'not an int') - self.assertRaises(OverflowError, os.setegid, 1<<32) - - @unittest.skipUnless(hasattr(os, 'setreuid'), 'test needs os.setreuid()') - def test_setreuid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setreuid, 0, 0) -+ self.assertRaises(TypeError, os.setreuid, 'not an int', 0) -+ self.assertRaises(TypeError, os.setreuid, 0, 'not an int') - self.assertRaises(OverflowError, os.setreuid, 1<<32, 0) - self.assertRaises(OverflowError, os.setreuid, 0, 1<<32) - -@@ -715,6 +721,8 @@ if sys.platform != 'win32': - def test_setregid(self): - if os.getuid() != 0: - self.assertRaises(os.error, os.setregid, 0, 0) -+ self.assertRaises(TypeError, os.setregid, 'not an int', 0) -+ self.assertRaises(TypeError, os.setregid, 0, 'not an int') - self.assertRaises(OverflowError, os.setregid, 1<<32, 0) - self.assertRaises(OverflowError, os.setregid, 0, 1<<32) - diff --git a/00168-distutils-cflags.patch b/00168-distutils-cflags.patch deleted file mode 100644 index 0c4a8df34a5f47af26b23ebde53d9d5ee0435ead..0000000000000000000000000000000000000000 --- a/00168-distutils-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Python-2.6.6/Lib/distutils/sysconfig.py.distutils-cflags Python-2.6.6/Lib/distutils/sysconfig.py ---- Python-2.6.6/Lib/distutils/sysconfig.py.distutils-cflags 2011-08-12 17:18:17.833091153 -0400 -+++ Python-2.6.6/Lib/distutils/sysconfig.py 2011-08-12 17:18:27.449106938 -0400 -@@ -187,7 +187,7 @@ def customize_compiler(compiler): - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = cflags + ' ' + os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] diff --git a/0342-bpo-36126-Fix-ref-count-leakage-in-structseq_repr.-G.patch b/0342-bpo-36126-Fix-ref-count-leakage-in-structseq_repr.-G.patch deleted file mode 100644 index b941ed9fc10db7a8e7220d39c31b4084384a4555..0000000000000000000000000000000000000000 --- a/0342-bpo-36126-Fix-ref-count-leakage-in-structseq_repr.-G.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 69b4a17f342146d6b7a73975a37678db9916aa75 Mon Sep 17 00:00:00 2001 -From: "Gao, Xiang" -Date: Thu, 28 Feb 2019 08:18:48 -0500 -Subject: [PATCH 342/362] bpo-36126: Fix ref count leakage in structseq_repr. - (GH-12035) - ---- - Objects/structseq.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Objects/structseq.c b/Objects/structseq.c -index 3e45840..aee9528 100644 ---- a/Objects/structseq.c -+++ b/Objects/structseq.c -@@ -266,6 +266,7 @@ structseq_repr(PyStructSequence *obj) - - val = PyTuple_GetItem(tup, i); - if (cname == NULL || val == NULL) { -+ Py_DECREF(tup); - return NULL; - } - repr = PyObject_Repr(val); --- -1.8.3.1 - diff --git a/0349-2.7-bpo-13096-Fix-memory-leak-in-ctypes-POINTER-hand.patch b/0349-2.7-bpo-13096-Fix-memory-leak-in-ctypes-POINTER-hand.patch deleted file mode 100644 index 0c6186724b468dd61f626693c1cb715e45a2499d..0000000000000000000000000000000000000000 --- a/0349-2.7-bpo-13096-Fix-memory-leak-in-ctypes-POINTER-hand.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 710dcfd2f4bee034894a39026388f9c21ea976f1 Mon Sep 17 00:00:00 2001 -From: stratakis -Date: Mon, 4 Mar 2019 16:40:25 +0100 -Subject: [PATCH 349/362] [2.7] bpo-13096: Fix memory leak in ctypes POINTER - handling of large values (GH-12100) - ---- - Misc/NEWS.d/next/Library/2019-03-04-16-13-01.bpo-13096.SGPt_n.rst | 1 + - Modules/_ctypes/callproc.c | 1 + - 2 files changed, 2 insertions(+) - create mode 100644 Misc/NEWS.d/next/Library/2019-03-04-16-13-01.bpo-13096.SGPt_n.rst - -diff --git a/Misc/NEWS.d/next/Library/2019-03-04-16-13-01.bpo-13096.SGPt_n.rst b/Misc/NEWS.d/next/Library/2019-03-04-16-13-01.bpo-13096.SGPt_n.rst -new file mode 100644 -index 0000000..2bf49c8 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2019-03-04-16-13-01.bpo-13096.SGPt_n.rst -@@ -0,0 +1 @@ -+Fix memory leak in ctypes POINTER handling of large values. -diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index 2097342..defcde1 100644 ---- a/Modules/_ctypes/callproc.c -+++ b/Modules/_ctypes/callproc.c -@@ -1831,6 +1831,7 @@ POINTER(PyObject *self, PyObject *cls) - "s(O){}", - buf, - &PyCPointer_Type); -+ PyMem_Free(buf); - if (result == NULL) - return result; - key = PyLong_FromVoidPtr(result); --- -1.8.3.1 - diff --git a/0350-2.7-bpo-36179-Fix-ref-leaks-in-_hashopenssl-GH-12158.patch b/0350-2.7-bpo-36179-Fix-ref-leaks-in-_hashopenssl-GH-12158.patch deleted file mode 100644 index 9cf26b7f1f659f3e5ef55170cc51a6f26862856e..0000000000000000000000000000000000000000 --- a/0350-2.7-bpo-36179-Fix-ref-leaks-in-_hashopenssl-GH-12158.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 84b5ac9ba6fd71ba9d0ef98e2a166a35189b263f Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Mon, 4 Mar 2019 18:10:45 +0100 -Subject: [PATCH 350/362] [2.7] bpo-36179: Fix ref leaks in _hashopenssl - (GH-12158) (GH-12166) - -Fix two unlikely reference leaks in _hashopenssl. The leaks only occur in -out-of-memory cases. Thanks to Charalampos Stratakis. - -Signed-off-by: Christian Heimes - -https://bugs.python.org/issue36179. -(cherry picked from commit b7bc283ab6a23ee98784400ebffe7fe410232a2e) - -Co-authored-by: Christian Heimes - - - -https://bugs.python.org/issue36179 ---- - .../next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst | 2 ++ - Modules/_hashopenssl.c | 14 ++++++++------ - 2 files changed, 10 insertions(+), 6 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst - -diff --git a/Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst b/Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst -new file mode 100644 -index 0000000..61a9877 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst -@@ -0,0 +1,2 @@ -+Fix two unlikely reference leaks in _hashopenssl. The leaks only occur in -+out-of-memory cases. -diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c -index de69f6f..78445eb 100644 ---- a/Modules/_hashopenssl.c -+++ b/Modules/_hashopenssl.c -@@ -133,12 +133,6 @@ newEVPobject(PyObject *name) - if (retval == NULL) - return NULL; - -- retval->ctx = EVP_MD_CTX_new(); -- if (retval->ctx == NULL) { -- PyErr_NoMemory(); -- return NULL; -- } -- - /* save the name for .name to return */ - Py_INCREF(name); - retval->name = name; -@@ -146,6 +140,13 @@ newEVPobject(PyObject *name) - retval->lock = NULL; - #endif - -+ retval->ctx = EVP_MD_CTX_new(); -+ if (retval->ctx == NULL) { -+ Py_DECREF(retval); -+ PyErr_NoMemory(); -+ return NULL; -+ } -+ - return retval; - } - -@@ -205,6 +206,7 @@ EVP_copy(EVPobject *self, PyObject *unused) - return NULL; - - if (!locked_EVP_MD_CTX_copy(newobj->ctx, self)) { -+ Py_DECREF(newobj); - return _setException(PyExc_ValueError); - } - return (PyObject *)newobj; --- -1.8.3.1 - diff --git a/0351-2.7-bpo-36149-Fix-potential-use-of-uninitialized-mem.patch b/0351-2.7-bpo-36149-Fix-potential-use-of-uninitialized-mem.patch deleted file mode 100644 index 505772b5b81f6ad55435e03945086df27bf70acf..0000000000000000000000000000000000000000 --- a/0351-2.7-bpo-36149-Fix-potential-use-of-uninitialized-mem.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d9bf7f4198871132714cfe7d702baaa02206e9f1 Mon Sep 17 00:00:00 2001 -From: "T. Wouters" -Date: Mon, 4 Mar 2019 10:52:07 -0800 -Subject: [PATCH 351/362] [2.7] bpo-36149 Fix potential use of uninitialized - memory in cPickle (#12105) - -Fix off-by-one bug in cPickle that caused it to use uninitialised memory on truncated pickles read from FILE*s. ---- - .../2019-02-28-13-52-18.bpo-36149.GJdnh4.rst | 2 ++ - Modules/cPickle.c | 13 ++++++++----- - 2 files changed, 10 insertions(+), 5 deletions(-) - create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-02-28-13-52-18.bpo-36149.GJdnh4.rst - -diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-02-28-13-52-18.bpo-36149.GJdnh4.rst b/Misc/NEWS.d/next/Core and Builtins/2019-02-28-13-52-18.bpo-36149.GJdnh4.rst -new file mode 100644 -index 0000000..672db6c ---- /dev/null -+++ b/Misc/NEWS.d/next/Core and Builtins/2019-02-28-13-52-18.bpo-36149.GJdnh4.rst -@@ -0,0 +1,2 @@ -+Fix use of uninitialized memory in cPickle when reading a truncated pickle -+from a file object. -diff --git a/Modules/cPickle.c b/Modules/cPickle.c -index 914ebb3..f7c6fec 100644 ---- a/Modules/cPickle.c -+++ b/Modules/cPickle.c -@@ -586,12 +586,15 @@ readline_file(Unpicklerobject *self, char **s) - while (1) { - Py_ssize_t bigger; - char *newbuf; -- for (; i < (self->buf_size - 1); i++) { -- if (feof(self->fp) || -- (self->buf[i] = getc(self->fp)) == '\n') { -- self->buf[i + 1] = '\0'; -+ while (i < (self->buf_size - 1)) { -+ int newchar = getc(self->fp); -+ if (newchar != EOF) { -+ self->buf[i++] = newchar; -+ } -+ if (newchar == EOF || newchar == '\n') { -+ self->buf[i] = '\0'; - *s = self->buf; -- return i + 1; -+ return i; - } - } - if (self->buf_size > (PY_SSIZE_T_MAX >> 1)) { --- -1.8.3.1 - diff --git a/0353-2.7-bpo-36186-Fix-linuxaudiodev.linux_audio_device-e.patch b/0353-2.7-bpo-36186-Fix-linuxaudiodev.linux_audio_device-e.patch deleted file mode 100644 index d7a83a60cc46dbc8b2cce9dbb12d3f3217deac0c..0000000000000000000000000000000000000000 --- a/0353-2.7-bpo-36186-Fix-linuxaudiodev.linux_audio_device-e.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b2aefd77e1da438aed649d018d6aa504ec35eac8 Mon Sep 17 00:00:00 2001 -From: stratakis -Date: Wed, 6 Mar 2019 15:11:56 +0100 -Subject: [PATCH 353/362] [2.7] bpo-36186: Fix - linuxaudiodev.linux_audio_device() error handling (GH-12163) - -Fix linuxaudiodev.linux_audio_device() error handling: -close the internal file descriptor if it fails to open the device. ---- - Misc/NEWS.d/next/Library/2019-03-04-16-39-16.bpo-36186.Hqw1A_.rst | 1 + - Modules/linuxaudiodev.c | 2 ++ - 2 files changed, 3 insertions(+) - create mode 100644 Misc/NEWS.d/next/Library/2019-03-04-16-39-16.bpo-36186.Hqw1A_.rst - -diff --git a/Misc/NEWS.d/next/Library/2019-03-04-16-39-16.bpo-36186.Hqw1A_.rst b/Misc/NEWS.d/next/Library/2019-03-04-16-39-16.bpo-36186.Hqw1A_.rst -new file mode 100644 -index 0000000..a14d155 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2019-03-04-16-39-16.bpo-36186.Hqw1A_.rst -@@ -0,0 +1 @@ -+Fix linuxaudiodev.linux_audio_device() error handling: close the internal file descriptor if it fails to open the device. -diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c -index 7fe20ae..f5135d9 100644 ---- a/Modules/linuxaudiodev.c -+++ b/Modules/linuxaudiodev.c -@@ -126,10 +126,12 @@ newladobject(PyObject *arg) - } - if (imode == O_WRONLY && ioctl(fd, SNDCTL_DSP_NONBLOCK, NULL) == -1) { - PyErr_SetFromErrnoWithFilename(LinuxAudioError, basedev); -+ close(fd); - return NULL; - } - if (ioctl(fd, SNDCTL_DSP_GETFMTS, &afmts) == -1) { - PyErr_SetFromErrnoWithFilename(LinuxAudioError, basedev); -+ close(fd); - return NULL; - } - /* Create and initialize the object */ --- -1.8.3.1 - diff --git a/CVE-2017-18207.patch b/CVE-2017-18207.patch new file mode 100644 index 0000000000000000000000000000000000000000..aac7383a150a31c84d9b4a63ef21a6546e530821 --- /dev/null +++ b/CVE-2017-18207.patch @@ -0,0 +1,22 @@ +From ae0ed14794ced2c51c822fc6f0d3ca92064619dd Mon Sep 17 00:00:00 2001 +From: BT123 +Date: Fri, 17 Nov 2017 16:45:45 +0800 +Subject: [PATCH] bug in wave.py + +--- + Lib/wave.py | 2 ++ + 1 file changed, 2 insertions(+) + +Index: Python-2.7.13/Lib/wave.py +=================================================================== +--- Python-2.7.13.orig/Lib/wave.py 2018-06-07 17:00:25.370728844 +0000 ++++ Python-2.7.13/Lib/wave.py 2018-06-07 17:02:51.768202800 +0000 +@@ -272,6 +272,8 @@ class Wave_read: + self._sampwidth = (sampwidth + 7) // 8 + else: + raise Error, 'unknown format: %r' % (wFormatTag,) ++ if self._nchannels == 0: ++ raise Error, "The audio file in wav format should have at least one channel!" + self._framesize = self._nchannels * self._sampwidth + self._comptype = 'NONE' + self._compname = 'not compressed' diff --git a/python2.spec b/python2.spec index 693c376555701496692d174bd02f189dfaf96882..f73076e418703820406879f47b6bb3aef6b7ab10 100644 --- a/python2.spec +++ b/python2.spec @@ -15,7 +15,7 @@ %undefine _debuginfo_subpackages Name: python2 Version: 2.7.18 -Release: 1 +Release: 2 Summary: Python is an interpreted, interactive object-oriented programming language suitable License: Python URL: https://www.python.org/ @@ -23,62 +23,63 @@ Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz #with systemtap Source1: libpython.stp #custom modifications -Patch0: python-2.7.1-config.patch -Patch1: 00001-pydocnogui.patch -Patch4: python-2.5-cflags.patch -Patch6: python-2.5.1-plural-fix.patch -Patch7: python-2.5.1-sqlite-encoding.patch -Patch10: 00010-2.7.13-binutils-no-dep.patch -Patch13: python-2.7rc1-socketmodule-constants.patch -Patch14: python-2.7rc1-socketmodule-constants2.patch -Patch16: python-2.6-rpath.patch -Patch17: python-2.6.4-distutils-rpath.patch -Patch55: 00055-systemtap.patch -Patch102: 00102-2.7.13-lib64.patch -Patch103: python-2.7-lib64-sysconfig.patch -Patch104: 00104-lib64-fix-for-test_install.patch -Patch111: 00111-no-static-lib.patch -Patch112: 00112-2.7.13-debug-build.patch -Patch113: 00113-more-configuration-flags.patch -Patch114: 00114-statvfs-f_flag-constants.patch -Patch121: 00121-add-Modules-to-build-path.patch -Patch128: python-2.7.1-fix_test_abc_with_COUNT_ALLOCS.patch -Patch130: python-2.7.2-add-extension-suffix-to-python-config.patch -Patch131: 00131-disable-tests-in-test_io.patch -Patch132: 00132-add-rpmbuild-hooks-to-unittest.patch -Patch133: 00133-skip-test_dl.patch -Patch136: 00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch -Patch137: 00137-skip-distutils-tests-that-fail-in-rpmbuild.patch -Patch138: 00138-fix-distutils-tests-in-debug-build.patch -Patch139: 00139-skip-test_float-known-failure-on-arm.patch -Patch140: 00140-skip-test_ctypes-known-failure-on-sparc.patch -Patch142: 00142-skip-failing-pty-tests-in-rpmbuild.patch -Patch143: 00143-tsc-on-ppc.patch -Patch147: 00147-add-debug-malloc-stats.patch -Patch155: 00155-avoid-ctypes-thunks.patch -Patch156: 00156-gdb-autoload-safepath.patch -Patch165: 00165-crypt-module-salt-backport.patch -Patch167: 00167-disable-stack-navigation-tests-when-optimized-in-test_gdb.patch -Patch169: 00169-avoid-implicit-usage-of-md5-in-multiprocessing.patch -Patch170: 00170-gc-assertions.patch -Patch174: 00174-fix-for-usr-move.patch -Patch180: 00180-python-add-support-for-ppc64p7.patch -Patch181: 00181-allow-arbitrary-timeout-in-condition-wait.patch -Patch185: 00185-urllib2-honors-noproxy-for-ftp.patch -Patch187: 00187-add-RPATH-to-pyexpat.patch -Patch189: 00189-use-rpm-wheels.patch -Patch191: 00191-disable-NOOP.patch -Patch193: 00193-enable-loading-sqlite-extensions.patch -Patch289: 00289-disable-nis-detection.patch -Patch290: 04000-modularity-disable-tk.patch -Patch291: 05000-autotool-intermediates.patch -Patch362: python2-add-generic-os-supportr.patch -Patch363: bugfix-linux_distribution-skip-link-file.patch -Patch364: bugfix-test_locale-and-test_codecs.patch -Patch372: CVE-2019-17514.patch -Patch374: bugfix-excessive-memory-usage-when-using-regular-expressions.patch -Patch375: CVE-2020-8492.patch -Patch376: CVE-2019-9674.patch +Patch0: python-2.7.1-config.patch +Patch1: 00001-pydocnogui.patch +Patch2: python-2.5-cflags.patch +Patch3: python-2.5.1-plural-fix.patch +Patch4: python-2.5.1-sqlite-encoding.patch +Patch5: 00010-2.7.13-binutils-no-dep.patch +Patch6: python-2.7rc1-socketmodule-constants.patch +Patch7: python-2.7rc1-socketmodule-constants2.patch +Patch8: python-2.6-rpath.patch +Patch9: python-2.6.4-distutils-rpath.patch +Patch10: 00055-systemtap.patch +Patch11: 00102-2.7.13-lib64.patch +Patch12: python-2.7-lib64-sysconfig.patch +Patch13: 00104-lib64-fix-for-test_install.patch +Patch14: 00111-no-static-lib.patch +Patch15: 00112-2.7.13-debug-build.patch +Patch16: 00113-more-configuration-flags.patch +Patch17: 00114-statvfs-f_flag-constants.patch +Patch18: 00121-add-Modules-to-build-path.patch +Patch19: python-2.7.1-fix_test_abc_with_COUNT_ALLOCS.patch +Patch20: python-2.7.2-add-extension-suffix-to-python-config.patch +Patch21: 00131-disable-tests-in-test_io.patch +Patch22: 00132-add-rpmbuild-hooks-to-unittest.patch +Patch23: 00133-skip-test_dl.patch +Patch24: 00136-skip-tests-of-seeking-stdin-in-rpmbuild.patch +Patch25: 00137-skip-distutils-tests-that-fail-in-rpmbuild.patch +Patch26: 00138-fix-distutils-tests-in-debug-build.patch +Patch27: 00139-skip-test_float-known-failure-on-arm.patch +Patch28: 00140-skip-test_ctypes-known-failure-on-sparc.patch +Patch29: 00142-skip-failing-pty-tests-in-rpmbuild.patch +Patch30: 00143-tsc-on-ppc.patch +Patch31: 00147-add-debug-malloc-stats.patch +Patch32: 00155-avoid-ctypes-thunks.patch +Patch33: 00156-gdb-autoload-safepath.patch +Patch34: 00165-crypt-module-salt-backport.patch +Patch35: 00167-disable-stack-navigation-tests-when-optimized-in-test_gdb.patch +Patch36: 00169-avoid-implicit-usage-of-md5-in-multiprocessing.patch +Patch37: 00170-gc-assertions.patch +Patch38: 00174-fix-for-usr-move.patch +Patch39: 00180-python-add-support-for-ppc64p7.patch +Patch40: 00181-allow-arbitrary-timeout-in-condition-wait.patch +Patch41: 00185-urllib2-honors-noproxy-for-ftp.patch +Patch42: 00187-add-RPATH-to-pyexpat.patch +Patch43: 00189-use-rpm-wheels.patch +Patch44: 00191-disable-NOOP.patch +Patch45: 00193-enable-loading-sqlite-extensions.patch +Patch46: 00289-disable-nis-detection.patch +Patch47: 04000-modularity-disable-tk.patch +Patch48: 05000-autotool-intermediates.patch +Patch49: python2-add-generic-os-supportr.patch +Patch50: bugfix-linux_distribution-skip-link-file.patch +Patch51: bugfix-test_locale-and-test_codecs.patch +Patch52: CVE-2019-17514.patch +Patch53: CVE-2017-18207.patch +Patch54: bugfix-excessive-memory-usage-when-using-regular-expressions.patch +Patch55: CVE-2020-8492.patch +Patch56: CVE-2019-9674.patch BuildRequires: libdb-devel libffi-devel valgrind-devel ncurses-devel expat-devel readline-devel BuildRequires: openssl-devel libtirpc-devel tcl-devel tk-devel glibc-devel libnsl2-devel @@ -613,6 +614,9 @@ sed -e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME_debug}|" %{SOURCE1} \ %{dynload_dir}/_testcapimodule_d.so %changelog +* Fri Aug 07 2020 Leo Fang - 2.7.18-2 +- delete useless patch&repatch CVE-2017-28207 and modify yaml file + * Sat Aug 1 2020 wenzhanli - 2.7.18-1 - Type:bugfix - ID:NA diff --git a/python2.yaml b/python2.yaml index 171dd54eda4969ea9a884487e7e2421a700cf0ca..0a802b11f3a71c2e5a8df172b0ac010d10534a0b 100644 --- a/python2.yaml +++ b/python2.yaml @@ -1,5 +1,5 @@ -version_control: NA -src_repo: -tag_prefix: -seperator: -url: https://www.python.org/downloads/ \ No newline at end of file +version_control: github +src_repo: python/cpython +tag_prefix: "^v?3*|^v" +seperator: "." +url: https://github.com/python/cypthon.git