diff options
Diffstat (limited to 'sysutils/ups-nut')
| -rw-r--r-- | sysutils/ups-nut/MESSAGE | 6 | ||||
| -rw-r--r-- | sysutils/ups-nut/Makefile | 19 | ||||
| -rw-r--r-- | sysutils/ups-nut/PLIST | 58 | ||||
| -rw-r--r-- | sysutils/ups-nut/distinfo | 9 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-aa | 11 | ||||
| -rw-r--r-- | sysutils/ups-nut/patches/patch-ac | 18 |
6 files changed, 74 insertions, 47 deletions
diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE index 58ba30948dc..e1d84376cdb 100644 --- a/sysutils/ups-nut/MESSAGE +++ b/sysutils/ups-nut/MESSAGE @@ -1,9 +1,13 @@ ====================================================================== -$NetBSD: MESSAGE,v 1.1.2.2 2002/06/23 19:01:10 jlam Exp $ +$NetBSD: MESSAGE,v 1.1.2.3 2002/08/25 21:21:28 jlam 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. + ====================================================================== diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index d0379daa03d..1e7b50f1f06 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18.2.2 2002/06/30 06:24:16 jlam Exp $ +# $NetBSD: Makefile,v 1.18.2.3 2002/08/25 21:21:29 jlam Exp $ # -DISTNAME= nut-0.45.5 -PKGNAME= ups-nut-0.45.5 -PKGREVISION= 1 +DISTNAME= nut-0.50.0 +PKGNAME= ups-nut-0.50.0 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ @@ -74,12 +73,14 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ ${PREFIX}/etc/rc.d/$${script}; \ done - ${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR} + ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers ${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR} + ${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.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST index b5ecec3d6be..2f03063165f 100644 --- a/sysutils/ups-nut/PLIST +++ b/sysutils/ups-nut/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7.2.1 2002/06/23 19:01:11 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7.2.2 2002/08/25 21:21:29 jlam Exp $ bin/upsc bin/upscmd bin/upsct @@ -16,12 +16,20 @@ man/man5/upsmon.conf.5 man/man5/upssched.conf.5 man/man8/apcsmart.8 man/man8/belkin.8 +man/man8/bestferrups801-807.8 man/man8/bestups.8 +man/man8/cyberpower.8 +man/man8/everups.8 man/man8/fentonups.8 +man/man8/genericups.8 +man/man8/hp.8 +man/man8/masterguard.8 +man/man8/mge-ellipse.8 man/man8/newapc.8 -man/man8/newvictron.8 man/man8/nutupsdrv.8 man/man8/powercom.8 +man/man8/sec.8 +man/man8/tripplite.8 man/man8/upsc.8 man/man8/upscmd.8 man/man8/upsct.8 @@ -31,73 +39,66 @@ man/man8/upsdrvctl.8 man/man8/upslog.8 man/man8/upsmon.8 man/man8/upssched.8 -sbin/ups-drivers/aeg +man/man8/victronups.8 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 sbin/ups-drivers/cyberpower -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 -sbin/ups-drivers/mgeups -sbin/ups-drivers/multilink -sbin/ups-drivers/mustekups +sbin/ups-drivers/mge-utalk sbin/ups-drivers/newapc -sbin/ups-drivers/newpowercom -sbin/ups-drivers/newvictron -sbin/ups-drivers/optiups sbin/ups-drivers/powercom +sbin/ups-drivers/powerware 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 sbin/upsd sbin/upsdrvctl sbin/upsmon sbin/upssched -share/doc/nut/Changes.trust 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/apc.txt +share/doc/nut/cables/ge-imv-victron.txt +share/doc/nut/cables/imv.txt +share/doc/nut/cables/mgeups.txt share/doc/nut/cables/powerware.txt share/doc/nut/cables/repotec.txt share/doc/nut/cables/sms.txt -share/doc/nut/cables/victron.txt share/doc/nut/chroot.txt share/doc/nut/commands.txt share/doc/nut/config-files.txt 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/dummycons.txt -share/doc/nut/dummyups.txt -share/doc/nut/generic-ups.txt -share/doc/nut/mge-ellipse.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/multilink.txt share/doc/nut/new-modules.txt share/doc/nut/pager.txt -share/doc/nut/powercom.txt share/doc/nut/protocol.txt share/doc/nut/shutdown.txt share/doc/nut/tips.txt share/doc/nut/todo.txt -share/doc/nut/ups-trust425+625.txt share/doc/nut/upssched.txt share/examples/nut/hosts.conf.sample share/examples/nut/multimon.conf.sample @@ -108,6 +109,7 @@ 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 diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo index 194e96113e4..105f1f66f99 100644 --- a/sysutils/ups-nut/distinfo +++ b/sysutils/ups-nut/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.9.2.1 2002/06/23 19:01:11 jlam Exp $ +$NetBSD: distinfo,v 1.9.2.2 2002/08/25 21:21:30 jlam Exp $ -SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3 -Size (nut-0.45.5.tar.gz) = 386936 bytes -SHA1 (patch-aa) = 74fcdb7d75dcc7a53b0591bd22ff5c6bbeb572ff +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 diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa index 8962838e8ae..dd24b5eef01 100644 --- a/sysutils/ups-nut/patches/patch-aa +++ b/sysutils/ups-nut/patches/patch-aa @@ -1,15 +1,16 @@ -$NetBSD: patch-aa,v 1.5.2.2 2002/06/23 19:01:12 jlam Exp $ +$NetBSD: patch-aa,v 1.5.2.3 2002/08/25 21:21:31 jlam Exp $ ---- models/upscommon.c.orig Fri Mar 15 00:59:57 2002 +--- models/upscommon.c.orig Fri May 17 15:27:55 2002 +++ models/upscommon.c -@@ -716,6 +716,10 @@ - return; - } +@@ -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-ac b/sysutils/ups-nut/patches/patch-ac new file mode 100644 index 00000000000..96687a5c9ae --- /dev/null +++ b/sysutils/ups-nut/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.4.4.2 2002/08/25 21:21:32 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]); |