X-Git-Url: http://gitweb/?a=blobdiff_plain;f=python%2FPkgfile;h=ab941952430825eddf8917ef88dfdf653e7eb8de;hb=d1dc6e4dc1e23e44868086fd6eaf7d2a3d648214;hp=0cd7e2308c0085cd916330ee4045642e0a38eb23;hpb=33f239475a95261bf13cc96f9eb5cedc29539aea;p=ports%2Fopt-arm64.git

diff --git a/python/Pkgfile b/python/Pkgfile
index 0cd7e23..ab94195 100644
--- a/python/Pkgfile
+++ b/python/Pkgfile
@@ -5,21 +5,21 @@
 # Depends on: db gdbm openssl bzip2 zlib sqlite3
 
 name=python
-version=2.7.14
+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
-  # 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" \
+  # remove 2to3, we use the one from python3
+  rm -r Lib/lib2to3
+
+  # remove tests
+  rm -r Lib/{bsddb,ctypes,email,lib-tk,sqlite3,unittest}/test
+  rm -r Lib/{{distutils,json}/tests,idlelib/idle_test,test}
+
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -36,9 +36,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