westermo · joazet · Mar 27, 2024 · Mar 26, 2024 · Mar 26, 2024 · Mar 26, 2024
diff --git a/buildroot b/buildroot
diff --git a/package/Config.in b/package/Config.in
@@ -3,7 +3,6 @@ source "$BR2_EXTERNAL_NETBOX_PATH/package/factory/Config.in"
 source "$BR2_EXTERNAL_NETBOX_PATH/package/finit/Config.in"
 source "$BR2_EXTERNAL_NETBOX_PATH/package/libnsh/Config.in"
 source "$BR2_EXTERNAL_NETBOX_PATH/package/mcjoin/Config.in"
-source "$BR2_EXTERNAL_NETBOX_PATH/package/mdnsd/Config.in"
 source "$BR2_EXTERNAL_NETBOX_PATH/package/nemesis/Config.in"
 source "$BR2_EXTERNAL_NETBOX_PATH/package/querierd/Config.in"
 source "$BR2_EXTERNAL_NETBOX_PATH/package/skeleton-init-finit/Config.in"

diff --git a/package/finit/finit.hash b/package/finit/finit.hash
@@ -1,6 +1,4 @@
-# From https://github.com/troglobit/finit/releases/
-sha256 262d8cfea80d94e048e3f1b149f5d940b4579a38f2b7dba563cf4b0b497e7422  finit-4.3.tar.gz
-# Locally calculated
+sha256 139adcb81ec8a5bb628249f92e2144b20f7e14c53aa56bb86a2fd42c5e7dca11  finit-4.7.tar.gz
 sha256 abdb9adbbc1faacc35c80bc2974c7d6b842e3e50b066d688385b5d21be86206f  LICENSE
 
 # No hash for git snapshots:

diff --git a/package/finit/finit.mk b/package/finit/finit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FINIT_VERSION = 4.3
+FINIT_VERSION = 4.7
 FINIT_SITE = https://github.com/troglobit/finit/releases/download/$(FINIT_VERSION)
 FINIT_LICENSE = MIT
 FINIT_LICENSE_FILES = LICENSE

diff --git a/package/mcjoin/mcjoin.hash b/package/mcjoin/mcjoin.hash
@@ -1,2 +1,2 @@
-sha256 54f5913ebdda014c51435b6d2293ec157895c2740b992c259c79e34b4648ef7a  mcjoin-2.9.tar.gz
+sha256 0ec72cb333d43c26d947b38059580166f131eafb7b6dccbb6ee619abd4e98670  mcjoin-2.11.tar.gz
 sha256 3ef2afdb478d713edb86e5d911c698ce1d3ad65568b135c8faeca9cc0860b584  LICENSE
diff --git a/package/mcjoin/mcjoin.mk b/package/mcjoin/mcjoin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MCJOIN_VERSION = 2.9
+MCJOIN_VERSION = 2.11
 MCJOIN_SOURCE  = mcjoin-$(MCJOIN_VERSION).tar.gz
 MCJOIN_SITE    = https://github.com/troglobit/mcjoin/releases/download/v$(MCJOIN_VERSION)
 MCJOIN_LICENSE = ISC

diff --git a/package/mdnsd/.gitignore b/package/mdnsd/.gitignore
diff --git a/package/mdnsd/Config.in b/package/mdnsd/Config.in
diff --git a/package/mdnsd/ftp.service b/package/mdnsd/ftp.service
diff --git a/package/mdnsd/http.service b/package/mdnsd/http.service
diff --git a/package/mdnsd/ipp.service b/package/mdnsd/ipp.service
diff --git a/package/mdnsd/mdnsd.hash b/package/mdnsd/mdnsd.hash
diff --git a/package/mdnsd/mdnsd.mk b/package/mdnsd/mdnsd.mk
diff --git a/package/mdnsd/mdnsd.svc b/package/mdnsd/mdnsd.svc
diff --git a/package/mdnsd/printer.service b/package/mdnsd/printer.service
diff --git a/package/mdnsd/ssh.service b/package/mdnsd/ssh.service
diff --git a/package/querierd/querierd.hash b/package/querierd/querierd.hash
@@ -1,2 +1,2 @@
-sha256 05e4abd16a8906840a01c2bd483309868920fef458126c2788747c4ec867426e  querierd-0.4.tar.gz
+sha256 b425e5d9db3e87a5e4d6dd3887f4378202e07aaf2304412f5c1fb0589ab625dc  querierd-0.10.tar.gz
 sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29  LICENSE
diff --git a/package/querierd/querierd.mk b/package/querierd/querierd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-QUERIERD_VERSION = 0.4
+QUERIERD_VERSION = 0.10
 QUERIERD_SITE    = \
 	https://github.com/westermo/querierd/releases/download/v$(QUERIERD_VERSION)
 QUERIERD_LICENSE = BSD-3-Clause

diff --git a/patches/finit/4.2/cgroup-iwatcher-init-reorder.patch b/patches/finit/4.2/cgroup-iwatcher-init-reorder.patch
diff --git a/patches/finit/4.2/finit-time_t.patch b/patches/finit/4.2/finit-time_t.patch
diff --git a/patches/finit/4.2/ignore-bogus-ln-warnings.patch b/patches/finit/4.2/ignore-bogus-ln-warnings.patch
diff --git a/patches/finit/4.7/disable-unused-hotplug-options.patch b/patches/finit/4.7/disable-unused-hotplug-options.patch
@@ -0,0 +1,42 @@
+Index: finit-4.7/system/10-hotplug.conf.in
+===================================================================
+--- finit-4.7.orig/system/10-hotplug.conf.in
++++ finit-4.7/system/10-hotplug.conf.in
+@@ -18,26 +18,26 @@
+ # change the contents any way you like, it can even be empty.
+
+ # Check for systemd-udevd and eudev, if we find both, we opt for the latter.
+-service nowarn [S12345789] cgroup.system name:udevd notify:none pid:udevd log /lib/systemd/systemd-udevd -- Device event daemon (udev)
+-service nowarn [S12345789] cgroup.system name:udevd notify:none pid:udevd log udevd -D -- Device event daemon (udev)
++#service nowarn [S12345789] cgroup.system name:udevd notify:none pid:udevd log /lib/systemd/systemd-udevd -- Device event daemon (udev)
++#service nowarn [S12345789] cgroup.system name:udevd notify:none pid:udevd log udevd -D -- Device event daemon (udev)
+
+ # Wait for udevd to start, then trigger coldplug events and module loading.
+ # The last 'settle' call waits for it to finalize processing all uevents.
+-run nowarn if:udevd cgroup.init :1 [S] <service/udevd/ready> log udevadm settle -t 0                  --
+-run nowarn if:udevd cgroup.init :2 [S] <service/udevd/ready> log udevadm control --reload             --
+-run nowarn if:udevd cgroup.init :3 [S] <service/udevd/ready> log udevadm trigger -c add -t devices    -- Requesting device events
+-run nowarn if:udevd cgroup.init :4 [S] <service/udevd/ready> log udevadm trigger -c add -t subsystems -- Requesting subsystem events
+-run nowarn if:udevd cgroup.init :5 [S] <service/udevd/ready> log udevadm settle -t 30                 -- Waiting for udev to finish
++#run nowarn if:udevd cgroup.init :1 [S] <service/udevd/ready> log udevadm settle -t 0                  --
++#run nowarn if:udevd cgroup.init :2 [S] <service/udevd/ready> log udevadm control --reload             --
++#run nowarn if:udevd cgroup.init :3 [S] <service/udevd/ready> log udevadm trigger -c add -t devices    -- Requesting device events
++#run nowarn if:udevd cgroup.init :4 [S] <service/udevd/ready> log udevadm trigger -c add -t subsystems -- Requesting subsystem events
++#run nowarn if:udevd cgroup.init :5 [S] <service/udevd/ready> log udevadm settle -t 30                 -- Waiting for udev to finish
+
+ # If udevd is not available, check for mdevd.  Unlike plain 'mdev -df', the
+ # mdevd-coldplug process exits when mdevd has completed.  So the condition
+ # <run/coldplug/success> (same as for plain mdev below) can be relied on as a
+ # barrier for services that, e.g., need to probe for switchcore ports or PHYs
+ # that require firmware loading before they show up.
+-service nowarn conflict:udevd,mdev cgroup.init notify:none if:!udevd \
+-	[S12345789] notify:s6 mdevd -O 4 -D %n -- Device event daemon (mdevd)
+-run     nowarn conflict:udevd,mdev cgroup.init name:coldplug <service/mdevd/ready> \
+-	[S] mdevd-coldplug -- Cold plugging system
++#service nowarn conflict:udevd,mdev cgroup.init notify:none if:!udevd \
++#	[S12345789] notify:s6 mdevd -O 4 -D %n -- Device event daemon (mdevd)
++#run     nowarn conflict:udevd,mdev cgroup.init name:coldplug <service/mdevd/ready> \
++#	[S] mdevd-coldplug -- Cold plugging system
+
+ # If neither udevd or mdevd are available, fall back to mdev.  The new daemon
+ # mode calls `mdev -s` internally but does not create a PID file when that is
diff --git a/patches/finit/4.7/dont-remount-ro-root-on-shutdown.patch b/patches/finit/4.7/dont-remount-ro-root-on-shutdown.patch
@@ -0,0 +1,12 @@
+--- a/src/sig.c
++++ b/src/sig.c
+@@ -371,7 +371,8 @@
+ 	sync();
+ 	run("mount -n -o remount,ro -t dummytype dummydev /", NULL);
+ 	run("mount -n -o remount,ro dummydev /", NULL);
+-	run("mount -n -o remount,ro /", "mount");
++	if (!ismnt("/proc/mounts", "/", "ro"))
++		run("mount -n -o remount,ro /", "mount");
+
+ 	/* Call mdadm to mark any RAID array(s) as clean before halting. */
+ 	mdadm_wait();