From 71add8bf81448e4a4b0609ffa12757e89e0d5e40 Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Sat, 9 May 2026 04:49:52 -0400
Subject: [PATCH 1/7] nut: bump to 2.8.5

Bump version to latest stable release. Adjust configure
and drivers as needed.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/net/nut/Makefile b/net/nut/Makefile
index fa5acf83bf928..3946ad370ee3c 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nut
-PKG_VERSION:=2.8.4
-PKG_RELEASE:=3
+PKG_VERSION:=2.8.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://networkupstools.org/source/2.8/
-PKG_HASH:=a2fe55bc2d90b4a848d6ff8bac361e6d1c97f899a545219cad707d17a27ff127
+PKG_SOURCE_URL:=https://www.networkupstools.org/source/2.8/
+PKG_HASH:=18bf32e59eb764b13da3c4fa70384926d7fa584cb31d2fe7f137a570633eeec1
 PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later GPL-1.0-or-later Artistic-1.0-Perl
 PKG_LICENSE_FILES:=LICENSE-GPL2 LICENSE-GPL3 COPYING
 PKG_FIXUP:=autoreconf
@@ -406,7 +406,7 @@ SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom	\
  gamatronic genericups isbmex liebert liebert-esp2 liebert-gxe masterguard metasys	\
  mge-utalk microdowell microsol-apc mge-shut nutdrv_hashx oneac optiups powercom powervar_cx_ser rhino	\
  safenet nutdrv_siemens-sitop solis tripplite tripplitesu upscode2 victronups powerpanel \
- blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser ve-direct \
+ blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser ve-direct meanwell_ntu \
  nutdrv_qx
 SERIAL_DRIVERLIST += nhs_ser
 SNMP_DRIVERLIST = snmp-ups
@@ -527,8 +527,10 @@ $(eval $(call DriverDescription,serial,bicker_ser,\
 	Driver for Bicker DC UPS via serial port connections))
 $(eval $(call DriverDescription,serial,ve-direct,\
 	Driver for Victron UPS unit running on VE.Direct serial protocol))
+$(eval $(call DriverDescription,serial,meanwell_ntu,\
+	Driver for Mean Well NTU series equipment with serial port))
 $(eval $(call DriverDescription,serial,nhs_ser,\
-	Driver for NHS Nobreaks, senoidal line, with serial port))
+	Driver for NHS Nobreaks - senoidal line - with serial port))
 $(eval $(call DriverDescription,snmp,snmp-ups,\
 	Multi-MIB Driver for SNMP UPS equipment))
 $(eval $(call DriverDescription,usb,usbhid-ups,\
@@ -556,7 +558,8 @@ CONFIGURE_VARS += \
 	ac_cv_path_AR=$(TARGET_AR)
 
 CONFIGURE_ARGS += \
-	--sysconfdir=/etc/nut \
+	--sysconfdir=/etc \
+	--with-confdir-suffix=/nut \
 	--datadir=/usr/share/nut \
 	--with-dev \
 	--$(if $(CONFIG_NUT_DRIVER_USB),with,without)-usb \

From 8be136f6fe20400313b2ecaa5a8624473246aebd Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Sat, 9 May 2026 22:33:24 -0400
Subject: [PATCH 2/7] nut: move drivers to libexec

They are executables not libraries, so move the UPS drivers
to /usr/libexec/nut.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/Makefile              | 8 ++++----
 net/nut/files/nut-server.init | 6 +++---
 net/nut/files/nutshutdown     | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net/nut/Makefile b/net/nut/Makefile
index 3946ad370ee3c..58643b458bd7e 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -383,9 +383,9 @@ define DriverPackage
 
         endef
         define Package/nut-driver-$(2)/install
-		$(INSTALL_DIR) $$(1)/lib/nut
-		$(CP) $$(PKG_INSTALL_DIR)/lib/nut/$(2) $$(1)/lib/nut/
-		$(if $(filter $(2),clone),$(CP) $$(PKG_INSTALL_DIR)/lib/nut/$(2)-outlet $$(1)/lib/nut/)
+		$(INSTALL_DIR) $$(1)/usr/libexec/nut
+		$(CP) $$(PKG_INSTALL_DIR)/usr/libexec/nut/$(2) $$(1)/usr/libexec/nut/
+		$(if $(filter $(2),clone),$(CP) $$(PKG_INSTALL_DIR)/usr/libexec/nut/$(2)-outlet $$(1)/usr/libexec/nut/)
         endef
 endef
 define DriverDescription
@@ -582,7 +582,7 @@ CONFIGURE_ARGS += \
 	--without-nut_monitor \
 	--with-statepath=/var/run/nut \
 	--with-pidpath=/var/run \
-	--with-drvpath=/lib/nut \
+	--with-drvpath=/usr/libexec/nut \
 	--with-user=nut \
 	--with-group=nut \
 	$(if $(CONFIG_PACKAGE_nut-web-cgi),--with-gd-includes="`pkg-config --cflags gdlib`") \
diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init
index be1cd45e20a5c..e62a3c364f02b 100755
--- a/net/nut/files/nut-server.init
+++ b/net/nut/files/nut-server.init
@@ -368,7 +368,7 @@ start_ups_driver() {
 	procd_set_param stdout 0 # Subset of stderr
 	procd_set_param env NUT_QUIET_INIT_UPSNOTIFY=true
 	procd_set_param env NUT_STATEPATH="${STATEPATH}"
-	procd_set_param command /lib/nut/"${driver}" -FF -a "$ups" ${RUNAS:+-u "$RUNAS"}
+	procd_set_param command /usr/libexec/nut/"${driver}" -FF -a "$ups" ${RUNAS:+-u "$RUNAS"}
 	procd_close_instance
 	haveupscfg=1
 }
@@ -516,7 +516,7 @@ stop_ups_driver() {
 	config_get driver "$ups" driver "usbhid-ups"
 
 	if procd_running nut-server "$ups"; then
-		signal_instance "$ups" "$driver" "/lib/nut/'${driver}' -c exit -a '${ups}'" "TERM" "${STATEPATH}/${driver}-${ups}.pid"
+		signal_instance "$ups" "$driver" "/usr/libexec/nut/'${driver}' -c exit -a '${ups}'" "TERM" "${STATEPATH}/${driver}-${ups}.pid"
 		if procd_running nut-server upsd >/dev/null 2>&1; then
 			signal_instance upsd upsd "upsd -c stop" "TERM" "${STATEPATH}/upsd.pid" "procd_kill nut-server upsd"
 		fi
@@ -546,7 +546,7 @@ reload_ups_driver() {
 
 	# Try to reload, otherwise exit politely, then stop and restart procd instance
 	if procd_running nut-server "$ups"; then
-		signal_instance "$ups" "$driver" "/lib/nut/'${driver}' -c reload-or-exit -a '${ups}'" HUP "${STATEPATH}/${driver}-${ups}.pid"
+		signal_instance "$ups" "$driver" "/usr/libexec/nut/'${driver}' -c reload-or-exit -a '${ups}'" HUP "${STATEPATH}/${driver}-${ups}.pid"
 	fi
 	/etc/init.d/nut-server start "$ups" 2>&1 | logger -t nut-server
 }
diff --git a/net/nut/files/nutshutdown b/net/nut/files/nutshutdown
index 7270f983f1088..f8115270465f9 100755
--- a/net/nut/files/nutshutdown
+++ b/net/nut/files/nutshutdown
@@ -14,7 +14,7 @@ shutdown_instance() {
 
 	# Only FSD if killpower was indicated
 	if [ -f /var/run/killpower ]; then
-		/lib/nut/"${driver}" -a "$cfg" -k
+		/usr/libexec/nut/"${driver}" -a "$cfg" -k
 	fi
 }
 

From df61116b24175427e6812805684f6bc2cb09cc62 Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Sat, 9 May 2026 11:27:18 -0400
Subject: [PATCH 3/7] nut: bump OpenWrt copyright for files with it

For files with an existing OpenWrt copyright notation,
update to include 2026 for scripts which have been
updated this year.

Per https://github.com/openwrt/packages/pull/29390#discussion_r3213318908

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/Makefile              | 2 +-
 net/nut/files/nut-cgi.init    | 2 +-
 net/nut/files/nut-server.init | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/nut/Makefile b/net/nut/Makefile
index 58643b458bd7e..2a8f2d7458845 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2006-2016 OpenWrt.org
+# Copyright (C) 2006-2026 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/net/nut/files/nut-cgi.init b/net/nut/files/nut-cgi.init
index 68d39f668b85b..e5c3cf193dd87 100755
--- a/net/nut/files/nut-cgi.init
+++ b/net/nut/files/nut-cgi.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright © 2012 OpenWrt.org
+# Copyright © 2012-2026 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init
index e62a3c364f02b..dcdd08cff0734 100755
--- a/net/nut/files/nut-server.init
+++ b/net/nut/files/nut-server.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright © 2012 OpenWrt.org
+# Copyright © 2012-2026 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

From 90bf04ac435fb75c5833aa057d51cac10c2ec579 Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Sat, 9 May 2026 22:35:51 -0400
Subject: [PATCH 4/7] nut: add version test overrides

Allow CI to pass by skipping the generic version
check where it not appropriate.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/test-version.sh | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 net/nut/test-version.sh

diff --git a/net/nut/test-version.sh b/net/nut/test-version.sh
new file mode 100644
index 0000000000000..2b07817d0a98d
--- /dev/null
+++ b/net/nut/test-version.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+if [ "$PKG_NAME" = "nut" ]; then
+	exit 0
+fi
+
+EXEC="${PKG_NAME#nut-}"
+
+case "$EXEC" in
+common | upsmon-sendmail-notify | avahi-service)
+	exit 0
+	;;
+driver-*)
+	DRIVER="${EXEC#driver-}"
+	/usr/libexec/nut/"$DRIVER" -V 2>&1 | grep -qF "${PKG_VERSION}"
+	;;
+server)
+	"upsd" -V 2>&1 | grep -qF "${PKG_VERSION}" && "upsdrvctl" -V 2>&1 | grep -qF "${PKG_VERSION}"
+	;;
+upssched)
+	# Only intended to be run from upsmon
+	exit 0
+	;;
+web-cgi)
+	# Only runs as CGI scripts
+	exit 0
+	;;
+*)
+	"$EXEC" -V 2>&1 | grep -qF "${PKG_VERSION}"
+	;;
+esac

From fd02697db3ed36401178fef5bb4953ea7b0d6b1e Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Sat, 30 May 2026 18:23:15 -0400
Subject: [PATCH 5/7] nut: belatedly add migration for nut-monitor changes

Add previously missed migration script (uci-defaults) for changes
to nut-monitor initscript.

Created with the help of iterative code reviews by
Qwen3.6-27B (LLM model) running on llama.cpp (local LLM server),
controlled by LATE.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/Makefile                          |   2 +
 net/nut/files/nut-monitor-migrate.default | 243 ++++++++++++++++++++++
 2 files changed, 245 insertions(+)
 create mode 100644 net/nut/files/nut-monitor-migrate.default

diff --git a/net/nut/Makefile b/net/nut/Makefile
index 2a8f2d7458845..04d12d5364db8 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -170,9 +170,11 @@ define Package/nut-upsmon/install
 	$(INSTALL_DIR) $(1)/etc/nut
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/nut-monitor.init $(1)/etc/init.d/nut-monitor
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upsmon $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/nutshutdown $(1)/usr/sbin/nutshutdown
+	$(INSTALL_DATA) ./files/nut-monitor-migrate.default $(1)/etc/uci-defaults/80-nut-monitor-migrate
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) ./files/nut_monitor $(1)/etc/config/nut_monitor
 	ln -sf /var/etc/nut/upsmon.conf $(1)/etc/nut/upsmon.conf
diff --git a/net/nut/files/nut-monitor-migrate.default b/net/nut/files/nut-monitor-migrate.default
new file mode 100644
index 0000000000000..2d928127c6290
--- /dev/null
+++ b/net/nut/files/nut-monitor-migrate.default
@@ -0,0 +1,243 @@
+#!/bin/sh
+# Script is sourced not executed, but shebang helps tools recognize this as
+# a shell script.
+
+# In recent (relevant) versions of shellcheck busybox is a valid shell type
+# shellcheck shell=busybox
+
+# uci-defaults script to migrate old uci config for notifications and monitor sections,
+# to the new. Applied during install or on first boot after install, if setting on install
+# fails
+
+# IPKG_INSTROOT is intentionally only set when building an image and
+# is intentionally empty on a live OpenWrt device
+
+# Only run this uci-defaults script on a live OpenWrt device
+[ -z "${IPKG_INSTROOT}" ] || exit 0
+
+# Loads needed OpenWrt functions
+# shellcheck source=net/nut/files/functions.sh.functions
+. /lib/functions.sh || {
+	logger -s -t nut-monitor-migrate "Unable to source 'functions.sh' in 'nut-monitor-migrate' uci-default script. Bailing"
+	exit 1
+}
+
+# Adds notification flag (value) to 'notify_flags' from caller
+# shellcheck disable=SC2329,SC2317
+get_notify_flags() {
+	local value="$1"
+
+	append notify_flags "$value" "+"
+}
+
+# shellcheck disable=SC2329,SC2317
+convert_flags() {
+	local notify_flags="$1"
+	local working_flags=""
+	local flag_val
+
+	# In input flags can be in any order. If any of the input flags are IGNORE,
+	# the output should only contain IGNORE. If the input contains only SYSLOG
+	# or only EXEC, use as is. If the input contains both SYSLOG and EXEC (in
+	# any order) the output must be SYSLOG+EXEC
+	for flag_val in IGNORE SYSLOG EXEC; do
+		# If the notify_flags contains $flag_val
+		case "$notify_flags" in
+		"$flag_val"+* | *+"$flag_val" | "$flag_val")
+			case "$flag_val" in
+			IGNORE)
+				working_flags="IGNORE"
+				printf "%s" "$working_flags"
+				return
+				;;
+			SYSLOG)
+				# If working flags exists, it already has a non SYSLOG value
+				# SYSLOG must come first in the final flags, so append
+				# old working_flags to SYSLOG with delimiter '+', and make
+				# that the new working_flags
+				if [ "$working_flags" = "EXEC" ]; then
+					working_flags="${flag_val}+${working_flags}"
+				else
+					working_flags="$flag_val"
+				fi
+				;;
+			EXEC)
+				# append to an empty variable just returns the value to be
+				# appended without a delimiter, so we do not need to check
+				# for already having a value in 'working_flags'
+				append working_flags "$flag_val" "+"
+				;;
+			esac
+			;;
+		esac
+	done
+	printf "%s" "$working_flags"
+}
+
+# As the uci-defaults environment in which this runs does not logging available,
+# nor is stderr captured or displayed on the console, these messages exist only
+# to assist when debugging manual runs of the script.
+# shellcheck disable=SC2329,SC2317
+log_migration_error() {
+	local reason="$1"
+
+	printf "'%s': ERROR: '%s'\n" "nut-monitor-migrate" "$reason" >&2
+}
+
+# shellcheck disable=SC2329,SC2317
+get_notification_flags() {
+	local uci_option="$1"
+	local cfg="$2"
+	local notify_flags=""
+	# accumulates flags in notify_flags via get_notify_flags
+	config_list_foreach "$cfg" "$uci_option" get_notify_flags
+	convert_flags "$notify_flags"
+}
+
+# shellcheck disable=SC2329,SC2317
+process_upsmon_section() {
+	local cfg="$1"
+	local notify_type flag_name notify_msg notify_section
+	local notification_name notify_flags_as_var upsmon_final_flags
+	# List of notification messages options in existing (to be converted)
+	# UCI config for nut_monitor
+	local nut_notify_message_types="onlinemsg onbattmsg lowbattmsg fsdmsg commokmsg"
+	append nut_notify_message_types "commbadmsg shutdownmsg replbattmsg"
+	append nut_notify_message_types "nocommmsmsg nocommmsg noparentmsg"
+
+	# We need word-splitting to iterate over nut_notify_message_types
+	# This is a local variable defined by us, so it is safe to do this.
+	# We still disable globbing of the word-split
+	set -f
+	for notify_type in $nut_notify_message_types; do
+		# Transform <prefix>msg into <prefix>notify (flag_name) and <PREFIX> (notification_name)
+		flag_name="${notify_type/msg/notify}"
+		notification_name="${notify_type/msg/}"
+		# busybox ash does not support case transformation via variable  parameter substitution,
+		# so we use tr.
+		notification_name="$(printf '%s' "$notification_name" | tr '[:lower:]' '[:upper:]')"
+		# Transform wrong NOCOMMS to NOCOMM (typo in nocommsmsg which should
+		# have been nocommmsg in previous script)
+		if [ "$notification_name" = "NOCOMMMS" ]; then
+			notification_name="NOCOMM"
+		fi
+		config_get notify_msg "$cfg" "$notify_type"
+		config_get notify_flags_as_var "$cfg" "$flag_name"
+		if [ -n "$notify_msg" ] || [ -n "$notify_flags_as_var" ]; then
+			notify_section="$(uci -q add nut_monitor notifications)"
+			if [ -z "$notify_section" ]; then
+				log_migration_error "Failed to add notifications section"
+				# We don't want to prevent other sections from being processed
+				# if this one fails, so do not error exit, but keep going.
+				continue
+			fi
+			if ! uci -q rename nut_monitor."$notify_section"="$notification_name"; then
+				log_migration_error "Failed to rename '$notify_section' to '$notification_name'"
+				# We don't want to prevent other sections from being processed
+				# if this one fails, so do not error exit, but keep going.
+				continue
+			fi
+		fi
+		if [ -n "$notify_msg" ]; then
+			if ! uci -q set nut_monitor."$notification_name".message="$notify_msg"; then
+				log_migration_error "Failed to add message for '$notification_name'"
+				continue
+			fi
+		fi
+		upsmon_final_flags="$(get_notification_flags "$flag_name" "$cfg")"
+		if [ -n "$upsmon_final_flags" ]; then
+			if ! uci -q set nut_monitor."$notification_name".flag="$upsmon_final_flags"; then
+				log_migration_error "Failed to add flag(s) to '$notification_name'"
+				continue
+			fi
+		fi
+
+		# Keep going even if deleting old flag fails. It won't be used
+		# anyway, and partial success is better than none.
+		if [ -n "$cfg" ] && [ -n "$notify_flags_as_var" ] && ! uci -q delete nut_monitor."$cfg"."$flag_name"; then
+			log_migration_error "Failed to delete old flag '$flag_name' from '$cfg'"
+		fi
+		# Keep going even if deleting old notification message fails. It
+		# won't be used anyway, and partial success is better than none.
+		if [ -n "$cfg" ] && [ -n "$notify_msg" ] && ! uci -q delete nut_monitor."$cfg"."$notify_type"; then
+			log_migration_error "Failed to delete old notification type '$notify_type' from '$cfg'"
+		fi
+	done
+	set +f
+	upsmon_final_flags="$(get_notification_flags "defaultnotify" "$cfg")"
+	if [ -n "$upsmon_final_flags" ]; then
+		if ! uci -q set nut_monitor."$cfg".defaultnotify="$upsmon_final_flags"; then
+			log_migration_error "Failed to update defaultnotify for '$cfg'"
+		fi
+	fi
+}
+
+# shellcheck disable=SC2329,SC2317
+process_primary_secondary() {
+	local cfg="$1"
+	local monitor_type="$2"
+	local upsname hostname port powervalue username password section
+
+	section="$(uci -q add nut_monitor monitor)" || {
+		log_migration_error "Failed to add monitor section to replace '$cfg'"
+		# Do not error exit as we do not want to stop other sections from being
+		# processed
+		return 0
+	}
+
+	if [ -n "$section" ]; then
+		{
+			uci -q set nut_monitor."$section".type="$monitor_type" || return 1
+
+			# Empty values are allowed and should remain as such in the new
+			# section.
+			config_get upsname "$cfg" upsname
+			config_get hostname "$cfg" hostname
+			config_get port "$cfg" port
+			config_get powervalue "$cfg" powervalue
+			config_get username "$cfg" username
+			config_get password "$cfg" password
+
+			uci -q set nut_monitor."$section".upsname="$upsname" || return 1
+			uci -q set nut_monitor."$section".hostname="$hostname" || return 1
+			uci -q set nut_monitor."$section".port="$port" || return 1
+			uci -q set nut_monitor."$section".powervalue="$powervalue" || return 1
+			uci -q set nut_monitor."$section".username="$username" || return 1
+			uci -q set nut_monitor."$section".password="$password" || return 1
+
+			# Delete the old section with name config (of type primary
+			# or secondary)
+			uci -q delete nut_monitor."$cfg" || return 1
+			# Rename the nut_monitor section '$section' we created, above, with
+			# the name of the old section. This requires that the old section
+			# with the same name has already been removed.
+			# In the event of delete failure, the new section is present, but
+			# with the name assigned when the new section was created.
+			uci -q rename nut_monitor."$section"="$cfg" || return 1
+			return 0
+		} || {
+			log_migration_error "Error converting primary/secondary section '$cfg'"
+			# Do not error exit as we do not want to stop other sections from
+			# being processed
+			return 0
+		}
+	else
+		log_migration_error "Name of monitor section to replace '$cfg' was empty"
+		# Do not error exit as we do not want to stop other sections from being
+		# processed
+		return 0
+
+	fi
+}
+
+config_load nut_monitor || {
+	echo "nut-monitor-migrate: FATAL: Failed to load nut_monitor"
+	exit 1
+}
+config_foreach process_upsmon_section upsmon
+config_foreach process_primary_secondary master primary
+config_foreach process_primary_secondary slave secondary
+
+uci commit nut_monitor
+
+exit 0

From e8b15c8930d04307f7ebadad7810b20ac769530e Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Tue, 2 Jun 2026 16:47:28 -0400
Subject: [PATCH 6/7] nut: fix quoting bug for ups stop and reload

Extra quotes were being interpreted literally, preventing proper
ups driver stop and/or reload.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/files/nut-server.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init
index dcdd08cff0734..6365f60eb6b72 100755
--- a/net/nut/files/nut-server.init
+++ b/net/nut/files/nut-server.init
@@ -516,7 +516,7 @@ stop_ups_driver() {
 	config_get driver "$ups" driver "usbhid-ups"
 
 	if procd_running nut-server "$ups"; then
-		signal_instance "$ups" "$driver" "/usr/libexec/nut/'${driver}' -c exit -a '${ups}'" "TERM" "${STATEPATH}/${driver}-${ups}.pid"
+		signal_instance "$ups" "$driver" "/usr/libexec/nut/${driver} -c exit -a ${ups}" "TERM" "${STATEPATH}/${driver}-${ups}.pid"
 		if procd_running nut-server upsd >/dev/null 2>&1; then
 			signal_instance upsd upsd "upsd -c stop" "TERM" "${STATEPATH}/upsd.pid" "procd_kill nut-server upsd"
 		fi
@@ -546,7 +546,7 @@ reload_ups_driver() {
 
 	# Try to reload, otherwise exit politely, then stop and restart procd instance
 	if procd_running nut-server "$ups"; then
-		signal_instance "$ups" "$driver" "/usr/libexec/nut/'${driver}' -c reload-or-exit -a '${ups}'" HUP "${STATEPATH}/${driver}-${ups}.pid"
+		signal_instance "$ups" "$driver" "/usr/libexec/nut/${driver} -c reload-or-exit -a {ups}" HUP "${STATEPATH}/${driver}-${ups}.pid"
 	fi
 	/etc/init.d/nut-server start "$ups" 2>&1 | logger -t nut-server
 }

From a996814ba5ee932ef8a6c58f73aa16d153420451 Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
Date: Mon, 8 Jun 2026 21:16:36 -0400
Subject: [PATCH 7/7] nut: tweak version override for CI

Apparently the CI wants to 'see' the version not just get a return code,
so emit the version when we have one.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 net/nut/test-version.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/nut/test-version.sh b/net/nut/test-version.sh
index 2b07817d0a98d..0b392726473e7 100644
--- a/net/nut/test-version.sh
+++ b/net/nut/test-version.sh
@@ -12,10 +12,10 @@ common | upsmon-sendmail-notify | avahi-service)
 	;;
 driver-*)
 	DRIVER="${EXEC#driver-}"
-	/usr/libexec/nut/"$DRIVER" -V 2>&1 | grep -qF "${PKG_VERSION}"
+	/usr/libexec/nut/"$DRIVER" -V 2>&1 | grep -F "${PKG_VERSION}"
 	;;
 server)
-	"upsd" -V 2>&1 | grep -qF "${PKG_VERSION}" && "upsdrvctl" -V 2>&1 | grep -qF "${PKG_VERSION}"
+	"upsd" -V 2>&1 | grep -F "${PKG_VERSION}" && "upsdrvctl" -V 2>&1 | grep -qF "${PKG_VERSION}"
 	;;
 upssched)
 	# Only intended to be run from upsmon
@@ -26,6 +26,6 @@ web-cgi)
 	exit 0
 	;;
 *)
-	"$EXEC" -V 2>&1 | grep -qF "${PKG_VERSION}"
+	"$EXEC" -V 2>&1 | grep -F "${PKG_VERSION}"
 	;;
 esac