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 103950e0a58090a6eaf58195407deb570cefb256 (commit) via 1e8767976c1b0080bb650fba5e5608157bb6ba62 (commit) via 7ba3706b0ff6df75a5dbe8d91a15f000c3942362 (commit) via a82e1eabc9e4a263eb5172cb4337537577aeec1c (commit) from ef6979b51d0c1796a18980c95f5fdf17f56fa909 (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 103950e0a58090a6eaf58195407deb570cefb256 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Mar 12 14:46:18 2021 +0000

More rootfile updates

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

commit 1e8767976c1b0080bb650fba5e5608157bb6ba62 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 11 15:09:40 2021 +0000

nagios_nrpe: Backup configuration before update

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

commit 7ba3706b0ff6df75a5dbe8d91a15f000c3942362 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 11 14:58:43 2021 +0000

Drop python3-setuptools

This package comes with the Python 3 distribution

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

commit a82e1eabc9e4a263eb5172cb4337537577aeec1c Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Mar 11 14:57:21 2021 +0000

Update rootfiles

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

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

Summary of changes: config/backup/includes/nagios_nrpe | 1 + config/rootfiles/common/aarch64/suricata | 4 +- config/rootfiles/common/aarch64/util-linux | 8 ++- config/rootfiles/common/armv5tel/suricata | 4 +- config/rootfiles/common/armv5tel/util-linux | 6 +++ config/rootfiles/common/coreutils | 6 +++ config/rootfiles/common/i586/suricata | 4 +- config/rootfiles/common/i586/util-linux | 7 ++- config/rootfiles/common/python3-setuptools | 59 -------------------- config/rootfiles/common/sysvinit | 2 + config/rootfiles/common/x86_64/suricata | 4 +- config/rootfiles/packages/nagios_nrpe | 1 + lfs/nagios_nrpe | 5 +- lfs/python3-setuptools | 84 ----------------------------- make.sh | 1 - 15 files changed, 44 insertions(+), 152 deletions(-) create mode 100644 config/backup/includes/nagios_nrpe delete mode 100644 config/rootfiles/common/python3-setuptools delete mode 100644 lfs/python3-setuptools

Difference in files: diff --git a/config/backup/includes/nagios_nrpe b/config/backup/includes/nagios_nrpe new file mode 100644 index 000000000..ce6de7ae7 --- /dev/null +++ b/config/backup/includes/nagios_nrpe @@ -0,0 +1 @@ +/etc/nagios/nrpe.cfg diff --git a/config/rootfiles/common/aarch64/suricata b/config/rootfiles/common/aarch64/suricata index f891fa449..32358483a 100644 --- a/config/rootfiles/common/aarch64/suricata +++ b/config/rootfiles/common/aarch64/suricata @@ -3,7 +3,6 @@ etc/suricata/suricata.yaml #root/.cargo #root/.cargo/.package-cache usr/bin/suricata -#usr/include/suricata-plugin.h #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS #usr/share/doc/suricata/Basic_Setup.txt @@ -17,6 +16,9 @@ usr/bin/suricata #usr/share/doc/suricata/TODO #usr/share/doc/suricata/Third_Party_Installation_Guides.txt #usr/share/man/man1/suricata.1 +#usr/share/man/man1/suricatactl-filestore.1 +#usr/share/man/man1/suricatactl.1 +#usr/share/man/man1/suricatasc.1 var/lib/suricata var/lib/suricata/classification.config var/lib/suricata/reference.config diff --git a/config/rootfiles/common/aarch64/util-linux b/config/rootfiles/common/aarch64/util-linux index 04feaf8cc..cb5c4ef54 100644 --- a/config/rootfiles/common/aarch64/util-linux +++ b/config/rootfiles/common/aarch64/util-linux @@ -58,7 +58,6 @@ usr/bin/fallocate usr/bin/flock usr/bin/getopt #usr/bin/hexdump -#usr/bin/i386 usr/bin/ionice #usr/bin/ipcmk #usr/bin/ipcrm @@ -91,14 +90,20 @@ usr/bin/tailf #usr/bin/ul #usr/bin/uname26 #usr/bin/unshare +usr/bin/uuidgen #usr/bin/whereis +#usr/include/blkid +#usr/include/blkid/blkid.h #usr/include/libfdisk #usr/include/libfdisk/libfdisk.h #usr/include/libmount #usr/include/libmount/libmount.h #usr/include/libsmartcols #usr/include/libsmartcols/libsmartcols.h +#usr/include/uuid +#usr/include/uuid/uuid.h #usr/lib/libblkid.la +#usr/lib/libblkid.so #usr/lib/libfdisk.la #usr/lib/libfdisk.so #usr/lib/libmount.la @@ -289,7 +294,6 @@ usr/sbin/rtcwake #usr/share/man/man8/fsfreeze.8 #usr/share/man/man8/fstrim.8 #usr/share/man/man8/hwclock.8 -#usr/share/man/man8/i386.8 #usr/share/man/man8/isosize.8 #usr/share/man/man8/ldattach.8 #usr/share/man/man8/linux32.8 diff --git a/config/rootfiles/common/armv5tel/suricata b/config/rootfiles/common/armv5tel/suricata index f891fa449..32358483a 100644 --- a/config/rootfiles/common/armv5tel/suricata +++ b/config/rootfiles/common/armv5tel/suricata @@ -3,7 +3,6 @@ etc/suricata/suricata.yaml #root/.cargo #root/.cargo/.package-cache usr/bin/suricata -#usr/include/suricata-plugin.h #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS #usr/share/doc/suricata/Basic_Setup.txt @@ -17,6 +16,9 @@ usr/bin/suricata #usr/share/doc/suricata/TODO #usr/share/doc/suricata/Third_Party_Installation_Guides.txt #usr/share/man/man1/suricata.1 +#usr/share/man/man1/suricatactl-filestore.1 +#usr/share/man/man1/suricatactl.1 +#usr/share/man/man1/suricatasc.1 var/lib/suricata var/lib/suricata/classification.config var/lib/suricata/reference.config diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index 259ff0346..8bde3a73a 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -90,14 +90,20 @@ usr/bin/tailf #usr/bin/ul #usr/bin/uname26 #usr/bin/unshare +usr/bin/uuidgen #usr/bin/whereis +#usr/include/blkid +#usr/include/blkid/blkid.h #usr/include/libfdisk #usr/include/libfdisk/libfdisk.h #usr/include/libmount #usr/include/libmount/libmount.h #usr/include/libsmartcols #usr/include/libsmartcols/libsmartcols.h +#usr/include/uuid +#usr/include/uuid/uuid.h #usr/lib/libblkid.la +#usr/lib/libblkid.so #usr/lib/libfdisk.la #usr/lib/libfdisk.so #usr/lib/libmount.la diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils index d764f7bd5..e7ebaa04f 100644 --- a/config/rootfiles/common/coreutils +++ b/config/rootfiles/common/coreutils @@ -258,7 +258,9 @@ usr/sbin/chroot #usr/share/man/man1/csplit.1 #usr/share/man/man1/cut.1 #usr/share/man/man1/date.1 +#usr/share/man/man1/dir.1 #usr/share/man/man1/dirname.1 +#usr/share/man/man1/du.1 #usr/share/man/man1/echo.1 #usr/share/man/man1/env.1 #usr/share/man/man1/expand.1 @@ -273,8 +275,11 @@ usr/sbin/chroot #usr/share/man/man1/id.1 #usr/share/man/man1/join.1 #usr/share/man/man1/link.1 +#usr/share/man/man1/ln.1 #usr/share/man/man1/logname.1 #usr/share/man/man1/md5sum.1 +#usr/share/man/man1/mkdir.1 +#usr/share/man/man1/mknod.1 #usr/share/man/man1/mktemp.1 #usr/share/man/man1/nice.1 #usr/share/man/man1/nl.1 @@ -292,6 +297,7 @@ usr/sbin/chroot #usr/share/man/man1/pwd.1 #usr/share/man/man1/readlink.1 #usr/share/man/man1/realpath.1 +#usr/share/man/man1/rm.1 #usr/share/man/man1/runcon.1 #usr/share/man/man1/seq.1 #usr/share/man/man1/sha1sum.1 diff --git a/config/rootfiles/common/i586/suricata b/config/rootfiles/common/i586/suricata index f891fa449..32358483a 100644 --- a/config/rootfiles/common/i586/suricata +++ b/config/rootfiles/common/i586/suricata @@ -3,7 +3,6 @@ etc/suricata/suricata.yaml #root/.cargo #root/.cargo/.package-cache usr/bin/suricata -#usr/include/suricata-plugin.h #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS #usr/share/doc/suricata/Basic_Setup.txt @@ -17,6 +16,9 @@ usr/bin/suricata #usr/share/doc/suricata/TODO #usr/share/doc/suricata/Third_Party_Installation_Guides.txt #usr/share/man/man1/suricata.1 +#usr/share/man/man1/suricatactl-filestore.1 +#usr/share/man/man1/suricatactl.1 +#usr/share/man/man1/suricatasc.1 var/lib/suricata var/lib/suricata/classification.config var/lib/suricata/reference.config diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux index e5023c4d3..bcfe1ef26 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -91,14 +91,20 @@ usr/bin/tailf #usr/bin/ul #usr/bin/uname26 #usr/bin/unshare +usr/bin/uuidgen #usr/bin/whereis +#usr/include/blkid +#usr/include/blkid/blkid.h #usr/include/libfdisk #usr/include/libfdisk/libfdisk.h #usr/include/libmount #usr/include/libmount/libmount.h #usr/include/libsmartcols #usr/include/libsmartcols/libsmartcols.h +#usr/include/uuid +#usr/include/uuid/uuid.h #usr/lib/libblkid.la +#usr/lib/libblkid.so #usr/lib/libfdisk.la #usr/lib/libfdisk.so #usr/lib/libmount.la @@ -321,5 +327,4 @@ usr/sbin/rtcwake #usr/share/man/man8/uuidd.8 #usr/share/man/man8/wdctl.8 #usr/share/man/man8/wipefs.8 -#usr/share/man/man8/x86_64.8 #usr/share/man/man8/zramctl.8 diff --git a/config/rootfiles/common/python3-setuptools b/config/rootfiles/common/python3-setuptools deleted file mode 100644 index e0425e1bb..000000000 --- a/config/rootfiles/common/python3-setuptools +++ /dev/null @@ -1,59 +0,0 @@ -#usr/lib/python3.8/site-packages/pkg_resources/py31compat.py -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/PKG-INFO -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/SOURCES.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/dependency_links.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/entry_points.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/requires.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/top_level.txt -#usr/lib/python3.8/site-packages/setuptools-40.6.3-py3.8.egg-info/zip-safe -#usr/lib/python3.8/site-packages/setuptools/__pycache__/_deprecation_warning.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/build_meta.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/config.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/dep_util.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/glibc.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/pep425tags.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/py33compat.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/py36compat.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/__pycache__/wheel.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_deprecation_warning.py -#usr/lib/python3.8/site-packages/setuptools/_vendor -#usr/lib/python3.8/site-packages/setuptools/_vendor/__init__.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/__pycache__ -#usr/lib/python3.8/site-packages/setuptools/_vendor/__pycache__/__init__.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/__pycache__/pyparsing.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/__pycache__/six.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__about__.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__init__.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__ -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/__about__.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/__init__.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/_compat.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/_structures.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/markers.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/requirements.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/specifiers.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/utils.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/__pycache__/version.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/_compat.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/_structures.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/markers.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/requirements.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/specifiers.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/utils.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/packaging/version.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/pyparsing.py -#usr/lib/python3.8/site-packages/setuptools/_vendor/six.py -#usr/lib/python3.8/site-packages/setuptools/build_meta.py -#usr/lib/python3.8/site-packages/setuptools/command/__pycache__/build_clib.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/command/__pycache__/dist_info.cpython-36.pyc -#usr/lib/python3.8/site-packages/setuptools/command/build_clib.py -#usr/lib/python3.8/site-packages/setuptools/command/dist_info.py -#usr/lib/python3.8/site-packages/setuptools/config.py -#usr/lib/python3.8/site-packages/setuptools/dep_util.py -#usr/lib/python3.8/site-packages/setuptools/glibc.py -#usr/lib/python3.8/site-packages/setuptools/pep425tags.py -#usr/lib/python3.8/site-packages/setuptools/py33compat.py -#usr/lib/python3.8/site-packages/setuptools/py36compat.py -#usr/lib/python3.8/site-packages/setuptools/wheel.py diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index 0b389a7c3..d06a31872 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -6,6 +6,7 @@ bin/pidof sbin/halt sbin/init sbin/killall5 +sbin/logsave sbin/poweroff sbin/reboot sbin/runlevel @@ -34,6 +35,7 @@ usr/bin/wall #usr/share/man/man8/halt.8 #usr/share/man/man8/init.8 #usr/share/man/man8/killall5.8 +#usr/share/man/man8/logsave.8 #usr/share/man/man8/pidof.8 #usr/share/man/man8/poweroff.8 #usr/share/man/man8/reboot.8 diff --git a/config/rootfiles/common/x86_64/suricata b/config/rootfiles/common/x86_64/suricata index f891fa449..32358483a 100644 --- a/config/rootfiles/common/x86_64/suricata +++ b/config/rootfiles/common/x86_64/suricata @@ -3,7 +3,6 @@ etc/suricata/suricata.yaml #root/.cargo #root/.cargo/.package-cache usr/bin/suricata -#usr/include/suricata-plugin.h #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS #usr/share/doc/suricata/Basic_Setup.txt @@ -17,6 +16,9 @@ usr/bin/suricata #usr/share/doc/suricata/TODO #usr/share/doc/suricata/Third_Party_Installation_Guides.txt #usr/share/man/man1/suricata.1 +#usr/share/man/man1/suricatactl-filestore.1 +#usr/share/man/man1/suricatactl.1 +#usr/share/man/man1/suricatasc.1 var/lib/suricata var/lib/suricata/classification.config var/lib/suricata/reference.config diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe index 1da6c3baf..f2539adca 100644 --- a/config/rootfiles/packages/nagios_nrpe +++ b/config/rootfiles/packages/nagios_nrpe @@ -6,3 +6,4 @@ etc/rc.d/init.d/nrpe usr/bin/nrpe #usr/lib/nagios usr/lib/nagios/check_nrpe +var/ipfire/backup/addons/includes/nagios_nrpe diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index a011a75b4..a8b4b3676 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nagios_nrpe -PAK_VER = 7 +PAK_VER = 8

DEPS = nagios-plugins

@@ -96,5 +96,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # install initscript $(call INSTALL_INITSCRIPT,nrpe)

+ install -v -m 644 ${DIR_SRC}/config/backup/includes/nagios_nrpe \ + /var/ipfire/backup/addons/includes/nagios_nrpe + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools deleted file mode 100644 index 8a78fbe02..000000000 --- a/lfs/python3-setuptools +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 40.6.3 - -THISAPP = setuptools-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python3-setuptools -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 425b58efe131537abde25c1b5624527a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -e '/tag_build = .post/d' -e '/tag_date = 1/d' -i setup.cfg - cd $(DIR_APP) && python3 bootstrap.py - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && python3 setup.py install --root=/ - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0feea8d46..98ffee0d1 100755 --- a/make.sh +++ b/make.sh @@ -1562,7 +1562,6 @@ buildipfire() { lfsmake2 python-lzma lfsmake2 python-progressbar lfsmake2 ddns - lfsmake2 python3-setuptools lfsmake2 python3-setuptools-scm lfsmake2 python3-six lfsmake2 python3-dateutil

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