pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ups-nut: Update to 2.8.5
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Tue Apr 28 09:43:37 2026 -0400
Changeset: 8e943b203d5fdd1b6935a24f9752dc7ab2fff357
Modified Files:
ups-nut/Makefile.common
ups-nut/PLIST
ups-nut/TODO
ups-nut/distinfo
ups-nut/patches/patch-configure
Removed Files:
ups-nut/patches/patch-clients_upsclient.c
Log Message:
ups-nut: Update to 2.8.5
not quite ready for import, but close
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8e943b203d5fdd1b6935a24f9752dc7ab2fff357
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ups-nut/Makefile.common | 4 +-
ups-nut/PLIST | 222 ++++++++++++++++++++++++++++++
ups-nut/TODO | 3 +-
ups-nut/distinfo | 9 +-
ups-nut/patches/patch-clients_upsclient.c | 14 --
ups-nut/patches/patch-configure | 6 +-
6 files changed, 233 insertions(+), 25 deletions(-)
diffs:
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index 674bb882db..7698e7e4ea 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -5,11 +5,11 @@
# used by wip/ups-nut-usb/Makefile
# used by wip/p5-UPS-Nut/Makefile
-DISTNAME= nut-2.8.4.1305
+DISTNAME= nut-2.8.5
CATEGORIES= sysutils
#MASTER_SITES= http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
MASTER_SITES= https://www.NetBSD.org/~gdt/
-# Isolate gdt-built distfiles from pkgsrc proper
+# Isolate gdt-built distfiles from pkgsrc proper.
DIST_SUBDIR= ups-nut-wip
MAINTAINER?= gdt%NetBSD.org@localhost
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index 7f10518abf..b14091bfba 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -107,10 +107,40 @@ man/man3/nutclient_logout.3
man/man3/nutclient_set_device_variable_value.3
man/man3/nutclient_set_device_variable_values.3
man/man3/nutclient_tcp_create_client.3
+man/man3/nutclient_tcp_create_client_ssl_NSSL.3
+man/man3/nutclient_tcp_create_client_ssl_OpenSSL.3
man/man3/nutclient_tcp_disconnect.3
+man/man3/nutclient_tcp_get_ssl_cafile.3
+man/man3/nutclient_tcp_get_ssl_capath.3
+man/man3/nutclient_tcp_get_ssl_caps.3
+man/man3/nutclient_tcp_get_ssl_certfile.3
+man/man3/nutclient_tcp_get_ssl_certhost_name.3
+man/man3/nutclient_tcp_get_ssl_certident_name.3
+man/man3/nutclient_tcp_get_ssl_certstore_path.3
+man/man3/nutclient_tcp_get_ssl_certstore_prefix.3
+man/man3/nutclient_tcp_get_ssl_certverify.3
+man/man3/nutclient_tcp_get_ssl_force.3
+man/man3/nutclient_tcp_get_ssl_keyfile.3
+man/man3/nutclient_tcp_get_ssl_keypass.3
+man/man3/nutclient_tcp_get_ssl_try.3
man/man3/nutclient_tcp_get_timeout.3
man/man3/nutclient_tcp_is_connected.3
+man/man3/nutclient_tcp_is_ssl.3
man/man3/nutclient_tcp_reconnect.3
+man/man3/nutclient_tcp_set_ssl_cafile.3
+man/man3/nutclient_tcp_set_ssl_capath.3
+man/man3/nutclient_tcp_set_ssl_certfile.3
+man/man3/nutclient_tcp_set_ssl_certhost_name.3
+man/man3/nutclient_tcp_set_ssl_certident_name.3
+man/man3/nutclient_tcp_set_ssl_certstore_path.3
+man/man3/nutclient_tcp_set_ssl_certstore_prefix.3
+man/man3/nutclient_tcp_set_ssl_certverify.3
+man/man3/nutclient_tcp_set_ssl_config_NSS.3
+man/man3/nutclient_tcp_set_ssl_config_OpenSSL.3
+man/man3/nutclient_tcp_set_ssl_force.3
+man/man3/nutclient_tcp_set_ssl_keyfile.3
+man/man3/nutclient_tcp_set_ssl_keypass.3
+man/man3/nutclient_tcp_set_ssl_try.3
man/man3/nutclient_tcp_set_timeout.3
man/man3/nutscan.3
man/man3/nutscan_add_commented_option_to_device.3
@@ -140,6 +170,13 @@ man/man3/nutscan_scan_snmp.3
man/man3/nutscan_scan_usb.3
man/man3/nutscan_scan_xml_http_range.3
man/man3/nutscan_stringify_ip_ranges.3
+man/man3/nutscan_upslog_cookie.3
+man/man3/nutscan_upslog_get_debug_level.3
+man/man3/nutscan_upslog_getproctag.3
+man/man3/nutscan_upslog_set_debug_level.3
+man/man3/nutscan_upslog_setprocname.3
+man/man3/nutscan_upslog_setproctag.3
+man/man3/nutscan_upslog_start_sync.3
man/man3/upscli_add_host_cert.3
man/man3/upscli_cleanup.3
man/man3/upscli_connect.3
@@ -153,17 +190,29 @@ man/man3/upscli_list_next.3
man/man3/upscli_list_start.3
man/man3/upscli_readline.3
man/man3/upscli_readline_timeout.3
+man/man3/upscli_readline_timeout_may_disconnect.3
+man/man3/upscli_report_build_details.3
man/man3/upscli_sendline.3
man/man3/upscli_sendline_timeout.3
+man/man3/upscli_sendline_timeout_may_disconnect.3
man/man3/upscli_set_default_connect_timeout.3
man/man3/upscli_splitaddr.3
man/man3/upscli_splitname.3
man/man3/upscli_ssl.3
+man/man3/upscli_ssl_caps.3
+man/man3/upscli_ssl_caps_descr.3
man/man3/upscli_str_add_unique_token.3
man/man3/upscli_str_contains_token.3
man/man3/upscli_strerror.3
man/man3/upscli_tryconnect.3
man/man3/upscli_upserror.3
+man/man3/upscli_upslog_cookie.3
+man/man3/upscli_upslog_get_debug_level.3
+man/man3/upscli_upslog_getproctag.3
+man/man3/upscli_upslog_set_debug_level.3
+man/man3/upscli_upslog_setprocname.3
+man/man3/upscli_upslog_setproctag.3
+man/man3/upscli_upslog_start_sync.3
man/man3/upsclient.3
man/man5/nut.conf.5
man/man5/ups.conf.5
@@ -292,6 +341,179 @@ 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/doc/nut/html-doc/FAQ.html
+share/doc/nut/html-doc/cables.html
+share/doc/nut/html-doc/developer-guide.html
+share/doc/nut/html-doc/packager-guide.html
+share/doc/nut/html-doc/qa-guide.html
+share/doc/nut/html-doc/release-notes.html
+share/doc/nut/html-doc/solaris-usb.html
+share/doc/nut/html-doc/user-manual.html
+share/doc/nut/html-man/adelsystem_cbi.html
+share/doc/nut/html-man/al175.html
+share/doc/nut/html-man/apc_modbus.html
+share/doc/nut/html-man/apcsmart-old.html
+share/doc/nut/html-man/apcsmart.html
+share/doc/nut/html-man/apcupsd-ups.html
+share/doc/nut/html-man/asem.html
+share/doc/nut/html-man/bcmxcp.html
+share/doc/nut/html-man/bcmxcp_usb.html
+share/doc/nut/html-man/belkin.html
+share/doc/nut/html-man/belkinunv.html
+share/doc/nut/html-man/bestfcom.html
+share/doc/nut/html-man/bestfortress.html
+share/doc/nut/html-man/bestuferrups.html
+share/doc/nut/html-man/bestups.html
+share/doc/nut/html-man/bicker_ser.html
+share/doc/nut/html-man/blazer_ser.html
+share/doc/nut/html-man/blazer_usb.html
+share/doc/nut/html-man/clone-outlet.html
+share/doc/nut/html-man/clone.html
+share/doc/nut/html-man/dummy-ups.html
+share/doc/nut/html-man/etapro.html
+share/doc/nut/html-man/everups.html
+share/doc/nut/html-man/failover.html
+share/doc/nut/html-man/gamatronic.html
+share/doc/nut/html-man/generic_gpio.html
+share/doc/nut/html-man/generic_modbus.html
+share/doc/nut/html-man/genericups.html
+share/doc/nut/html-man/hosts.conf.html
+share/doc/nut/html-man/huawei-ups2000.html
+share/doc/nut/html-man/hwmon_ina219.html
+share/doc/nut/html-man/index.html
+share/doc/nut/html-man/isbmex.html
+share/doc/nut/html-man/ivtscd.html
+share/doc/nut/html-man/libnutclient.html
+share/doc/nut/html-man/libnutclient_commands.html
+share/doc/nut/html-man/libnutclient_devices.html
+share/doc/nut/html-man/libnutclient_general.html
+share/doc/nut/html-man/libnutclient_misc.html
+share/doc/nut/html-man/libnutclient_tcp.html
+share/doc/nut/html-man/libnutclient_variables.html
+share/doc/nut/html-man/libupsclient-config.html
+share/doc/nut/html-man/liebert-esp2.html
+share/doc/nut/html-man/liebert-gxe.html
+share/doc/nut/html-man/liebert.html
+share/doc/nut/html-man/macosx-ups.html
+share/doc/nut/html-man/masterguard.html
+share/doc/nut/html-man/meanwell_ntu.html
+share/doc/nut/html-man/metasys.html
+share/doc/nut/html-man/mge-shut.html
+share/doc/nut/html-man/mge-utalk.html
+share/doc/nut/html-man/microdowell.html
+share/doc/nut/html-man/microsol-apc.html
+share/doc/nut/html-man/must_ep2000pro.html
+share/doc/nut/html-man/netxml-ups.html
+share/doc/nut/html-man/nut-ipmipsu.html
+share/doc/nut/html-man/nut-recorder.html
+share/doc/nut/html-man/nut-scanner.html
+share/doc/nut/html-man/nut-upower.html
+share/doc/nut/html-man/nut.conf.html
+share/doc/nut/html-man/nut.html
+share/doc/nut/html-man/nutconf.html
+share/doc/nut/html-man/nutdrv_atcl_usb.html
+share/doc/nut/html-man/nutdrv_hashx.html
+share/doc/nut/html-man/nutdrv_qx.html
+share/doc/nut/html-man/nutdrv_siemens-sitop.html
+share/doc/nut/html-man/nutscan.html
+share/doc/nut/html-man/nutscan_add_device_to_device.html
+share/doc/nut/html-man/nutscan_add_ip_range.html
+share/doc/nut/html-man/nutscan_add_option_to_device.html
+share/doc/nut/html-man/nutscan_cidr_to_ip.html
+share/doc/nut/html-man/nutscan_display_parsable.html
+share/doc/nut/html-man/nutscan_display_sanity_check.html
+share/doc/nut/html-man/nutscan_display_sanity_check_serial.html
+share/doc/nut/html-man/nutscan_display_ups_conf.html
+share/doc/nut/html-man/nutscan_display_ups_conf_with_sanity_check.html
+share/doc/nut/html-man/nutscan_free_device.html
+share/doc/nut/html-man/nutscan_free_ip_ranges.html
+share/doc/nut/html-man/nutscan_get_serial_ports_list.html
+share/doc/nut/html-man/nutscan_init.html
+share/doc/nut/html-man/nutscan_init_ip_ranges.html
+share/doc/nut/html-man/nutscan_ip_ranges_iter_inc.html
+share/doc/nut/html-man/nutscan_ip_ranges_iter_init.html
+share/doc/nut/html-man/nutscan_new_device.html
+share/doc/nut/html-man/nutscan_scan_avahi.html
+share/doc/nut/html-man/nutscan_scan_eaton_serial.html
+share/doc/nut/html-man/nutscan_scan_ipmi.html
+share/doc/nut/html-man/nutscan_scan_nut.html
+share/doc/nut/html-man/nutscan_scan_nut_simulation.html
+share/doc/nut/html-man/nutscan_scan_snmp.html
+share/doc/nut/html-man/nutscan_scan_usb.html
+share/doc/nut/html-man/nutscan_scan_xml_http_range.html
+share/doc/nut/html-man/nutscan_stringify_ip_ranges.html
+share/doc/nut/html-man/nutscan_upslog_set_debug_level.html
+share/doc/nut/html-man/nutupsdrv.html
+share/doc/nut/html-man/oneac.html
+share/doc/nut/html-man/optiups.html
+share/doc/nut/html-man/phoenixcontact_modbus.html
+share/doc/nut/html-man/pijuice.html
+share/doc/nut/html-man/powercom.html
+share/doc/nut/html-man/powerman-pdu.html
+share/doc/nut/html-man/powerpanel.html
+share/doc/nut/html-man/powervar_cx_ser.html
+share/doc/nut/html-man/powervar_cx_usb.html
+share/doc/nut/html-man/rhino.html
+share/doc/nut/html-man/richcomm_usb.html
+share/doc/nut/html-man/riello_ser.html
+share/doc/nut/html-man/riello_usb.html
+share/doc/nut/html-man/safenet.html
+share/doc/nut/html-man/skel.html
+share/doc/nut/html-man/sms_ser.html
+share/doc/nut/html-man/snmp-ups.html
+share/doc/nut/html-man/sockdebug.html
+share/doc/nut/html-man/socomec_jbus.html
+share/doc/nut/html-man/solis.html
+share/doc/nut/html-man/tripplite.html
+share/doc/nut/html-man/tripplite_usb.html
+share/doc/nut/html-man/tripplitesu.html
+share/doc/nut/html-man/ups.conf.html
+share/doc/nut/html-man/upsc.html
+share/doc/nut/html-man/upscli_add_host_cert.html
+share/doc/nut/html-man/upscli_cleanup.html
+share/doc/nut/html-man/upscli_connect.html
+share/doc/nut/html-man/upscli_disconnect.html
+share/doc/nut/html-man/upscli_fd.html
+share/doc/nut/html-man/upscli_get.html
+share/doc/nut/html-man/upscli_get_default_connect_timeout.html
+share/doc/nut/html-man/upscli_init.html
+share/doc/nut/html-man/upscli_init_default_connect_timeout.html
+share/doc/nut/html-man/upscli_list_next.html
+share/doc/nut/html-man/upscli_list_start.html
+share/doc/nut/html-man/upscli_readline.html
+share/doc/nut/html-man/upscli_report_build_details.html
+share/doc/nut/html-man/upscli_sendline.html
+share/doc/nut/html-man/upscli_set_default_connect_timeout.html
+share/doc/nut/html-man/upscli_splitaddr.html
+share/doc/nut/html-man/upscli_splitname.html
+share/doc/nut/html-man/upscli_ssl.html
+share/doc/nut/html-man/upscli_ssl_caps.html
+share/doc/nut/html-man/upscli_str_add_unique_token.html
+share/doc/nut/html-man/upscli_str_contains_token.html
+share/doc/nut/html-man/upscli_strerror.html
+share/doc/nut/html-man/upscli_upserror.html
+share/doc/nut/html-man/upscli_upslog_set_debug_level.html
+share/doc/nut/html-man/upsclient.html
+share/doc/nut/html-man/upscmd.html
+share/doc/nut/html-man/upscode2.html
+share/doc/nut/html-man/upsd.conf.html
+share/doc/nut/html-man/upsd.html
+share/doc/nut/html-man/upsd.users.html
+share/doc/nut/html-man/upsdrvctl.html
+share/doc/nut/html-man/upsimage.cgi.html
+share/doc/nut/html-man/upslog.html
+share/doc/nut/html-man/upsmon.conf.html
+share/doc/nut/html-man/upsmon.html
+share/doc/nut/html-man/upsrw.html
+share/doc/nut/html-man/upssched.conf.html
+share/doc/nut/html-man/upssched.html
+share/doc/nut/html-man/upsset.cgi.html
+share/doc/nut/html-man/upsset.conf.html
+share/doc/nut/html-man/upsstats.cgi.html
+share/doc/nut/html-man/upsstats.html.html
+share/doc/nut/html-man/usbhid-ups.html
+share/doc/nut/html-man/ve-direct.html
+share/doc/nut/html-man/victronups.html
share/examples/nut/nut.conf.sample
share/examples/nut/ups.conf.sample
share/examples/nut/upsd.conf.sample
diff --git a/ups-nut/TODO b/ups-nut/TODO
index 2c36939b5b..785a2e90e8 100644
--- a/ups-nut/TODO
+++ b/ups-nut/TODO
@@ -1,6 +1,7 @@
+ - Write COMMIT_MSG.
+
- Debug PLIST.Darwin not working.
- Check all patches and comment and send upstream.
- Resolve manpage building.
- Think about uncommenting upsdrvctl shutdown.
- Document why altqd is in files/upskillpower.sh, or remove.
-
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index a35f6426f8..3ebdd7cb7f 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,10 +1,9 @@
$NetBSD: distinfo,v 1.46 2025/09/16 12:23:20 gdt Exp $
-BLAKE2s (ups-nut-wip/nut-2.8.4.1305.tar.gz) = 4cca1625c2f29976db8f82e6c8e3fe73a203e86f6fc5b54454eb44f7a0c5db48
-SHA512 (ups-nut-wip/nut-2.8.4.1305.tar.gz) = 8c3c5eccf7c1541efb4598a0de7d450793e49db0bbb18f65a6b8448af4d95cc1ed3a84c43eafa86a798262569e57b0c0e0089795675ea48f183cacff0640863b
-Size (ups-nut-wip/nut-2.8.4.1305.tar.gz) = 6134504 bytes
-SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
-SHA1 (patch-configure) = b1c2f7e57ecb4e4a94985f5b40afe5a00a9e9458
+BLAKE2s (ups-nut-wip/nut-2.8.5.tar.gz) = 381c047237d5ab314304c80c94ce7309c2cc9db2b5c88b5bafb2192fb36f2eb9
+SHA512 (ups-nut-wip/nut-2.8.5.tar.gz) = e57c012fa73fad59d8c2669159fc899b8aa50b41af972e6ccdb0f880f5e7580b47c3b16af873b05d55a874a40917b8875ed200861ab234714a02088c02400576
+Size (ups-nut-wip/nut-2.8.5.tar.gz) = 7153174 bytes
+SHA1 (patch-configure) = 30b1fa8026549e23b9648b6ea82c3642ae80ebbd
SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
diff --git a/ups-nut/patches/patch-clients_upsclient.c b/ups-nut/patches/patch-clients_upsclient.c
deleted file mode 100644
index 5b07f41f02..0000000000
--- a/ups-nut/patches/patch-clients_upsclient.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$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 2023-10-16 08:06:18.000000000 +0000
-+++ clients/upsclient.c
-@@ -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>
diff --git a/ups-nut/patches/patch-configure b/ups-nut/patches/patch-configure
index 6303d3b555..16b381ed22 100644
--- a/ups-nut/patches/patch-configure
+++ b/ups-nut/patches/patch-configure
@@ -2,13 +2,13 @@ $NetBSD: patch-configure,v 1.1 2025/09/10 11:08:57 jperkin Exp $
Disable special manual page handling on SunOS.
---- configure.orig 2026-01-25 23:16:21.000000000 +0000
+--- configure.orig 2026-04-26 11:40:29.191919966 +0000
+++ configure
-@@ -27046,8 +27046,6 @@ DEFAULT_MAN_DIR_AS_BASE='yes'
+@@ -27390,8 +27390,6 @@ DEFAULT_MAN_DIR_AS_BASE='yes'
case "${target_os}" in
solaris*|sunos*|SunOS*|illumos*)
-- DEFAULT_MAN_SECTION_CMD_SYS="1m"
+- DEFAULT_MAN_SECTION_CMD_SYS="1m"
- DEFAULT_MAN_DIR_AS_BASE="no"
;;
esac
Home |
Main Index |
Thread Index |
Old Index