CVS commit: pkgsrc/sysutils

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Apr  3 17:42:54 UTC 2024

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common PLIST distinfo
        pkgsrc/sysutils/ups-nut-cgi: Makefile
Removed Files:
        pkgsrc/sysutils/ups-nut/patches: patch-drivers_dstate.c

Log Message:
systuils/ups-nut*: Update to 2.8.2

(Not actually tested with hardware, but upstream has been stable.)

packaging changes:

  add new programs as documented in upstream NEWS

  drop patch cherry-picked from upstream

  ups-nut-cgi: drop force-removal of libs that should not have been
  installed, because they are no longer installed

Upstream NEWS summary, less bugfixes and minor improvements:

Release notes for NUT 2.8.2 - what's new since 2.8.1
----------------------------------------------------

 - Fix fallout of development in NUT v2.8.0 and/or v2.8.1:
   [lots of bugs, some serious]

 - usbhid-ups driver:
   * The `onlinedischarge` configuration flag name was too ambiguous and got
     deprecated (will be supported but no longer promoted by documentation),
     introducing `onlinedischarge_onbattery` as the meaningful alias. [#2213]

 - Laid foundations for the SmartNUT effort (aiming to integrate drivers with
   some other backends than the networked NUT data server process).

 - Eaton contributed recipes and scripts used to create the IPP for Unix
   bundle (aka Eaton IPSS Unix or UPP), a freely available value-added
   packaging of NUT distributed as the UPS software companion for OSes
   where their more complex UPS monitoring/management tools had not been
   ported. This allows for delivery of NUT packages with an interactive
   installer and some system integration scripts (events, notifications,
   status, shutdown daemon...), and was contributed to the NUT upstream
   project by Eaton -- provided "as is" at the moment, and may later serve
   as foundation or inspiration for new NUT features. [#2288]

 - nutconf (C++ library and tool to read and manage NUT configuration files)
   was started in the open by Eaton employees and used in the IPP installer,
   but the code lingered in a side branch. It was now brushed up to our common
   best practices and added to the main codebase. As of this import, there are
   known deficiencies in Windows platform support, as well as some un-awareness
   about configuration key words which appeared in NUT since 2013. [#2290]


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/ups-nut/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/ups-nut/distinfo
cvs rdiff -u -r1.76 -r1.77 pkgsrc/sysutils/ups-nut-cgi/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/ups-nut/patches/patch-drivers_dstate.c

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

Modified files:

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.75 pkgsrc/sysutils/ups-nut/Makefile:1.76
--- pkgsrc/sysutils/ups-nut/Makefile:1.75       Wed Nov 22 18:14:42 2023
+++ pkgsrc/sysutils/ups-nut/Makefile    Wed Apr  3 17:42:53 2024
@@ -1,9 +1,8 @@
-# $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"
 
 PKGNAME=               ups-${DISTNAME}
-PKGREVISION=           2
 COMMENT=               Network UPS Tools
 
 SUBST_CLASSES+=                man-so

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.15 pkgsrc/sysutils/ups-nut/Makefile.common:1.16
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.15        Sat Dec 23 09:25:37 2023
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Wed Apr  3 17:42:53 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.15 2023/12/23 09:25:37 zafer Exp $
+# $NetBSD: Makefile.common,v 1.16 2024/04/03 17:42:53 gdt Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
 # used by sysutils/ups-nut-usb/Makefile
 # used by sysutils/p5-UPS-Nut/Makefile
 
-DISTNAME=              nut-2.8.1
+DISTNAME=              nut-2.8.2
 CATEGORIES=            sysutils
 MASTER_SITES=          https://networkupstools.org/source/${PKGVERSION_NOREV:R}/
 

Index: pkgsrc/sysutils/ups-nut/PLIST
diff -u pkgsrc/sysutils/ups-nut/PLIST:1.32 pkgsrc/sysutils/ups-nut/PLIST:1.33
--- pkgsrc/sysutils/ups-nut/PLIST:1.32  Thu Nov  9 18:58:44 2023
+++ pkgsrc/sysutils/ups-nut/PLIST       Wed Apr  3 17:42:53 2024
@@ -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
@@ -105,6 +106,7 @@ 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_option_to_device.3
 man/man3/nutscan_cidr_to_ip.3
@@ -121,6 +123,7 @@ 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
@@ -180,6 +183,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

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.41 pkgsrc/sysutils/ups-nut/distinfo:1.42
--- pkgsrc/sysutils/ups-nut/distinfo:1.41       Thu Nov  9 16:41:15 2023
+++ pkgsrc/sysutils/ups-nut/distinfo    Wed Apr  3 17:42:53 2024
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.41 2023/11/09 16:41:15 gdt Exp $
+$NetBSD: distinfo,v 1.42 2024/04/03 17:42:53 gdt Exp $
 
-BLAKE2s (nut-2.8.1.tar.gz) = a95145a968d75569ebf4cf1bbeb79d2a99d18ccb9a0f77349b67fa80f17bdedc
-SHA512 (nut-2.8.1.tar.gz) = 32bff67749ef28cf57860bb5859d06b0a76daeada7f22eba59962f1695edb1f0f444d912fc4ae8c14ac3af5ab08b9cdb64d0ed65884fd38adc4bc8e470ce2a4c
-Size (nut-2.8.1.tar.gz) = 4125263 bytes
+BLAKE2s (nut-2.8.2.tar.gz) = e61241dfd7c0400daad742a5b081f995c828fdfbe59d4d108bf4e0011f25142d
+SHA512 (nut-2.8.2.tar.gz) = b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c
+Size (nut-2.8.2.tar.gz) = 5599935 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = c6a232fd9b0ec73825e16f35b142f7195b35a3fe
-SHA1 (patch-drivers_dstate.c) = 9da93879a3db4f44a5cd35b275546dfcb2c89ce9
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
 SHA1 (patch-drivers_libusb0.c) = 71719f12cd8a8efd93d07b6b2d50d8334df7daab
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438

Index: pkgsrc/sysutils/ups-nut-cgi/Makefile
diff -u pkgsrc/sysutils/ups-nut-cgi/Makefile:1.76 pkgsrc/sysutils/ups-nut-cgi/Makefile:1.77
--- pkgsrc/sysutils/ups-nut-cgi/Makefile:1.76   Sun Nov 12 13:23:38 2023
+++ pkgsrc/sysutils/ups-nut-cgi/Makefile        Wed Apr  3 17:42:54 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.76 2023/11/12 13:23:38 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2024/04/03 17:42:54 gdt Exp $
 
-PKGREVISION= 1
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}
@@ -31,10 +30,6 @@ CONF_FILES+=         ${NUT_EGDIR}/upsstats.html
 do-install:
        (cd ${WRKSRC}/clients && env ${MAKE_ENV} \
            ${MAKE_PROGRAM} ${INSTALL_MAKE_FLAGS} install-cgiexecPROGRAMS)
-       # cgiexec is overzealous and installs libraries (which are in ups-nut)
-       ${RM} -f ${DESTDIR}${PREFIX}/lib/libnut*
-       ${RM} -f ${DESTDIR}${PREFIX}/lib/libups*
-       ${RMDIR} ${DESTDIR}${PREFIX}/lib
        for f in hosts.conf.sample upsset.conf.sample \
            upsstats.html.sample upsstats-single.html.sample; do \
                ${INSTALL_DATA} ${WRKSRC}/conf/$$f ${DESTDIR}${NUT_EGDIR}; \