bug #42883, nut snmp-ups support. bug #42195, version bump. bug #43551, catch nut problems with leftover pidfile (in upsd.rc6).

7 files changed, 243 insertions, 21 deletions

diff --git a/net-misc/nut/ChangeLog b/net-misc/nut/ChangeLog
index b47c9d3bc029..a7a0d52e8114 100644
--- a/net-misc/nut/ChangeLog
+++ b/net-misc/nut/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2004/03/01 21:34:08 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/ChangeLog,v 1.27 2004/03/09 03:39:22 robbat2 Exp $
+
+  08 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> files/upsd.rc6:
+  bug #42883, nut snmp-ups support. bug #42195, version bump. bug #43551, catch
+  nut problems with leftover pidfile.
 
   05 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> nut-1.2.1-r1.ebuild,
   nut-1.2.1.ebuild, nut-1.2.2.ebuild, nut-1.3.6.ebuild, nut-1.4.0.ebuild,
diff --git a/net-misc/nut/Manifest b/net-misc/nut/Manifest
index 891ebdffab28..ea42e96aeb1b 100644
--- a/net-misc/nut/Manifest
+++ b/net-misc/nut/Manifest
@@ -1,31 +1,35 @@
-MD5 21f871db8f71e909d5169587749795cc nut-1.4.0.ebuild 3403
-MD5 6aab9abab0b73d9a5a7a78e644433734 nut-1.0.0.ebuild 2527
-MD5 799fd2baa38a488eae64dc1faa1a2924 nut-1.5.8.ebuild 2316
-MD5 c40b34bfcfd9e912b798bc149e3dd4b6 nut-1.2.1.ebuild 2966
-MD5 523983ce9b9aefa4cf9ed3a709d184a0 nut-1.3.6.ebuild 3384
-MD5 02b4ad4853ad76108045c70a47000d8c nut-1.5.7.ebuild 2334
-MD5 4c96216e06f67dd363cbb0430d51b21a nut-1.2.2.ebuild 3324
-MD5 6dce3f7061da57df456726c7dbadbbd2 nut-1.5.8-r1.ebuild 2799
-MD5 7b7b13d4f04cf0847215622d5988d490 nut-1.4.0-r3.ebuild 2333
-MD5 352e7a4593deae8d7198d2abb6013315 nut-1.2.1-r1.ebuild 3282
-MD5 640076665f7178756bdf964526720cf6 ChangeLog 4149
-MD5 1591b9ac69b062b35eba0670b5291fb3 nut-1.5.1.ebuild 3407
-MD5 b93b543b8a5de2aeec4a8d4f5faf4a92 nut-1.5.6-r2.ebuild 2337
+MD5 ba339ff4e6a8ad490d7420aa2ef105cc nut-1.4.0.ebuild 3402
+MD5 310e9a3f33c9e15939745e45489556bc nut-1.0.0.ebuild 2526
+MD5 cf7efc913756150f16dac715eaf9756c nut-1.5.8.ebuild 2315
+MD5 49b497e6827e63ac84f1a44bdc0b0126 nut-1.2.1.ebuild 2965
+MD5 616cb93b262d3b70178b3e85d860f66a nut-1.5.12.ebuild 3280
+MD5 dc66eb70c35e0b398e33879a2411eef9 nut-1.3.6.ebuild 3383
+MD5 563a594824fd0be3262aad8d5f107874 nut-1.5.7.ebuild 2333
+MD5 e46e3c17b745a6cec05de329fceb794c nut-1.4.1.ebuild 2315
+MD5 4144b88dd70618b92461e0884f50ca83 nut-1.2.2.ebuild 3323
+MD5 eabffcdb4fdc8497494bb7d2ea74b2d7 nut-1.5.8-r1.ebuild 2798
+MD5 d0b843a999a749faf5222a41a3f8d1ef nut-1.4.0-r3.ebuild 2332
+MD5 fad67d27a0dd364a95c5eff36982f6d3 nut-1.2.1-r1.ebuild 3281
+MD5 b8b57d4f66f1a0770d07353b49f3bf1b ChangeLog 4339
+MD5 d3d0c75e1d63d105b51ef247edf1c081 nut-1.5.1.ebuild 3406
+MD5 b67cf33b309d6a87e7f2c8cfc3a28a71 nut-1.5.6-r2.ebuild 2336
 MD5 91a159b983332d5ed0fb985cc1fe1b80 metadata.xml 330
 MD5 53b3c22e90b76d9ed4ac9cbbef393c31 files/digest-nut-1.0.0 61
 MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1 61
 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 af157fac0a88e11c79527d952fce75ec files/digest-nut-1.4.1 61
 MD5 884831c15f0700dbc89db196a32a2695 files/digest-nut-1.5.1 61
 MD5 95e684fab414b46c58d8a46114a9b0ca files/digest-nut-1.5.7 61
 MD5 a9ef824765dcb50fb2565e905921b268 files/digest-nut-1.5.8 61
-MD5 2bbffa4aad5969fa3d0d74a6039d6070 files/upsmon-init 491
+MD5 ffa9209a6b5f2e02460630cb844324f0 files/upsmon-init 480
 MD5 4f6c951306e95660e88086bc591f03d0 files/digest-nut-1.2.1-r1 61
 MD5 de17bbc812bdd76ec7b807a0deb5e636 files/digest-nut-1.4.0-r3 61
+MD5 7b76eef352ad93b1369096360bbc3a11 files/digest-nut-1.5.12 62
 MD5 7ae6f61ceeee54557c5ad414688b82d0 files/digest-nut-1.5.6-r2 61
 MD5 a9ef824765dcb50fb2565e905921b268 files/digest-nut-1.5.8-r1 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
+MD5 d9f15db2fd0a18b34b2ba4e83f76cb1f files/upsd.rc6 594
+MD5 6e11c5b10da2a5c6d2b01b7caf97fbea files/upsdrv.rc6 485
+MD5 ba59cc3c6c2c10ce054dd8a9afb9d175 files/upsmon.rc6 494
+MD5 5e6d1b6932c79a059573a6dbb5fa80bc files/upsd-init 585
diff --git a/net-misc/nut/files/digest-nut-1.4.1 b/net-misc/nut/files/digest-nut-1.4.1
new file mode 100644
index 000000000000..ab239bb29e00
--- /dev/null
+++ b/net-misc/nut/files/digest-nut-1.4.1
@@ -0,0 +1 @@
+MD5 ae91ea3d643d7665bda0a95ce62957a0 nut-1.4.1.tar.gz 550238
diff --git a/net-misc/nut/files/digest-nut-1.5.12 b/net-misc/nut/files/digest-nut-1.5.12
new file mode 100644
index 000000000000..0e168a873a54
--- /dev/null
+++ b/net-misc/nut/files/digest-nut-1.5.12
@@ -0,0 +1 @@
+MD5 26eefc05469d500130b84ab9bc2aa738 nut-1.5.12.tar.gz 510378
diff --git a/net-misc/nut/files/upsd.rc6 b/net-misc/nut/files/upsd.rc6
index 0d16163fc95d..fad15e41afc0 100644
--- a/net-misc/nut/files/upsd.rc6
+++ b/net-misc/nut/files/upsd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsd.rc6,v 1.6 2004/03/06 03:36:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut/files/upsd.rc6,v 1.7 2004/03/09 03:39:22 robbat2 Exp $
 
 depend() {
 	need net upsdrv
@@ -10,6 +10,11 @@ depend() {
 
 start() {
 	ebegin "Starting upsd"
+	# clean up first
+	pkill -u root -x upsd
+	sleep 1s
+	rm -f /var/state/nut/upsd.pid
+	# now start up
 	start-stop-daemon --start --quiet --exec /usr/sbin/upsd
 	eend $?
 }
diff --git a/net-misc/nut/nut-1.4.1.ebuild b/net-misc/nut/nut-1.4.1.ebuild
new file mode 100644
index 000000000000..8a50d4482cde
--- /dev/null
+++ b/net-misc/nut/nut-1.4.1.ebuild
@@ -0,0 +1,91 @@
+# 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.1.ebuild,v 1.1 2004/03/09 03:39:22 robbat2 Exp $
+
+DESCRIPTION="Network-UPS Tools."
+HOMEPAGE="http://www.networkupstools.org/"
+SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE="cgi"
+
+RDEPEND="cgi? ( =media-libs/libgd-1* )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
+
+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"
+
+	ebegin "Recreating configure"
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
+	eend $?
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
+
+	econf \
+		--with-user=nut \
+		--with-group=nut \
+		--with-drvpath=/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"
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
+
+	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}/upsdrv.rc6" upsdrv
+	newexe "${FILESDIR}/upsmon.rc6" upsmon
+
+	keepdir /var/lib/nut
+}
+
+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.5.12.ebuild b/net-misc/nut/nut-1.5.12.ebuild
new file mode 100644
index 000000000000..235aee2373e8
--- /dev/null
+++ b/net-misc/nut/nut-1.5.12.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2004 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.12.ebuild,v 1.1 2004/03/09 03:39:22 robbat2 Exp $
+
+inherit fixheadtails
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="http://www.networkupstools.org/"
+SRC_URI="mirror://nut/source/${PV%.*}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE="cgi"
+
+RDEPEND="cgi? ( =media-libs/libgd-1* )
+		 snmp? ( virtual/snmp )"
+DEPEND="$RDEPEND
+	>=sys-apps/sed-4
+	>=sys-devel/autoconf-2.58"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	sed -e "s/install: install-dirs/install: install-dirs install-conf/" \
+		-i Makefile.in || die "sed failed"
+
+	ht_fix_file configure.in config.guess
+
+	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 autoconf || die "autoconf failed"
+	eend $?
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} `use_with cgi` `use_with cgi cgipath /usr/share/nut`"
+	if [ -z "${NUT_DRIVERS}" ]; then
+		NUT_DRIVERS="${NUT_DRIVERS} bestups fentonups apcsmart everups belkin masterguard \
+		powercom cyberpower tripplite victronups genericups mge-utalk bestuferrups \
+		isbmex etapro liebert sms esupssmart tripplitesu blazer safenet belkinunv \
+		oneac ippon cyberpower1100"
+		if use snmp; then
+			NUT_DRIVERS="${NUT_DRIVERS} snmp-ups"
+		fi
+	fi
+	NUT_DRIVERS="`echo ${NUT_DRIVERS} | xargs`"
+	myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
+
+	econf \
+		--with-user=nut \
+		--with-group=nut \
+		--with-drvpath=/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"
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
+
+	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}
+
+	docinto cables
+	dodoc docs/cables/*
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/upsd.rc6" upsd
+	newexe "${FILESDIR}/upsdrv.rc6" upsdrv
+	newexe "${FILESDIR}/upsmon.rc6" upsmon
+
+	keepdir /var/lib/nut
+
+	fperms 0700 /var/lib/nut
+	fperms 0640 /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
+	fowners nut:nut /var/lib/nut
+	fowners root:nut /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
+}
+
+pkg_postinst() {
+	# this is to ensure that everybody that installed old versions still has correct
+	# permissions
+	chown nut:nut ${ROOT}/var/lib/nut 2>/dev/null
+	chmod 0700 ${ROOT}/var/lib/nut 2>/dev/null
+	chown root:nut ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
+	chmod 0640 ${ROOT}/etc/nut/{upsd.conf,upsd.users,upsmon.conf} 2>/dev/null
+}