python: update to 2.7.18

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python
index d4c38e32cc4c07807d7d57fe5e993e4d83201ce2..61d7b98443dde4a6f3dd7aa6090d08bc3f1b9e0b 100644 (file)
--- a/config/rootfiles/common/aarch64/python
+++ b/config/rootfiles/common/aarch64/python
@@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2103,9 +2103,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo

diff --git a/config/rootfiles/common/armv5tel/python b/config/rootfiles/common/armv5tel/python
index f7da1f66cbe565da4c3b38c97161597a3f154c24..90f66fc84b821b5324727459a8a01d149ecf94e8 100644 (file)
--- a/config/rootfiles/common/armv5tel/python
+++ b/config/rootfiles/common/armv5tel/python
@@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2105,9 +2105,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo

diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python
index f7da1f66cbe565da4c3b38c97161597a3f154c24..90f66fc84b821b5324727459a8a01d149ecf94e8 100644 (file)
--- a/config/rootfiles/common/i586/python
+++ b/config/rootfiles/common/i586/python
@@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2105,9 +2105,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo

diff --git a/config/rootfiles/common/x86_64/python b/config/rootfiles/common/x86_64/python
index eb7f8fa1881eaaeaabd47b16c1e45786d7644f8c..c1d00df14f0bcbfbc10abe378d2eb11c91833795 100644 (file)
--- a/config/rootfiles/common/x86_64/python
+++ b/config/rootfiles/common/x86_64/python
@@ -1927,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.18-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2103,9 +2103,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.18.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo

diff --git a/lfs/python b/lfs/python
index c2638baec2c930ea3f7fd9b70f8bef6c5d3aa577..5b386e298c1638bb7fdcec3f0ae55f8dd11c6fa5 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -26,7 +26,7 @@ include Config
 
 # If you update this make sure that you also change the VER and PAK_VER of
 # python-optional-src !
-VER        = 2.7.17
+VER        = 2.7.18
 
 THISAPP    = Python-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b3b6d2c92f42a60667814358ab9f0cfd
+$(DL_FILE)_MD5 = fd6cc8ec0a78c44036f825e739f36e5a
 
 install : $(TARGET)
 

diff --git a/lfs/python-optional-src b/lfs/python-optional-src
index 2439c4899d40bed23bee785d3bc2631527b534b0..eef3872afdf8eaae69ec863ba167198c1c8171be 100644 (file)
--- a/lfs/python-optional-src
+++ b/lfs/python-optional-src
@@ -24,12 +24,12 @@
 
 include Config
 
-VER       = 2.7.17
+VER       = 2.7.18
 
 include python
 
 PROG      = python-optional-src
-PAK_VER    = 6
+PAK_VER    = 7
 DEPS       =
 
 dist: