core199: Ship the refreshed udev

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

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

diff --git a/config/rootfiles/core/199/filelists/files b/config/rootfiles/core/199/filelists/files
index 17b198cb7cb239961b8329c46eef998f8e467732..369c39914cf8238db3c32a8ea88c9e9601dac0a6 100644 (file)
--- a/config/rootfiles/core/199/filelists/files
+++ b/config/rootfiles/core/199/filelists/files
@@ -1,8 +1,12 @@
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/messagebus
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/openvpn-n2n
 etc/rc.d/init.d/openvpn-rw
 etc/rc.d/init.d/wireguard
+etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc3.d/S15messagebus
+etc/rc.d/rc6.d/K85messagebus
 etc/ssh/ssh_config
 etc/ssh/sshd_config
 srv/web/ipfire/cgi-bin/connections.cgi
@@ -15,3 +19,4 @@ srv/web/ipfire/cgi-bin/wireguard.cgi
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
 usr/sbin/openvpn-authenticator
 var/ipfire/header.pl
+var/ipfire/qos/bin/makeqosscripts.pl

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

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

diff --git a/config/rootfiles/core/199/update.sh b/config/rootfiles/core/199/update.sh
index 53cd46b67673cd838f6284023b5fff2ce3ae93bc..0e0bb85efb40aaa42a42f034246dfce9e222b18c 100644 (file)
--- a/config/rootfiles/core/199/update.sh
+++ b/config/rootfiles/core/199/update.sh
@@ -86,7 +86,30 @@ rm -rvf \
 
 # Stop services
 
+# Remove dropped packages
+for package in dbus; do \
+        if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
+                stop_service "${package}"
+                for i in $(</opt/pakfire/db/rootfiles/${package}); do
+                        rm -rfv "/${i}"
+                done
+        fi
+        rm -f "/opt/pakfire/db/installed/meta-${package}"
+        rm -f "/opt/pakfire/db/meta/meta-${package}"
+        rm -f "/opt/pakfire/db/rootfiles/${package}"
+done
+
 # Remove files
+rm -rfv \
+       /lib/udev
+
+# Create the messagebus group
+if ! getent group messagebus >/dev/null; then
+       groupadd -g 50 messagebus
+fi
+if ! getent passwd messagebus >/dev/null; then
+       useradd -g messagebus -u 50 -d /var/empty -s /bin/false messagebus
+fi
 
 # Extract files
 extract_files
@@ -111,6 +134,7 @@ ldconfig
 sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi
 
 # Start services
+/etc/init.d/udev restart
 /etc/init.d/openvpn-n2n restart
 /etc/init.d/openvpn-rw restart
 /etc/init.d/suricata restart

diff --git a/lfs/alsa b/lfs/alsa
index fba9b47f597b704fc410eaf394056e0cd0393fd4..0ccced2bb443cbb74056862b9f0cf05d78f71ff4 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -35,7 +35,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 23
+PAK_VER    = 24
 
 DEPS       =
 

diff --git a/lfs/tshark b/lfs/tshark
index 5760f94eba2050f82b3ec438fd23adbded759088..f01063087b0dcf2781c739e3e2b5dc835154be7c 100644 (file)
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tshark
 DEPS       = c-ares
-PAK_VER    = 28
+PAK_VER    = 29
 
 SERVICES   =