4 files changed, 38 insertions, 13 deletions
diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
index 9ba4abdd581..e74ae00b3f0 100644
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ubox
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
-PKG_SOURCE_DATE:=2020-10-25
-PKG_SOURCE_VERSION:=9ef886819dd48303d8ced4cdbc9afbf32682535c
-PKG_MIRROR_HASH:=e2d93b798b91de98cb003f7b3be97d3d8a2413c8612b527d096c86ac5365cbdd
+PKG_SOURCE_DATE:=2024-01-24
+PKG_SOURCE_VERSION:=2c5887cb46883a28d69071c4349c3dabbbe3972c
+PKG_MIRROR_HASH:=0ded95382fd3a2e9751ea5fdd16c2afb7dcc52499f6ab47951c5db9525a4faa9
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -18,12 +18,10 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
-
 define Package/ubox
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
+  DEPENDS:=+libubox +ubusd +ubus +libubus +libuci
   TITLE:=OpenWrt system helper toolbox
   ALTERNATIVES:=\
     100:/sbin/rmmod:/sbin/kmodloader \
@@ -33,6 +31,10 @@ define Package/ubox
     100:/sbin/modprobe:/sbin/kmodloader
 endef
 
+define Package/ubox/conffiles
+/etc/modules.conf
+endef
+
 define Package/getrandom
   SECTION:=base
   CATEGORY:=Base system
@@ -42,7 +44,7 @@ endef
 define Package/logd
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
+  DEPENDS:=+libubox +libubus +libblobmsg-json +libudebug
   TITLE:=OpenWrt system log implementation
   USERID:=logd=514:logd=514
 endef
@@ -53,17 +55,19 @@ define Package/getrandom/install
 endef
 
 define Package/ubox/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(1)/etc
 
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
+	$(INSTALL_DATA) ./files/modules.conf $(1)/etc/modules.conf
 endef
 
 define Package/logd/install
-	$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ $(1)/usr/share/acl.d
 
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
 	$(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+	$(INSTALL_DATA) ./files/logd.json $(1)/usr/share/acl.d
 endef
 
 $(eval $(call BuildPackage,ubox))
diff --git a/package/system/ubox/files/log.init b/package/system/ubox/files/log.init
index c4802d41992..c6fdf44292f 100644
--- a/package/system/ubox/files/log.init
+++ b/package/system/ubox/files/log.init
@@ -34,7 +34,7 @@ start_service_daemon()
 {
 	[ $log_buffer_size -eq 0 -a $log_size -gt 0 ] && log_buffer_size=$log_size
 	[ $log_buffer_size -eq 0 ] && log_buffer_size=64
-	procd_open_instance
+	procd_open_instance logd
 	procd_set_param command "/sbin/logd"
 	procd_append_param command -S "${log_buffer_size}"
 	procd_set_param respawn 5 1 -1
@@ -52,9 +52,12 @@ start_service_file()
 	}
 	[ -z "${log_file}" ] && return
 
+	[ "$_BOOT" = "1" ] &&
+		[ "$(procd_get_mountpoints "${log_file}")" ] && return 0
+
 	mkdir -p "$(dirname "${log_file}")"
 
-	procd_open_instance
+	procd_open_instance logfile
 	procd_set_param command "$PROG" -f -F "$log_file" -p "$pid_file"
 	[ -n "${log_size}" ] && procd_append_param command -S "$log_size"
 	procd_close_instance
@@ -73,7 +76,7 @@ start_service_remote()
 	[ -z "${log_ip}" ] && return
 	[ -z "${log_hostname}" ] && log_hostname=$(cat /proc/sys/kernel/hostname)
 
-	procd_open_instance
+	procd_open_instance logremote
 	procd_set_param command "$PROG" -f -h "$log_hostname" -r "$log_ip" "${log_port}" -p "$pid_file"
 	case "${log_proto}" in
 		"udp") procd_append_param command -u;;
@@ -83,10 +86,17 @@ start_service_remote()
 	procd_close_instance
 }
 
+register_mount_trigger()
+{
+	[ -n "${log_file}" ] && procd_add_action_mount_trigger start "${log_file}"
+}
+
 service_triggers()
 {
+	config_load system
 	procd_add_reload_trigger "system"
 	procd_add_validation validate_log_section
+	config_foreach validate_log_section system register_mount_trigger
 }
 
 start_service()
@@ -96,3 +106,7 @@ start_service()
 	config_foreach validate_log_section system start_service_file
 	config_foreach validate_log_section system start_service_remote
 }
+
+boot() {
+	_BOOT=1 start
+}
diff --git a/package/system/ubox/files/logd.json b/package/system/ubox/files/logd.json
new file mode 100644
index 00000000000..f0b2fb1e12c
--- /dev/null
+++ b/package/system/ubox/files/logd.json
@@ -0,0 +1,4 @@
+{
+	"user": "logd",
+	"publish": [ "log" ]
+}
diff --git a/package/system/ubox/files/modules.conf b/package/system/ubox/files/modules.conf
new file mode 100644
index 00000000000..f54345fe4f7
--- /dev/null
+++ b/package/system/ubox/files/modules.conf
@@ -0,0 +1,3 @@
+# examples:
+# options mod1 option=val
+# blacklist mod2