aboutsummaryrefslogtreecommitdiff
path: root/sysutils/nut
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/nut')
-rw-r--r--sysutils/nut/Makefile18
-rw-r--r--sysutils/nut/distinfo6
-rw-r--r--sysutils/nut/files/patch-configure47
-rw-r--r--sysutils/nut/files/patch-m4_nut__check_libltdl.m421
-rw-r--r--sysutils/nut/files/patch-scripts_Makefile8
-rw-r--r--sysutils/nut/files/patch-scripts_Makefile.am11
-rw-r--r--sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c14
-rw-r--r--sysutils/nut/pkg-plist195
8 files changed, 224 insertions, 96 deletions
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 5300855588ea..5d37f0c5eedb 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nut
-PORTVERSION= 2.8.2
+PORTVERSION= 2.8.5
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
@@ -37,7 +37,6 @@ OPTIONS_DEFAULT_powerpc= FREEIPMI
OPTIONS_DEFAULT_powerpc64= FREEIPMI
OPTIONS_DEFAULT_powerpc64le= FREEIPMI
OPTIONS_DEFAULT_riscv64= FREEIPMI
-OPTIONS_DEFAULT_riscv64sf= FREEIPMI
OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV
OPTIONS_SINGLE= IPMI SSL
OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
@@ -66,6 +65,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
--program-transform-name="" \
--localstatedir=${STATEDIR} \
--datadir=${PREFIX}/etc/nut \
+ --mandir=${PREFIX}/share/man/nut \
--with-devd-dir=${PREFIX}/etc/devd \
--with-drvpath=${PREFIX}/libexec/nut \
--with-statepath=${STATEDIR} \
@@ -78,12 +78,13 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
--without-python2 \
--with-python3=${PYTHON_CMD} \
--without-nut_monitor \
- --with-ltdl --with-nut-scanner
+ --with-ltdl --with-nut-scanner \
+ --without-augeas-lenses-dir \
+ --enable-extapi-enphase=no
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -pthread
-CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LIB_DEPENDS+= libltdl.so:devel/libltdl
MANPAGES_CONFIGURE_ON= --with-doc=man=auto
@@ -99,17 +100,18 @@ CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
SERIAL_CONFIGURE_WITH= serial
USB_CONFIGURE_WITH= usb=auto
+USB_LIB_DEPENDS= libgio-2.0.so:devel/glib20
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_WITH= snmp
-NEON_LIB_DEPENDS+= libneon.so:www/neon
+NEON_LIB_DEPENDS= libneon.so:www/neon
NEON_CONFIGURE_WITH= neon
-PDU_LIB_DEPENDS+= libpowerman.so:sysutils/powerman
+PDU_LIB_DEPENDS= libpowerman.so:sysutils/powerman
PDU_CONFIGURE_WITH= powerman
-MODBUS_LIB_DEPENDS+= libmodbus.so:comms/libmodbus
+MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus
MODBUS_CONFIGURE_WITH= modbus
AVAHI_BUILD_DEPENDS= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
@@ -155,7 +157,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${STAGEDIR}${DOCSDIR}/cables
${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${STAGEDIR}${DOCSDIR}
-.for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README
+.for file in AUTHORS COPYING INSTALL MAINTAINERS NEWS README
${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo
index a6539cf5526e..6e39d852266c 100644
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712029991
-SHA256 (nut-2.8.2.tar.gz) = e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d
-SIZE (nut-2.8.2.tar.gz) = 5599935
+TIMESTAMP = 1775621282
+SHA256 (nut-2.8.5.tar.gz) = 18bf32e59eb764b13da3c4fa70384926d7fa584cb31d2fe7f137a570633eeec1
+SIZE (nut-2.8.5.tar.gz) = 7362259
diff --git a/sysutils/nut/files/patch-configure b/sysutils/nut/files/patch-configure
new file mode 100644
index 000000000000..5cf35fc6265d
--- /dev/null
+++ b/sysutils/nut/files/patch-configure
@@ -0,0 +1,47 @@
+--- configure.orig 2026-04-13 13:26:29.248587000 -0700
++++ configure 2026-04-13 13:31:28.601276000 -0700
+@@ -9342,18 +9342,6 @@
+
+ fi
+
+-for TOKEN in upsmon nutmon ups nut; do
+- if test -n "`${PROBE_OS_USER} ${TOKEN}`"
+-then :
+- RUN_AS_USER="${TOKEN}"
+-fi
+- if test -n "`${PROBE_OS_GROUP} ${TOKEN}`"
+-then :
+- RUN_AS_GROUP="${TOKEN}"
+-fi
+-done
+-unset TOKEN
+-
+ case ${target_os} in #(
+ *mingw*) :
+ POWERDOWNFLAG="C:\\\\killpower" ;; #(
+@@ -22556,7 +22544,6 @@
+ printf "%s\n" "#define HAVE_UU_LOCK 1" >>confdefs.h
+
+ SERLIBS="-lutil"
+- RUN_AS_USER="uucp"
+
+ else $as_nop
+
+@@ -41472,7 +41459,7 @@
+ then :
+ withval=$with_nut_monitor; nut_with_nut_monitor="${withval}"
+ else $as_nop
+- nut_with_nut_monitor="auto"
++ nut_with_nut_monitor="no"
+
+ fi
+
+@@ -47583,7 +47570,7 @@
+ fi
+ if test -n "${nut_with_nut_monitor_py2gtk2}${nut_with_nut_monitor_py3qt5}${nut_with_nut_monitor_py3qt6}" ; then
+ case "${nut_with_nut_monitor}" in
+- "auto") nut_with_nut_monitor="yes" ;;
++ "auto") nut_with_nut_monitor="no" ;;
+ esac
+ else
+ case "${nut_with_nut_monitor}" in
diff --git a/sysutils/nut/files/patch-m4_nut__check_libltdl.m4 b/sysutils/nut/files/patch-m4_nut__check_libltdl.m4
deleted file mode 100644
index ae4a2710adf5..000000000000
--- a/sysutils/nut/files/patch-m4_nut__check_libltdl.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- m4/nut_check_libltdl.m4.orig 2023-08-01 07:33:24.593954000 -0700
-+++ m4/nut_check_libltdl.m4 2023-08-01 07:35:18.506094000 -0700
-@@ -10,10 +10,7 @@
- dnl No NUT_CHECK_PKGCONFIG here: (lib)ltdl.pc was not seen on any OS
-
- dnl save CFLAGS and LIBS
-- CFLAGS_ORIG="${CFLAGS}"
-- LIBS_ORIG="${LIBS}"
- LIBS=""
-- CFLAGS=""
- dnl For fallback below:
- myCFLAGS=""
-
-@@ -71,7 +68,5 @@
- unset myCFLAGS
-
- dnl restore original CFLAGS and LIBS
-- CFLAGS="${CFLAGS_ORIG}"
-- LIBS="${LIBS_ORIG}"
- fi
- ])
diff --git a/sysutils/nut/files/patch-scripts_Makefile b/sysutils/nut/files/patch-scripts_Makefile
deleted file mode 100644
index 0fb15d83ac33..000000000000
--- a/sysutils/nut/files/patch-scripts_Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/Makefile.am.orig 2020-02-09 10:44:01.000000000 -0800
-+++ scripts/Makefile.am 2020-03-24 19:40:01.084978000 -0700
-@@ -25,4 +25,4 @@
- Windows/halt.c \
- Windows/Makefile
-
--SUBDIRS = augeas devd hotplug python systemd udev Solaris upsdrvsvcctl
-+SUBDIRS = augeas devd hotplug python udev upsdrvsvcctl
diff --git a/sysutils/nut/files/patch-scripts_Makefile.am b/sysutils/nut/files/patch-scripts_Makefile.am
new file mode 100644
index 000000000000..067768646757
--- /dev/null
+++ b/sysutils/nut/files/patch-scripts_Makefile.am
@@ -0,0 +1,11 @@
+--- scripts/Makefile.am.orig 2025-11-17 05:13:21.000000000 -0800
++++ scripts/Makefile.am 2025-11-17 07:46:55.934951000 -0800
+@@ -30,7 +30,7 @@
+ valgrind/valgrind.sh.in \
+ Windows/halt.c
+
+-SUBDIRS = augeas devd hotplug installer obs python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
++SUBDIRS = augeas devd hotplug installer obs python udev ufw Solaris Windows upsdrvsvcctl external_apis
+
+ SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc obs/README.adoc
+
diff --git a/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c b/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c
new file mode 100644
index 000000000000..bcd884c3b786
--- /dev/null
+++ b/sysutils/nut/files/patch-tools_nut-scanner_nutscan-init.c
@@ -0,0 +1,14 @@
+--- tools/nut-scanner/nutscan-init.c.orig 2024-07-17 06:41:06.000000000 -0700
++++ tools/nut-scanner/nutscan-init.c 2024-07-18 13:41:55.306142000 -0700
+@@ -216,7 +216,11 @@
+ }
+ # endif /* SOFILE_LIBUSB1 */
+ if (!libname) {
++# ifdef __FreeBSD__
++ libname = get_libname("libusb.so");
++# else
+ libname = get_libname("libusb-1.0" SOEXT);
++# endif
+ }
+ # ifdef SOPATH_LIBUSB1
+ if (!libname) {
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 7d9afbd89d34..f427ce716006 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -4,17 +4,20 @@
%%CGI%%@sample %%CGIETCDIR%%hosts.conf.sample
%%CGI%%@sample %%CGIETCDIR%%upsset.conf.sample
%%CGI%%@sample %%CGIETCDIR%%upsstats.html.sample
+%%CGI%%@sample %%CGIETCDIR%%upsstats-modern-list.html.sample
+%%CGI%%@sample %%CGIETCDIR%%upsstats-modern-single.html.sample
%%CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample
%%CGI%%%%WWWDIR%%/bottom.html
%%CGI%%%%WWWDIR%%/header.html
%%CGI%%%%WWWDIR%%/index.html
%%CGI%%%%WWWDIR%%/nut-banner.png
+%%CGI%%%%WWWDIR%%/nut-logo-60x60.png
%%ETCDIR%%/cmdvartab
%%ETCDIR%%/driver.list
@sample %%ETCDIR%%/nut.conf.sample
@sample %%ETCDIR%%/ups.conf.sample
@sample %%ETCDIR%%/upsd.conf.sample
-@sample(%%NUT_USER%%,%%NUT_GROUP%%,0640) %%ETCDIR%%/upsd.users.sample
+@sample %%ETCDIR%%/upsd.users.sample
@sample %%ETCDIR%%/upsmon.conf.sample
@sample %%ETCDIR%%/upssched.conf.sample
@sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
@@ -41,27 +44,27 @@ bin/upssched-cmd
lib/libnutclient.a
lib/libnutclient.so
lib/libnutclient.so.2
-lib/libnutclient.so.2.0.2
+lib/libnutclient.so.2.1.0
lib/libupsclient.a
lib/libupsclient.so
-lib/libupsclient.so.6
-lib/libupsclient.so.6.0.1
+lib/libupsclient.so.7
+lib/libupsclient.so.7.1.0
lib/libnutclientstub.a
lib/libnutclientstub.so
lib/libnutclientstub.so.1
lib/libnutclientstub.so.1.0.1
lib/libnutscan.a
lib/libnutscan.so
-lib/libnutscan.so.2
-lib/libnutscan.so.2.0.5
-%%PYTHON_SITELIBDIR%%/PyNUT.py
-%%PYTHON_SITELIBDIR%%/test_nutclient.py
+lib/libnutscan.so.4
+lib/libnutscan.so.4.1.0
%%DEV%%libdata/pkgconfig/libnutclient.pc
%%DEV%%libdata/pkgconfig/libnutscan.pc
%%DEV%%libdata/pkgconfig/libupsclient.pc
%%DEV%%libdata/pkgconfig/libnutclientstub.pc
+%%DEV%%libexec/sockdebug
%%SERIAL%%libexec/nut/al175
%%SERIAL%%libexec/nut/apcupsd-ups
+%%SERIAL%%libexec/nut/meanwell_ntu
%%USB%%libexec/nut/nutdrv_atcl_usb
%%USB%%libexec/nut/nutdrv_qx
%%SERIAL%%libexec/nut/riello_ser
@@ -76,6 +79,7 @@ lib/libnutscan.so.2.0.5
%%SERIAL%%libexec/nut/bestfortress
%%SERIAL%%libexec/nut/bestuferrups
%%SERIAL%%libexec/nut/bestups
+%%SERIAL%%libexec/nut/bicker_ser
%%SERIAL%%libexec/nut/blazer_ser
%%USB%%libexec/nut/blazer_usb
%%SERIAL%%libexec/nut/clone
@@ -83,12 +87,14 @@ lib/libnutscan.so.2.0.5
%%SERIAL%%libexec/nut/dummy-ups
%%SERIAL%%libexec/nut/etapro
%%SERIAL%%libexec/nut/everups
+%%USB%%libexec/nut/failover
%%SERIAL%%libexec/nut/gamatronic
%%SERIAL%%libexec/nut/genericups
%%SERIAL%%libexec/nut/isbmex
%%SERIAL%%libexec/nut/ivtscd
%%SERIAL%%libexec/nut/liebert
%%SERIAL%%libexec/nut/liebert-esp2
+%%SERIAL%%libexec/nut/liebert-gxe
%%SERIAL%%libexec/nut/masterguard
%%SERIAL%%libexec/nut/metasys
%%SERIAL%%libexec/nut/mge-utalk
@@ -99,10 +105,13 @@ lib/libnutscan.so.2.0.5
%%SERIAL%%libexec/nut/oneac
%%SERIAL%%libexec/nut/optiups
%%IPMIPSU%%libexec/nut/nut-ipmipsu
+%%SERIAL%%libexec/nut/nutdrv_hashx
%%SERIAL%%libexec/nut/nutdrv_siemens-sitop
%%SERIAL%%libexec/nut/powercom
%%PDU%%libexec/nut/powerman-pdu
+%%SERIAL%%libexec/nut/powervar_cx_ser
%%SERIAL%%libexec/nut/powerpanel
+%%USB%%libexec/nut/powervar_cx_usb
%%SERIAL%%libexec/nut/rhino
%%USB%%libexec/nut/richcomm_usb
%%SERIAL%%libexec/nut/safenet
@@ -119,10 +128,62 @@ lib/libnutscan.so.2.0.5
%%MODBUS%%libexec/nut/apc_modbus
%%MODBUS%%libexec/nut/generic_modbus
%%MODBUS%%libexec/nut/huawei-ups2000
+%%MODBUS%%libexec/nut/must_ep2000pro
%%MODBUS%%libexec/nut/phoenixcontact_modbus
+%%USB%%libexec/nut/nut-upower
%%MODBUS%%libexec/nut/socomec_jbus
+%%SERIAL%%libexec/nut/ve-direct
%%SERIAL%%libexec/nut/victronups
-%%DEV%%libexec/sockdebug
+%%MANPAGES%%%%CGI%%share/man/man5/hosts.conf.5.gz
+%%MANPAGES%%%%CGI%%share/man/man5/upsset.conf.5.gz
+%%MANPAGES%%%%CGI%%share/man/man5/upsstats.html.5.gz
+%%MANPAGES%%%%CGI%%share/man/man8/upsimage.cgi.8.gz
+%%MANPAGES%%%%CGI%%share/man/man8/upsset.cgi.8.gz
+%%MANPAGES%%%%CGI%%share/man/man8/upsstats.cgi.8.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_create_client_ssl_NSSL.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_create_client_ssl_OpenSSL.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_cafile.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_capath.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_caps.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_certfile.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_certhost_name.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_certident_name.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_certstore_path.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_certstore_prefix.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_certverify.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_force.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_keyfile.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_keypass.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_get_ssl_try.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_is_ssl.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_cafile.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_capath.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_certfile.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_certhost_name.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_certident_name.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_certstore_path.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_certstore_prefix.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_certverify.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_config_NSS.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_config_OpenSSL.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_force.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_keyfile.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_keypass.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%client_tcp_set_ssl_try.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_cookie.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_get_debug_level.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_getproctag.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_set_debug_level.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_setprocname.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_setproctag.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/%%NUT_USER%%scan_upslog_start_sync.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_cookie.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_get_debug_level.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_getproctag.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_set_debug_level.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_setprocname.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_setproctag.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_upslog_start_sync.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/libnutclient.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_commands.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_devices.3.gz
@@ -160,16 +221,21 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_commented_option_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_device_to_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_ip_range.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_option_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_parsable.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_sanity_check.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_sanity_check_serial.3.gz
-%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_device.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_get_serial_ports_list.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init_ip_ranges.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_inc.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_init.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_new_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_avahi.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz
@@ -179,112 +245,128 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_snmp.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_usb.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/nutscan_stringify_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_add_host_cert.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_cleanup.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_connect.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_disconnect.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_fd.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_get.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_get_default_connect_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_init.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_init_default_connect_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_next.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_start.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline_timeout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline_timeout_may_disconnect.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline_timeout_may_disconnect.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_report_build_details.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline_timeout.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_set_default_connect_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitaddr.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitname.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_ssl.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_ssl_caps.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_ssl_caps_descr.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_str_add_unique_token.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_str_contains_token.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_strerror.3.gz
+%%MANPAGES%%%%DEV%%share/man/man3/upscli_tryconnect.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_upserror.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upsclient.3.gz
-%%MANPAGES%%share/man/man5/nut.conf.5.gz
-%%MANPAGES%%share/man/man5/ups.conf.5.gz
-%%MANPAGES%%share/man/man5/upsd.conf.5.gz
-%%MANPAGES%%share/man/man5/upsd.users.5.gz
-%%MANPAGES%%share/man/man5/upsmon.conf.5.gz
-%%MANPAGES%%share/man/man5/upssched.conf.5.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/al175.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/apcupsd-ups.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/blazer_ser.8.gz
-%%MANPAGES%%%%USB%%share/man/man8/blazer_usb.8.gz
-%%MANPAGES%%%%NEON%%share/man/man8/netxml-ups.8.gz
-%%MANPAGES%%share/man/man8/nut-driver-enumerator.8.gz
-%%MANPAGES%%share/man/man8/nut-recorder.8.gz
-%%MANPAGES%%share/man/man8/nut-scanner.8.gz
-%%MANPAGES%%share/man/man8/nutconf.8.gz
-%%MANPAGES%%%%USB%%share/man/man8/nutdrv_atcl_usb.8.gz
-%%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz
-%%MANPAGES%%share/man/man8/nutupsdrv.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz
-%%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
-%%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz
+%%MANPAGES%%%%DEV%%share/man/man8/sockdebug.8.gz
+%%MANPAGES%%%%IPMIPSU%%share/man/man8/nut-ipmipsu.8.gz
%%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz
%%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz
%%MANPAGES%%%%MODBUS%%share/man/man8/huawei-ups2000.8.gz
+%%MANPAGES%%%%MODBUS%%share/man/man8/must_ep2000pro.8.gz
%%MANPAGES%%%%MODBUS%%share/man/man8/phoenixcontact_modbus.8.gz
%%MANPAGES%%%%MODBUS%%share/man/man8/socomec_jbus.8.gz
-%%MANPAGES%%share/man/man8/upsc.8.gz
-%%MANPAGES%%share/man/man8/upscmd.8.gz
-%%MANPAGES%%share/man/man8/upsd.8.gz
-%%MANPAGES%%share/man/man8/upsdrvctl.8.gz
-%%MANPAGES%%share/man/man8/upsdrvsvcctl.8.gz
-%%MANPAGES%%share/man/man8/upslog.8.gz
-%%MANPAGES%%share/man/man8/upsmon.8.gz
-%%MANPAGES%%share/man/man8/upsrw.8.gz
-%%MANPAGES%%share/man/man8/upssched.8.gz
-%%MANPAGES%%%%CGI%%share/man/man5/hosts.conf.5.gz
-%%MANPAGES%%%%CGI%%share/man/man5/upsset.conf.5.gz
-%%MANPAGES%%%%CGI%%share/man/man5/upsstats.html.5.gz
-%%MANPAGES%%%%CGI%%share/man/man8/upsset.cgi.8.gz
-%%MANPAGES%%%%CGI%%share/man/man8/upsstats.cgi.8.gz
-%%MANPAGES%%%%CGI%%share/man/man8/upsimage.cgi.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart.8.gz
+%%MANPAGES%%%%NEON%%share/man/man8/netxml-ups.8.gz
+%%MANPAGES%%%%PDU%%share/man/man8/powerman-pdu.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/al175.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart-old.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/bestfortress.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/apcupsd-ups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/bcmxcp.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/belkin.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/belkinunv.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bestfcom.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bestfortress.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/bestuferrups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/bestups.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/bestfcom.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/bicker_ser.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/blazer_ser.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/clone-outlet.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/clone.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/dummy-ups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/etapro.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/everups.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/failover.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/gamatronic.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/genericups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/isbmex.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/ivtscd.8.gz
-%%MANPAGES%%%%SERIAL%%share/man/man8/liebert.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/liebert-esp2.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/liebert-gxe.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/liebert.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/masterguard.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/meanwell_ntu.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/metasys.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/mge-shut.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/mge-utalk.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/microdowell.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/microsol-apc.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_hashx.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens-sitop.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/oneac.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/optiups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/powercom.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/powerpanel.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/powervar_cx_ser.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/rhino.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/safenet.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/solis.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/tripplite.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/tripplitesu.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/upscode2.8.gz
+%%MANPAGES%%%%SERIAL%%share/man/man8/ve-direct.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/victronups.8.gz
+%%MANPAGES%%%%SNMP%%share/man/man8/snmp-ups.8.gz
%%MANPAGES%%%%USB%%share/man/man8/bcmxcp_usb.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/blazer_usb.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/nut-upower.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/nutdrv_atcl_usb.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/powervar_cx_usb.8.gz
%%MANPAGES%%%%USB%%share/man/man8/richcomm_usb.8.gz
-%%MANPAGES%%%%DEV%%share/man/man8/sockdebug.8.gz
+%%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz
%%MANPAGES%%%%USB%%share/man/man8/tripplite_usb.8.gz
%%MANPAGES%%%%USB%%share/man/man8/usbhid-ups.8.gz
-%%MANPAGES%%%%SNMP%%share/man/man8/snmp-ups.8.gz
-%%MANPAGES%%%%IPMIPSU%%share/man/man8/nut-ipmipsu.8.gz
-%%MANPAGES%%%%PDU%%share/man/man8/powerman-pdu.8.gz
+%%MANPAGES%%share/man/man5/nut.conf.5.gz
+%%MANPAGES%%share/man/man5/ups.conf.5.gz
+%%MANPAGES%%share/man/man5/upsd.conf.5.gz
+%%MANPAGES%%share/man/man5/upsd.users.5.gz
+%%MANPAGES%%share/man/man5/upsmon.conf.5.gz
+%%MANPAGES%%share/man/man5/upssched.conf.5.gz
+%%MANPAGES%%share/man/man7/nut.7.gz
+%%MANPAGES%%share/man/man8/nut-recorder.8.gz
+%%MANPAGES%%share/man/man8/nut-scanner.8.gz
+%%MANPAGES%%share/man/man8/nutconf.8.gz
+%%MANPAGES%%share/man/man8/nutupsdrv.8.gz
+%%MANPAGES%%share/man/man8/upsc.8.gz
+%%MANPAGES%%share/man/man8/upscmd.8.gz
+%%MANPAGES%%share/man/man8/upsd.8.gz
+%%MANPAGES%%share/man/man8/upsdrvctl.8.gz
+%%MANPAGES%%share/man/man8/upslog.8.gz
+%%MANPAGES%%share/man/man8/upsmon.8.gz
+%%MANPAGES%%share/man/man8/upsrw.8.gz
+%%MANPAGES%%share/man/man8/upssched.8.gz
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
@@ -293,3 +375,4 @@ sbin/upssched
@dir(%%NUT_USER%%,%%NUT_GROUP%%,750) %%STATEDIR%%
@dir libexec/nut
@dir(%%NUT_USER%%,%%NUT_GROUP%%,) /var/log/nut
+%%PORTDOCS%%@dir %%DOCSDIR%%/html-man