From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0708b3b343e5eec032c17157255f5543baf9e8d1
Date: Sun, 06 Jan 2019 14:54:39 +0000 [thread overview]
Message-ID: <20190106145440.50C0584FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 45712 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 0708b3b343e5eec032c17157255f5543baf9e8d1 (commit)
via 5e6f343b7d60abad53248532cd451bb9f81af84c (commit)
via b15309e9d14baff65f70b3954ec337944ee1d3bd (commit)
from 9ab1c9302c01f11010d0cb87a66366361465461e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0708b3b343e5eec032c17157255f5543baf9e8d1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jan 6 15:53:27 2019 +0100
core127: remove double files from armv5tel filelist
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5e6f343b7d60abad53248532cd451bb9f81af84c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jan 6 15:51:53 2019 +0100
python: update to 2.7.15
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b15309e9d14baff65f70b3954ec337944ee1d3bd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 5 13:47:31 2019 +0100
transmission: update to 2.94
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/python | 43 +++-
config/rootfiles/common/armv5tel/python | 43 +++-
config/rootfiles/common/i586/python | 43 +++-
config/rootfiles/common/x86_64/python | 43 +++-
config/rootfiles/core/127/filelists/aarch64/python | 1 +
config/rootfiles/core/127/filelists/armv5tel/files | 7 -
.../rootfiles/core/127/filelists/armv5tel/python | 1 +
.../112 => core/127}/filelists/i586/python | 0
.../112 => core/127}/filelists/x86_64/python | 0
lfs/python | 9 +-
lfs/python-optional-src | 6 +-
lfs/transmission | 9 +-
src/patches/python-2.7.13-getentropy.patch | 22 --
src/patches/transmission-2.92-openssl-1.1.0.patch | 261 ---------------------
14 files changed, 150 insertions(+), 338 deletions(-)
create mode 120000 config/rootfiles/core/127/filelists/aarch64/python
create mode 120000 config/rootfiles/core/127/filelists/armv5tel/python
copy config/rootfiles/{oldcore/112 => core/127}/filelists/i586/python (100%)
copy config/rootfiles/{oldcore/112 => core/127}/filelists/x86_64/python (100%)
delete mode 100644 src/patches/python-2.7.13-getentropy.patch
delete mode 100644 src/patches/transmission-2.92-openssl-1.1.0.patch
Difference in files:
diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python
index 463dfed8f..3259a241b 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 9248201f9..586755c9b 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 9248201f9..586755c9b 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 9824e19cb..350171647 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 000000000..b2b0103b6
--- /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/files b/config/rootfiles/core/127/filelists/armv5tel/files
index d76f3915c..6a00446f4 100644
--- a/config/rootfiles/core/127/filelists/armv5tel/files
+++ b/config/rootfiles/core/127/filelists/armv5tel/files
@@ -1,9 +1,2 @@
boot/boot.cmd
boot/boot.scr
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/credits.cgi
-var/ipfire/langs
-etc/rc.d/init.d/aws
-etc/rc.d/init.d/unbound
-srv/web/ipfire/cgi-bin/dnsforward.cgi
diff --git a/config/rootfiles/core/127/filelists/armv5tel/python b/config/rootfiles/core/127/filelists/armv5tel/python
new file mode 120000
index 000000000..df0dd5c06
--- /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 000000000..a2b842b99
--- /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 000000000..a593187de
--- /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 35651ba60..66bc3b901 100644
--- a/lfs/python
+++ b/lfs/python
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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.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 82bb0e894..cb0ac1fa6 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 <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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,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/lfs/transmission b/lfs/transmission
index 5de887c43..4eac88bd9 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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,7 @@
include Config
-VER = 2.92
+VER = 2.94
THISAPP = transmission-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
-PAK_VER = 15
+PAK_VER = 16
DEPS = ""
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3fce404a436e3cd7fde80fb6ed61c264
+$(DL_FILE)_MD5 = c92829294edfa391c046407eeb16358a
install : $(TARGET)
@@ -79,7 +79,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/transmission-2.92-openssl-1.1.0.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
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 7e00061c1..000000000
--- 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().
diff --git a/src/patches/transmission-2.92-openssl-1.1.0.patch b/src/patches/transmission-2.92-openssl-1.1.0.patch
deleted file mode 100644
index 29484b833..000000000
--- a/src/patches/transmission-2.92-openssl-1.1.0.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From f91cf5ad8c677b61ceb0bf5877b87f9e93256dd7 Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian(a)breakpoint.cc>
-Date: Mon, 5 Sep 2016 21:49:07 +0000
-Subject: [PATCH] transmission: build against openssl 1.1.0
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian(a)breakpoint.cc>
----
- libtransmission/crypto-utils-openssl.c | 73 ++++++++++++++++++++++++++++++++--
- 1 file changed, 69 insertions(+), 4 deletions(-)
-
-diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
-index c4539dc..972e24a 100644
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -229,6 +229,61 @@ tr_rc4_process (tr_rc4_ctx_t handle,
- ****
- ***/
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+static inline int
-+DH_set0_pqg (DH * dh,
-+ BIGNUM * p,
-+ BIGNUM * q,
-+ BIGNUM * g)
-+{
-+ /* If the fields p and g in d are NULL, the corresponding input
-+ * parameters MUST be non-NULL. q may remain NULL.
-+ */
-+ if ((dh->p == NULL && p == NULL)
-+ || (dh->g == NULL && g == NULL))
-+ return 0;
-+
-+ if (p != NULL) {
-+ BN_free (dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL) {
-+ BN_free (dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL) {
-+ BN_free (dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL) {
-+ dh->length = BN_num_bits (q);
-+ }
-+
-+ return 1;
-+}
-+
-+static inline int
-+DH_set_length (DH * dh,
-+ long length)
-+{
-+ dh->length = length;
-+ return 1;
-+}
-+
-+static inline void
-+DH_get0_key(const DH * dh,
-+ const BIGNUM ** pub_key,
-+ const BIGNUM ** priv_key)
-+{
-+ if (pub_key != NULL)
-+ *pub_key = dh->pub_key;
-+ if (priv_key != NULL)
-+ *priv_key = dh->priv_key;
-+}
-+
-+#endif
-+
- tr_dh_ctx_t
- tr_dh_new (const uint8_t * prime_num,
- size_t prime_num_length,
-@@ -236,13 +291,19 @@ tr_dh_new (const uint8_t * prime_num,
- size_t generator_num_length)
- {
- DH * handle = DH_new ();
-+ BIGNUM * p, * g;
-
- assert (prime_num != NULL);
- assert (generator_num != NULL);
-+ p = BN_bin2bn (prime_num, prime_num_length, NULL);
-+ g = BN_bin2bn (generator_num, generator_num_length, NULL);
-
-- if (!check_pointer (handle->p = BN_bin2bn (prime_num, prime_num_length, NULL)) ||
-- !check_pointer (handle->g = BN_bin2bn (generator_num, generator_num_length, NULL)))
-+ if (!check_pointer (p) ||
-+ !check_pointer (g) ||
-+ !DH_set0_pqg (handle, p, NULL, g))
- {
-+ BN_free (p);
-+ BN_free (g);
- DH_free (handle);
- handle = NULL;
- }
-@@ -267,16 +328,20 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
- {
- DH * handle = raw_handle;
- int dh_size, my_public_key_length;
-+ const BIGNUM * hand_pub_key;
-
- assert (handle != NULL);
- assert (public_key != NULL);
-
-- handle->length = private_key_length * 8;
-+
-+ DH_set_length(handle, private_key_length * 8);
-
- if (!check_result (DH_generate_key (handle)))
- return false;
-
-- my_public_key_length = BN_bn2bin (handle->pub_key, public_key);
-+ DH_get0_key (handle, &hand_pub_key, NULL);
-+
-+ my_public_key_length = BN_bn2bin (hand_pub_key, public_key);
- dh_size = DH_size (handle);
-
- tr_dh_align_key (public_key, my_public_key_length, dh_size);
-From 8c8386a7f3f482a9c917f51d28e0042e55f56b3e Mon Sep 17 00:00:00 2001
-From: Mike Gelfand <mikedld(a)mikedld.com>
-Date: Wed, 7 Sep 2016 01:09:04 +0300
-Subject: [PATCH] Fix coding style and building with !TR_LIGHTWEIGHT
-
----
- libtransmission/crypto-utils-openssl.c | 60 +++++++++++++++++++---------------
- 1 file changed, 33 insertions(+), 27 deletions(-)
-
-diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
-index 972e24a..9fd2c58 100644
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -14,6 +14,7 @@
- #include <assert.h>
-
- #include <openssl/bn.h>
-+#include <openssl/crypto.h>
- #include <openssl/dh.h>
- #include <openssl/err.h>
- #include <openssl/evp.h>
-@@ -48,7 +49,12 @@ log_openssl_error (const char * file,
- static bool strings_loaded = false;
- if (!strings_loaded)
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- ERR_load_crypto_strings ();
-+#else
-+ OPENSSL_init_crypto (OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-+#endif
-+
- strings_loaded = true;
- }
- #endif
-@@ -230,6 +236,7 @@ tr_rc4_process (tr_rc4_ctx_t handle,
- ***/
-
- #if OPENSSL_VERSION_NUMBER < 0x10100000
-+
- static inline int
- DH_set0_pqg (DH * dh,
- BIGNUM * p,
-@@ -237,28 +244,29 @@ DH_set0_pqg (DH * dh,
- BIGNUM * g)
- {
- /* If the fields p and g in d are NULL, the corresponding input
-- * parameters MUST be non-NULL. q may remain NULL.
-+ * parameters MUST be non-NULL. q may remain NULL.
- */
-- if ((dh->p == NULL && p == NULL)
-- || (dh->g == NULL && g == NULL))
-+ if ((dh->p == NULL && p == NULL) || (dh->g == NULL && g == NULL))
- return 0;
-
-- if (p != NULL) {
-- BN_free (dh->p);
-- dh->p = p;
-- }
-- if (q != NULL) {
-- BN_free (dh->q);
-- dh->q = q;
-- }
-- if (g != NULL) {
-- BN_free (dh->g);
-- dh->g = g;
-- }
--
-- if (q != NULL) {
-+ if (p != NULL)
-+ {
-+ BN_free (dh->p);
-+ dh->p = p;
-+ }
-+ if (q != NULL)
-+ {
-+ BN_free (dh->q);
-+ dh->q = q;
-+ }
-+ if (g != NULL)
-+ {
-+ BN_free (dh->g);
-+ dh->g = g;
-+ }
-+
-+ if (q != NULL)
- dh->length = BN_num_bits (q);
-- }
-
- return 1;
- }
-@@ -267,8 +275,8 @@ static inline int
- DH_set_length (DH * dh,
- long length)
- {
-- dh->length = length;
-- return 1;
-+ dh->length = length;
-+ return 1;
- }
-
- static inline void
-@@ -295,12 +303,11 @@ tr_dh_new (const uint8_t * prime_num,
-
- assert (prime_num != NULL);
- assert (generator_num != NULL);
-+
- p = BN_bin2bn (prime_num, prime_num_length, NULL);
- g = BN_bin2bn (generator_num, generator_num_length, NULL);
-
-- if (!check_pointer (p) ||
-- !check_pointer (g) ||
-- !DH_set0_pqg (handle, p, NULL, g))
-+ if (!check_pointer (p) || !check_pointer (g) || !DH_set0_pqg (handle, p, NULL, g))
- {
- BN_free (p);
- BN_free (g);
-@@ -328,20 +335,19 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
- {
- DH * handle = raw_handle;
- int dh_size, my_public_key_length;
-- const BIGNUM * hand_pub_key;
-+ const BIGNUM * my_public_key;
-
- assert (handle != NULL);
- assert (public_key != NULL);
-
--
- DH_set_length(handle, private_key_length * 8);
-
- if (!check_result (DH_generate_key (handle)))
- return false;
-
-- DH_get0_key (handle, &hand_pub_key, NULL);
-+ DH_get0_key (handle, &my_public_key, NULL);
-
-- my_public_key_length = BN_bn2bin (hand_pub_key, public_key);
-+ my_public_key_length = BN_bn2bin (my_public_key, public_key);
- dh_size = DH_size (handle);
-
- tr_dh_align_key (public_key, my_public_key_length, dh_size);
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-01-06 14:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190106145440.50C0584FDD4@people01.i.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox