ups-nut: Include a minor pending upstream bugfix

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Thu Nov 9 19:39:13 2023 -0500
Changeset:	dd073656d43e7e5a19479f26f5435cc202a572cf

Modified Files:
	ups-nut/Makefile.common
	ups-nut/PLIST
	ups-nut/distinfo
Removed Files:
	ups-nut/patches/patch-aa
	ups-nut/patches/patch-drivers_usbhid-ups.c

Log Message:
ups-nut: Include a minor pending upstream bugfix

https://github.com/networkupstools/nut/pull/2163

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

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

diffstat:
 ups-nut/Makefile.common                    |  2 +-
 ups-nut/PLIST                              |  1 -
 ups-nut/distinfo                           |  6 +++---
 ups-nut/patches/patch-aa                   | 15 ---------------
 ups-nut/patches/patch-drivers_usbhid-ups.c | 28 ----------------------------
 5 files changed, 4 insertions(+), 48 deletions(-)

diffs:
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index c881cbe95f..e2ce06bbcf 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -5,7 +5,7 @@
 # used by wip/ups-nut-usb/Makefile
 # used by wip/p5-UPS-Nut/Makefile
 
-DISTNAME=		nut-2.8.1.0.20231109.0
+DISTNAME=		nut-2.8.1.0.20231109.2
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
 MASTER_SITES=		https://www.netbsd.org/~gdt/
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index 5ca5c25905..2e5c32ca2a 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -23,7 +23,6 @@ lib/pkgconfig/libnutclientstub.pc
 lib/pkgconfig/libnutscan.pc
 lib/pkgconfig/libupsclient.pc
 ${PYSITELIB}/PyNUT.py
-${PYSITELIB}/setup.py
 ${PYSITELIB}/test_nutclient.py
 libexec/nut/al175
 libexec/nut/apcsmart
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index 0886878364..9c99d46d76 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.41 2023/11/09 16:41:15 gdt Exp $
 
-BLAKE2s (nut-2.8.1.0.20231109.0.tar.gz) = 2d3e58fc5e73f9df28c4d87314dcc6a691ef593ba4af1eab3ff4650665388a79
-SHA512 (nut-2.8.1.0.20231109.0.tar.gz) = 15ebd1786ce0d120831309823f178d2a0f90af9c1b15bd133da5b375741a9bdc096924f8d0c3a1e959d184aad968b01b8885888808ffc1cf827030a36dd02dd4
-Size (nut-2.8.1.0.20231109.0.tar.gz) = 4113476 bytes
+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
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = c6a232fd9b0ec73825e16f35b142f7195b35a3fe
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
diff --git a/ups-nut/patches/patch-aa b/ups-nut/patches/patch-aa
deleted file mode 100644
index 2c3aea3016..0000000000
--- a/ups-nut/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2022/04/26 23:28:25 gdt Exp $
-
-Default conf files go to example dir.
-
---- conf/Makefile.in.orig	2023-01-17 13:58:54.000000000 +0000
-+++ conf/Makefile.in
-@@ -211,7 +211,7 @@ CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CONFIG_FLAGS = @CONFIG_FLAGS@
--CONFPATH = @CONFPATH@
-+CONFPATH = $(DESTDIR)@prefix@/share/examples/nut
- CPP = @CPP@
- CPPCHECK = @CPPCHECK@
- CPPFLAGS = @CPPFLAGS@
diff --git a/ups-nut/patches/patch-drivers_usbhid-ups.c b/ups-nut/patches/patch-drivers_usbhid-ups.c
deleted file mode 100644
index 2597e30f1e..0000000000
--- a/ups-nut/patches/patch-drivers_usbhid-ups.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-drivers_usbhid-ups.c,v 1.2 2022/11/26 14:45:47 gdt Exp $
-
-Avoid re-closing a udev that already was closed.  Avoids a double-close
-that triggers a SEGV in a list-delete operation.
-
-This may actually be the real bug for this code in libusb1.c:
-
-static int nut_libusb_open(libusb_device_handle **udevp,
-[ ... ]
-#ifndef __linux__ /* SUN_LIBUSB (confirmed to work on Solaris and FreeBSD) */
-	/* Causes a double free corruption in linux if device is detached! */
-
-as the same double-free list issue occurs here.
-
-
-Fixed upstream slightly differently, but essentially the same, in:
-https://github.com/networkupstools/nut/commit/89dbdd1e60
-
---- drivers/usbhid-ups.c.orig	2022-11-26 14:02:03.000000000 +0000
-+++ drivers/usbhid-ups.c
-@@ -1160,6 +1160,7 @@ void upsdrv_cleanup(void)
- 	upsdebugx(1, "upsdrv_cleanup...");
- 
- 	comm_driver->close_dev(udev);
-+	udev = HID_DEV_HANDLE_CLOSED;
- 	Free_ReportDesc(pDesc);
- 	free_report_buffer(reportbuf);
- #ifndef SHUT_MODE