core185: Ship everything that is linked against XZ

This is a precautionary step to avoid that we have any issues to face
because of a downgrade as new symbols have been added to liblzma 5.6.0.

Furthermore, this should avoid shipping any traces of any other
potential malware in XZ that has been added in 5.6.0 or after.

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

diff --git a/config/rootfiles/core/185/filelists/aarch64/boost b/config/rootfiles/core/185/filelists/aarch64/boost
new file mode 120000 (symlink)
index 0000000..807ad06
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/aarch64/boost
@@ -0,0 +1 @@
+../../../../common/aarch64/boost
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/aarch64/grub b/config/rootfiles/core/185/filelists/aarch64/grub
new file mode 120000 (symlink)
index 0000000..40ae85f
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/aarch64/grub
@@ -0,0 +1 @@
+../../../../common/aarch64/grub
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/apache2 b/config/rootfiles/core/185/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/collectd b/config/rootfiles/core/185/filelists/collectd
new file mode 120000 (symlink)
index 0000000..871b32f
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files
index 09ce838868d468ee44030ad905db8a5f812af6ee..53793fda1440435b10b52459b21a60affff1a3a6 100644 (file)
--- a/config/rootfiles/core/185/filelists/files
+++ b/config/rootfiles/core/185/filelists/files
@@ -50,6 +50,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/time.cgi
+usr/lib/python3.10/lib-dynload/_lzma.cpython-310-xxxMACHINExxx-linux-gnu.so
 usr/local/bin/update-ids-ruleset
 var/ipfire/backup/bin/backup.pl
 var/ipfire/ids-functions.pl

diff --git a/config/rootfiles/core/185/filelists/kmod b/config/rootfiles/core/185/filelists/kmod
new file mode 120000 (symlink)
index 0000000..0020e19
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/kmod
@@ -0,0 +1 @@
+../../../common/kmod
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/libarchive b/config/rootfiles/core/185/filelists/libarchive
new file mode 120000 (symlink)
index 0000000..551f1f7
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/libtiff b/config/rootfiles/core/185/filelists/libtiff
new file mode 120000 (symlink)
index 0000000..dd89e3c
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/libtiff
@@ -0,0 +1 @@
+../../../common/libtiff
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/libxml2 b/config/rootfiles/core/185/filelists/libxml2
new file mode 120000 (symlink)
index 0000000..242e69f
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/libxml2
@@ -0,0 +1 @@
+../../../common/libxml2
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/riscv64/boost b/config/rootfiles/core/185/filelists/riscv64/boost
new file mode 120000 (symlink)
index 0000000..cbc461c
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/riscv64/boost
@@ -0,0 +1 @@
+../../../../common/riscv64/boost
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/riscv64/grub b/config/rootfiles/core/185/filelists/riscv64/grub
new file mode 120000 (symlink)
index 0000000..7013c0b
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/riscv64/grub
@@ -0,0 +1 @@
+../../../../common/riscv64/grub
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/x86_64/boost b/config/rootfiles/core/185/filelists/x86_64/boost
new file mode 120000 (symlink)
index 0000000..9ed31e1
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/x86_64/boost
@@ -0,0 +1 @@
+../../../../common/x86_64/boost
\ No newline at end of file

diff --git a/config/rootfiles/core/185/filelists/x86_64/grub b/config/rootfiles/core/185/filelists/x86_64/grub
new file mode 120000 (symlink)
index 0000000..78d3bd7
--- /dev/null
+++ b/config/rootfiles/core/185/filelists/x86_64/grub
@@ -0,0 +1 @@
+../../../../common/x86_64/grub
\ No newline at end of file

diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index f86013c0d4f6dac41026f9e448b73a53cf69cde7..28f18a7dac130f8975634a6444a23810d4c02fff 100644 (file)
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -88,12 +88,15 @@ chmod -v 640 /etc/sudoers.d/*
 # Start services
 telinit u
 /etc/init.d/sshd restart
+/etc/init.d/apache restart
 /etc/init.d/suricata restart
 /etc/init.d/unbound restart
 /etc/init.d/ntp start
 if [ -f /var/ipfire/proxy/enable ]; then
        /etc/init.d/squid start
 fi
+/etc/init.d/collectd restart
+
 ## Modify ovpnconfig according to bug 13548 for no-pass entry for N2N client connections
 # Check if ovpnconfig exists and is not empty
 if [ -s /var/ipfire/ovpn/ovpnconfig ]; then

diff --git a/lfs/foomatic b/lfs/foomatic
index d057505a9c57d8d95569eebbd562c3e8ca8c2021..21a5a589ada9798052af043d65a405d8965bc8a6 100644 (file)
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -37,7 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/foomatic-filters-$(VER_FILTERS)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = foomatic
-PAK_VER    = 9
+PAK_VER    = 10
 
 DEPS       = cups ghostscript hplip
 

diff --git a/lfs/sarg b/lfs/sarg
index d38933fb00d958ebf54913cb87a4e5a9fda622f5..1b8a077a649961c1e269414de7dfaf17257eb474 100644 (file)
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
-PAK_VER    = 6
+PAK_VER    = 7
 
 DEPS       =
 

diff --git a/lfs/tor b/lfs/tor
index 74b738512b33dc24329faa9d9816f2ad1637b186..aed30805f7070a097eae6fd380141c8bbe027109 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -34,7 +34,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 83
+PAK_VER    = 84
 
 DEPS       = libseccomp