Version bump and clean up of Nut (bug #85296), resolving bugs for SSL, GD (bug #62745), USB (bug #73074), and moving portions to /sbin and /lib/nut to allow for poweroff where /usr is a seperate partition (bug #88832). Also add udev rules for new USB devices.

Package-Manager: portage-2.1_rc1-r2

4 files changed, 181 insertions, 5 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 8f70ed97d577..3be760e58ef6 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/nut
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.1 2006/05/15 23:43:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.2 2006/05/18 06:05:29 robbat2 Exp $
+
+*nut-2.0.3 (18 May 2006)
+
+  18 May 2006; Robin H. Johnson <robbat2@gentoo.org> +nut-2.0.3.ebuild:
+  Version bump and clean up of Nut (bug #85296), resolving bugs for SSL, GD
+  (bug #62745), USB (bug #73074), and moving portions to /sbin and /lib/nut to
+  allow for poweroff where /usr is a seperate partition (bug #88832). Also add
+  udev rules for new USB devices.
 
   15 May 2006; Robin H. Johnson <robbat2@gentoo.org> +files/upsd.rc6,
   +files/upsdrv.rc6, +files/upsdrv.rc6-r1, +files/upsmon.rc6, +metadata.xml,
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 90b7340ce757..6ba8f7ef61f4 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -16,6 +16,7 @@ RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 files/upsmon.rc6 473
 SHA256 f338e5955c6f1e601cb0b90b95c00cbde47ef3dc56e970d8f42bb335203fbcc7 files/upsmon.rc6 473
 DIST nut-2.0.0.tar.gz 530492 RMD160 7f36296b61b79fe13d78c65a66aa034b60e1c0d2 SHA256 5015eda31ffae1e899c6b80d9c0c943e24fae1934591a50018f01e2622ebf9b8 size 530492
 DIST nut-2.0.1-pre4.tar.gz 563526 RMD160 5b0a3ab8a400e70f308471aa7b1fbcaa8052f739 SHA256 6a374f34e155ef2f09c10c046ef34a628fe4cb9970973c88c57cbca16d78624f size 563526
+DIST nut-2.0.3.tar.gz 656376 RMD160 890c52b1ab538101c30e5be33e785817a773cdb9 SHA256 e4ded1fd1f119a71ee500d043bfa08d912d84793738d81b2bd08871e34ed8f95 size 656376
 EBUILD nut-2.0.0-r1.ebuild 3201 RMD160 f1df0ecc6d618da617aa65cb9f4f7868901d0ae5 SHA1 f429deba2efecb67faf63006df86843cee76c642 SHA256 1f96055d8b8799daeaa65d811e687f08d5b19637a311846345c3465c24bcac77 size 3201
 MD5 317ca948257c2d787a7a37d15f2db473 nut-2.0.0-r1.ebuild 3201
 RMD160 f1df0ecc6d618da617aa65cb9f4f7868901d0ae5 nut-2.0.0-r1.ebuild 3201
@@ -28,10 +29,14 @@ EBUILD nut-2.0.1_pre4.ebuild 3261 RMD160 bbd843faf48eded2af803a1bb7e6c5d05c30549
 MD5 8809b41802e3ee3222dc5304021142bb nut-2.0.1_pre4.ebuild 3261
 RMD160 bbd843faf48eded2af803a1bb7e6c5d05c30549c nut-2.0.1_pre4.ebuild 3261
 SHA256 4b772a64f70a129326768d1f6f1436ff38564983f3dd92ac3c2eb8632e50d83f nut-2.0.1_pre4.ebuild 3261
-MISC ChangeLog 7682 RMD160 ee91b069edf1437840eb37a6e1a16aecd2e07963 SHA1 433c20bd1b4026a35e95313eb582640a5a82c4d6 SHA256 0b871e0cf9f9aabd4ed3bb5fd5dbecf3bdcce21e49552ba480cd8626746c1996 size 7682
-MD5 9cb9885df26ef498b0f82b5ff38572a6 ChangeLog 7682
-RMD160 ee91b069edf1437840eb37a6e1a16aecd2e07963 ChangeLog 7682
-SHA256 0b871e0cf9f9aabd4ed3bb5fd5dbecf3bdcce21e49552ba480cd8626746c1996 ChangeLog 7682
+EBUILD nut-2.0.3.ebuild 4098 RMD160 24a7562be85a1f97e7a66097755c58a8cdb80665 SHA1 51a120c46d6edc46aa92098e8c66cb71bded10dc SHA256 c4d7ac980e746d0a4fbefabd68e2f557b7327f87cb377fa870487bf3d837d35f size 4098
+MD5 61484ea86863e51b9c9a1652bdeae3bf nut-2.0.3.ebuild 4098
+RMD160 24a7562be85a1f97e7a66097755c58a8cdb80665 nut-2.0.3.ebuild 4098
+SHA256 c4d7ac980e746d0a4fbefabd68e2f557b7327f87cb377fa870487bf3d837d35f nut-2.0.3.ebuild 4098
+MISC ChangeLog 8049 RMD160 7a52640c4e0c4d13dfd4bfcb574e4a233d0ea608 SHA1 81f6a45386d6132cdf76a16a46d78353775666df SHA256 d3d2193aeb1e0ac9545ec8beedd2cbb773aa87d6dbf72fb1170119184e0c6e0f size 8049
+MD5 3f4740c9621df729e36814202b5135ed ChangeLog 8049
+RMD160 7a52640c4e0c4d13dfd4bfcb574e4a233d0ea608 ChangeLog 8049
+SHA256 d3d2193aeb1e0ac9545ec8beedd2cbb773aa87d6dbf72fb1170119184e0c6e0f ChangeLog 8049
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b size 219
 MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc metadata.xml 219
@@ -45,3 +50,6 @@ SHA256 26d7796b5c899ee0d07325b0c27578a14843ec27a510806e941ed83decbaf71f files/di
 MD5 e6a7669f1606c70c25f83573bc75ad22 files/digest-nut-2.0.1_pre4 244
 RMD160 f5ea2b7e207be7589eff32656404d7da1a42c35e files/digest-nut-2.0.1_pre4 244
 SHA256 4866c4f95b4b98a1189f00ea4e5d3447f4f7ee5bfff71dd9c59f6c25b4bf73ca files/digest-nut-2.0.1_pre4 244
+MD5 5a43e7f37bd0612cb2dd452deb50d5a3 files/digest-nut-2.0.3 229
+RMD160 4d2ca56c0309afe9db50e1a97681135d9fa208a2 files/digest-nut-2.0.3 229
+SHA256 017d3a946060089d62dfdd42621bacfc1b226a902c114a956e3326f77a2bc7dc files/digest-nut-2.0.3 229
diff --git a/sys-power/nut/files/digest-nut-2.0.3 b/sys-power/nut/files/digest-nut-2.0.3
new file mode 100644
index 000000000000..55c8a6e59877
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.3
@@ -0,0 +1,3 @@
+MD5 ed2d3104d021a6ddb864f23d8cbd1cf6 nut-2.0.3.tar.gz 656376
+RMD160 890c52b1ab538101c30e5be33e785817a773cdb9 nut-2.0.3.tar.gz 656376
+SHA256 e4ded1fd1f119a71ee500d043bfa08d912d84793738d81b2bd08871e34ed8f95 nut-2.0.3.tar.gz 656376
diff --git a/sys-power/nut/nut-2.0.3.ebuild b/sys-power/nut/nut-2.0.3.ebuild
new file mode 100644
index 000000000000..c9fd44b803ee
--- /dev/null
+++ b/sys-power/nut/nut-2.0.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.3.ebuild,v 1.1 2006/05/18 06:05:29 robbat2 Exp $
+
+inherit eutils fixheadtails
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="http://www.networkupstools.org/"
+# Nut mirrors are presently broken
+#SRC_URI="mirror://nut/source/${PV%.*}/${MY_P}.tar.gz"
+SRC_URI="http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~alpha ~amd64"
+IUSE="cgi snmp usb ssl"
+
+RDEPEND="cgi? ( >=media-libs/gd-2 )
+		snmp? ( net-analyzer/net-snmp )
+		usb? ( dev-libs/libusb )
+		ssl? ( dev-libs/openssl )"
+DEPEND="$RDEPEND
+		>=sys-apps/sed-4
+		>=sys-devel/autoconf-2.58"
+
+pkg_setup() {
+	enewgroup nut 84
+	enewuser nut 84 -1 /var/state/nut nut
+}
+
+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
+
+	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
+
+	if [ -n "${NUT_DRIVERS}" ]; then
+		myconf="${myconf} --with-drivers=${NUT_DRIVERS// /,}"
+	fi
+
+	econf \
+		--with-user=nut \
+		--with-group=nut \
+		--with-drvpath=/lib/nut \
+		--sysconfdir=/etc/nut \
+		--with-logfacility=LOG_DAEMON \
+		--with-statepath=/var/lib/nut \
+		$(use_with ssl) \
+		$(use_with cgi) \
+		$(use_with cgi cgipath /usr/share/nut) \
+		${myconf} || die "econf failed"
+
+	emake || die "compile problem"
+
+	if use snmp; then
+		emake snmp || die "snmp compile problem"
+	fi
+
+	if use usb; then
+		emake usb || die "usb compile problem"
+	fi
+
+	if use cgi; then
+		emake cgi || die "cgi compile problem"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install install-lib || die "make install failed"
+
+	dodir /sbin
+	dosym /lib/nut/upsdrvctl /sbin/upsdrvctl
+	# This needs to exist for the scripts
+	dosym /lib/nut/upsdrvctl /usr/sbin/upsdrvctl
+
+	if use snmp; then
+		make DESTDIR="${D}" install-snmp || die "make install-snmp failed"
+	fi
+
+	if use usb; then
+		make DESTDIR="${D}" install-usb || die "make install-usb failed"
+	fi
+
+	if use cgi; then
+		make DESTDIR="${D}" install-cgi || die "make install-cgi failed"
+		make DESTDIR="${D}" install-cgi-conf || die "make install-cgi-conf failed"
+		einfo "CGI monitoring scripts are installed in /usr/share/nut,"
+		einfo "copy them to your web server's ScriptPath to activate."
+	fi
+
+	# this must be done after all of the install phases
+	for i in "${D}"/etc/nut/*.sample ; do
+		mv "${i}" "${i/.sample/}"
+	done
+
+
+	dodoc CHANGES CREDITS INSTALL MAINTAINERS NEWS README UPGRADING \
+			docs/{FAQ,*.txt}
+
+	newdoc lib/README README.lib
+
+	docinto cables
+	dodoc docs/cables/*
+
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/upsd.rc6" upsd
+	newexe "${FILESDIR}/upsdrv.rc6-r1" upsdrv
+	newexe "${FILESDIR}/upsmon.rc6" upsmon
+
+	# This sets up permissions for nut to access a UPS
+	insinto /etc/udev/rules.d/
+	newins scripts/hotplug-ng/nut-usbups.rules 70-nut-usbups.rules
+
+	keepdir /var/lib/nut
+
+	fperms 0700 /var/lib/nut
+	fowners nut:nut /var/lib/nut
+
+	fperms 0640 /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
+	fowners root:nut /etc/nut/{upsd.conf,upsd.users,upsmon.conf}
+
+	fperms 0640 /etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html}
+	fowners root:nut /etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html}
+}
+
+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
+
+	chown root:nut ${ROOT}/etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html} 2>/dev/null
+	chmod 0640 ${ROOT}/etc/nut/{hosts.conf,upsset.conf,upsstats{,-single}.html} 2>/dev/null
+}