X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=python%2FPkgfile;h=c2b5ce91909cf6b875b49c53d9420aadfa0bf977;hb=3eb9dd4947b6f2049968891f00addf135e5fc421;hp=b6871369f8eea57e69d18a94b8167df2dc5a6801;hpb=3f0678fe92046de6eef701a2b3047208ecf6476d;p=ports%2Fopt-arm.git

diff --git a/python/Pkgfile b/python/Pkgfile
index b687136..c2b5ce9 100644
--- a/python/Pkgfile
+++ b/python/Pkgfile
@@ -5,26 +5,24 @@
 # Depends on: db gdbm openssl bzip2 zlib sqlite3
 
 name=python
-version=2.7.14
-release=1
+version=2.7.18
+release=2
 source=(http://www.python.org/ftp/$name/$version/Python-$version.tar.xz \
-        CVE-2018-1000030.patch
         pyconfig.h)
 
 build () {
   cd Python-$version
 
+  # remove 2to3, we use the one from python3
+  rm -r Lib/lib2to3
+
   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
- 
+  # remove tests
+  rm -r Lib/{bsddb,ctypes,email,lib-tk,sqlite3,unittest}/test
+  rm -r Lib/{{distutils,json}/tests,idlelib/idle_test,test}
 
-  # set OPT to the python default without -O3
-  # our CFLAGS are used as well
-  OPT="-Wall -Wstrict-prototypes -fwrapv" \
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -41,9 +39,8 @@ build () {
   ln -s python2.7 $PKG/usr/include/python
   ln -s /usr/lib/libpython2.7.so $PKG/usr/lib/python2.7/config/libpython2.7.so
 
-  rm -r $PKG/usr/lib/python/{bsddb,ctypes,email,sqlite3}/test
-  rm -r $PKG/usr/lib/python/{distutils,json,lib2to3}/tests
-  rm $PKG/usr/lib/python/{distutils,site-packages,test/data}/README
+  rm $PKG/usr/bin/2to3
+  rm $PKG/usr/lib/python/{distutils,site-packages}/README
   rm $PKG/usr/lib/python/idlelib/{ChangeLog,{NEWS,README,TODO}.txt}
   rm $PKG/usr/lib/python/ctypes/macholib/README.ctypes