CVS commit: pkgsrc/sysutils

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils
From: "Greg Troxel" <gdt%netbsd.org@localhost>
Date: Thu, 9 Nov 2023 16:41:16 +0000

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Nov  9 16:41:16 UTC 2023

Modified Files:
        pkgsrc/sysutils/p5-UPS-Nut: Makefile
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common PLIST distinfo
        pkgsrc/sysutils/ups-nut-cgi: Makefile
        pkgsrc/sysutils/ups-nut-snmp: Makefile
        pkgsrc/sysutils/ups-nut-usb: Makefile
        pkgsrc/sysutils/ups-nut/patches: patch-clients_upsclient.c
Added Files:
        pkgsrc/sysutils/ups-nut/patches: patch-conf_Makefile.in
            patch-drivers_dstate.c
Removed Files:
        pkgsrc/sysutils/ups-nut/patches: patch-aa patch-drivers_usbhid-ups.c

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

Upstream NEWS, less bugfixes, minor improvements, and developer-facing
changes:

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

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

 - "UPS management protocol", Informational RFC 9271 published
   by IETF at https://www.rfc-editor.org/info/rfc9271 and the
   IANA port number registry was updated accordingly at
   https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=3493
   (even though this RFC is not formally an Internet Standard)

 - NUT documentation files were rearranged, renaming some to `*.adoc` pattern
   to facilitate automatic rendering in GitHub and IDE GUIs, and adding recipe
   support for GitHub issue/PR links. This `NEWS` file is now proper asciidoc
   rendered into `release-notes.pdf` (and HTML versions). [issue #1953, PR #2048]
   Internally, the documents would use a new way to define cross-linking to
   other pages and their chapters, to facilitate different renderers (including
   GitHub UI), and file names created for "chunked HTML" documentation format
   will no longer have the "chapter number, section number" format which is
   not easy to maintain over time with independent builds of documentation
   in NUT and the actual and historic snapshots for nut-website for example.
   Chapter/Section names will be adapted to produce "chunked HTML" file names
   instead. Documentation links rendered in GitHub UI should point to the HTML
   pages served by a current iteration of the NUT website. [PR #226, PR #669]

 - State tree structure and methods (including "dstate" wrapper for common
   driver internals) was enhanced with time-stamping of last modification
   (setting, changing, deleting the value or some fields in an entry):
   this allows to detect stale information in a centralized fashion [#2010]

 - nutdrv_qx updates:
   * a `battery_voltage_reports_one_pack` driver option was added for devices
     which "natively" report a `battery.voltage` for a single battery pack or
     cell, not for the whole assembly [#1279]

 - usbhid-ups updates:
   * added support for `subdriver` configuration option, to select the
     USB HID subdriver for the device manually where automatic match
     does not suffice (e.g. new devices for which no `vendorid`/`productid`
     pair was built into any driver, or for different-capability devices
     with same interface chips, notably "phoenixtec/liebert" and "mge") [#1369]
   * added `onlinedischarge_calibration` option for UPSes that report
     `OL+DISCHRG` when they are in calibration mode [#2104]

 - apc_modbus driver was introduced, to cover the feature gap between existing
   NUT drivers for APC hardware and the actual USB-connected devices (or their
   firmwares) released since roughly 2010, which deprecated standard USB HID
   support in favor of Modbus-based protocol which is used across the board
   (also with their network management cards). The new driver can monitor APC
   UPS devices over TCP and Serial connections, as well as USB with a patched
   libmodbus (check https://github.com/EchterAgo/libmodbus/commits/rtu_usb
   for now, PR pending). [#139, #2063]
   * For a decade until this driver got introduced, people were advised to
     use apcupsd project as the actual program which talks to a device, and
     NUT apcupsd-ups driver to relay information back and forth. This was a
     limited solution due to lack of command and variable setting support,
     as well as relaying of just some readings (just whatever apcupsd exposes,
     further constrained by what our driver knows to re-translate), with
     little leverage for NUT to tap into everything the device has to offer.
     There were also issues on some systems due to packaging (e.g. marking
     NUT and apcupsd as competing implementations of the same features) which
     required clumsy workarounds to get both installed and running. Finally,
     there is a small matter of long-term viability of that approach: last
     commits to apcupsd sources were in 2017 (with last release 3.14.14 in
     May 2016): https://sourceforge.net/p/apcupsd/svn/HEAD/tree/

 - The `upsd` configured to listen on IPv6 addresses should handle only
   IPv6 (and not IPv4-mappings) to avoid surprises and insecurity; it
   will now warn if a host name resolves to several addresses (and will only
   listen on the first hit, as before in such cases) [#2012]

 - A definitive behavior for `LISTEN *` directives became specified, to try
   handling both IPv4 and IPv6 "any" address (subject to `upsd` CLI options
   to only choose one, and to OS abilities). When both address families are
   enabled, the `upsd` data server will first try to open an IPv6 socket
   asking for disabled IPv4-mapped IPv6 address support (if the OS honors
   that), and then an IPv4 socket (which may fail if the IPv6 socket already
   covers it anyway); in other words, you can end up with one or two separate
   listening sockets. [#2012]

 - Numerous daemons (`upsd`, `upsmon`, drivers, `upsdrvctl`, `upssched`)
   which accepted `-D` option for debug setting previously, now can also
   honour a `NUT_DEBUG_LEVEL=NUM` environment variable if no `-D` arguments
   were provided. Unlike those arguments, the environment variable does
   not enforce that daemons run in foreground mode by default [#1915]
   * Note that unlike some other NUT daemons, `upssched` with enabled
     debug does not stop reporting on `stderr`! [#1965]


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/p5-UPS-Nut/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/ups-nut/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/ups-nut/distinfo
cvs rdiff -u -r1.74 -r1.75 pkgsrc/sysutils/ups-nut-cgi/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/ups-nut-snmp/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/ups-nut-usb/Makefile
cvs rdiff -u -r1.13 -r0 pkgsrc/sysutils/ups-nut/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in \
    pkgsrc/sysutils/ups-nut/patches/patch-drivers_dstate.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/sysutils/ups-nut/patches/patch-drivers_usbhid-ups.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/p5-UPS-Nut/Makefile
diff -u pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.18 pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.19
--- pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.18    Thu Jul  6 09:41:34 2023
+++ pkgsrc/sysutils/p5-UPS-Nut/Makefile Thu Nov  9 16:41:16 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2023/07/06 09:41:34 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2023/11/09 16:41:16 gdt Exp $
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/p5-UPS-Nut/}
 COMMENT=               Network UPS Tools perl binding
-PKGREVISION=           13
 CATEGORIES=            sysutils perl5
 PATCHDIR=              ${.CURDIR}/patches
 

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.71 pkgsrc/sysutils/ups-nut/Makefile:1.72
--- pkgsrc/sysutils/ups-nut/Makefile:1.71       Thu Jun 22 05:31:07 2023
+++ pkgsrc/sysutils/ups-nut/Makefile    Thu Nov  9 16:41:15 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.71 2023/06/22 05:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2023/11/09 16:41:15 gdt Exp $
 
-PKGREVISION= 6
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
@@ -19,8 +18,11 @@ TOOLS_SCRIPT.perl=   exit 1
 CONFIGURE_ARGS+=       --with-drvpath=${NUT_DRVDIR:Q}
 CONFIGURE_ARGS+=       --with-altpidpath=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=       --with-pidpath=${NUT_STATEDIR:Q}
+# nut, bizarrely, does not install headers by default
 CONFIGURE_ARGS+=       --with-dev
 CONFIGURE_ARGS+=       --without-snmp  # provided by sysutils/ups-nut-snmp
+# nut is overly aggressive about installing python files; tell it not to.
+CONFIGURE_ARGS+=       --without-python2 --without-python3
 
 PKG_GROUPS_VARS+=      NUT_GROUP
 PKG_USERS_VARS+=       NUT_USER
@@ -66,11 +68,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/; \

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.12 pkgsrc/sysutils/ups-nut/Makefile.common:1.13
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.12        Tue Apr 26 23:28:25 2022
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Thu Nov  9 16:41:15 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.12 2022/04/26 23:28:25 gdt Exp $
+# $NetBSD: Makefile.common,v 1.13 2023/11/09 16:41:15 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.0
+DISTNAME=              nut-2.8.1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
 

Index: pkgsrc/sysutils/ups-nut/PLIST
diff -u pkgsrc/sysutils/ups-nut/PLIST:1.30 pkgsrc/sysutils/ups-nut/PLIST:1.31
--- pkgsrc/sysutils/ups-nut/PLIST:1.30  Thu Aug 11 16:00:17 2022
+++ pkgsrc/sysutils/ups-nut/PLIST       Thu Nov  9 16:41:15 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2022/08/11 16:00:17 gdt Exp $
+@comment $NetBSD: PLIST,v 1.31 2023/11/09 16:41:15 gdt Exp $
 bin/nut-scanner
 bin/upsc
 bin/upscmd
@@ -61,11 +61,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
@@ -105,7 +107,10 @@ 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_ups_conf.3
+man/man3/nutscan_display_ups_conf_with_sanity_check.3
 man/man3/nutscan_free_device.3
 man/man3/nutscan_get_serial_ports_list.3
 man/man3/nutscan_init.3
@@ -183,6 +188,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
@@ -201,16 +208,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
@@ -219,37 +222,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
@@ -258,6 +267,5 @@ share/examples/nut/upsmon.conf.sample
 share/examples/nut/upssched.conf.sample
 share/nut/cmdvartab
 share/nut/driver.list
-share/nut/solaris-init/nut
 @pkgdir share/doc/nut/drivers
 @pkgdir etc/nut

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.40 pkgsrc/sysutils/ups-nut/distinfo:1.41
--- pkgsrc/sysutils/ups-nut/distinfo:1.40       Sat Nov 26 14:45:47 2022
+++ pkgsrc/sysutils/ups-nut/distinfo    Thu Nov  9 16:41:15 2023
@@ -1,11 +1,12 @@
-$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.tar.gz) = 244e154d951f4a1d08172e162826fdb4082c3e0a033a426040adc2b9a420feca
-SHA512 (nut-2.8.0.tar.gz) = 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577
-Size (nut-2.8.0.tar.gz) = 3287640 bytes
-SHA1 (patch-aa) = a471517e5e05f92b1eb904b227dbf1b0decec848
-SHA1 (patch-clients_upsclient.c) = 9c521684a5ccf108bd464767f9b31aa2694afae1
+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
+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
-SHA1 (patch-drivers_usbhid-ups.c) = 3f1a14cc764ef0dbb5befd19910dd6790ab98df9
+SHA1 (patch-server_sockdebug.c) = 788efc0a519a6a0256b80156fff415d91a359098

Index: pkgsrc/sysutils/ups-nut-cgi/Makefile
diff -u pkgsrc/sysutils/ups-nut-cgi/Makefile:1.74 pkgsrc/sysutils/ups-nut-cgi/Makefile:1.75
--- pkgsrc/sysutils/ups-nut-cgi/Makefile:1.74   Sat Oct 21 17:11:29 2023
+++ pkgsrc/sysutils/ups-nut-cgi/Makefile        Thu Nov  9 16:41:15 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.74 2023/10/21 17:11:29 gdt Exp $
+# $NetBSD: Makefile,v 1.75 2023/11/09 16:41:15 gdt Exp $
 
-PKGREVISION= 4
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}
@@ -17,21 +16,6 @@ INSTALLATION_DIRS+=  ${PREFIX}/${PKGMANDI
 CONFIGURE_ARGS+=       --with-cgi
 CONFIGURE_ARGS+=       --with-cgipath=${NUT_CGIDIR:Q}
 
-#
-# This is horrendous, but configure script assumes everything is in /usr/X11R6
-# and hardcodes the list of libraries.  libXpm is optional in gd/buildlink3.mk
-# and the configure script assumes it, however it doesn't appear necessary so
-# is removed for now.
-#
-.include "../../mk/jpeg.buildlink3.mk"
-GD_LIBS=               -lm
-.for bl3 lib in gd gd png png zlib z ${JPEG_TYPE} jpeg freetype2 freetype
-GD_LIBS+=              ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${bl3}}/lib
-GD_LIBS+=              -L${BUILDLINK_PREFIX.${bl3}}/lib -l${lib}
-GD_INCS+=              -I${BUILDLINK_PREFIX.${bl3}}/include
-.endfor
-CONFIGURE_ARGS+=       --with-gd-libs="${GD_LIBS}"
-CONFIGURE_ARGS+=       --with-gd-includes="${GD_INCS}"
 
 BUILD_DEFS+=           NUT_STATEDIR
 
@@ -46,6 +30,10 @@ 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}; \
@@ -66,4 +54,5 @@ do-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/ups-nut-snmp/Makefile
diff -u pkgsrc/sysutils/ups-nut-snmp/Makefile:1.13 pkgsrc/sysutils/ups-nut-snmp/Makefile:1.14
--- pkgsrc/sysutils/ups-nut-snmp/Makefile:1.13  Tue Oct 24 22:11:16 2023
+++ pkgsrc/sysutils/ups-nut-snmp/Makefile       Thu Nov  9 16:41:16 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.13 2023/10/24 22:11:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2023/11/09 16:41:16 gdt Exp $
 
-PKGREVISION= 2
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-snmp/}

Index: pkgsrc/sysutils/ups-nut-usb/Makefile
diff -u pkgsrc/sysutils/ups-nut-usb/Makefile:1.16 pkgsrc/sysutils/ups-nut-usb/Makefile:1.17
--- pkgsrc/sysutils/ups-nut-usb/Makefile:1.16   Fri Nov 25 07:45:04 2022
+++ pkgsrc/sysutils/ups-nut-usb/Makefile        Thu Nov  9 16:41:16 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2022/11/25 07:45:04 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/11/09 16:41:16 gdt Exp $
 
-PKGREVISION= 2
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-usb/}

Index: pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c
diff -u pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c:1.2 pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c:1.3
--- pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c:1.2       Fri Sep 21 00:59:53 2018
+++ pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c   Thu Nov  9 16:41:15 2023
@@ -1,14 +1,14 @@
-$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   2018-04-01 17:13:02.200981408 +0000
+--- clients/upsclient.c.orig   2023-10-16 08:06:18.000000000 +0000
 +++ clients/upsclient.c
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <fcntl.h>
+@@ -38,6 +38,7 @@
+ #ifndef WIN32
+ # include <netdb.h>
+ # include <sys/socket.h>
++# include <sys/time.h>
+ # include <netinet/in.h>
+ # include <arpa/inet.h>
+ # include <fcntl.h>

Added files:

Index: pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in
diff -u /dev/null pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in:1.1
--- /dev/null   Thu Nov  9 16:41:16 2023
+++ pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in      Thu Nov  9 16:41:15 2023
@@ -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@
Index: pkgsrc/sysutils/ups-nut/patches/patch-drivers_dstate.c
diff -u /dev/null pkgsrc/sysutils/ups-nut/patches/patch-drivers_dstate.c:1.1
--- /dev/null   Thu Nov  9 16:41:16 2023
+++ pkgsrc/sysutils/ups-nut/patches/patch-drivers_dstate.c      Thu Nov  9 16:41:15 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-drivers_dstate.c,v 1.1 2023/11/09 16:41:15 gdt Exp $
+
+Cherry-pick upstream bugfix.
+
+commit 2842201db26468a1eb1bf579e8b2fbf7538c5076
+Author: Doug Nazar <nazard%nazar.ca@localhost>
+Date:   Tue Nov 7 21:31:11 2023 -0500
+
+    Fix SIGSEGV while preforming INSTCMD
+    
+    Parameter arg[2] is not guaranteed to be valid while preforming INSTCMD.
+    Don't pass directly to main_instcmd().
+    
+    Signed-off-by: Doug Nazar <nazard%nazar.ca@localhost>
+
+--- drivers/dstate.c
++++ drivers/dstate.c
+@@ -780,7 +780,7 @@ static int sock_arg(conn_t *conn, size_t numarg, char **arg)
+                       upsdebugx(3, "%s: TRACKING = %s", __func__, cmdid);
+ 
+               /* try the handler shared by all drivers first */
+-              ret = main_instcmd(arg[1], arg[2], conn);
++              ret = main_instcmd(cmdname, cmdparam, conn);
+               if (ret != STAT_INSTCMD_UNKNOWN) {
+                       /* The command was acknowledged by shared handler, and
+                        * either handled successfully, or failed, or was not

Prev by Date: CVS commit: pkgsrc/devel/py-wrapt
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/py-wrapt
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index