python: update to 2.7.18

Message ID 20200912214634.29320-1-arne_f@ipfire.org
State Accepted
Commit 8f190905045922e3fd5d685d61fd7d7a062068bc
Headers
Series python: update to 2.7.18 |

Commit Message

Arne Fitzenreiter Sept. 12, 2020, 9:46 p.m. UTC
  Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/rootfiles/common/aarch64/python  | 6 +++---
 config/rootfiles/common/armv5tel/python | 6 +++---
 config/rootfiles/common/i586/python     | 6 +++---
 config/rootfiles/common/x86_64/python   | 6 +++---
 lfs/python                              | 4 ++--
 lfs/python-optional-src                 | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)
  

Comments

Michael Tremer Sept. 17, 2020, 7:23 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 12 Sep 2020, at 22:46, Arne Fitzenreiter <arne_f@ipfire.org> wrote:
> 
> Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
> ---
> config/rootfiles/common/aarch64/python  | 6 +++---
> config/rootfiles/common/armv5tel/python | 6 +++---
> config/rootfiles/common/i586/python     | 6 +++---
> config/rootfiles/common/x86_64/python   | 6 +++---
> lfs/python                              | 4 ++--
> lfs/python-optional-src                 | 4 ++--
> 6 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python
> index d4c38e32c..61d7b9844 100644
> --- 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 f7da1f66c..90f66fc84 100644
> --- 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 f7da1f66c..90f66fc84 100644
> --- 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 eb7f8fa18..c1d00df14 100644
> --- 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 c2638baec..5b386e298 100644
> --- 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 2439c4899..eef3872af 100644
> --- 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: 
> -- 
> 2.17.1
>
  

Patch

diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python
index d4c38e32c..61d7b9844 100644
--- 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 f7da1f66c..90f66fc84 100644
--- 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 f7da1f66c..90f66fc84 100644
--- 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 eb7f8fa18..c1d00df14 100644
--- 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 c2638baec..5b386e298 100644
--- 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 2439c4899..eef3872af 100644
--- 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: