Skip to content

Commit

Permalink
Update ups-nut from 0.45.3 to 0.45.5. Notable changes:
Browse files Browse the repository at this point in the history
- 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)
  • Loading branch information
lukem committed May 13, 2002
1 parent 14562db commit 86ae7d8
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 49 deletions.
9 changes: 9 additions & 0 deletions sysutils/ups-nut/MESSAGE
Original file line number Diff line number Diff line change
@@ -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.

======================================================================
9 changes: 6 additions & 3 deletions sysutils/ups-nut/Makefile
Original file line number Diff line number Diff line change
@@ -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/

Expand Down Expand Up @@ -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}

Expand Down
9 changes: 8 additions & 1 deletion sysutils/ups-nut/PLIST
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions sysutils/ups-nut/distinfo
Original file line number Diff line number Diff line change
@@ -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
24 changes: 0 additions & 24 deletions sysutils/ups-nut/patches/patch-af

This file was deleted.

29 changes: 13 additions & 16 deletions sysutils/ups-nut/patches/patch-ag
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 86ae7d8

Please sign in to comment.