From 3650709f7a8d123993b44d27096528e66e418ee1 Mon Sep 17 00:00:00 2001 From: lukem Date: Mon, 13 May 2002 14:40:51 +0000 Subject: Update ups-nut from 0.45.3 to 0.45.5. Notable changes: - upsd.users(5) has changed formats. NOTE: you need to update your file for upsd(8) to function - upsmon can reload its configuration on the fly (with '-c reload') - upsdrvctl can power off UPS's in an orderly fashion - new drivers: - tripplite - Tripp-Lite SmartUPS models - newvictron - IMV/Victron hardware - bestferrups801-807 - Best FerrUPS 8.01-8.07 firmware - genericups type 14 - for Online P-series units - upsdrvctl now waits up to "maxstartdelay" (default 45) seconds for a driver to start before it gives up and goes to the next entry (refer to CHANGES in the distribution, or http://www.exploits.org/nut/release/new-0.45.4.txt and http://www.exploits.org/nut/release/new-0.45.5.txt for a detailed list) --- sysutils/ups-nut/MESSAGE | 9 +++++++++ sysutils/ups-nut/Makefile | 9 ++++++--- sysutils/ups-nut/PLIST | 9 ++++++++- sysutils/ups-nut/distinfo | 9 ++++----- sysutils/ups-nut/patches/patch-af | 24 ------------------------ sysutils/ups-nut/patches/patch-ag | 29 +++++++++++++---------------- 6 files changed, 40 insertions(+), 49 deletions(-) create mode 100644 sysutils/ups-nut/MESSAGE delete mode 100644 sysutils/ups-nut/patches/patch-af diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE new file mode 100644 index 00000000000..6fadded5ed6 --- /dev/null +++ b/sysutils/ups-nut/MESSAGE @@ -0,0 +1,9 @@ +====================================================================== +$NetBSD: MESSAGE,v 1.1 2002/05/13 14:40:51 lukem Exp $ + + ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5. + You will need to update this before restarting upsd(8). + Refer to ${NUT_EGDIR}/upsd.users.sample + and upsd.users(5) for more information. + +====================================================================== diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 8b6789dc856..9c5452a0504 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2002/01/03 14:42:43 lukem Exp $ +# $NetBSD: Makefile,v 1.19 2002/05/13 14:40:51 lukem Exp $ # -DISTNAME= nut-0.45.3 -PKGNAME= ups-nut-0.45.3 +DISTNAME= nut-0.45.5 +PKGNAME= ups-nut-0.45.5 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ @@ -32,6 +32,9 @@ NUT_GROUP?= nut FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR} FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR} +MESSAGE_SUBST+= NUT_CONFDIR=${NUT_CONFDIR} +MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR} + PKG_GROUPS= ${NUT_GROUP} PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\\ UPS\\ Tools::${SH} diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index 5385f6978ef..df23923ae28 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2002/01/03 14:42:43 lukem Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/05/13 14:40:51 lukem Exp $ bin/upsc bin/upscmd bin/upsct @@ -18,6 +18,8 @@ man/man8/apcsmart.8 man/man8/belkin.8 man/man8/bestups.8 man/man8/fentonups.8 +man/man8/newapc.8 +man/man8/newvictron.8 man/man8/nutupsdrv.8 man/man8/powercom.8 man/man8/upsc.8 @@ -32,6 +34,7 @@ man/man8/upssched.8 sbin/ups-drivers/aeg sbin/ups-drivers/apcsmart sbin/ups-drivers/belkin +sbin/ups-drivers/bestferrups801-807 sbin/ups-drivers/bestfort sbin/ups-drivers/bestuferrups sbin/ups-drivers/bestups @@ -40,6 +43,7 @@ sbin/ups-drivers/engetron sbin/ups-drivers/everups sbin/ups-drivers/fentonups sbin/ups-drivers/genericups +sbin/ups-drivers/hp sbin/ups-drivers/ipt-anzen sbin/ups-drivers/masterguard sbin/ups-drivers/mge-ellipse @@ -48,11 +52,13 @@ sbin/ups-drivers/multilink sbin/ups-drivers/mustekups sbin/ups-drivers/newapc sbin/ups-drivers/newpowercom +sbin/ups-drivers/newvictron sbin/ups-drivers/optiups sbin/ups-drivers/powercom sbin/ups-drivers/sec sbin/ups-drivers/sms sbin/ups-drivers/toshiba1500 +sbin/ups-drivers/tripplite sbin/ups-drivers/ups-trust425+625 sbin/ups-drivers/upseyeux sbin/ups-drivers/victronups @@ -65,6 +71,7 @@ share/doc/nut/FAQ share/doc/nut/README share/doc/nut/access.txt share/doc/nut/belkin.txt +share/doc/nut/bestferrups801-807.txt share/doc/nut/big-servers.txt share/doc/nut/cables/powerware.txt share/doc/nut/cables/repotec.txt diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index 26e85dcf6a0..7f75d9ce569 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.9 2002/01/03 14:42:43 lukem Exp $ +$NetBSD: distinfo,v 1.10 2002/05/13 14:40:51 lukem Exp $ -SHA1 (nut-0.45.3.tar.gz) = c6596eb9291a046e47a473db8cec81a082e28d2b -Size (nut-0.45.3.tar.gz) = 339066 bytes +SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3 +Size (nut-0.45.5.tar.gz) = 386936 bytes SHA1 (patch-ab) = fac1a47430a2c2d692ecede2ac6ed78c60a82566 SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d -SHA1 (patch-af) = 92f99eae16425baab09b1f5e6546caf322ca430c -SHA1 (patch-ag) = d75f10af8a716effbdca17dd28323bd6edc75c87 +SHA1 (patch-ag) = b6ae992f9b92d68683ac6adb7378d11158cc1fdc diff --git a/sysutils/ups-nut/patches/patch-af b/sysutils/ups-nut/patches/patch-af deleted file mode 100644 index 1cc9fb42d49..00000000000 --- a/sysutils/ups-nut/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.3 2001/11/20 14:53:04 lukem Exp $ - ---- models/newapc.c.orig Thu Oct 11 04:32:07 2001 -+++ models/newapc.c -@@ -185,11 +185,18 @@ - case APC_F_HEX: - case APC_F_DEC: - case APC_F_SECONDS: -- case APC_F_MINUTES: - case APC_F_HOURS: - case APC_F_LEAVE: - /* All of these just pass through at present */ - ptr = upsval; -+ break; -+ case APC_F_MINUTES: -+ strncpy(tmp, upsval, sizeof(tmp) - 1); -+ tmp[sizeof(tmp) - 1] = 0; -+ tval = strlen(tmp) - 1; -+ if (tmp[tval] == ':') /* cull trailing `:' */ -+ tmp[tval] = 0; -+ ptr = tmp; - break; - default: - /* Moan */ diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag index 66c39bae4d9..ea9e99f5ac1 100644 --- a/sysutils/ups-nut/patches/patch-ag +++ b/sysutils/ups-nut/patches/patch-ag @@ -1,24 +1,21 @@ -$NetBSD: patch-ag,v 1.3 2001/11/21 03:22:05 simonb Exp $ +$NetBSD: patch-ag,v 1.4 2002/05/13 14:40:51 lukem Exp $ ---- models/Makefile.in.orig Wed Aug 29 21:40:53 2001 -+++ models/Makefile.in Wed Nov 21 02:52:43 2001 -@@ -1,7 +1,9 @@ - # Network UPS Tools: models +--- models/Makefile.in.orig Tue Mar 26 10:30:31 2002 ++++ models/Makefile.in +@@ -2,6 +2,7 @@ # directories -+prefix = $(INSTALLROOT)@prefix@ MODELPATH = $(INSTALLROOT)@MODELPATH@ -+SBINPATH = $(prefix)/@sbindir@ ++SBINPATH = $(INSTALLROOT)@prefix@/@sbindir@ # other definitions CC = @CC@ -@@ -85,6 +87,8 @@ - distclean: clean +@@ -97,7 +98,7 @@ + # Install handlers + + install: all install-@DRIVER_INSTALL_TARGET@ +- $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(MODELPATH); ++ $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(SBINPATH); + + # Install every driver - install: all -- @for f in $(PROGS) $(PROGS2) upsdrvctl ; do \ -+ $(INSTALLCMD) -m 0755 -d $(MODELPATH) -+ @for f in $(PROGS) $(PROGS2) ; do \ - $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MODELPATH); \ - done -+ @$(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(SBINPATH) -- cgit v1.2.3