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 a8b1843bf7ada879d3c526d588acbd9b59463d8d (commit) via 0882b3e44e29408c7e296f0aab3a613facf344f8 (commit) from 4b0d8ba79ac3bb2e21a48679cc1ca01ec2f1e65d (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 a8b1843bf7ada879d3c526d588acbd9b59463d8d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 14 13:22:37 2021 +0000

unbound-dhcp-leases-bridge: Fix shebang

Reported-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 0882b3e44e29408c7e296f0aab3a613facf344f8 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 14 13:22:09 2021 +0000

python-daemon: Port to Python 3

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/python-daemon | 19 ------------------- config/rootfiles/common/python3-daemon | 14 ++++++++++++++ config/unbound/unbound-dhcp-leases-bridge | 2 +- lfs/{python-daemon => python3-daemon} | 2 +- make.sh | 2 +- 5 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 config/rootfiles/common/python-daemon create mode 100644 config/rootfiles/common/python3-daemon rename lfs/{python-daemon => python3-daemon} (98%)

Difference in files: diff --git a/config/rootfiles/common/python-daemon b/config/rootfiles/common/python-daemon deleted file mode 100644 index 34d36a463..000000000 --- a/config/rootfiles/common/python-daemon +++ /dev/null @@ -1,19 +0,0 @@ -#usr/lib/python2.7/site-packages/daemon -usr/lib/python2.7/site-packages/daemon/__init__.py -usr/lib/python2.7/site-packages/daemon/__init__.pyc -usr/lib/python2.7/site-packages/daemon/_metadata.py -usr/lib/python2.7/site-packages/daemon/_metadata.pyc -usr/lib/python2.7/site-packages/daemon/daemon.py -usr/lib/python2.7/site-packages/daemon/daemon.pyc -usr/lib/python2.7/site-packages/daemon/pidfile.py -usr/lib/python2.7/site-packages/daemon/pidfile.pyc -usr/lib/python2.7/site-packages/daemon/runner.py -usr/lib/python2.7/site-packages/daemon/runner.pyc -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/PKG-INFO -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/SOURCES.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/dependency_links.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/not-zip-safe -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/requires.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/top_level.txt -#usr/lib/python2.7/site-packages/python_daemon-2.1.1-py2.7.egg-info/version_info.json diff --git a/config/rootfiles/common/python3-daemon b/config/rootfiles/common/python3-daemon new file mode 100644 index 000000000..653dee7d4 --- /dev/null +++ b/config/rootfiles/common/python3-daemon @@ -0,0 +1,14 @@ +#usr/lib/python3.8/site-packages/daemon +usr/lib/python3.8/site-packages/daemon/__init__.py +usr/lib/python3.8/site-packages/daemon/_metadata.py +usr/lib/python3.8/site-packages/daemon/daemon.py +usr/lib/python3.8/site-packages/daemon/pidfile.py +usr/lib/python3.8/site-packages/daemon/runner.py +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/PKG-INFO +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/SOURCES.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/dependency_links.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/not-zip-safe +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/requires.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/python_daemon-2.1.1-py3.8.egg-info/version_info.json diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index 2d8ef1387..6f2b7ff35 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 ############################################################################### # # # IPFire.org - A linux based firewall # diff --git a/lfs/python-daemon b/lfs/python3-daemon similarity index 98% rename from lfs/python-daemon rename to lfs/python3-daemon index e834f30fd..8f0876ff7 100644 --- a/lfs/python-daemon +++ b/lfs/python3-daemon @@ -70,6 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py install --root=/ + cd $(DIR_APP) && python3 setup.py install --root=/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index b98f8a34b..60474a18e 100755 --- a/make.sh +++ b/make.sh @@ -1347,7 +1347,7 @@ buildipfire() { lfsmake2 python-setuptools lfsmake2 python3-inotify lfsmake2 python-docutils - lfsmake2 python-daemon + lfsmake2 python3-daemon lfsmake2 glib lfsmake2 ntp lfsmake2 openssh

hooks/post-receive -- IPFire 2.x development tree