cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nut-2.8.0

Browse Source
This commit is contained in:
sthen 2022-05-08 07:33:38 +00:00
parent ccec33d98a
commit debb57addd
6 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sysutils/nut/Makefile
View File

@ -3,12 +3,8 @@ COMMENT-cgi= CGIs for monitoring Nut-based UPSs
COMMENT-snmp= driver for monitoring UPS via SNMP
COMMENT-xml= driver for monitoring UPS via XML/HTTP
V= 2.8.0-rc2
V= 2.8.0
DISTNAME= nut-${V}
#PKGNAME= nut-${V:S/-//}
# this is really 2.8.0rc2 but pre/rc can't be compared in pkg_add sort;
# go back to the default after 2.8.0 release
PKGNAME= nut-2.8.0pre20220410
PKGNAME-main= ${PKGNAME}
PKGNAME-cgi= ${PKGNAME:S/-/-cgi-/}
@ -50,9 +46,6 @@ WEB_ROOT= /var/www
SUBST_VARS= BASESYSCONFDIR WEB_ROOT
CONFIGURE_STYLE= gnu
#AUTOCONF_VERSION= 2.71
#AUTOMAKE_VERSION= 1.16
#AUTORECONF= ./autogen.sh
SYSCONFDIR= ${BASESYSCONFDIR}/nut
LDFLAGS+= -L${LOCALBASE}/lib -pthread

4
sysutils/nut/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nut-2.8.0-rc2.tar.gz) = iNk+WogdQCeIN56+T6Aoaq9A6MwpW6LOBNAJbesx0Ps=
SIZE (nut-2.8.0-rc2.tar.gz) = 3235209
SHA256 (nut-2.8.0.tar.gz) = w+WnCNp5e3xwtlPTexIGoAD8tQO4VRn+TN9jU/eSv+U=
SIZE (nut-2.8.0.tar.gz) = 3287640

4
sysutils/nut/patches/patch-clients_upsset_c
View File

@ -1,7 +1,7 @@
Index: clients/upsset.c
--- clients/upsset.c.orig
+++ clients/upsset.c
@@ -192,7 +192,7 @@ static void do_pickups(const char *currfunc)
@@ -193,7 +193,7 @@ static void do_pickups(const char *currfunc)
char hostfn[SMALLBUF];
PCONF_CTX_t ctx;
@ -10,7 +10,7 @@ Index: clients/upsset.c
printf("<FORM METHOD=\"POST\" ACTION=\"upsset.cgi\">\n");
@@ -1017,7 +1017,7 @@ static void check_conf(void)
@@ -1018,7 +1018,7 @@ static void check_conf(void)
char fn[SMALLBUF];
PCONF_CTX_t ctx;

2
sysutils/nut/patches/patch-common_common_c
View File

@ -1,7 +1,7 @@
Index: common/common.c
--- common/common.c.orig
+++ common/common.c
@@ -534,6 +534,17 @@ const char * confpath(void)
@@ -535,6 +535,17 @@ const char * confpath(void)
return path;
}

10
sysutils/nut/patches/patch-conf_ups_conf_sample
View File

@ -1,16 +1,16 @@
Index: conf/ups.conf.sample
--- conf/ups.conf.sample.orig
+++ conf/ups.conf.sample
@@ -81,7 +81,7 @@ maxretry = 3
@@ -127,7 +127,7 @@ maxretry = 3
# apcsmart, bestups, and sec are some examples.
#
# port: REQUIRED. The serial port where your UPS is connected.
-# /dev/ttyS0 is usually the first port on Linux boxes, for example.
+# /dev/tty00 is usually the first port on Linux boxes, for example.
+# /dev/tty00 is usually the first port on OpenBSD boxes, for example.
#
# sdorder: optional. When you have multiple UPSes on your system, you
# sdorder: OPTIONAL. When you have multiple UPSes on your system, you
# usually need to turn them off in a certain order. upsdrvctl
@@ -133,11 +133,11 @@ maxretry = 3
@@ -181,11 +181,11 @@ maxretry = 3
# --------
#
# A simple example for a UPS called "powerpal" that uses the blazer_ser
@ -24,7 +24,7 @@ Index: conf/ups.conf.sample
# desc = "Web server"
#
# If your UPS driver requires additional settings, you can specify them
@@ -152,3 +152,17 @@ maxretry = 3
@@ -200,3 +200,17 @@ maxretry = 3
#
# To find out if your driver supports any extra settings, start it with
# the -h option and/or read the driver's documentation.

2
sysutils/nut/pkg/PLIST-main
View File

@ -150,7 +150,7 @@ lib/pkgconfig/libupsclient.pc
@man man/man3/nutscan_scan_nut.3
@man man/man3/nutscan_scan_snmp.3
@man man/man3/nutscan_scan_usb.3
@man man/man3/nutscan_scan_xml_http.3
@man man/man3/nutscan_scan_xml_http_range.3
@man man/man3/upscli_add_host_cert.3
@man man/man3/upscli_cleanup.3
@man man/man3/upscli_connect.3