Bump to version 1.5.7. Move drivers to /lib/nut and link control to /sbin for halt.sh to work properly. Fix pid file handling in startup scripts. Fixes all of bug 31665.

14 files changed, 64 insertions, 117 deletions

diff --git a/net-misc/nut/ChangeLog b/net-misc/nut/ChangeLog
index bf86d7962fdc..79a267803f84 100644
--- a/net-misc/nut/ChangeLog
+++ b/net-misc/nut/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/nut
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/ChangeLog,v 1.21 2003/10/21 14:08:22 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/ChangeLog,v 1.22 2003/10/29 23:57:26 max Exp $
+
+*nut-1.5.7 (29 Oct 2003)
+
+  29 Oct 2003; Max Kalika <max@gentoo.org> nut-1.4.0-r1.ebuild,
+  nut-1.4.0-r2.ebuild, nut-1.4.0-r3.ebuild, nut-1.5.6-r1.ebuild,
+  nut-1.5.6-r2.ebuild, nut-1.5.6.ebuild, nut-1.5.7.ebuild, files/upsd.rc6,
+  files/upsdrv.rc6, files/upsmon.rc6:
+  Bump to version 1.5.7. Cleanup Move drivers to /lib/nut and link control to
+  /sbin for halt.sh to work properly. Fix pid file handling in startup scripts.
+  Fixes all of bug 31665.
 
   21 Oct 2003; Max Kalika <max@gentoo.org> files/upsd.rc6:
   Fix pid path.
diff --git a/net-misc/nut/Manifest b/net-misc/nut/Manifest
index 5e0310250e0d..a6e272c85ad0 100644
--- a/net-misc/nut/Manifest
+++ b/net-misc/nut/Manifest
@@ -1,15 +1,14 @@
 MD5 96547e9537bb024f208d43371aa5f2b2 nut-1.4.0.ebuild 3362
 MD5 6aab9abab0b73d9a5a7a78e644433734 nut-1.0.0.ebuild 2527
 MD5 e7b0cec5163957ce8fbd4f6911a35e3e nut-1.2.1.ebuild 2921
-MD5 3fb09bb67ca8f1360c43d1a33d13f8ba nut-1.4.0-r2.ebuild 2165
-MD5 fdf7fb6f4b0ddf88390d685049455d50 nut-1.5.6-r1.ebuild 2169
 MD5 7eb4b01b750fa4ca836f8d76e17b217d nut-1.3.6.ebuild 3362
-MD5 72ac604c561eeb8394cfb20f0877cad7 nut-1.4.0-r1.ebuild 2125
+MD5 547ec5f3c8a6377bfdb87d04fff55adc nut-1.5.7.ebuild 2285
 MD5 9f1719e548b416ed9d719b908e1fa520 nut-1.2.2.ebuild 3283
+MD5 3ac7638876213a0837f5c8c010b1ce7f nut-1.4.0-r3.ebuild 2284
 MD5 bb9618c8b03a1237cd7ab2ac7c060cae nut-1.2.1-r1.ebuild 3237
-MD5 2128ddfd977ae4ec119b0b4cdbe165d6 nut-1.5.6.ebuild 2127
-MD5 3dd4e1eb93e411295f0d784019cf77ae ChangeLog 3157
+MD5 9d4e0a36dacaebab6e98ab1f7dafa412 ChangeLog 3610
 MD5 cf7701e7f443498501140c4a537410bf nut-1.5.1.ebuild 3366
+MD5 e20a375faa7234f4dbcd8798688e34d4 nut-1.5.6-r2.ebuild 2288
 MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
 MD5 53b3c22e90b76d9ed4ac9cbbef393c31 files/digest-nut-1.0.0 61
 MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1 61
@@ -17,13 +16,12 @@ MD5 ab96c8181bf3780dae5e3377987b05c2 files/digest-nut-1.2.2 61
 MD5 391798e93c10d171a3a7f9941527e293 files/digest-nut-1.3.6 61
 MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0 61
 MD5 884831c15f0700dbc89db196a32a2695 files/digest-nut-1.5.1 61
-MD5 7ae6f61ceeee54557c5ad414688b82d0 files/digest-nut-1.5.6 61
+MD5 95e684fab414b46c58d8a46114a9b0ca files/digest-nut-1.5.7 61
 MD5 2bbffa4aad5969fa3d0d74a6039d6070 files/upsmon-init 491
 MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1-r1 61
-MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0-r1 61
-MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0-r2 61
-MD5 7ae6f61ceeee54557c5ad414688b82d0 files/digest-nut-1.5.6-r1 61
-MD5 09cd2c4a01fbc186346dae4a568a4391 files/upsd.rc6 542
-MD5 5b98b3010fedd5ce35a376163b7d1626 files/upsdrv.rc6 507
-MD5 424be14e1b0730f51102f9f49a0ac643 files/upsmon.rc6 510
+MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0-r3 61
+MD5 7ae6f61ceeee54557c5ad414688b82d0 files/digest-nut-1.5.6-r2 61
+MD5 7faa5d7d46a78272384e1c621bb311cb files/upsd.rc6 503
+MD5 012892c09e8265fd790794e13d2f9986 files/upsdrv.rc6 493
+MD5 1e3f785a988685f999291d5b67c38c89 files/upsmon.rc6 502
 MD5 c5fa9d5b07e3724f41bb5fd83bbcc4c7 files/upsd-init 596
diff --git a/net-misc/nut/files/digest-nut-1.4.0-r2 b/net-misc/nut/files/digest-nut-1.4.0-r2
deleted file mode 100644
index 1a233a0f22a5..000000000000
--- a/net-misc/nut/files/digest-nut-1.4.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ddf547866db0f1eeb9c535ba0339906 nut-1.4.0.tar.gz 523924
diff --git a/net-misc/nut/files/digest-nut-1.4.0-r1 b/net-misc/nut/files/digest-nut-1.4.0-r3
index 1a233a0f22a5..1a233a0f22a5 100644
--- a/net-misc/nut/files/digest-nut-1.4.0-r1
+++ b/net-misc/nut/files/digest-nut-1.4.0-r3
diff --git a/net-misc/nut/files/digest-nut-1.5.6-r1 b/net-misc/nut/files/digest-nut-1.5.6-r1
deleted file mode 100644
index 5edaab2f6e61..000000000000
--- a/net-misc/nut/files/digest-nut-1.5.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59d0e0952a68fa04a63a25bc181a68c0 nut-1.5.6.tar.gz 479689
diff --git a/net-misc/nut/files/digest-nut-1.5.6 b/net-misc/nut/files/digest-nut-1.5.6-r2
index 5edaab2f6e61..5edaab2f6e61 100644
--- a/net-misc/nut/files/digest-nut-1.5.6
+++ b/net-misc/nut/files/digest-nut-1.5.6-r2
diff --git a/net-misc/nut/files/digest-nut-1.5.7 b/net-misc/nut/files/digest-nut-1.5.7
new file mode 100644
index 000000000000..332960aa495f
--- /dev/null
+++ b/net-misc/nut/files/digest-nut-1.5.7
@@ -0,0 +1 @@
+MD5 09d3e2795fd2b5e43cc99e788ac69ed3 nut-1.5.7.tar.gz 485442
diff --git a/net-misc/nut/files/upsd.rc6 b/net-misc/nut/files/upsd.rc6
index e95570a062d6..44a0fa4d97e4 100644
--- a/net-misc/nut/files/upsd.rc6
+++ b/net-misc/nut/files/upsd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsd.rc6,v 1.4 2003/10/21 14:08:22 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsd.rc6,v 1.5 2003/10/29 23:57:26 max Exp $
 
 depend() {
 	need net upsdrv
@@ -10,13 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting upsd"
-	start-stop-daemon --start --quiet --startas /usr/sbin/upsd \
-		--pidfile=/var/lib/nut/upsd.pid
+	start-stop-daemon --start --quiet --exec /usr/sbin/upsd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping upsd"
-	start-stop-daemon --stop --quiet --pidfile=/var/lib/nut/upsd.pid
+	start-stop-daemon --stop --quiet --pidfile /var/lib/nut/upsd.pid
 	eend $?
 }
diff --git a/net-misc/nut/files/upsdrv.rc6 b/net-misc/nut/files/upsdrv.rc6
index 1d056c59d5b3..2b9db8a9dc53 100644
--- a/net-misc/nut/files/upsdrv.rc6
+++ b/net-misc/nut/files/upsdrv.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsdrv.rc6,v 1.2 2003/10/21 14:03:57 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsdrv.rc6,v 1.3 2003/10/29 23:57:26 max Exp $
 
 depend() {
 	need net
@@ -10,12 +10,12 @@ depend() {
 
 start() {
 	ebegin "Starting UPS drivers"
-	/usr/lib/nut/upsdrvctl start
+	/sbin/upsdrvctl start
 	eend $? "Failed to start UPS drivers!"
 }
 
 stop() {
 	ebegin "Stopping UPS drivers"
-	/usr/lib/nut/upsdrvctl stop
+	/sbin/upsdrvctl stop
 	eend $? "Failed to stop UPS drivers!"
 }
diff --git a/net-misc/nut/files/upsmon.rc6 b/net-misc/nut/files/upsmon.rc6
index bce0ef3ba1a1..f110d82a7755 100644
--- a/net-misc/nut/files/upsmon.rc6
+++ b/net-misc/nut/files/upsmon.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsmon.rc6,v 1.2 2003/10/20 10:37:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsmon.rc6,v 1.3 2003/10/29 23:57:26 max Exp $
 
 depend() {
 	need net
@@ -16,6 +16,6 @@ start() {
 
 stop() {
 	ebegin "Stopping upsmon"
-	start-stop-daemon --stop --quiet --pidfile=/var/lib/nut/upsmon.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/upsmon.pid
 	eend $?
 }
diff --git a/net-misc/nut/nut-1.4.0-r1.ebuild b/net-misc/nut/nut-1.4.0-r1.ebuild
deleted file mode 100644
index ae85653933d8..000000000000
--- a/net-misc/nut/nut-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0-r1.ebuild,v 1.1 2003/10/16 23:26:27 max Exp $
-
-DESCRIPTION="Network-UPS Tools."
-SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
-HOMEPAGE="http://www.exploits.org/nut/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="cgi"
-
-DEPEND=">=sys-apps/sed-4
-	cgi? ( =media-libs/libgd-1* )"
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-i configure.in || die "sed failed"
-}
-
-src_compile() {
-	local myconf
-	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
-
-	WANT_AUTOCONF_2_5=1 autoconf
-	econf \
-		--with-user=nut \
-		--with-group=nut \
-		--with-drvpath=/usr/lib/nut \
-		--sysconfdir=/etc/nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-statepath=/var/lib/nut \
-		--with-linux-hiddev \
-		${myconf}
-
-	sed -e "s:= bestups:= hidups bestups:" \
-		-i drivers/Makefile || die "sed failed"
-	sed -e "s:= powercom.8:= hidups.8 powercom.8:" \
-		-i man/Makefile || "sed failed"
-
-	emake || die "compile problem"
-
-	if [ "`use cgi`" ] ; then
-		emake cgi || die "compile cgi problem"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	keepdir /var/lib/nut
-
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}"
-	done
-
-	if [ "`use cgi`" ] ; then
-		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
-		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
-		einfo "copy them to your web server's ScriptPath to activate."
-	fi
-
-	dodoc CHANGES COPYING CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
-		docs/{FAQ,*.txt,driver.list}
-
-	docinto cables
-	dodoc docs/cables/*
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/upsd.rc6" upsd
-	newexe "${FILESDIR}/upsmon.rc6" upsmon
-}
-
-pkg_postinst() {
-	chown nut:nut ${ROOT}/var/lib/nut
-	chmod 0700 ${ROOT}/var/lib/nut
-	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf}
-}
diff --git a/net-misc/nut/nut-1.4.0-r2.ebuild b/net-misc/nut/nut-1.4.0-r3.ebuild
index 425a1500c52e..da76790849cd 100644
--- a/net-misc/nut/nut-1.4.0-r2.ebuild
+++ b/net-misc/nut/nut-1.4.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0-r2.ebuild,v 1.2 2003/10/21 14:03:57 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.4.0-r3.ebuild,v 1.1 2003/10/29 23:57:26 max Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/release/${PV%.*}/${P}.tar.gz"
@@ -19,17 +19,20 @@ src_unpack() {
 
 	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
 		-i configure.in || die "sed failed"
+
+	ebegin "Recreating configure"
+	WANT_AUTOCONF_2_5=1 autoconf || die "autoconf failed"
+	eend $?
 }
 
 src_compile() {
 	local myconf
 	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
 
-	WANT_AUTOCONF_2_5=1 autoconf
 	econf \
 		--with-user=nut \
 		--with-group=nut \
-		--with-drvpath=/usr/lib/nut \
+		--with-drvpath=/lib/nut \
 		--sysconfdir=/etc/nut \
 		--with-logfacility=LOG_DAEMON \
 		--with-statepath=/var/lib/nut \
@@ -50,7 +53,9 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	keepdir /var/lib/nut
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
 
 	for i in "${D}"/etc/nut/*.sample ; do
 		mv "${i}" "${i/.sample/}"
@@ -72,6 +77,8 @@ src_install() {
 	newexe "${FILESDIR}/upsd.rc6" upsd
 	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
 	newexe "${FILESDIR}/upsmon.rc6" upsmon
+
+	keepdir /var/lib/nut
 }
 
 pkg_postinst() {
diff --git a/net-misc/nut/nut-1.5.6.ebuild b/net-misc/nut/nut-1.5.6-r2.ebuild
index fa09726388eb..f28e3ec56c52 100644
--- a/net-misc/nut/nut-1.5.6.ebuild
+++ b/net-misc/nut/nut-1.5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.6.ebuild,v 1.1 2003/10/17 16:00:53 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.6-r2.ebuild,v 1.1 2003/10/29 23:57:26 max Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
@@ -19,17 +19,20 @@ src_unpack() {
 
 	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
 		-i configure.in || die "sed failed"
+
+	ebegin "Recreating configure"
+	WANT_AUTOCONF_2_5=1 autoconf || die "autoconf failed"
+	eend $?
 }
 
 src_compile() {
 	local myconf
 	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
 
-	WANT_AUTOCONF_2_5=1 autoconf
 	econf \
 		--with-user=nut \
 		--with-group=nut \
-		--with-drvpath=/usr/lib/nut \
+		--with-drvpath=/lib/nut \
 		--sysconfdir=/etc/nut \
 		--with-logfacility=LOG_DAEMON \
 		--with-statepath=/var/lib/nut \
@@ -50,7 +53,9 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	keepdir /var/lib/nut
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
 
 	for i in "${D}"/etc/nut/*.sample ; do
 		mv "${i}" "${i/.sample/}"
@@ -70,7 +75,10 @@ src_install() {
 
 	exeinto /etc/init.d
 	newexe "${FILESDIR}/upsd.rc6" upsd
+	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
 	newexe "${FILESDIR}/upsmon.rc6" upsmon
+
+	keepdir /var/lib/nut
 }
 
 pkg_postinst() {
diff --git a/net-misc/nut/nut-1.5.6-r1.ebuild b/net-misc/nut/nut-1.5.7.ebuild
index c692f78485fc..a404dd4fa990 100644
--- a/net-misc/nut/nut-1.5.6-r1.ebuild
+++ b/net-misc/nut/nut-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.6-r1.ebuild,v 1.2 2003/10/21 14:03:57 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/nut-1.5.7.ebuild,v 1.1 2003/10/29 23:57:26 max Exp $
 
 DESCRIPTION="Network-UPS Tools."
 SRC_URI="http://www.exploits.org/nut/development/${PV%.*}/${P}.tar.gz"
@@ -19,17 +19,20 @@ src_unpack() {
 
 	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
 		-i configure.in || die "sed failed"
+
+	ebegin "Recreating configure"
+	WANT_AUTOCONF_2_5=1 autoconf || die "autoconf failed"
+	eend $?
 }
 
 src_compile() {
 	local myconf
 	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
 
-	WANT_AUTOCONF_2_5=1 autoconf
 	econf \
 		--with-user=nut \
 		--with-group=nut \
-		--with-drvpath=/usr/lib/nut \
+		--with-drvpath=/lib/nut \
 		--sysconfdir=/etc/nut \
 		--with-logfacility=LOG_DAEMON \
 		--with-statepath=/var/lib/nut \
@@ -50,7 +53,9 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	keepdir /var/lib/nut
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
 
 	for i in "${D}"/etc/nut/*.sample ; do
 		mv "${i}" "${i/.sample/}"
@@ -72,6 +77,8 @@ src_install() {
 	newexe "${FILESDIR}/upsd.rc6" upsd
 	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
 	newexe "${FILESDIR}/upsmon.rc6" upsmon
+
+	keepdir /var/lib/nut
 }
 
 pkg_postinst() {