X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpython;h=66bc3b901f0c6cba47006968ed9e26c25aae32d2;hb=968ce70af13653166540493485d755b872f62aa7;hp=6095e5ed02ecb3c6f8a450a8766ebc1bb5b303e0;hpb=fef20dab7453231b19228efb90577070d2548c50;p=ipfire-2.x.git

diff --git a/lfs/python b/lfs/python
index 6095e5ed02..66bc3b901f 100644
--- a/lfs/python
+++ b/lfs/python
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,9 @@
 
 include Config
 
-VER        = 2.7.3
+# If you update this make sure that you also change the VER and PAK_VER of
+# python-optional-src !
+VER        = 2.7.15
 
 THISAPP    = Python-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0
+$(DL_FILE)_MD5 = a80ae3cc478460b922242f43a1b4094d
 
 install : $(TARGET)
 
@@ -70,8 +72,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
-	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
+	rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
+	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
+		--prefix=/usr \
+		--enable-shared \
+		--with-system-ffi
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)