sysutils/nut: Update to 2.8.2

5 files changed, 13 insertions, 26 deletions

diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index 58f885881df5..ad70a66cdca6 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -108,6 +108,7 @@ lib/libnutscan.so.2.0.5
 %%SERIAL%%libexec/nut/safenet
 %%SERIAL%%libexec/nut/skel
 %%SNMP%%libexec/nut/snmp-ups
+%%SERIAL%%libexec/nut/sms_ser
 %%SERIAL%%libexec/nut/solis
 %%SERIAL%%libexec/nut/tripplite
 %%USB%%libexec/nut/tripplite_usb
@@ -218,6 +219,7 @@ lib/libnutscan.so.2.0.5
 %%MANPAGES%%share/man/man8/nutupsdrv.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz
 %%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
 %%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz
 %%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz
 %%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index d93528170746..791d13b6f804 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	nut
-PORTVERSION=	2.8.1
-PORTREVISION=	3
+PORTVERSION=	2.8.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 
diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo
index 91721deab284..a6539cf5526e 100644
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699981499
-SHA256 (nut-2.8.1.tar.gz) = 7da48ee23b1f0d8d72560bb0af84f5c5ae4dbe35452b84cb49840132e47f099c
-SIZE (nut-2.8.1.tar.gz) = 4125263
+TIMESTAMP = 1712029991
+SHA256 (nut-2.8.2.tar.gz) = e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d
+SIZE (nut-2.8.2.tar.gz) = 5599935
diff --git a/sysutils/nut/files/patch-drivers_libusb1.c b/sysutils/nut/files/patch-drivers_libusb1.c
deleted file mode 100644
index 8e778ecf8707..000000000000
--- a/sysutils/nut/files/patch-drivers_libusb1.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- drivers/libusb1.c.orig	2023-11-24 07:19:04.377537000 -0800
-+++ drivers/libusb1.c	2023-11-24 07:20:06.065188000 -0800
-@@ -263,14 +263,7 @@
- 			libusb_free_device_list(devlist, 1);
- 			fatal_with_errno(EXIT_FAILURE, "Out of memory");
- 		}
--		if (bus_num > 0) {
--			sprintf(curDevice->Bus, "%03d", bus_num);
--		} else {
--			upsdebugx(1, "%s: invalid libusb bus number %i",
--				__func__, bus_num);
--			free(curDevice->Bus);
--			curDevice->Bus = NULL;
--		}
-+		sprintf(curDevice->Bus, "%03d", bus_num);
- 
- 		device_addr = libusb_get_device_address(device);
- 		curDevice->Device = (char *)malloc(4);
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index ee950b01a582..ad70a66cdca6 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -22,6 +22,7 @@
 @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
 %%USB%%etc/devd/nut-usb.conf
 bin/nut-scanner
+bin/nutconf
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -52,7 +53,7 @@ lib/libnutclientstub.so.1.0.1
 lib/libnutscan.a
 lib/libnutscan.so
 lib/libnutscan.so.2
-lib/libnutscan.so.2.0.2
+lib/libnutscan.so.2.0.5
 %%PYTHON_SITELIBDIR%%/PyNUT.py
 %%PYTHON_SITELIBDIR%%/test_nutclient.py
 %%DEV%%libdata/pkgconfig/libnutclient.pc
@@ -106,8 +107,8 @@ lib/libnutscan.so.2.0.2
 %%USB%%libexec/nut/richcomm_usb
 %%SERIAL%%libexec/nut/safenet
 %%SERIAL%%libexec/nut/skel
-%%SERIAL%%libexec/nut/sms_ser
 %%SNMP%%libexec/nut/snmp-ups
+%%SERIAL%%libexec/nut/sms_ser
 %%SERIAL%%libexec/nut/solis
 %%SERIAL%%libexec/nut/tripplite
 %%USB%%libexec/nut/tripplite_usb
@@ -157,6 +158,7 @@ lib/libnutscan.so.2.0.2
 %%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_reconnect.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_set_timeout.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_commented_option_to_device.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_device_to_device.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_option_to_device.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz
@@ -173,6 +175,7 @@ lib/libnutscan.so.2.0.2
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_ipmi.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut_simulation.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_snmp.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_usb.3.gz
 %%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz
@@ -209,12 +212,14 @@ lib/libnutscan.so.2.0.2
 %%MANPAGES%%share/man/man8/nut-driver-enumerator.8.gz
 %%MANPAGES%%share/man/man8/nut-recorder.8.gz
 %%MANPAGES%%share/man/man8/nut-scanner.8.gz
+%%MANPAGES%%share/man/man8/nutconf.8.gz
 %%MANPAGES%%%%USB%%share/man/man8/nutdrv_atcl_usb.8.gz
 %%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz
 %%MANPAGES%%share/man/man8/nutupsdrv.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz
 %%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
 %%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz
 %%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz
 %%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz
@@ -267,7 +272,6 @@ lib/libnutscan.so.2.0.2
 %%MANPAGES%%%%SERIAL%%share/man/man8/powerpanel.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/rhino.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/safenet.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/solis.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/tripplite.8.gz
 %%MANPAGES%%%%SERIAL%%share/man/man8/tripplitesu.8.gz