update from 0.44.3-pre5 to 0.45.1 (with an extra vendor patch).

changes include:
- ups info moved to ups.conf instead of upsd.conf
- unified driver control between ups drivers
- upsmon doesn't run as root by default any more; most of the work is
  done by an unprivileged child, with a parent only accepting shutdown
  messages
- more model support:
	- AEG Proect S. - aeg
	- SMS Ltda (Brazillian) - sms
	- SOLA 620 - bestups
	- Ever UPS - everups
- various other improvements and bugfixes

see http://www.exploits.org/nut/release/new-0.45.1.txt for more details)

8 files changed, 81 insertions, 120 deletions

diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 598d41dff0d..2049a5a75d5 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2001/08/27 14:35:14 tron Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/28 04:37:27 lukem Exp $
 #
 
-DISTNAME=		nut-0.44.3-pre5
-PKGNAME=		ups-nut-0.44.3pre5
+DISTNAME=		nut-0.45.1
+PKGNAME=		ups-nut-0.45.1
 CATEGORIES=		sysutils
-MASTER_SITES=		http://www.exploits.org/nut/testing/0.44.3-pre/
+MASTER_SITES=		http://www.exploits.org/nut/release/
+
+PATCH_SITES=		http://www.exploits.org/nut/testing/0.45.2-pre/
+PATCHFILES=		upsmon-pdflag.diff
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		collver@linuxfreemail.com
 HOMEPAGE=		http://www.exploits.org/nut/
@@ -30,7 +34,6 @@ ADDGROUP=		groupadd
 USERDEL=		userdel
 GROUPDEL=		groupdel
 .endif
-WRKSRC=			${WRKDIR}/nut-0.44.3
 DEINSTALL_FILE=         ${WRKDIR}/DEINSTALL
 INSTALL_FILE=           ${WRKDIR}/INSTALL
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
@@ -78,6 +81,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${NUT_DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index cdd9ded5366..1511df8ea98 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:10 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/09/28 04:37:27 lukem Exp $
 
-SHA1 (nut-0.44.3-pre5.tar.gz) = 066d62ec6ebd522aa9b7d0f046856cfb1a34f61a
-Size (nut-0.44.3-pre5.tar.gz) = 241901 bytes
+SHA1 (nut-0.45.1.tar.gz) = 2da78c22dd7162140c2b332bde69dde7a67d7b2c
+Size (nut-0.45.1.tar.gz) = 306332 bytes
+SHA1 (upsmon-pdflag.diff) = 463978fc9c0ab0b8a31bb7562991d9c3cca57166
+Size (upsmon-pdflag.diff) = 2160 bytes
 SHA1 (patch-aa) = 2919c36f928d7b3a22574f8ca0633cd11bb99c70
-SHA1 (patch-ab) = da464964fd63f2c3cb34d06f2d6de9e5c1aa356a
-SHA1 (patch-ad) = 2e325eb1a8bd85ef81d265df76e866d8a31a6b57
-SHA1 (patch-ae) = 22f61a60b3f707514d67ebd0ec7ba9a0ba50e781
-SHA1 (patch-af) = 6bc9661388928d6a294cdfa156e77aa5fe9669cb
-SHA1 (patch-ag) = e46760b14601313ddd61c40a09965c01be9060fb
+SHA1 (patch-ab) = 76a764c47c6832154aa20369d7ba46145bc73535
+SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
index dbf2f57da9d..27705e04102 100644
--- a/sysutils/ups-nut/patches/patch-ab
+++ b/sysutils/ups-nut/patches/patch-ab
@@ -1,24 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2001/03/11 13:46:12 martin Exp $
+$NetBSD: patch-ab,v 1.3 2001/09/28 04:37:27 lukem Exp $
 
---- conf/Makefile.in.orig	Sat Mar 10 15:53:30 2001
-+++ conf/Makefile.in	Sat Mar 10 15:54:03 2001
-@@ -12,17 +12,9 @@
+--- conf/Makefile.in.orig	Fri Jun  1 19:23:15 2001
++++ conf/Makefile.in	Fri Sep 28 13:58:30 2001
+@@ -4,7 +4,7 @@
+ CONFPATH   = $(INSTALLROOT)@sysconfdir@
+ INSTALLCMD = @INSTALL@
  
- install:
- 	@for f in $(SECFILES) ; do \
--		if (test -f $(CONFPATH)/$$f ); then \
--			echo "Preserving existing config file: $$f"; \
--		else \
--			$(INSTALLCMD) -m 0600 $$f $(CONFPATH); \
--		fi; \
-+		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
- 	done
+-SECFILES = upsmon.conf upsd.conf upsd.users
++SECFILES = upsmon.conf ups.conf upsd.conf upsd.users
+ PUBFILES = hosts.conf multimon.conf upsset.conf upssched.conf
  
- 	@for f in $(PUBFILES) ; do \
--		if (test -f $(CONFPATH)/$$f ); then \
--			echo "Preserving existing config file: $$f"; \
--		else \
--			$(INSTALLCMD) -m 0644 $$f $(CONFPATH); \
--		fi; \
-+		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
- 	done
+ all:
diff --git a/sysutils/ups-nut/patches/patch-ad b/sysutils/ups-nut/patches/patch-ad
index c9d9ddf0b6b..1422ca34976 100644
--- a/sysutils/ups-nut/patches/patch-ad
+++ b/sysutils/ups-nut/patches/patch-ad
@@ -1,26 +1,28 @@
-$NetBSD: patch-ad,v 1.1 2001/03/11 13:46:12 martin Exp $
+$NetBSD: patch-ad,v 1.2 2001/09/28 04:37:27 lukem Exp $
 
---- configure.in.orig	Sat Mar 10 15:32:25 2001
-+++ configure.in	Sat Mar 10 15:32:27 2001
-@@ -350,12 +350,16 @@
+--- configure.in.orig	Tue Jun 12 07:47:56 2001
++++ configure.in	Fri Sep 28 10:41:01 2001
+@@ -396,13 +396,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.    |
  
--temp_group=`grep ^$RUN_AS_GROUP: /etc/group`
--if ( test x"$temp_group" = "x" )
+-grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
+-if (test "$?" = "1")
 -then
--   AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
--   AC_MSG_ERROR(Restart configure using --with-group and another group name.)
+-	# 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 temp_group=`grep ^$RUN_AS_GROUP: /etc/group`
-+dnl if ( test x"$temp_group" = "x" )
++dnl grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
++dnl if (test "$?" = "1")
 +dnl then
-+dnl    AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
-+dnl    AC_MSG_ERROR(Restart configure using --with-group and another group name.)
++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.                                       |
diff --git a/sysutils/ups-nut/patches/patch-ae b/sysutils/ups-nut/patches/patch-ae
deleted file mode 100644
index ad051ff2d52..00000000000
--- a/sysutils/ups-nut/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/04/01 14:04:37 martin Exp $
-
---- models/upscommon.c.orig	Tue Feb 27 07:01:46 2001
-+++ models/upscommon.c	Sun Apr  1 15:59:54 2001
-@@ -555,11 +555,16 @@
- #ifdef HAVE_SHMAT
-         test_writeinfo();
- 
--/* some systems (NetBSD) don't define SHM_R and SHM_W - they default to it */
-+/*
-+ * The use of SHM_R and SHM_W is not portable. Neither Posix nor
-+ * SUSv2 specify it. Solaris and Linux have them (as well as newer
-+ * versions of NetBSD) but either do not document them (Solaris) or
-+ * explicitly depreceate their use (NetBSD).
-+ */ 
- #ifdef SHM_R
- #define IPC_MODE IPC_CREAT|SHM_R|SHM_W|S_IRGRP|S_IWGRP
- #else
--#define IPC_MODE IPC_CREAT
-+#define IPC_MODE IPC_CREAT|0600|S_IRGRP|S_IWGRP
- #endif
-         
- 	if (shmok == 1) {
diff --git a/sysutils/ups-nut/patches/patch-af b/sysutils/ups-nut/patches/patch-af
deleted file mode 100644
index cf36063175b..00000000000
--- a/sysutils/ups-nut/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/03/11 16:22:08 martin Exp $
-
---- clients/upslog.c.orig	Tue Feb 27 05:27:32 2001
-+++ clients/upslog.c	Sun Mar 11 17:14:20 2001
-@@ -222,7 +222,7 @@
- 				else if (strncasecmp(cmpstr, "ETIME", 5) == 0) {
- 					char	timebuf[16];
- 
--					snprintf (timebuf, sizeof(timebuf), "%ld", tod);
-+					snprintf (timebuf, sizeof(timebuf), "%ld", (unsigned long)tod);
- 					strlcat(logbuffer, timebuf, sizeof(logbuffer));
- 					logbufremain -= strlen(timebuf);
- 				}
diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag
deleted file mode 100644
index 596db8b5e9a..00000000000
--- a/sysutils/ups-nut/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/03/11 16:22:08 martin Exp $
-
---- models/mge-ellipse.c.orig	Tue Feb 27 05:36:19 2001
-+++ models/mge-ellipse.c	Sun Mar 11 17:13:07 2001
-@@ -695,7 +695,7 @@
-   start = buf;
-   fprintf(stderr,"%s: (%d bytes)\n", msg, len);
-   while (len > 0) {
--    snprintf(line, sizeof(line), "%08x: ", buf - start);
-+    snprintf(line, sizeof(line), "%08lx: ", (unsigned long)(buf - start));
-     out = line + 10;
-           
-     for (i = 0, pc = buf, nlocal = len; i < 16; i++, pc++) {
diff --git a/sysutils/ups-nut/pkg/PLIST b/sysutils/ups-nut/pkg/PLIST
index 9320fb94a11..e13ebfd900c 100644
--- a/sysutils/ups-nut/pkg/PLIST
+++ b/sysutils/ups-nut/pkg/PLIST
@@ -1,48 +1,71 @@
-@comment $NetBSD: PLIST,v 1.3 2001/04/28 04:35:06 jtb Exp $
-etc/rc.d/upsd
-etc/nut/hosts.conf.sample
-etc/nut/multimon.conf.sample
-etc/nut/upsd.conf.sample
-etc/nut/upsmon.conf.sample
-etc/nut/upsset.passwd.sample
-bin/ups-trust425+625
+@comment $NetBSD: PLIST,v 1.4 2001/09/28 04:37:28 lukem Exp $
+bin/aeg
 bin/apcsmart
+bin/belkin
+bin/bestfort
+bin/bestuferrups
+bin/bestups
+bin/engetron
+bin/everups
 bin/fentonups
 bin/genericups
-bin/optiups
-bin/bestups
-bin/victronups
 bin/ipt-anzen
-bin/bestfort
+bin/mge-ellipse
+bin/mgeups
+bin/multilink
 bin/mustekups
-bin/engetron
-bin/belkin
+bin/newapc
+bin/optiups
 bin/powercom
-bin/bestuferrups
+bin/sec
+bin/sms
 bin/toshiba1500
-bin/newapc
+bin/ups-trust425+625
 bin/upsc
-bin/upslog
+bin/upscmd
 bin/upsct
 bin/upsct2
-bin/upscmd
+bin/upsdrvctl
+bin/upseyeux
+bin/upslog
+bin/victronups
+etc/nut/hosts.conf.sample
+etc/nut/multimon.conf.sample
+etc/nut/ups.conf.sample
+etc/nut/upsd.conf.sample
+etc/nut/upsd.users.sample
+etc/nut/upsmon.conf.sample
+etc/nut/upssched.conf.sample
+etc/nut/upsset.conf.sample
+etc/rc.d/upsd
 man/man8/apcsmart.8
+man/man8/nutupsdrv.8
 man/man8/powercom.8
 sbin/upsd
 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/big-servers.txt
+share/doc/nut/cables/powerware.txt
+share/doc/nut/cables/repotec.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/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/model-arguments.txt
+share/doc/nut/multilink.txt
 share/doc/nut/new-modules.txt
 share/doc/nut/pager.txt
 share/doc/nut/powercom.txt
@@ -51,12 +74,7 @@ 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/model-arguments.txt
 share/doc/nut/upssched.txt
-share/doc/nut/README
-share/doc/nut/QUICKSTART
-share/doc/nut/cables/powerware.txt
-share/doc/nut/cables/victron.txt
 @dirrm share/doc/nut/cables
 @dirrm share/doc/nut
-@unexec rmdir /var/db/nut
+@dirrm etc/nut