ups-nut: Advance to today's git master, just past 2.8.1

[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 15:32:51 2023 -0500
Changeset:	562a41c7dcfeed30bfe63c6906644b9632a9f10c

Modified Files:
	ups-nut/DESCR
	ups-nut/Makefile
	ups-nut/Makefile.common
	ups-nut/PLIST
	ups-nut/distinfo
	ups-nut/files/upskillpower.sh
	ups-nut/patches/patch-clients_upsclient.c
Added Files:
	ups-nut/COMMIT_MESSAGE
	ups-nut/patches/patch-conf_Makefile.in
	ups-nut/patches/patch-server_sockdebug.c

Log Message:
ups-nut: Advance to today's git master, just past 2.8.1

Relative to 2.8.1, this is mostly minor fixes and CI setup.  It
includes a fix previously carried as a patch.

The distfile is modified from git by:
  - changing the version number
  - a very minor fix to a recent regression in variable
    naming

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

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/DESCR                             |  3 ++
 ups-nut/Makefile                          | 20 +++----
 ups-nut/Makefile.common                   |  4 +-
 ups-nut/PLIST                             | 89 +++++++++++++++++--------------
 ups-nut/distinfo                          | 14 ++---
 ups-nut/files/upskillpower.sh             |  2 +-
 ups-nut/patches/patch-clients_upsclient.c |  4 +-
 ups-nut/patches/patch-conf_Makefile.in    | 16 ++++++
 ups-nut/patches/patch-server_sockdebug.c  | 21 ++++++++
 10 files changed, 112 insertions(+), 63 deletions(-)

diffs:
diff --git a/ups-nut/COMMIT_MESSAGE b/ups-nut/COMMIT_MESSAGE
new file mode 100644
index 0000000000..cadf11b3d9
--- /dev/null
+++ b/ups-nut/COMMIT_MESSAGE
@@ -0,0 +1,2 @@
+sysutils/ups-nut: Update to 2.8.2(CHECK)
+
diff --git a/ups-nut/DESCR b/ups-nut/DESCR
index 939b32130e..facab20bb4 100644
--- a/ups-nut/DESCR
+++ b/ups-nut/DESCR
@@ -3,6 +3,9 @@ Network communications are used so that multiple systems can monitor a
 single physical UPS and shut down together if necessary without any
 special "sharing hardware" on the UPS itself.
 
+There are additional ups-nut-* packages for cgi, SNMP, and USB
+support.
+
 This package tracks the NUT git repository, and sometimes includes
 proposed changes or experimental changes.  It is not suitable for
 production systems.
diff --git a/ups-nut/Makefile b/ups-nut/Makefile
index be4dcefc30..1ca6e8d133 100644
--- a/ups-nut/Makefile
+++ b/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2023/01/08 01:32:54 gdt Exp $
+# $NetBSD: Makefile,v 1.72 2023/11/09 16:41:15 gdt Exp $
 
 .include "Makefile.common"
 
@@ -16,24 +16,23 @@ SUBST_NOOP_OK.man-so=	yes
 TOOLS_SCRIPT.perl=	exit 1
 
 CONFIGURE_ARGS+=	--with-drvpath=${NUT_DRVDIR:Q}
-# should be /var/run
 CONFIGURE_ARGS+=	--with-pidpath=${NUT_STATEDIR:Q}
-# should be /var/run/nut
 CONFIGURE_ARGS+=	--with-altpidpath=${NUT_STATEDIR:Q}
-# STATEDIR should be created at boot: /var/run/nut?
 
-CONFIGURE_ARGS+=	--without-asciidoc
+# nut, bizarrely, does not install headers by default
 CONFIGURE_ARGS+=	--with-dev
+CONFIGURE_ARGS+=	--without-asciidoc
+
 CONFIGURE_ARGS+=	--without-snmp		# provided by sysutils/ups-nut-snmp
 CONFIGURE_ARGS+=	--without-usb		# provided by sysutils/ups-nut-usb
-CONFIGURE_ARGS+=	--without-nut_monitor	# not packaged
+CONFIGURE_ARGS+=	--without-nut_monitor	# not yet packaged
 
-# \todo Move to split package.
-# Disable python2 to Workaround
+# Disable python2 to workaround
 # https://github.com/networkupstools/nut/issues/1792 which upstream
 # declines to fix.
 CONFIGURE_ARGS+=	--without-python2
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
+# \todo Move to split package.
 
 PKG_GROUPS_VARS+=	NUT_GROUP
 PKG_USERS_VARS+=	NUT_USER
@@ -77,11 +76,12 @@ post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${NUT_EGDIR}
 	${MV} ${DESTDIR}${NUT_CONFDIR}/*.sample ${DESTDIR}${NUT_EGDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${NUT_DOCDIR}
-	for f in COPYING CREDITS ChangeLog NEWS README INSTALL UPGRADING; do \
+	${INSTALL_DATA_DIR} ${DESTDIR}${NUT_DOCDIR}/detailed
+	for f in AUTHORS COPYING ChangeLog NEWS.adoc README.adoc UPGRADING.adoc; do \
 		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${NUT_DOCDIR}; \
 	done
 	for f in ${WRKSRC}/docs/*.txt; do \
-		${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}; \
+		${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/detailed; \
 	done
 	for f in ${WRKSRC}/docs/cables/*.txt; do \
 		${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/cables/; \
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index 3bd0f45351..c881cbe95f 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.0.1.20230126.0
+DISTNAME=		nut-2.8.1.0.20231109.0
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
 MASTER_SITES=		https://www.netbsd.org/~gdt/
@@ -46,6 +46,6 @@ NUT_DATADIR=		${PREFIX}/share/nut
 NUT_DOCDIR=		${PREFIX}/share/doc/nut
 NUT_DRVDIR=		${PREFIX}/libexec/nut
 NUT_EGDIR=		${PREFIX}/share/examples/nut
-# Should be run
+# \todo Change to /var/run rather than /var/db
 NUT_STATEDIR?=		${VARBASE}/db/nut
 NUT_CGIDIR=		${PREFIX}/libexec/cgi-bin
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index cbeecd8a37..5ca5c25905 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2022/08/11 16:00:17 gdt Exp $
+@comment $NetBSD: PLIST,v 1.32 2023/11/09 18:58:44 gdt Exp $
 bin/nut-scanner
 bin/upsc
 bin/upscmd
@@ -23,6 +23,7 @@ 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
@@ -63,11 +64,13 @@ libexec/nut/rhino
 libexec/nut/riello_ser
 libexec/nut/safenet
 libexec/nut/skel
+libexec/nut/sms_ser
 libexec/nut/solis
 libexec/nut/tripplite
 libexec/nut/tripplitesu
 libexec/nut/upscode2
 libexec/nut/victronups
+libexec/sockdebug
 man/man3/libnutclient.3
 man/man3/libnutclient_commands.3
 man/man3/libnutclient_devices.3
@@ -106,9 +109,9 @@ man/man3/nutscan.3
 man/man3/nutscan_add_device_to_device.3
 man/man3/nutscan_add_option_to_device.3
 man/man3/nutscan_cidr_to_ip.3
+man/man3/nutscan_display_parsable.3
 man/man3/nutscan_display_sanity_check.3
 man/man3/nutscan_display_sanity_check_serial.3
-man/man3/nutscan_display_parsable.3
 man/man3/nutscan_display_ups_conf.3
 man/man3/nutscan_display_ups_conf_with_sanity_check.3
 man/man3/nutscan_free_device.3
@@ -188,6 +191,8 @@ man/man8/powerpanel.8
 man/man8/rhino.8
 man/man8/riello_ser.8
 man/man8/safenet.8
+man/man8/sms_ser.8
+man/man8/sockdebug.8
 man/man8/solis.8
 man/man8/tripplite.8
 man/man8/tripplitesu.8
@@ -206,16 +211,12 @@ sbin/upsd
 sbin/upsdrvctl
 sbin/upsmon
 sbin/upssched
+share/doc/nut/AUTHORS
 share/doc/nut/COPYING
 share/doc/nut/ChangeLog
-share/doc/nut/FAQ.txt
-share/doc/nut/INSTALL
-share/doc/nut/NEWS
-share/doc/nut/README
-share/doc/nut/UPGRADING
-share/doc/nut/acknowledgements.txt
-share/doc/nut/asciidoc.txt
-share/doc/nut/cables.txt
+share/doc/nut/NEWS.adoc
+share/doc/nut/README.adoc
+share/doc/nut/UPGRADING.adoc
 share/doc/nut/cables/apc-rs500-serial.txt
 share/doc/nut/cables/apc.txt
 share/doc/nut/cables/ge-imv-victron.txt
@@ -224,37 +225,43 @@ share/doc/nut/cables/mgeups.txt
 share/doc/nut/cables/powerware.txt
 share/doc/nut/cables/repotec.txt
 share/doc/nut/cables/sms.txt
-share/doc/nut/ci-farm-lxc-setup.txt
-share/doc/nut/config-notes.txt
-share/doc/nut/config-prereqs.txt
-share/doc/nut/configure.txt
-share/doc/nut/contact-closure.txt
-share/doc/nut/daisychain.txt
-share/doc/nut/design.txt
-share/doc/nut/developer-guide.txt
-share/doc/nut/developers.txt
-share/doc/nut/documentation.txt
-share/doc/nut/download.txt
-share/doc/nut/features.txt
-share/doc/nut/hid-subdrivers.txt
-share/doc/nut/history.txt
-share/doc/nut/macros.txt
-share/doc/nut/net-protocol.txt
-share/doc/nut/new-clients.txt
-share/doc/nut/new-drivers.txt
-share/doc/nut/nut-names.txt
-share/doc/nut/nut-qa.txt
-share/doc/nut/nutdrv_qx-subdrivers.txt
-share/doc/nut/outlets.txt
-share/doc/nut/packager-guide.txt
-share/doc/nut/scheduling.txt
-share/doc/nut/security.txt
-share/doc/nut/snmp-subdrivers.txt
-share/doc/nut/snmp.txt
-share/doc/nut/sock-protocol.txt
-share/doc/nut/solaris-usb.txt
-share/doc/nut/support.txt
-share/doc/nut/user-manual.txt
+share/doc/nut/detailed/ChangeLog.txt
+share/doc/nut/detailed/FAQ.txt
+share/doc/nut/detailed/acknowledgements.txt
+share/doc/nut/detailed/asciidoc.txt
+share/doc/nut/detailed/cables.txt
+share/doc/nut/detailed/ci-farm-lxc-setup.txt
+share/doc/nut/detailed/config-notes.txt
+share/doc/nut/detailed/config-prereqs.txt
+share/doc/nut/detailed/configure.txt
+share/doc/nut/detailed/contact-closure.txt
+share/doc/nut/detailed/daisychain.txt
+share/doc/nut/detailed/design.txt
+share/doc/nut/detailed/developer-guide.txt
+share/doc/nut/detailed/developers.txt
+share/doc/nut/detailed/documentation.txt
+share/doc/nut/detailed/download.txt
+share/doc/nut/detailed/features.txt
+share/doc/nut/detailed/hid-subdrivers.txt
+share/doc/nut/detailed/history.txt
+share/doc/nut/detailed/macros.txt
+share/doc/nut/detailed/net-protocol.txt
+share/doc/nut/detailed/new-clients.txt
+share/doc/nut/detailed/new-drivers.txt
+share/doc/nut/detailed/nut-names.txt
+share/doc/nut/detailed/nut-qa.txt
+share/doc/nut/detailed/nutdrv_qx-subdrivers.txt
+share/doc/nut/detailed/outlets.txt
+share/doc/nut/detailed/packager-guide.txt
+share/doc/nut/detailed/release-notes.txt
+share/doc/nut/detailed/scheduling.txt
+share/doc/nut/detailed/security.txt
+share/doc/nut/detailed/snmp-subdrivers.txt
+share/doc/nut/detailed/snmp.txt
+share/doc/nut/detailed/sock-protocol.txt
+share/doc/nut/detailed/solaris-usb.txt
+share/doc/nut/detailed/support.txt
+share/doc/nut/detailed/user-manual.txt
 share/examples/nut/nut.conf.sample
 share/examples/nut/ups.conf.sample
 share/examples/nut/upsd.conf.sample
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index 45cd6cef2e..0886878364 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.40 2022/11/26 14:45:47 gdt Exp $
+$NetBSD: distinfo,v 1.41 2023/11/09 16:41:15 gdt Exp $
 
-BLAKE2s (nut-2.8.0.1.20230126.0.tar.gz) = 3ab6c9dddbdcc67f3aa6e6d5de4a893637407555e7bcd8ca8f7a0f542fc27d15
-SHA512 (nut-2.8.0.1.20230126.0.tar.gz) = c52abb069a2afdfa9772fb26c18629d2f99b0d02244d91dfe770e953315c024f0356581728f9769734ac47534436f76537b2496913d516f605e3983c4245093b
-Size (nut-2.8.0.1.20230126.0.tar.gz) = 3728277 bytes
-SHA1 (patch-aa) = b40db0b8488f5f275c29c368001cc7003a2303b7
-SHA1 (patch-clients_upsclient.c) = 50633e97a747b61dfed155b96414992040e6386f
+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
+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_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
-SHA1 (patch-drivers_usbhid-ups.c) = 9be263163c338f17413df99e20b41185564568d5
+SHA1 (patch-server_sockdebug.c) = 788efc0a519a6a0256b80156fff415d91a359098
diff --git a/ups-nut/files/upskillpower.sh b/ups-nut/files/upskillpower.sh
index eb226c5a98..b5d972b19a 100644
--- a/ups-nut/files/upskillpower.sh
+++ b/ups-nut/files/upskillpower.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: upskillpower.sh,v 1.1 2023/01/08 01:14:23 gdt Exp $
+# $NetBSD: upskillpower.sh,v 1.2 2023/06/22 05:31:07 wiz Exp $
 #
 # PROVIDE: upskillpower
 # REQUIRE: mountcritremote
diff --git a/ups-nut/patches/patch-clients_upsclient.c b/ups-nut/patches/patch-clients_upsclient.c
index d98a783b23..5b07f41f02 100644
--- a/ups-nut/patches/patch-clients_upsclient.c
+++ b/ups-nut/patches/patch-clients_upsclient.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-clients_upsclient.c,v 1.2 2018/09/21 00:59:53 jym Exp $
+$NetBSD: patch-clients_upsclient.c,v 1.3 2023/11/09 16:41:15 gdt Exp $
 
 Add missing header for timeval(3) functions.
 
---- clients/upsclient.c.orig	2022-11-26 14:02:03.000000000 +0000
+--- clients/upsclient.c.orig	2023-10-16 08:06:18.000000000 +0000
 +++ clients/upsclient.c
 @@ -38,6 +38,7 @@
  #ifndef WIN32
diff --git a/ups-nut/patches/patch-conf_Makefile.in b/ups-nut/patches/patch-conf_Makefile.in
new file mode 100644
index 0000000000..bd520ea277
--- /dev/null
+++ b/ups-nut/patches/patch-conf_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-conf_Makefile.in,v 1.1 2023/11/09 16:41:15 gdt Exp $
+
+Place example configs in example directory, not etcdir.
+This is a pkgsrc norms adjustment and thus not reportable upstream.
+
+--- conf/Makefile.in.orig	2023-10-31 22:03:30.000000000 +0000
++++ conf/Makefile.in
+@@ -218,7 +218,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-server_sockdebug.c b/ups-nut/patches/patch-server_sockdebug.c
new file mode 100644
index 0000000000..d97873157c
--- /dev/null
+++ b/ups-nut/patches/patch-server_sockdebug.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-server_sockdebug.c,v 1.1 2023/11/09 18:01:06 gdt Exp $
+
+Work around upstream bug of including libwrap  on a test program not written for tcp wrappers.
+
+Reported upstream by email 20231109.
+
+--- server/sockdebug.c.orig	2023-09-17 14:34:05.000000000 +0000
++++ server/sockdebug.c
+@@ -32,6 +32,12 @@
+ #include "parseconf.h"
+ #include "nut_stdint.h"
+ 
++#ifdef HAVE_WRAP
++#include <tcpd.h>
++int	allow_severity = LOG_INFO;
++int	deny_severity = LOG_WARNING;
++#endif	/* HAVE_WRAP */
++
+ static PCONF_CTX_t	sock_ctx;
+ 
+ static void sock_arg(size_t numarg, char **arg)