ups-nut: Update to 2.8.2.1418

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Dec 2 12:53:38 2024 -0500
Changeset:	19eeaa544897586c63904fbcef0099c771a48abe

Modified Files:
	ups-nut/Makefile
	ups-nut/Makefile.common
	ups-nut/PLIST
	ups-nut/PLIST.SunOS
	ups-nut/distinfo
	ups-nut/options.mk
	ups-nut/patches/patch-drivers_libusb0.c
Added Files:
	ups-nut/COMMIT_MSG
Removed Files:
	ups-nut/COMMIT_MESSAGE

Log Message:
ups-nut: Update to 2.8.2.1418

Upstream's new version number means that this is 1418 commits past
2.8.2.  1416 of those are upstream's, plus

  - retry select on EINTR (bugfix)
  - in tests, do not expect that repeated signals are not coalesced

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=19eeaa544897586c63904fbcef0099c771a48abe

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ups-nut/COMMIT_MESSAGE                  |  2 --
 ups-nut/COMMIT_MSG                      |  3 +++
 ups-nut/Makefile                        |  2 +-
 ups-nut/Makefile.common                 |  4 ++--
 ups-nut/PLIST                           | 18 +++++++++++++++++-
 ups-nut/PLIST.SunOS                     |  3 ++-
 ups-nut/distinfo                        |  8 ++++----
 ups-nut/options.mk                      |  2 +-
 ups-nut/patches/patch-drivers_libusb0.c |  6 +++---
 9 files changed, 33 insertions(+), 15 deletions(-)

diffs:
diff --git a/ups-nut/COMMIT_MESSAGE b/ups-nut/COMMIT_MESSAGE
deleted file mode 100644
index cadf11b3d9..0000000000
--- a/ups-nut/COMMIT_MESSAGE
+++ /dev/null
@@ -1,2 +0,0 @@
-sysutils/ups-nut: Update to 2.8.2(CHECK)
-
diff --git a/ups-nut/COMMIT_MSG b/ups-nut/COMMIT_MSG
new file mode 100644
index 0000000000..042898d4eb
--- /dev/null
+++ b/ups-nut/COMMIT_MSG
@@ -0,0 +1,3 @@
+sysutils/ups-nut: Update to 2.8.3
+
+[insert summary of NEWS.adoc when release happens]
diff --git a/ups-nut/Makefile b/ups-nut/Makefile
index 60b37fc973..18b6d2d98b 100644
--- a/ups-nut/Makefile
+++ b/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2023/11/22 18:14:42 gdt Exp $
+# $NetBSD: Makefile,v 1.76 2024/04/03 17:42:53 gdt Exp $
 
 .include "Makefile.common"
 
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index e2ce06bbcf..432d24dca4 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -5,10 +5,10 @@
 # used by wip/ups-nut-usb/Makefile
 # used by wip/p5-UPS-Nut/Makefile
 
-DISTNAME=		nut-2.8.1.0.20231109.2
+DISTNAME=		nut-2.8.2.1418
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
-MASTER_SITES=		https://www.netbsd.org/~gdt/
+MASTER_SITES=		https://www.NetBSD.org/~gdt/
 
 MAINTAINER?=		gdt%NetBSD.org@localhost
 HOMEPAGE=		http://www.networkupstools.org/
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index 2e5c32ca2a..b306c5af88 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.32 2023/11/09 18:58:44 gdt Exp $
+@comment $NetBSD: PLIST,v 1.33 2024/04/03 17:42:53 gdt Exp $
 bin/nut-scanner
+bin/nutconf
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -35,6 +36,7 @@ libexec/nut/bestfcom
 libexec/nut/bestfortress
 libexec/nut/bestuferrups
 libexec/nut/bestups
+libexec/nut/bicker_ser
 libexec/nut/blazer_ser
 libexec/nut/clone
 libexec/nut/clone-outlet
@@ -47,6 +49,7 @@ libexec/nut/isbmex
 libexec/nut/ivtscd
 libexec/nut/liebert
 libexec/nut/liebert-esp2
+libexec/nut/liebert-gxe
 libexec/nut/masterguard
 libexec/nut/metasys
 libexec/nut/mge-shut
@@ -105,7 +108,9 @@ man/man3/nutclient_tcp_is_connected.3
 man/man3/nutclient_tcp_reconnect.3
 man/man3/nutclient_tcp_set_timeout.3
 man/man3/nutscan.3
+man/man3/nutscan_add_commented_option_to_device.3
 man/man3/nutscan_add_device_to_device.3
+man/man3/nutscan_add_ip_range.3
 man/man3/nutscan_add_option_to_device.3
 man/man3/nutscan_cidr_to_ip.3
 man/man3/nutscan_display_parsable.3
@@ -114,16 +119,22 @@ man/man3/nutscan_display_sanity_check_serial.3
 man/man3/nutscan_display_ups_conf.3
 man/man3/nutscan_display_ups_conf_with_sanity_check.3
 man/man3/nutscan_free_device.3
+man/man3/nutscan_free_ip_ranges.3
 man/man3/nutscan_get_serial_ports_list.3
 man/man3/nutscan_init.3
+man/man3/nutscan_init_ip_ranges.3
+man/man3/nutscan_ip_ranges_iter_inc.3
+man/man3/nutscan_ip_ranges_iter_init.3
 man/man3/nutscan_new_device.3
 man/man3/nutscan_scan_avahi.3
 man/man3/nutscan_scan_eaton_serial.3
 man/man3/nutscan_scan_ipmi.3
 man/man3/nutscan_scan_nut.3
+man/man3/nutscan_scan_nut_simulation.3
 man/man3/nutscan_scan_snmp.3
 man/man3/nutscan_scan_usb.3
 man/man3/nutscan_scan_xml_http_range.3
+man/man3/nutscan_stringify_ip_ranges.3
 man/man3/upscli_add_host_cert.3
 man/man3/upscli_cleanup.3
 man/man3/upscli_connect.3
@@ -160,7 +171,9 @@ man/man8/bestfcom.8
 man/man8/bestfortress.8
 man/man8/bestuferrups.8
 man/man8/bestups.8
+man/man8/bicker_ser.8
 man/man8/blazer_ser.8
+man/man8/clone-outlet.8
 man/man8/clone.8
 man/man8/dummy-ups.8
 man/man8/etapro.8
@@ -170,6 +183,7 @@ man/man8/genericups.8
 man/man8/isbmex.8
 man/man8/ivtscd.8
 man/man8/liebert-esp2.8
+man/man8/liebert-gxe.8
 man/man8/liebert.8
 man/man8/masterguard.8
 man/man8/metasys.8
@@ -180,6 +194,7 @@ man/man8/microsol-apc.8
 man/man8/nut-driver-enumerator.8
 man/man8/nut-recorder.8
 man/man8/nut-scanner.8
+man/man8/nutconf.8
 man/man8/nutdrv_qx.8
 man/man8/nutdrv_siemens_sitop.8
 man/man8/nutupsdrv.8
@@ -269,5 +284,6 @@ share/examples/nut/upsmon.conf.sample
 share/examples/nut/upssched.conf.sample
 share/nut/cmdvartab
 share/nut/driver.list
+@pkgdir share/doc/nut/html-man
 @pkgdir share/doc/nut/drivers
 @pkgdir etc/nut
diff --git a/ups-nut/PLIST.SunOS b/ups-nut/PLIST.SunOS
index 380fa5f581..fd9fc8b2c5 100644
--- a/ups-nut/PLIST.SunOS
+++ b/ups-nut/PLIST.SunOS
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2022/04/29 08:41:00 jperkin Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2023/12/01 19:18:28 jperkin Exp $
 libexec/nut-driver-enumerator.sh
 sbin/upsdrvsvcctl
 share/nut/solaris-init/nut
+share/nut/solaris-init/reset-ups-usb-solaris.sh.sample
 share/nut/solaris-smf/manifest/nut-driver-enumerator.xml
 share/nut/solaris-smf/manifest/nut-driver.xml
 share/nut/solaris-smf/manifest/nut-monitor.xml
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index 9c99d46d76..1edcbfcef8 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.41 2023/11/09 16:41:15 gdt Exp $
 
-BLAKE2s (nut-2.8.1.0.20231109.2.tar.gz) = 8b942f9d2ad87e1f7c0aeb74278daf09275fa19c62597569567c965f1c55e328
-SHA512 (nut-2.8.1.0.20231109.2.tar.gz) = 818cd25ce85872ba7c771a3dfd31c94df9ecebab77e29fab0b77883ff5d65403184e192ad924196f7e95db3da0e5a194e99ebb35e8dc4f75c7e8b554dbc37b64
-Size (nut-2.8.1.0.20231109.2.tar.gz) = 4118681 bytes
+BLAKE2s (nut-2.8.2.1418.tar.gz) = ba19e9b7e022d13cf5dc347f9fb3bd968c6fadf6e99d583daa0a68234136e29a
+SHA512 (nut-2.8.2.1418.tar.gz) = 37ce5d26d8aa4d975f3ccb349a305412b82a25780b6e3019bc1688034641926b534add19622f4377fd37732ed890c8a37750b1b1ec88f8ba731565cf844eb481
+Size (nut-2.8.2.1418.tar.gz) = 5909677 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = c6a232fd9b0ec73825e16f35b142f7195b35a3fe
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
-SHA1 (patch-drivers_libusb0.c) = 71719f12cd8a8efd93d07b6b2d50d8334df7daab
+SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
 SHA1 (patch-server_sockdebug.c) = 788efc0a519a6a0256b80156fff415d91a359098
diff --git a/ups-nut/options.mk b/ups-nut/options.mk
index 574db3462a..ef878b1501 100644
--- a/ups-nut/options.mk
+++ b/ups-nut/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/03/24 11:01:55 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2023/11/09 21:02:48 gdt Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ups-nut
 PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
diff --git a/ups-nut/patches/patch-drivers_libusb0.c b/ups-nut/patches/patch-drivers_libusb0.c
index c27ae18d96..c1876ed032 100644
--- a/ups-nut/patches/patch-drivers_libusb0.c
+++ b/ups-nut/patches/patch-drivers_libusb0.c
@@ -1,10 +1,10 @@
 $NetBSD: patch-drivers_libusb0.c,v 1.1 2022/04/26 23:28:25 gdt Exp $
 
---- drivers/libusb0.c.orig	2022-03-27 12:59:49.000000000 +0000
+--- drivers/libusb0.c.orig	2024-12-02 14:39:55.000000000 +0000
 +++ drivers/libusb0.c
-@@ -532,6 +532,7 @@ static int libusb_open(usb_dev_handle **
+@@ -765,6 +765,7 @@ static int nut_libusb_open(usb_dev_handl
   */
- static int libusb_strerror(const int ret, const char *desc)
+ static int nut_libusb_strerror(const int ret, const char *desc)
  {
 +	/* \todo: Possibly change to >= */
  	if (ret > 0) {