CVS commit: pkgsrc/sysutils/ups-nut

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Aug 10 21:52:00 UTC 2025

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common PLIST buildlink3.mk
            distinfo

Log Message:
sysutils/ups-nut: Update to 2.8.4

Release notes for NUT 2.8.4 - what's new since 2.8.3
-------------------------------------------------------------

https://github.com/networkupstools/nut/milestone/9

 - New NUT drivers:
   * Introduced a `ve-direct` driver for Victron Energy UPS/solar panels
     monitoring. Most specific reported values are in an `experimental.*`
     namespace, as a community we need to come up with standard naming for
     those via `docs/nut-names.txt`. [#440]
   * Introduced a `nutdrv_hashx` driver for numerous devices from Ablerex,
     Atlantis Land, Epyc, Infosec, ION, PowerWalker, Right Power Technology,
     Salicru, UPS Solutions and other vendors (originally shipped with a
     "PowerMaster+", "PowerMaster" or "PowerGuide" software companion suite).
     This seems to be a protocol developed by Cyber Energy for serial-port
     devices, subsequently used by different vendors in their own products
     or re-branded Cyber Energy creations. [#2940]
   * Introduced a `failover` driver for monitoring multiple UPS driver sockets
     and seamless switching out of UPS data in a failover situation, includes
     support for end-to-end tracked instant commands and also variable updating.
     [#2962]
   * Introduced USB (`powervar_cx_usb`) and Serial (`powervar_cx_ser`) drivers
     for Powervar CUSPP protocol, tested with GTS (USB) and UPM (USB, Serial)
     models. [#2988]

 - NUT Monitor GUI:
   * Ported Python 3 version to Qt6, now shipped alongside Qt5 for systems
     with either or both, maximizing compatibility with old and new setups.
     [#2946]


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.35 -r1.36 pkgsrc/sysutils/ups-nut/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/ups-nut/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/ups-nut/distinfo

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.81 pkgsrc/sysutils/ups-nut/Makefile:1.82
--- pkgsrc/sysutils/ups-nut/Makefile:1.81       Sat May 31 13:58:38 2025
+++ pkgsrc/sysutils/ups-nut/Makefile    Sun Aug 10 21:51:59 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2025/05/31 13:58:38 gdt Exp $
+# $NetBSD: Makefile,v 1.82 2025/08/10 21:51:59 gdt Exp $
 
 .include "Makefile.common"
 
@@ -94,6 +94,8 @@ post-install:
                ${INSTALL_DATA} $$f ${DESTDIR}${NUT_DOCDIR}/detailed; \
        done
 
+TEST_TARGET=   check
+
 # nut-scanner needs libltdl, but this is not documented
 .include "../../devel/libltdl/buildlink3.mk"
 .if !empty(PKG_OPTIONS:Mpython)

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.20 pkgsrc/sysutils/ups-nut/Makefile.common:1.21
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.20        Fri Aug  1 14:14:44 2025
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Sun Aug 10 21:51:59 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.20 2025/08/01 14:14:44 gdt Exp $
+# $NetBSD: Makefile.common,v 1.21 2025/08/10 21:51:59 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.3
+DISTNAME=              nut-2.8.4
 CATEGORIES=            sysutils
 MASTER_SITES=          https://networkupstools.org/source/${PKGVERSION_NOREV:R}/
 
@@ -32,6 +32,8 @@ CONFIGURE_ARGS+=      --with-htmlpath=${PREFI
 CONFIGURE_ARGS+=       --with-user=${NUT_USER}
 CONFIGURE_ARGS+=       --with-group=${NUT_GROUP}
 
+CONFIGURE_ARGS+=       --disable-docs-changelog
+
 CHECK_PORTABILITY_SKIP=        packaging/*
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/sysutils/ups-nut/PLIST
diff -u pkgsrc/sysutils/ups-nut/PLIST:1.35 pkgsrc/sysutils/ups-nut/PLIST:1.36
--- pkgsrc/sysutils/ups-nut/PLIST:1.35  Sat May 17 23:56:37 2025
+++ pkgsrc/sysutils/ups-nut/PLIST       Sun Aug 10 21:51:59 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2025/05/17 23:56:37 gdt Exp $
+@comment $NetBSD: PLIST,v 1.36 2025/08/10 21:51:59 gdt Exp $
 bin/nut-scanner
 bin/nutconf
 bin/upsc
@@ -43,6 +43,7 @@ libexec/nut/clone-outlet
 libexec/nut/dummy-ups
 libexec/nut/etapro
 libexec/nut/everups
+libexec/nut/failover
 libexec/nut/gamatronic
 libexec/nut/genericups
 libexec/nut/isbmex
@@ -56,12 +57,14 @@ libexec/nut/mge-shut
 libexec/nut/mge-utalk
 libexec/nut/microdowell
 libexec/nut/microsol-apc
+libexec/nut/nutdrv_hashx
 libexec/nut/nutdrv_qx
 libexec/nut/nutdrv_siemens-sitop
 libexec/nut/oneac
 libexec/nut/optiups
 libexec/nut/powercom
 libexec/nut/powerpanel
+libexec/nut/powervar_cx_ser
 libexec/nut/rhino
 libexec/nut/riello_ser
 libexec/nut/safenet
@@ -71,6 +74,7 @@ libexec/nut/solis
 libexec/nut/tripplite
 libexec/nut/tripplitesu
 libexec/nut/upscode2
+libexec/nut/ve-direct
 libexec/nut/victronups
 libexec/sockdebug
 man/man3/libnutclient.3
@@ -166,6 +170,7 @@ man/man5/upsd.conf.5
 man/man5/upsd.users.5
 man/man5/upsmon.conf.5
 man/man5/upssched.conf.5
+man/man7/nut.7
 man/man8/al175.8
 man/man8/apcsmart-old.8
 man/man8/apcsmart.8
@@ -184,6 +189,7 @@ man/man8/clone.8
 man/man8/dummy-ups.8
 man/man8/etapro.8
 man/man8/everups.8
+man/man8/failover.8
 man/man8/gamatronic.8
 man/man8/genericups.8
 man/man8/isbmex.8
@@ -197,10 +203,10 @@ man/man8/mge-shut.8
 man/man8/mge-utalk.8
 man/man8/microdowell.8
 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_hashx.8
 man/man8/nutdrv_qx.8
 man/man8/nutdrv_siemens_sitop.8
 man/man8/nutupsdrv.8
@@ -208,6 +214,7 @@ man/man8/oneac.8
 man/man8/optiups.8
 man/man8/powercom.8
 man/man8/powerpanel.8
+man/man8/powervar_cx_ser.8
 man/man8/rhino.8
 man/man8/riello_ser.8
 man/man8/safenet.8
@@ -221,11 +228,11 @@ man/man8/upscmd.8
 man/man8/upscode2.8
 man/man8/upsd.8
 man/man8/upsdrvctl.8
-man/man8/upsdrvsvcctl.8
 man/man8/upslog.8
 man/man8/upsmon.8
 man/man8/upsrw.8
 man/man8/upssched.8
+man/man8/ve-direct.8
 man/man8/victronups.8
 sbin/upsd
 sbin/upsdrvctl

Index: pkgsrc/sysutils/ups-nut/buildlink3.mk
diff -u pkgsrc/sysutils/ups-nut/buildlink3.mk:1.6 pkgsrc/sysutils/ups-nut/buildlink3.mk:1.7
--- pkgsrc/sysutils/ups-nut/buildlink3.mk:1.6   Tue Jun 28 11:36:06 2022
+++ pkgsrc/sysutils/ups-nut/buildlink3.mk       Sun Aug 10 21:51:59 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2022/06/28 11:36:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2025/08/10 21:51:59 gdt Exp $
 
 BUILDLINK_TREE+=       ups-nut
 
@@ -14,8 +14,8 @@ pkgbase:= ups-nut
 
 .if ${PKG_BUILD_OPTIONS.ups-nut:Mnss}
 .  include "../../devel/nss/buildlink3.mk"
-#.elif ${PKG_BUILD_OPTIONS.ups-nut:Mopenssl}
-#.  include "../../security/openssl/buildlink3.mk"
+.elif ${PKG_BUILD_OPTIONS.ups-nut:Mopenssl}
+.  include "../../security/openssl/buildlink3.mk"
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.43 pkgsrc/sysutils/ups-nut/distinfo:1.44
--- pkgsrc/sysutils/ups-nut/distinfo:1.43       Sat May 17 23:56:37 2025
+++ pkgsrc/sysutils/ups-nut/distinfo    Sun Aug 10 21:51:59 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.43 2025/05/17 23:56:37 gdt Exp $
+$NetBSD: distinfo,v 1.44 2025/08/10 21:51:59 gdt Exp $
 
-BLAKE2s (nut-2.8.3.tar.gz) = 55bcfa51223db52023290041da578cdc32d3c2398a2172edb7079e443148a542
-SHA512 (nut-2.8.3.tar.gz) = 0aeafad02ab323b02041a370c586dede91483cab57e0a9d1256a685716ca9f0d0f114df904ef472d48fa53ac1896690b7878828eb3b00934959c7aeaa63af99f
-Size (nut-2.8.3.tar.gz) = 6240908 bytes
+BLAKE2s (nut-2.8.4.tar.gz) = ece7b19f55771472f113a712d047ff324199d28ea0f2f5cfa13a781ff8947e78
+SHA512 (nut-2.8.4.tar.gz) = 0d87c0006608f92ae54f8a500f93d9a81eac1d9abf57f32e7718dd72f265b8293a0b6cdba04c802b81eaf8907b52669c36b47b6875a4377f9752845ac6c5e8fa
+Size (nut-2.8.4.tar.gz) = 6522262 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b