diff options
author | lukem <lukem> | 2002-12-13 04:23:17 +0000 |
---|---|---|
committer | lukem <lukem> | 2002-12-13 04:23:17 +0000 |
commit | 35f3e7d334c8a869c2dede1ef76a589574472a52 (patch) | |
tree | 9d60baac030c4085b95e53c64ff123065f869d3b /sysutils/ups-nut | |
parent | 727e0146713c8fc4413ed2ce19cb33901fdd4b1b (diff) | |
download | pkgsrc-35f3e7d334c8a869c2dede1ef76a589574472a52.tar.gz |
Update from nut 0.50.0 to 1.2.1.
Many changes, too many to list here.
See:
http://www.exploits.org/nut/release/1.2/new-1.2.1.txt
and (after installation):
/usr/pkg/share/doc/nut/UPGRADING
Diffstat (limited to 'sysutils/ups-nut')
-rw-r--r-- | sysutils/ups-nut/MESSAGE | 6 | ||||
-rw-r--r-- | sysutils/ups-nut/Makefile | 31 | ||||
-rw-r--r-- | sysutils/ups-nut/PLIST | 55 | ||||
-rw-r--r-- | sysutils/ups-nut/distinfo | 15 | ||||
-rw-r--r-- | sysutils/ups-nut/files/upsdriver.sh | 4 | ||||
-rw-r--r-- | sysutils/ups-nut/patches/patch-aa | 16 | ||||
-rw-r--r-- | sysutils/ups-nut/patches/patch-ab | 18 | ||||
-rw-r--r-- | sysutils/ups-nut/patches/patch-ac | 18 | ||||
-rw-r--r-- | sysutils/ups-nut/patches/patch-ad | 8 | ||||
-rw-r--r-- | sysutils/ups-nut/patches/patch-ag | 21 | ||||
-rw-r--r-- | sysutils/ups-nut/patches/patch-ah | 23 |
11 files changed, 90 insertions, 125 deletions
diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE index 48950e89315..434bd2dddda 100644 --- a/sysutils/ups-nut/MESSAGE +++ b/sysutils/ups-nut/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2002/09/24 12:30:37 wiz Exp $ +$NetBSD: MESSAGE,v 1.5 2002/12/13 04:23:17 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). @@ -10,4 +10,8 @@ $NetBSD: MESSAGE,v 1.4 2002/09/24 12:30:37 wiz Exp $ to the IANA assigned 3493, from 3305 in previous versions. You will need to update all clients. + Various changes occurred in version 1.0. + If upgrading from a prior version, refer to + ${NUT_DOCDIR}/UPGRADING for more information. + =========================================================================== diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index f19472dbb70..5253b6e8e5a 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.24 2002/10/02 22:38:59 dillo Exp $ +# $NetBSD: Makefile,v 1.25 2002/12/13 04:23:17 lukem Exp $ # -DISTNAME= nut-0.50.0 -PKGNAME= ups-nut-0.50.0 +DISTNAME= nut-1.2.1 +PKGNAME= ups-nut-1.2.1 CATEGORIES= sysutils -MASTER_SITES= http://www.exploits.org/nut/release/ +MASTER_SITES= http://www.exploits.org/nut/release/1.2/ MAINTAINER= lukem@netbsd.org HOMEPAGE= http://www.exploits.org/nut/ @@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ --with-user=${NUT_USER} \ --with-group=${NUT_GROUP} \ --with-statepath=${NUT_STATEDIR} \ - --with-modelpath=${LOCALBASE}/sbin/ups-drivers + --with-drvpath=${LOCALBASE}/sbin/ups-drivers PKG_SYSCONFSUBDIR?= nut NUT_CONFDIR= ${PKG_SYSCONFDIR} @@ -32,25 +32,24 @@ FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR} MESSAGE_SUBST+= NUT_CONFDIR=${NUT_CONFDIR} MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR} +MESSAGE_SUBST+= NUT_DOCDIR=${NUT_DOCDIR} PKG_GROUPS= ${NUT_GROUP} PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\\ UPS\\ Tools::${SH} -CONF_FILES= ${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf -CONF_FILES+= ${NUT_EGDIR}/multimon.conf.sample ${NUT_CONFDIR}/multimon.conf -CONF_FILES+= ${NUT_EGDIR}/upsset.conf.sample ${NUT_CONFDIR}/upsset.conf -CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample ${NUT_CONFDIR}/upssched.conf -CONF_FILES+= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf +CONF_FILES= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf +CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \ + ${NUT_CONFDIR}/upssched.conf -CONF_FILES_PERMS= ${NUT_EGDIR}/upsmon.conf.sample \ - ${NUT_CONFDIR}/upsmon.conf \ - ${ROOT_USER} ${ROOT_GROUP} 0600 -CONF_FILES_PERMS+= ${NUT_EGDIR}/upsd.conf.sample \ +CONF_FILES_PERMS= ${NUT_EGDIR}/upsd.conf.sample \ ${NUT_CONFDIR}/upsd.conf \ ${ROOT_USER} ${ROOT_GROUP} 0600 CONF_FILES_PERMS+= ${NUT_EGDIR}/upsd.users.sample \ ${NUT_CONFDIR}/upsd.users \ ${ROOT_USER} ${ROOT_GROUP} 0600 +CONF_FILES_PERMS+= ${NUT_EGDIR}/upsmon.conf.sample \ + ${NUT_CONFDIR}/upsmon.conf \ + ${ROOT_USER} ${ROOT_GROUP} 0600 RCD_SCRIPTS= ups upsd upsdriver upslog upsmon OWN_DIRS= ${NUT_CONFDIR} @@ -62,7 +61,9 @@ pre-install: post-install: ${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers - ${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR} + for f in CHANGES COPYING CREDITS NEWS README UPGRADING; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${NUT_DOCDIR}; \ + done ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${NUT_DOCDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index 9139398a2f8..7e42a69ada8 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:51:04 jlam Exp $ +@comment $NetBSD: PLIST,v 1.11 2002/12/13 04:23:17 lukem Exp $ bin/upsc bin/upscmd -bin/upsct -bin/upsct2 bin/upslog +bin/upsrw etc/rc.d/ups etc/rc.d/upsd etc/rc.d/upsdriver @@ -15,56 +14,79 @@ man/man5/upsd.users.5 man/man5/upsmon.conf.5 man/man5/upssched.conf.5 man/man8/apcsmart.8 +man/man8/bcmxcp.8 man/man8/belkin.8 man/man8/bestferrups801-807.8 +man/man8/bestfortress.8 +man/man8/bestuferrups.8 man/man8/bestups.8 man/man8/cyberpower.8 +man/man8/etapro.8 man/man8/everups.8 man/man8/fentonups.8 man/man8/genericups.8 man/man8/hp.8 +man/man8/isbmex.8 +man/man8/liebert.8 man/man8/masterguard.8 man/man8/mge-ellipse.8 +man/man8/mge-utalk.8 +man/man8/microdowell.8 man/man8/newapc.8 man/man8/nutupsdrv.8 +man/man8/oneac.8 man/man8/powercom.8 +man/man8/powernet.8 man/man8/sec.8 +man/man8/sms.8 +man/man8/snmp-ups.8 man/man8/tripplite.8 man/man8/upsc.8 man/man8/upscmd.8 -man/man8/upsct.8 -man/man8/upsct2.8 man/man8/upsd.8 man/man8/upsdrvctl.8 man/man8/upslog.8 man/man8/upsmon.8 +man/man8/upsrw.8 man/man8/upssched.8 man/man8/victronups.8 sbin/ups-drivers/apcsmart +sbin/ups-drivers/bcmxcp sbin/ups-drivers/belkin sbin/ups-drivers/bestferrups801-807 +sbin/ups-drivers/bestfortress +sbin/ups-drivers/bestuferrups sbin/ups-drivers/bestups sbin/ups-drivers/cyberpower +sbin/ups-drivers/etapro sbin/ups-drivers/everups sbin/ups-drivers/fentonups sbin/ups-drivers/genericups sbin/ups-drivers/hp +sbin/ups-drivers/isbmex +sbin/ups-drivers/liebert sbin/ups-drivers/masterguard sbin/ups-drivers/mge-ellipse sbin/ups-drivers/mge-utalk +sbin/ups-drivers/microdowell sbin/ups-drivers/newapc +sbin/ups-drivers/oneac sbin/ups-drivers/powercom -sbin/ups-drivers/powerware sbin/ups-drivers/sec +sbin/ups-drivers/sms sbin/ups-drivers/tripplite +sbin/ups-drivers/upsdrvctl sbin/ups-drivers/victronups sbin/upsd -sbin/upsdrvctl sbin/upsmon sbin/upssched +share/doc/nut/CHANGES +share/doc/nut/COPYING +share/doc/nut/CREDITS share/doc/nut/FAQ +share/doc/nut/NEWS share/doc/nut/README -share/doc/nut/access.txt +share/doc/nut/UPGRADING share/doc/nut/big-servers.txt share/doc/nut/cables/apc.txt share/doc/nut/cables/ge-imv-victron.txt @@ -80,36 +102,27 @@ share/doc/nut/configure.txt share/doc/nut/data-room.txt share/doc/nut/design.txt share/doc/nut/developers.txt -share/doc/nut/driver-control.txt share/doc/nut/driver.list -share/doc/nut/drivers/belkin.txt -share/doc/nut/drivers/bestferrups801-807.txt -share/doc/nut/drivers/dummycons.txt -share/doc/nut/drivers/dummyups.txt share/doc/nut/drivers/generic-ups.txt share/doc/nut/drivers/mge-ellipse.txt share/doc/nut/drivers/mge-utalk.txt -share/doc/nut/drivers/multilink.txt -share/doc/nut/drivers/powercom.txt share/doc/nut/drivers/snmp-ups.txt -share/doc/nut/model-arguments.txt -share/doc/nut/new-modules.txt +share/doc/nut/new-drivers.txt share/doc/nut/pager.txt share/doc/nut/protocol.txt share/doc/nut/shutdown.txt -share/doc/nut/tips.txt +share/doc/nut/ssl.txt share/doc/nut/todo.txt share/doc/nut/upssched.txt -share/examples/nut/hosts.conf.sample -share/examples/nut/multimon.conf.sample share/examples/nut/ups.conf.sample share/examples/nut/upsd.conf.sample share/examples/nut/upsd.users.sample share/examples/nut/upsmon.conf.sample share/examples/nut/upssched.conf.sample -share/examples/nut/upsset.conf.sample @dirrm share/examples/nut @dirrm share/doc/nut/drivers @dirrm share/doc/nut/cables @dirrm share/doc/nut @dirrm sbin/ups-drivers +@exec ${MKDIR} %D/etc/nut +@dirrm etc/nut diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index 75a45431b4e..ab54fce274a 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.15 2002/10/02 22:38:59 dillo Exp $ +$NetBSD: distinfo,v 1.16 2002/12/13 04:23:17 lukem Exp $ -SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3 -Size (nut-0.50.0.tar.gz) = 382755 bytes -SHA1 (patch-aa) = 4d16a24725a0ff645c430ba43ef8c52856491a73 -SHA1 (patch-ab) = fac1a47430a2c2d692ecede2ac6ed78c60a82566 -SHA1 (patch-ac) = 60b2ac079232ab4af1b41928760601f0a09b9ae1 -SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d -SHA1 (patch-ag) = b6ae992f9b92d68683ac6adb7378d11158cc1fdc -SHA1 (patch-ah) = 352138de98a1a0451f20e6b60e4f0f44bcbe645d +SHA1 (nut-1.2.1.tar.gz) = db55b0165ef594ad1cf73bf5d3d9336a0ac0fb93 +Size (nut-1.2.1.tar.gz) = 444256 bytes +SHA1 (patch-ab) = 6f9ca3c1faa4cb20598116f602596f43d1e07199 +SHA1 (patch-ad) = 56b1b50affe7615b7ecc5e5db0305303ac2cd078 +SHA1 (patch-ah) = 8a6e0ce86a30bb2009654f4b1c5fcb25af22e7db diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh index feb36fa9b2f..01d09f01400 100644 --- a/sysutils/ups-nut/files/upsdriver.sh +++ b/sysutils/ups-nut/files/upsdriver.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: upsdriver.sh,v 1.6 2002/09/20 02:02:01 grant Exp $ +# $NetBSD: upsdriver.sh,v 1.7 2002/12/13 04:23:18 lukem Exp $ # # PROVIDE: upsdriver # REQUIRE: NETWORK syslogd mountcritremote @@ -31,7 +31,7 @@ fi if [ "${upsdriver_type:-upsdrvctl}" = "upsdrvctl" ] then - ctl_command="@PREFIX@/sbin/upsdrvctl" + ctl_command="@PREFIX@/sbin/ups-drivers/upsdrvctl" required_files="@NUT_CONFDIR@/ups.conf" start_cmd="${ctl_command} start" stop_cmd="${ctl_command} stop" diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa deleted file mode 100644 index 75598290e63..00000000000 --- a/sysutils/ups-nut/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2002/08/25 21:51:06 jlam Exp $ - ---- models/upscommon.c.orig Fri May 17 15:27:55 2002 -+++ models/upscommon.c -@@ -688,6 +688,11 @@ void info_ready(void) - { - int ret; - -+#ifdef HAVE_MMAP -+ /* sync external file representation before operating on the file */ -+ msync(shared_info, info_size, MS_INVALIDATE); -+#endif -+ - ret = rename(initfn, statefn); - - if (ret != 0) diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab index 9fb9ce303a9..fae3f6877c5 100644 --- a/sysutils/ups-nut/patches/patch-ab +++ b/sysutils/ups-nut/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.5 2001/11/21 15:50:56 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2002/12/13 04:23:19 lukem Exp $ ---- conf/Makefile.in.orig Mon Aug 13 13:12:18 2001 +--- conf/Makefile.in.orig Tue Sep 3 17:23:02 2002 +++ conf/Makefile.in -@@ -1,7 +1,7 @@ - # Network UPS Tools: conf +@@ -4,7 +4,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ - prefix = @prefix@ --CONFPATH = $(INSTALLROOT)@sysconfdir@ -+CONFPATH = $(INSTALLROOT)@datadir@/examples/nut - INSTALLCMD = @INSTALL@ +-CONFPATH = $(DESTDIR)@sysconfdir@ ++CONFPATH = $(DESTDIR)@datadir@/examples/nut + + INSTALLCMD = @INSTALL@ - SECFILES = upsmon.conf upsd.conf upsd.users diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac deleted file mode 100644 index 567735ca3b3..00000000000 --- a/sysutils/ups-nut/patches/patch-ac +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2002/08/25 21:51:06 jlam Exp $ - ---- clients/upslog.c.orig Fri May 17 08:26:22 2002 -+++ clients/upslog.c -@@ -180,6 +180,13 @@ void print_status(void) - continue; - } - -+ /* if a %%, append % and start over */ -+ if (logformat[i+1] == '%') { -+ snprintfcat(logbuffer, sizeof(logbuffer), "%%"); -+ i++; -+ continue; -+ } -+ - /* it must start with a % now - %<cmd>[ <arg>]%*/ - - cmd = xstrdup(&logformat[i+1]); diff --git a/sysutils/ups-nut/patches/patch-ad b/sysutils/ups-nut/patches/patch-ad index 1422ca34976..36eb479226c 100644 --- a/sysutils/ups-nut/patches/patch-ad +++ b/sysutils/ups-nut/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2001/09/28 04:37:27 lukem Exp $ +$NetBSD: patch-ad,v 1.3 2002/12/13 04:23:19 lukem Exp $ ---- configure.in.orig Tue Jun 12 07:47:56 2001 -+++ configure.in Fri Sep 28 10:41:01 2001 -@@ -396,13 +396,17 @@ +--- configure.in.orig Mon Dec 2 23:08:46 2002 ++++ configure.in +@@ -526,13 +526,17 @@ dnl | let's test it for sanity before proceeding. It's better to | dnl | catch them here rather than in the program itself at runtime. | diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag deleted file mode 100644 index ff0f31b73fa..00000000000 --- a/sysutils/ups-nut/patches/patch-ag +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2002/08/25 21:51:06 jlam Exp $ - ---- models/Makefile.in.orig Tue Mar 26 10:30:31 2002 -+++ models/Makefile.in -@@ -2,6 +2,7 @@ - - # directories - MODELPATH = $(INSTALLROOT)@MODELPATH@ -+SBINPATH = $(INSTALLROOT)@prefix@/@sbindir@ - - # other definitions - CC = @CC@ -@@ -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 - diff --git a/sysutils/ups-nut/patches/patch-ah b/sysutils/ups-nut/patches/patch-ah index ad0054bca45..7702461f310 100644 --- a/sysutils/ups-nut/patches/patch-ah +++ b/sysutils/ups-nut/patches/patch-ah @@ -1,18 +1,23 @@ -$NetBSD: patch-ah,v 1.1 2002/10/02 22:39:00 dillo Exp $ +$NetBSD: patch-ah,v 1.2 2002/12/13 04:23:20 lukem Exp $ ---- configure.orig Thu Oct 3 00:37:12 2002 +--- configure.orig Mon Dec 2 23:08:51 2002 +++ configure -@@ -2684,13 +2684,6 @@ fi - +@@ -4741,18 +4741,6 @@ + fi; +- -grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null -if (test "$?" = "1") -then - # not found, fatal error -- echo "configure: warning: $RUN_AS_GROUP not found in /etc/group!" 1>&2 -- echo "configure: warning: You might want to rerun configure using --with-group and another group name." 1>&2 --fi - +- { echo "$as_me:$LINENO: WARNING: $RUN_AS_GROUP not found in /etc/group!" >&5 +-echo "$as_me: WARNING: $RUN_AS_GROUP not found in /etc/group!" >&2;} +- { echo "$as_me:$LINENO: WARNING: You might want to rerun configure using --with-group and another group name." >&5 +-echo "$as_me: WARNING: You might want to rerun configure using --with-group and another group name." >&2;} +-fi +- +- + echo "$as_me:$LINENO: checking facility for syslog" >&5 + echo $ECHO_N "checking facility for syslog... $ECHO_C" >&6 - echo $ac_n "checking facility for syslog""... $ac_c" 1>&6 |