From 517eb90b674214e1b58f573bdf47f43bc6c8499e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 9 May 2018 00:50:15 +0200 Subject: [PATCH] python: updated to 2.7.15 --- python/.footprint | 12 ++++++------ python/.md5sum | 3 +-- python/Pkgfile | 10 ++-------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/python/.footprint b/python/.footprint index 7542e6d..fe3870b 100644 --- a/python/.footprint +++ b/python/.footprint @@ -1036,8 +1036,8 @@ drwxr-xr-x root/root usr/lib/python2.7/ensurepip/ -rw-r--r-- root/root usr/lib/python2.7/ensurepip/__main__.pyc -rw-r--r-- root/root usr/lib/python2.7/ensurepip/__main__.pyo drwxr-xr-x root/root usr/lib/python2.7/ensurepip/_bundled/ --rw-r--r-- root/root usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl --rw-r--r-- root/root usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +-rw-r--r-- root/root usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +-rw-r--r-- root/root usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl -rw-r--r-- root/root usr/lib/python2.7/ensurepip/_uninstall.py -rw-r--r-- root/root usr/lib/python2.7/ensurepip/_uninstall.pyc -rw-r--r-- root/root usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1440,7 +1440,7 @@ drwxr-xr-x root/root usr/lib/python2.7/json/ -rw-r--r-- root/root usr/lib/python2.7/keyword.pyc -rw-r--r-- root/root usr/lib/python2.7/keyword.pyo drwxr-xr-x root/root usr/lib/python2.7/lib-dynload/ --rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.14-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/lib-dynload/Python-2.7.15-py2.7.egg-info -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bisect.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_bsddb.so -rwxr-xr-x root/root usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1616,9 +1616,9 @@ drwxr-xr-x root/root usr/lib/python2.7/lib-tk/test/test_ttk/ -rw-r--r-- root/root usr/lib/python2.7/lib-tk/turtle.pyo drwxr-xr-x root/root usr/lib/python2.7/lib2to3/ -rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.14.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.14.final.0.pickle +-rw-r--r-- root/root usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyc -rw-r--r-- root/root usr/lib/python2.7/lib2to3/__init__.pyo @@ -2542,7 +2542,6 @@ drwxr-xr-x root/root usr/lib/python2.7/test/imghdrdata/ -rw-r--r-- root/root usr/lib/python2.7/test/seq_tests.pyc -rw-r--r-- root/root usr/lib/python2.7/test/seq_tests.pyo -rw-r--r-- root/root usr/lib/python2.7/test/sgml_input.html --rw-r--r-- root/root usr/lib/python2.7/test/sha256.pem -rw-r--r-- root/root usr/lib/python2.7/test/sortperf.py -rw-r--r-- root/root usr/lib/python2.7/test/sortperf.pyc -rw-r--r-- root/root usr/lib/python2.7/test/sortperf.pyo @@ -3830,6 +3829,7 @@ drwxr-xr-x root/root usr/lib/python2.7/test/tracedmodules/ -rw-r--r-- root/root usr/lib/python2.7/test/win_console_handler.pyo -rw-r--r-- root/root usr/lib/python2.7/test/wrongcert.pem drwxr-xr-x root/root usr/lib/python2.7/test/xmltestdata/ +-rw-r--r-- root/root usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml -rw-r--r-- root/root usr/lib/python2.7/test/xmltestdata/simple-ns.xml -rw-r--r-- root/root usr/lib/python2.7/test/xmltestdata/simple.xml -rw-r--r-- root/root usr/lib/python2.7/test/xmltestdata/test.xml diff --git a/python/.md5sum b/python/.md5sum index 2522bec..ce21c0a 100644 --- a/python/.md5sum +++ b/python/.md5sum @@ -1,3 +1,2 @@ -ff653e9e002ca0e3d4a828988e52edd3 CVE-2018-1000030.patch -1f6db41ad91d9eb0a6f0c769b8613c5b Python-2.7.14.tar.xz +a80ae3cc478460b922242f43a1b4094d Python-2.7.15.tar.xz 387d5f6d00d2be01ecb87216cac0f88c pyconfig.h diff --git a/python/Pkgfile b/python/Pkgfile index 00013b3..bcc33a3 100644 --- a/python/Pkgfile +++ b/python/Pkgfile @@ -5,10 +5,9 @@ # Depends on: db gdbm openssl bzip2 zlib sqlite3 name=python -version=2.7.14 -release=2 +version=2.7.15 +release=1 source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.xz \ - CVE-2018-1000030.patch pyconfig.h) build () { @@ -17,11 +16,6 @@ build () { export CFLAGS="-O2 -pipe -mfloat-abi=hard" export CXXFLAGS="$CFLAGS" - # fix for CVE-2018-1000030 - # see https://bugs.python.org/issue31530 - patch -p1 -i $SRC/CVE-2018-1000030.patch - - # set OPT to the python default without -O3 # our CFLAGS are used as well OPT="-Wall -Wstrict-prototypes -fwrapv" \ -- 2.26.2