From: Arne Fitzenreiter Date: Sun, 6 Jan 2019 14:51:53 +0000 (+0100) Subject: python: update to 2.7.15 X-Git-Tag: v2.21-core127~65 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5e6f343b7d60abad53248532cd451bb9f81af84c python: update to 2.7.15 Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python index 463dfed8fb..3259a241ba 100644 --- a/config/rootfiles/common/aarch64/python +++ b/config/rootfiles/common/aarch64/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1926,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.13-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.15-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 @@ -2100,9 +2100,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.13.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2752,6 +2752,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo +#usr/lib/python2.7/test/__main__.py +#usr/lib/python2.7/test/__main__.pyc +#usr/lib/python2.7/test/__main__.pyo #usr/lib/python2.7/test/_mock_backport.py #usr/lib/python2.7/test/_mock_backport.pyc #usr/lib/python2.7/test/_mock_backport.pyo @@ -2790,6 +2793,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py +#usr/lib/python2.7/test/bisect.py +#usr/lib/python2.7/test/bisect.pyc +#usr/lib/python2.7/test/bisect.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -3040,6 +3046,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/mp_fork_bomb.py #usr/lib/python2.7/test/mp_fork_bomb.pyc #usr/lib/python2.7/test/mp_fork_bomb.pyo +#usr/lib/python2.7/test/multibytecodec_support.py +#usr/lib/python2.7/test/multibytecodec_support.pyc +#usr/lib/python2.7/test/multibytecodec_support.pyo #usr/lib/python2.7/test/nokia.pem #usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem @@ -3065,6 +3074,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/pystone.py #usr/lib/python2.7/test/pystone.pyc #usr/lib/python2.7/test/pystone.pyo +#usr/lib/python2.7/test/pythoninfo.py +#usr/lib/python2.7/test/pythoninfo.pyc +#usr/lib/python2.7/test/pythoninfo.pyo #usr/lib/python2.7/test/randv2_32.pck #usr/lib/python2.7/test/randv2_64.pck #usr/lib/python2.7/test/randv3.pck @@ -3098,7 +3110,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo #usr/lib/python2.7/test/sgml_input.html -#usr/lib/python2.7/test/sha256.pem #usr/lib/python2.7/test/sortperf.py #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo @@ -3118,6 +3129,13 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo +#usr/lib/python2.7/test/support +#usr/lib/python2.7/test/support/__init__.py +#usr/lib/python2.7/test/support/__init__.pyc +#usr/lib/python2.7/test/support/__init__.pyo +#usr/lib/python2.7/test/support/script_helper.py +#usr/lib/python2.7/test/support/script_helper.pyc +#usr/lib/python2.7/test/support/script_helper.pyo #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo @@ -3663,6 +3681,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_import.py #usr/lib/python2.7/test/test_import.pyc #usr/lib/python2.7/test/test_import.pyo +#usr/lib/python2.7/test/test_import_magic.py +#usr/lib/python2.7/test/test_import_magic.pyc +#usr/lib/python2.7/test/test_import_magic.pyo #usr/lib/python2.7/test/test_importhooks.py #usr/lib/python2.7/test/test_importhooks.pyc #usr/lib/python2.7/test/test_importhooks.pyo @@ -3792,9 +3813,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_multibytecodec.py #usr/lib/python2.7/test/test_multibytecodec.pyc #usr/lib/python2.7/test/test_multibytecodec.pyo -#usr/lib/python2.7/test/test_multibytecodec_support.py -#usr/lib/python2.7/test/test_multibytecodec_support.pyc -#usr/lib/python2.7/test/test_multibytecodec_support.pyo #usr/lib/python2.7/test/test_multifile.py #usr/lib/python2.7/test/test_multifile.pyc #usr/lib/python2.7/test/test_multifile.pyo @@ -3963,6 +3981,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_readline.py #usr/lib/python2.7/test/test_readline.pyc #usr/lib/python2.7/test/test_readline.pyo +#usr/lib/python2.7/test/test_regrtest.py +#usr/lib/python2.7/test/test_regrtest.pyc +#usr/lib/python2.7/test/test_regrtest.pyo #usr/lib/python2.7/test/test_repr.py #usr/lib/python2.7/test/test_repr.pyc #usr/lib/python2.7/test/test_repr.pyo @@ -4140,6 +4161,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tempfile.py #usr/lib/python2.7/test/test_tempfile.pyc #usr/lib/python2.7/test/test_tempfile.pyo +#usr/lib/python2.7/test/test_test_support.py +#usr/lib/python2.7/test/test_test_support.pyc +#usr/lib/python2.7/test/test_test_support.pyo #usr/lib/python2.7/test/test_textwrap.py #usr/lib/python2.7/test/test_textwrap.pyc #usr/lib/python2.7/test/test_textwrap.pyo @@ -4373,6 +4397,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.pyo #usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata +#usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml #usr/lib/python2.7/test/xmltestdata/simple.xml #usr/lib/python2.7/test/xmltestdata/test.xml diff --git a/config/rootfiles/common/armv5tel/python b/config/rootfiles/common/armv5tel/python index 9248201f90..586755c9b0 100644 --- a/config/rootfiles/common/armv5tel/python +++ b/config/rootfiles/common/armv5tel/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1926,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.13-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.15-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 @@ -2102,9 +2102,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.13.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2754,6 +2754,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo +#usr/lib/python2.7/test/__main__.py +#usr/lib/python2.7/test/__main__.pyc +#usr/lib/python2.7/test/__main__.pyo #usr/lib/python2.7/test/_mock_backport.py #usr/lib/python2.7/test/_mock_backport.pyc #usr/lib/python2.7/test/_mock_backport.pyo @@ -2792,6 +2795,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py +#usr/lib/python2.7/test/bisect.py +#usr/lib/python2.7/test/bisect.pyc +#usr/lib/python2.7/test/bisect.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -3042,6 +3048,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/mp_fork_bomb.py #usr/lib/python2.7/test/mp_fork_bomb.pyc #usr/lib/python2.7/test/mp_fork_bomb.pyo +#usr/lib/python2.7/test/multibytecodec_support.py +#usr/lib/python2.7/test/multibytecodec_support.pyc +#usr/lib/python2.7/test/multibytecodec_support.pyo #usr/lib/python2.7/test/nokia.pem #usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem @@ -3067,6 +3076,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/pystone.py #usr/lib/python2.7/test/pystone.pyc #usr/lib/python2.7/test/pystone.pyo +#usr/lib/python2.7/test/pythoninfo.py +#usr/lib/python2.7/test/pythoninfo.pyc +#usr/lib/python2.7/test/pythoninfo.pyo #usr/lib/python2.7/test/randv2_32.pck #usr/lib/python2.7/test/randv2_64.pck #usr/lib/python2.7/test/randv3.pck @@ -3100,7 +3112,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo #usr/lib/python2.7/test/sgml_input.html -#usr/lib/python2.7/test/sha256.pem #usr/lib/python2.7/test/sortperf.py #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo @@ -3120,6 +3131,13 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo +#usr/lib/python2.7/test/support +#usr/lib/python2.7/test/support/__init__.py +#usr/lib/python2.7/test/support/__init__.pyc +#usr/lib/python2.7/test/support/__init__.pyo +#usr/lib/python2.7/test/support/script_helper.py +#usr/lib/python2.7/test/support/script_helper.pyc +#usr/lib/python2.7/test/support/script_helper.pyo #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo @@ -3665,6 +3683,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_import.py #usr/lib/python2.7/test/test_import.pyc #usr/lib/python2.7/test/test_import.pyo +#usr/lib/python2.7/test/test_import_magic.py +#usr/lib/python2.7/test/test_import_magic.pyc +#usr/lib/python2.7/test/test_import_magic.pyo #usr/lib/python2.7/test/test_importhooks.py #usr/lib/python2.7/test/test_importhooks.pyc #usr/lib/python2.7/test/test_importhooks.pyo @@ -3794,9 +3815,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_multibytecodec.py #usr/lib/python2.7/test/test_multibytecodec.pyc #usr/lib/python2.7/test/test_multibytecodec.pyo -#usr/lib/python2.7/test/test_multibytecodec_support.py -#usr/lib/python2.7/test/test_multibytecodec_support.pyc -#usr/lib/python2.7/test/test_multibytecodec_support.pyo #usr/lib/python2.7/test/test_multifile.py #usr/lib/python2.7/test/test_multifile.pyc #usr/lib/python2.7/test/test_multifile.pyo @@ -3965,6 +3983,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_readline.py #usr/lib/python2.7/test/test_readline.pyc #usr/lib/python2.7/test/test_readline.pyo +#usr/lib/python2.7/test/test_regrtest.py +#usr/lib/python2.7/test/test_regrtest.pyc +#usr/lib/python2.7/test/test_regrtest.pyo #usr/lib/python2.7/test/test_repr.py #usr/lib/python2.7/test/test_repr.pyc #usr/lib/python2.7/test/test_repr.pyo @@ -4142,6 +4163,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tempfile.py #usr/lib/python2.7/test/test_tempfile.pyc #usr/lib/python2.7/test/test_tempfile.pyo +#usr/lib/python2.7/test/test_test_support.py +#usr/lib/python2.7/test/test_test_support.pyc +#usr/lib/python2.7/test/test_test_support.pyo #usr/lib/python2.7/test/test_textwrap.py #usr/lib/python2.7/test/test_textwrap.pyc #usr/lib/python2.7/test/test_textwrap.pyo @@ -4375,6 +4399,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.pyo #usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata +#usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml #usr/lib/python2.7/test/xmltestdata/simple.xml #usr/lib/python2.7/test/xmltestdata/test.xml diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python index 9248201f90..586755c9b0 100644 --- a/config/rootfiles/common/i586/python +++ b/config/rootfiles/common/i586/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1926,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.13-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.15-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 @@ -2102,9 +2102,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.13.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2754,6 +2754,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo +#usr/lib/python2.7/test/__main__.py +#usr/lib/python2.7/test/__main__.pyc +#usr/lib/python2.7/test/__main__.pyo #usr/lib/python2.7/test/_mock_backport.py #usr/lib/python2.7/test/_mock_backport.pyc #usr/lib/python2.7/test/_mock_backport.pyo @@ -2792,6 +2795,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py +#usr/lib/python2.7/test/bisect.py +#usr/lib/python2.7/test/bisect.pyc +#usr/lib/python2.7/test/bisect.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -3042,6 +3048,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/mp_fork_bomb.py #usr/lib/python2.7/test/mp_fork_bomb.pyc #usr/lib/python2.7/test/mp_fork_bomb.pyo +#usr/lib/python2.7/test/multibytecodec_support.py +#usr/lib/python2.7/test/multibytecodec_support.pyc +#usr/lib/python2.7/test/multibytecodec_support.pyo #usr/lib/python2.7/test/nokia.pem #usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem @@ -3067,6 +3076,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/pystone.py #usr/lib/python2.7/test/pystone.pyc #usr/lib/python2.7/test/pystone.pyo +#usr/lib/python2.7/test/pythoninfo.py +#usr/lib/python2.7/test/pythoninfo.pyc +#usr/lib/python2.7/test/pythoninfo.pyo #usr/lib/python2.7/test/randv2_32.pck #usr/lib/python2.7/test/randv2_64.pck #usr/lib/python2.7/test/randv3.pck @@ -3100,7 +3112,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo #usr/lib/python2.7/test/sgml_input.html -#usr/lib/python2.7/test/sha256.pem #usr/lib/python2.7/test/sortperf.py #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo @@ -3120,6 +3131,13 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo +#usr/lib/python2.7/test/support +#usr/lib/python2.7/test/support/__init__.py +#usr/lib/python2.7/test/support/__init__.pyc +#usr/lib/python2.7/test/support/__init__.pyo +#usr/lib/python2.7/test/support/script_helper.py +#usr/lib/python2.7/test/support/script_helper.pyc +#usr/lib/python2.7/test/support/script_helper.pyo #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo @@ -3665,6 +3683,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_import.py #usr/lib/python2.7/test/test_import.pyc #usr/lib/python2.7/test/test_import.pyo +#usr/lib/python2.7/test/test_import_magic.py +#usr/lib/python2.7/test/test_import_magic.pyc +#usr/lib/python2.7/test/test_import_magic.pyo #usr/lib/python2.7/test/test_importhooks.py #usr/lib/python2.7/test/test_importhooks.pyc #usr/lib/python2.7/test/test_importhooks.pyo @@ -3794,9 +3815,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_multibytecodec.py #usr/lib/python2.7/test/test_multibytecodec.pyc #usr/lib/python2.7/test/test_multibytecodec.pyo -#usr/lib/python2.7/test/test_multibytecodec_support.py -#usr/lib/python2.7/test/test_multibytecodec_support.pyc -#usr/lib/python2.7/test/test_multibytecodec_support.pyo #usr/lib/python2.7/test/test_multifile.py #usr/lib/python2.7/test/test_multifile.pyc #usr/lib/python2.7/test/test_multifile.pyo @@ -3965,6 +3983,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_readline.py #usr/lib/python2.7/test/test_readline.pyc #usr/lib/python2.7/test/test_readline.pyo +#usr/lib/python2.7/test/test_regrtest.py +#usr/lib/python2.7/test/test_regrtest.pyc +#usr/lib/python2.7/test/test_regrtest.pyo #usr/lib/python2.7/test/test_repr.py #usr/lib/python2.7/test/test_repr.pyc #usr/lib/python2.7/test/test_repr.pyo @@ -4142,6 +4163,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tempfile.py #usr/lib/python2.7/test/test_tempfile.pyc #usr/lib/python2.7/test/test_tempfile.pyo +#usr/lib/python2.7/test/test_test_support.py +#usr/lib/python2.7/test/test_test_support.pyc +#usr/lib/python2.7/test/test_test_support.pyo #usr/lib/python2.7/test/test_textwrap.py #usr/lib/python2.7/test/test_textwrap.pyc #usr/lib/python2.7/test/test_textwrap.pyo @@ -4375,6 +4399,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.pyo #usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata +#usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml #usr/lib/python2.7/test/xmltestdata/simple.xml #usr/lib/python2.7/test/xmltestdata/test.xml diff --git a/config/rootfiles/common/x86_64/python b/config/rootfiles/common/x86_64/python index 9824e19cbd..350171647c 100644 --- a/config/rootfiles/common/x86_64/python +++ b/config/rootfiles/common/x86_64/python @@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1926,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.13-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.15-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 @@ -2100,9 +2100,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.13.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2752,6 +2752,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo +#usr/lib/python2.7/test/__main__.py +#usr/lib/python2.7/test/__main__.pyc +#usr/lib/python2.7/test/__main__.pyo #usr/lib/python2.7/test/_mock_backport.py #usr/lib/python2.7/test/_mock_backport.pyc #usr/lib/python2.7/test/_mock_backport.pyo @@ -2790,6 +2793,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py +#usr/lib/python2.7/test/bisect.py +#usr/lib/python2.7/test/bisect.pyc +#usr/lib/python2.7/test/bisect.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -3040,6 +3046,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/mp_fork_bomb.py #usr/lib/python2.7/test/mp_fork_bomb.pyc #usr/lib/python2.7/test/mp_fork_bomb.pyo +#usr/lib/python2.7/test/multibytecodec_support.py +#usr/lib/python2.7/test/multibytecodec_support.pyc +#usr/lib/python2.7/test/multibytecodec_support.pyo #usr/lib/python2.7/test/nokia.pem #usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem @@ -3065,6 +3074,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/pystone.py #usr/lib/python2.7/test/pystone.pyc #usr/lib/python2.7/test/pystone.pyo +#usr/lib/python2.7/test/pythoninfo.py +#usr/lib/python2.7/test/pythoninfo.pyc +#usr/lib/python2.7/test/pythoninfo.pyo #usr/lib/python2.7/test/randv2_32.pck #usr/lib/python2.7/test/randv2_64.pck #usr/lib/python2.7/test/randv3.pck @@ -3098,7 +3110,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo #usr/lib/python2.7/test/sgml_input.html -#usr/lib/python2.7/test/sha256.pem #usr/lib/python2.7/test/sortperf.py #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo @@ -3118,6 +3129,13 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo +#usr/lib/python2.7/test/support +#usr/lib/python2.7/test/support/__init__.py +#usr/lib/python2.7/test/support/__init__.pyc +#usr/lib/python2.7/test/support/__init__.pyo +#usr/lib/python2.7/test/support/script_helper.py +#usr/lib/python2.7/test/support/script_helper.pyc +#usr/lib/python2.7/test/support/script_helper.pyo #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo @@ -3663,6 +3681,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_import.py #usr/lib/python2.7/test/test_import.pyc #usr/lib/python2.7/test/test_import.pyo +#usr/lib/python2.7/test/test_import_magic.py +#usr/lib/python2.7/test/test_import_magic.pyc +#usr/lib/python2.7/test/test_import_magic.pyo #usr/lib/python2.7/test/test_importhooks.py #usr/lib/python2.7/test/test_importhooks.pyc #usr/lib/python2.7/test/test_importhooks.pyo @@ -3792,9 +3813,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_multibytecodec.py #usr/lib/python2.7/test/test_multibytecodec.pyc #usr/lib/python2.7/test/test_multibytecodec.pyo -#usr/lib/python2.7/test/test_multibytecodec_support.py -#usr/lib/python2.7/test/test_multibytecodec_support.pyc -#usr/lib/python2.7/test/test_multibytecodec_support.pyo #usr/lib/python2.7/test/test_multifile.py #usr/lib/python2.7/test/test_multifile.pyc #usr/lib/python2.7/test/test_multifile.pyo @@ -3963,6 +3981,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_readline.py #usr/lib/python2.7/test/test_readline.pyc #usr/lib/python2.7/test/test_readline.pyo +#usr/lib/python2.7/test/test_regrtest.py +#usr/lib/python2.7/test/test_regrtest.pyc +#usr/lib/python2.7/test/test_regrtest.pyo #usr/lib/python2.7/test/test_repr.py #usr/lib/python2.7/test/test_repr.pyc #usr/lib/python2.7/test/test_repr.pyo @@ -4140,6 +4161,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tempfile.py #usr/lib/python2.7/test/test_tempfile.pyc #usr/lib/python2.7/test/test_tempfile.pyo +#usr/lib/python2.7/test/test_test_support.py +#usr/lib/python2.7/test/test_test_support.pyc +#usr/lib/python2.7/test/test_test_support.pyo #usr/lib/python2.7/test/test_textwrap.py #usr/lib/python2.7/test/test_textwrap.pyc #usr/lib/python2.7/test/test_textwrap.pyo @@ -4373,6 +4397,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.pyo #usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata +#usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml #usr/lib/python2.7/test/xmltestdata/simple.xml #usr/lib/python2.7/test/xmltestdata/test.xml diff --git a/config/rootfiles/core/127/filelists/aarch64/python b/config/rootfiles/core/127/filelists/aarch64/python new file mode 120000 index 0000000000..b2b0103b61 --- /dev/null +++ b/config/rootfiles/core/127/filelists/aarch64/python @@ -0,0 +1 @@ +../../../../common/aarch64/python \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/armv5tel/python b/config/rootfiles/core/127/filelists/armv5tel/python new file mode 120000 index 0000000000..df0dd5c064 --- /dev/null +++ b/config/rootfiles/core/127/filelists/armv5tel/python @@ -0,0 +1 @@ +../../../../common/armv5tel/python \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/i586/python b/config/rootfiles/core/127/filelists/i586/python new file mode 120000 index 0000000000..a2b842b995 --- /dev/null +++ b/config/rootfiles/core/127/filelists/i586/python @@ -0,0 +1 @@ +../../../../common/i586/python \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/x86_64/python b/config/rootfiles/core/127/filelists/x86_64/python new file mode 120000 index 0000000000..a593187de6 --- /dev/null +++ b/config/rootfiles/core/127/filelists/x86_64/python @@ -0,0 +1 @@ +../../../../common/x86_64/python \ No newline at end of file diff --git a/lfs/python b/lfs/python index 35651ba60d..66bc3b901f 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2019 IPFire Team # # # # 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.13 +# 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 = 53b43534153bb2a0363f08bae8b9d990 +$(DL_FILE)_MD5 = a80ae3cc478460b922242f43a1b4094d install : $(TARGET) @@ -71,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ --prefix=/usr \ --enable-shared \ diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 82bb0e894d..cb0ac1fa66 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2019 IPFire Team # # # # 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,12 +24,12 @@ include Config -VER = 2.7.10 +VER = 2.7.15 include python PROG = python-optional-src -PAK_VER = 4 +PAK_VER = 5 DEPS = dist: diff --git a/src/patches/python-2.7.13-getentropy.patch b/src/patches/python-2.7.13-getentropy.patch deleted file mode 100644 index 7e00061c19..0000000000 --- a/src/patches/python-2.7.13-getentropy.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Python/random.c b/Python/random.c -index 2f83b5d..4cae217 100644 ---- a/Python/random.c -+++ b/Python/random.c -@@ -97,8 +97,15 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) - } - - /* Issue #25003: Don't use getentropy() on Solaris (available since -- * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ --#elif defined(HAVE_GETENTROPY) && !defined(sun) -+ Solaris 11.3), it is blocking whereas os.urandom() should not block. -+ -+ Issue #29188: Don't use getentropy() on Linux since the glibc 2.24 -+ implements it with the getrandom() syscall which can fail with ENOSYS, -+ and this error is not supported in py_getentropy() and getrandom() is called -+ with flags=0 which blocks until system urandom is initialized, which is not -+ the desired behaviour to seed the Python hash secret nor for os.urandom(): -+ see the PEP 524 which was only implemented in Python 3.6. */ -+#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux) - #define PY_GETENTROPY 1 - - /* Fill buffer with size pseudo-random bytes generated by getentropy().