diff options
Diffstat (limited to 'sysutils/ups-nut')
| -rw-r--r-- | sysutils/ups-nut/MESSAGE | 13 | ||||
| -rw-r--r-- | sysutils/ups-nut/Makefile | 27 | ||||
| -rw-r--r-- | sysutils/ups-nut/PLIST | 89 | ||||
| -rw-r--r-- | sysutils/ups-nut/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/ups-nut/files/upsdriver.sh | 6 | ||||
| -rw-r--r-- | sysutils/ups-nut/files/upslog.sh | 4 | ||||
| -rw-r--r-- | sysutils/ups-nut/files/upsmon.sh | 4 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-aa | 13 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-ab | 13 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-ad | 29 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-af | 23 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-ag | 13 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-ah | 23 |
13 files changed, 92 insertions, 177 deletions
diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE index 434bd2dddda..47535bc4ac4 100644 --- a/sysutils/ups-nut/MESSAGE +++ b/sysutils/ups-nut/MESSAGE @@ -1,16 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2002/12/13 04:23:17 lukem Exp $ +$NetBSD: MESSAGE,v 1.6 2004/02/15 13:14:25 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. - - The network port used by nut changed in version 0.50.0, - to the IANA assigned 3493, from 3305 in previous versions. - You will need to update all clients. - - Various changes occurred in version 1.0. + Various changes occurred in version 1.4. 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 afb12808415..353621a2d01 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,28 +1,33 @@ -# $NetBSD: Makefile,v 1.28 2003/07/17 22:53:56 grant Exp $ +# $NetBSD: Makefile,v 1.29 2004/02/15 13:14:25 lukem Exp $ # -DISTNAME= nut-1.2.1 -PKGNAME= ups-nut-1.2.1 -PKGREVISION= 1 +DISTNAME= nut-1.4.1 +PKGNAME= ups-nut-1.4.1 CATEGORIES= sysutils -MASTER_SITES= http://www.exploits.org/nut/release/1.2/ +MASTER_SITES= http://random.networkupstools.org/source/1.4/ MAINTAINER= lukem@NetBSD.org -HOMEPAGE= http://www.exploits.org/nut/ +HOMEPAGE= http://www.networkupstools.org/ COMMENT= Network UPS Tools USE_BUILDLINK2= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ + --datadir=${NUT_DATADIR} \ + --localstatedir=${NUT_STATEDIR} \ --with-user=${NUT_USER} \ --with-group=${NUT_GROUP} \ --with-statepath=${NUT_STATEDIR} \ - --with-drvpath=${LOCALBASE}/sbin/ups-drivers + --with-drvpath=${NUT_DRVDIR} \ + --with-altpidpath=${NUT_STATEDIR} \ + --with-pidpath=${NUT_STATEDIR} PKG_SYSCONFSUBDIR?= nut NUT_CONFDIR= ${PKG_SYSCONFDIR} +NUT_DATADIR= ${PREFIX}/share/nut NUT_DOCDIR= ${PREFIX}/share/doc/nut +NUT_DRVDIR= ${PREFIX}/libexec/nut NUT_EGDIR= ${PREFIX}/share/examples/nut NUT_STATEDIR= /var/db/nut @@ -58,18 +63,20 @@ OWN_DIRS= ${NUT_CONFDIR} OWN_DIRS_PERMS= ${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770 pre-install: - @${INSTALL_DATA_DIR} ${NUT_EGDIR} + @${MKDIR} ${NUT_STATEDIR} + @${MKDIR} ${NUT_DRVDIR} + @${CHOWN} ${NUT_USER} ${NUT_STATEDIR} + ${INSTALL_DATA_DIR} ${NUT_EGDIR} post-install: ${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers - for f in CHANGES COPYING CREDITS NEWS README UPGRADING; do \ + for f in CHANGES COPYING CREDITS NEWS README INSTALL 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} ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index 7e42a69ada8..ae69a9ef632 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2002/12/13 04:23:17 lukem Exp $ +@comment $NetBSD: PLIST,v 1.12 2004/02/15 13:14:25 lukem Exp $ bin/upsc bin/upscmd bin/upslog @@ -8,6 +8,37 @@ etc/rc.d/upsd etc/rc.d/upsdriver etc/rc.d/upslog etc/rc.d/upsmon +libexec/nut/apcsmart +libexec/nut/bcmxcp +libexec/nut/belkin +libexec/nut/bestfortress +libexec/nut/bestuferrups +libexec/nut/bestups +libexec/nut/blazer +libexec/nut/cyberpower +libexec/nut/esupssmart +libexec/nut/etapro +libexec/nut/everups +libexec/nut/fentonups +libexec/nut/ferrups +libexec/nut/genericups +libexec/nut/hp +libexec/nut/isbmex +libexec/nut/liebert +libexec/nut/masterguard +libexec/nut/mge-shut +libexec/nut/mge-utalk +libexec/nut/microdowell +libexec/nut/newapc +libexec/nut/oneac +libexec/nut/powercom +libexec/nut/safenet +libexec/nut/sec +libexec/nut/sms +libexec/nut/tripplite +libexec/nut/tripplitesu +libexec/nut/upsdrvctl +libexec/nut/victronups man/man5/ups.conf.5 man/man5/upsd.conf.5 man/man5/upsd.users.5 @@ -16,31 +47,32 @@ 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/dummycons.8 +man/man8/energizerups.8 man/man8/etapro.8 man/man8/everups.8 man/man8/fentonups.8 +man/man8/ferrups.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-shut.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/safenet.8 man/man8/sec.8 man/man8/sms.8 -man/man8/snmp-ups.8 man/man8/tripplite.8 +man/man8/tripplitesu.8 man/man8/upsc.8 man/man8/upscmd.8 man/man8/upsd.8 @@ -50,33 +82,6 @@ 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/sec -sbin/ups-drivers/sms -sbin/ups-drivers/tripplite -sbin/ups-drivers/upsdrvctl -sbin/ups-drivers/victronups sbin/upsd sbin/upsmon sbin/upssched @@ -84,6 +89,7 @@ share/doc/nut/CHANGES share/doc/nut/COPYING share/doc/nut/CREDITS share/doc/nut/FAQ +share/doc/nut/INSTALL share/doc/nut/NEWS share/doc/nut/README share/doc/nut/UPGRADING @@ -99,18 +105,20 @@ share/doc/nut/chroot.txt share/doc/nut/commands.txt share/doc/nut/config-files.txt share/doc/nut/configure.txt +share/doc/nut/contact-closure.txt share/doc/nut/data-room.txt share/doc/nut/design.txt share/doc/nut/developers.txt share/doc/nut/driver.list -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/snmp-ups.txt share/doc/nut/new-drivers.txt +share/doc/nut/new-names.txt +share/doc/nut/osd-notify.txt share/doc/nut/pager.txt +share/doc/nut/powersaving.txt share/doc/nut/protocol.txt share/doc/nut/shutdown.txt +share/doc/nut/snmp.txt +share/doc/nut/sock-protocol.txt share/doc/nut/ssl.txt share/doc/nut/todo.txt share/doc/nut/upssched.txt @@ -119,10 +127,11 @@ 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/nut/cmdvartab +@dirrm share/nut @dirrm share/examples/nut +@exec ${MKDIR} %D/share/doc/nut/drivers @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 +@dirrm libexec/nut diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index 1ae802e747b..7ec1b288502 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.17 2002/12/31 22:47:06 lukem Exp $ +$NetBSD: distinfo,v 1.18 2004/02/15 13:14:25 lukem Exp $ -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-af) = bc79381000992169074f6be02fcee7bbc2495ec9 -SHA1 (patch-ag) = df3cab5fafe985af9b8cbd0879b8e7c88b4e35b3 -SHA1 (patch-ah) = 8a6e0ce86a30bb2009654f4b1c5fcb25af22e7db +SHA1 (nut-1.4.1.tar.gz) = b23920207d3bd6563172194546f26dbe7cfb7ec6 +Size (nut-1.4.1.tar.gz) = 550238 bytes +SHA1 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh index 01d09f01400..888139d2877 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.7 2002/12/13 04:23:18 lukem Exp $ +# $NetBSD: upsdriver.sh,v 1.8 2004/02/15 13:14:25 lukem Exp $ # # PROVIDE: upsdriver # REQUIRE: NETWORK syslogd mountcritremote @@ -31,12 +31,12 @@ fi if [ "${upsdriver_type:-upsdrvctl}" = "upsdrvctl" ] then - ctl_command="@PREFIX@/sbin/ups-drivers/upsdrvctl" + ctl_command="@PREFIX@/libexec/nut/upsdrvctl" required_files="@NUT_CONFDIR@/ups.conf" start_cmd="${ctl_command} start" stop_cmd="${ctl_command} stop" else - command="@PREFIX@/sbin/ups-drivers/${upsdriver_type}" + command="@PREFIX@/libexec/nut/${upsdriver_type}" # # XXX - We need a way to easily determine the pidfile, which is of # XXX - the form @NUT_STATEDIR@/${updriver_type}-${tty}.pid diff --git a/sysutils/ups-nut/files/upslog.sh b/sysutils/ups-nut/files/upslog.sh index 2c9a0f9aaea..56a866813fb 100644 --- a/sysutils/ups-nut/files/upslog.sh +++ b/sysutils/ups-nut/files/upslog.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: upslog.sh,v 1.5 2002/09/20 02:02:01 grant Exp $ +# $NetBSD: upslog.sh,v 1.6 2004/02/15 13:14:25 lukem Exp $ # # PROVIDE: upslog # REQUIRE: upsd @@ -22,7 +22,7 @@ fi name="upslog" rcvar="${name}" command="@PREFIX@/bin/${name}" -pidfile="/var/run/${name}.pid" +pidfile="@NUT_STATEDIR@/${name}.pid" if [ -f /etc/rc.subr ] then diff --git a/sysutils/ups-nut/files/upsmon.sh b/sysutils/ups-nut/files/upsmon.sh index 23c7e7dbb84..5769ed8d21c 100644 --- a/sysutils/ups-nut/files/upsmon.sh +++ b/sysutils/ups-nut/files/upsmon.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: upsmon.sh,v 1.5 2003/01/26 00:48:24 fredb Exp $ +# $NetBSD: upsmon.sh,v 1.6 2004/02/15 13:14:25 lukem Exp $ # # PROVIDE: upsmon # REQUIRE: upsd @@ -14,7 +14,7 @@ fi name="upsmon" rcvar="${name}" command="@PREFIX@/sbin/${name}" -pidfile="/var/run/${name}.pid" +pidfile="@NUT_STATEDIR@/${name}.pid" required_files="@NUT_CONFDIR@/${name}.conf" if [ -f /etc/rc.subr ] diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa new file mode 100644 index 00000000000..af24a1f1874 --- /dev/null +++ b/sysutils/ups-nut/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.9 2004/02/15 13:14:25 lukem Exp $ + +--- conf/Makefile.in.orig Tue Sep 3 09:23:02 2002 ++++ conf/Makefile.in Sat Feb 14 22:02:46 2004 +@@ -4,7 +4,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + +-CONFPATH = $(DESTDIR)@sysconfdir@ ++CONFPATH = $(DESTDIR)@prefix@/share/examples/nut + + INSTALLCMD = @INSTALL@ + diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab deleted file mode 100644 index fae3f6877c5..00000000000 --- a/sysutils/ups-nut/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2002/12/13 04:23:19 lukem Exp $ - ---- conf/Makefile.in.orig Tue Sep 3 17:23:02 2002 -+++ conf/Makefile.in -@@ -4,7 +4,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - --CONFPATH = $(DESTDIR)@sysconfdir@ -+CONFPATH = $(DESTDIR)@datadir@/examples/nut - - INSTALLCMD = @INSTALL@ - diff --git a/sysutils/ups-nut/patches/patch-ad b/sysutils/ups-nut/patches/patch-ad deleted file mode 100644 index 36eb479226c..00000000000 --- a/sysutils/ups-nut/patches/patch-ad +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2002/12/13 04:23:19 lukem Exp $ - ---- 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. | - --grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null --if (test "$?" = "1") --then -- # not found, fatal error -- AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!) -- AC_MSG_WARN(You might want to rerun configure using --with-group and another group name.) --fi -+dnl | NetBSD's pkgsrc setup creates the user and group AFTER the build -+dnl | and BEFORE install. This gives the configure and build a chance -+dnl | to fail before modifying the group and passwd files. -+dnl -+dnl grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null -+dnl if (test "$?" = "1") -+dnl then -+dnl # not found, fatal error -+dnl AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!) -+dnl AC_MSG_WARN(You might want to rerun configure using --with-group and another group name.) -+dnl fi - - dnl | All done with group tests. | - dnl +------------------------------------------------------------------+ diff --git a/sysutils/ups-nut/patches/patch-af b/sysutils/ups-nut/patches/patch-af deleted file mode 100644 index 9936162ecec..00000000000 --- a/sysutils/ups-nut/patches/patch-af +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-af,v 1.5 2002/12/31 22:47:06 lukem Exp $ - ---- drivers/newapc.c.orig Mon Oct 7 14:35:35 2002 -+++ drivers/newapc.c -@@ -182,11 +182,16 @@ char * convert_ups2info (struct apc_cmdt - case APC_F_CELCIUS: - case APC_F_HEX: - case APC_F_DEC: -- case APC_F_SECONDS: -- case APC_F_HOURS: - case APC_F_LEAVE: - /* All of these just pass through at present */ - ptr = upsval; -+ break; -+ case APC_F_SECONDS: -+ case APC_F_HOURS: -+ /* Parse number */ -+ tval = strtol(upsval, NULL, 10); -+ sprintf(tmp, "%d", tval); -+ ptr = tmp; - break; - case APC_F_MINUTES: - /* Convert to seconds - NUT standard time measurement */ diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag deleted file mode 100644 index d769060b17e..00000000000 --- a/sysutils/ups-nut/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.7 2002/12/31 22:47:07 lukem Exp $ - ---- drivers/newapc.h.orig Tue Aug 20 17:06:26 2002 -+++ drivers/newapc.h -@@ -119,7 +119,7 @@ struct apc_cmdtab_t { - {INFO_MINUTIL, 0, 0, APC_POLL|APC_F_VOLT, NULL, NULL, 'N'}, - {INFO_OUTVOLT, 0, 0, APC_POLL|APC_F_VOLT, NULL, NULL, 'O'}, - {INFO_SLFTSTRES,0, 0, APC_POLL, NULL, NULL, 'X'}, -- {INFO_BATT_RUNTIME,0, 0, APC_POLL|APC_F_MINUTES, NULL, NULL, 'j'}, -+ {INFO_RUNTIME, 0, 0, APC_POLL|APC_F_SECONDS, NULL, NULL, 'j'}, - {INFO_MFRDATE, 0, 0, 0, NULL, NULL, 'm'}, - {INFO_TEMPMAX, 0, 0, APC_F_CELCIUS, NULL, NULL, '['}, - {INFO_TEMPMIN, 0, 0, APC_F_CELCIUS, NULL, NULL, ']'}, diff --git a/sysutils/ups-nut/patches/patch-ah b/sysutils/ups-nut/patches/patch-ah deleted file mode 100644 index 7702461f310..00000000000 --- a/sysutils/ups-nut/patches/patch-ah +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2002/12/13 04:23:20 lukem Exp $ - ---- configure.orig Mon Dec 2 23:08:51 2002 -+++ configure -@@ -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 "$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 - |