Bug #141897, version bump.

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 220 insertions, 5 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 69d52a6fb1d8..7292a2c757e5 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.12 2006/07/22 04:48:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.13 2006/07/30 04:09:59 robbat2 Exp $
+
+*nut-2.0.4 (30 Jul 2006)
+
+  30 Jul 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/upsstats-upsset-link-2.0.4.patch, +nut-2.0.4.ebuild:
+  Bug #141897, version bump.
 
   22 Jul 2006; Robin H. Johnson <robbat2@gentoo.org> nut-2.0.3-r1.ebuild:
   As per bug #138389, add a warning message.
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 53f7d950d82a..2300c971cd18 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -18,6 +18,10 @@ AUX upsmon.rc6 473 RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 SHA1 bde917f0
 MD5 db84bb9f67df55c305f5903ceb6e8244 files/upsmon.rc6 473
 RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 files/upsmon.rc6 473
 SHA256 f338e5955c6f1e601cb0b90b95c00cbde47ef3dc56e970d8f42bb335203fbcc7 files/upsmon.rc6 473
+AUX upsstats-upsset-link-2.0.4.patch 321 RMD160 4e6af2d55d790659d21458ed6f494e3f77466060 SHA1 53545a15a70cbdf994234749248b1abb76643fcc SHA256 81b5d2a38d66ef5bd94a87eb53c2156f4ce9e8244d1e028167ab886e82ae33c3
+MD5 cfbe8a9d025aff0375606852f7492507 files/upsstats-upsset-link-2.0.4.patch 321
+RMD160 4e6af2d55d790659d21458ed6f494e3f77466060 files/upsstats-upsset-link-2.0.4.patch 321
+SHA256 81b5d2a38d66ef5bd94a87eb53c2156f4ce9e8244d1e028167ab886e82ae33c3 files/upsstats-upsset-link-2.0.4.patch 321
 AUX upsstats-upsset-link.patch 321 RMD160 492b789e64d0a53c54fd54402742f04e7a362d33 SHA1 8f49d2504bf2a244d7875f7b67b1e73239f7ad0b SHA256 99ff9505010927ba252d50adb197eff06f1b06c0448f95e8f7ff5370fc230543
 MD5 45640141933ef31ba59a6a649e11e646 files/upsstats-upsset-link.patch 321
 RMD160 492b789e64d0a53c54fd54402742f04e7a362d33 files/upsstats-upsset-link.patch 321
@@ -25,6 +29,7 @@ SHA256 99ff9505010927ba252d50adb197eff06f1b06c0448f95e8f7ff5370fc230543 files/up
 DIST nut-2.0.0.tar.gz 530492 RMD160 7f36296b61b79fe13d78c65a66aa034b60e1c0d2 SHA1 5a89efac3047b6e8183224171be53251733d9927 SHA256 5015eda31ffae1e899c6b80d9c0c943e24fae1934591a50018f01e2622ebf9b8
 DIST nut-2.0.1-pre4.tar.gz 563526 RMD160 5b0a3ab8a400e70f308471aa7b1fbcaa8052f739 SHA1 0e94bb76bd1f1b35be39a30a39093da98a232d5d SHA256 6a374f34e155ef2f09c10c046ef34a628fe4cb9970973c88c57cbca16d78624f
 DIST nut-2.0.3.tar.gz 656376 RMD160 890c52b1ab538101c30e5be33e785817a773cdb9 SHA1 3ea064668846529d95663eadbf07b41ca8c25b1d SHA256 e4ded1fd1f119a71ee500d043bfa08d912d84793738d81b2bd08871e34ed8f95
+DIST nut-2.0.4.tar.gz 699424 RMD160 7368967572bd8b2361c6fdd642308ecbb661a994 SHA1 31e2464a0f868c7d04d052ee558e52956220ccba SHA256 6a8fb79fd5eb89baa36d321c8ffc1b6ec05265242c0ff3495aac49f008295db2
 EBUILD nut-2.0.0-r1.ebuild 3201 RMD160 f1df0ecc6d618da617aa65cb9f4f7868901d0ae5 SHA1 f429deba2efecb67faf63006df86843cee76c642 SHA256 1f96055d8b8799daeaa65d811e687f08d5b19637a311846345c3465c24bcac77
 MD5 317ca948257c2d787a7a37d15f2db473 nut-2.0.0-r1.ebuild 3201
 RMD160 f1df0ecc6d618da617aa65cb9f4f7868901d0ae5 nut-2.0.0-r1.ebuild 3201
@@ -45,10 +50,14 @@ EBUILD nut-2.0.3.ebuild 4098 RMD160 24a7562be85a1f97e7a66097755c58a8cdb80665 SHA
 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 9173 RMD160 fa349dfef9698d981e3c468849652d634ae84a72 SHA1 87b9091ad3b6d7dc9b7ebae63a3af89d00b4f8f8 SHA256 4d272eabe07b7c2b61d7a2e313b009024a2e7edb28a486a188ff920437dc8f94
-MD5 d5136fe2cda84ce1867487239519041d ChangeLog 9173
-RMD160 fa349dfef9698d981e3c468849652d634ae84a72 ChangeLog 9173
-SHA256 4d272eabe07b7c2b61d7a2e313b009024a2e7edb28a486a188ff920437dc8f94 ChangeLog 9173
+EBUILD nut-2.0.4.ebuild 4799 RMD160 4fbcbaa4c7e719146fa2e64729521865f9b9151f SHA1 d6428f92bc655c970274ad2e4ab385cae5e5cb3f SHA256 a3014053beb6142acffe8a33704ce08e0427ac2789bd7e62dc0d18d6246ece44
+MD5 25382ac4db5d91a9c1d589192675a289 nut-2.0.4.ebuild 4799
+RMD160 4fbcbaa4c7e719146fa2e64729521865f9b9151f nut-2.0.4.ebuild 4799
+SHA256 a3014053beb6142acffe8a33704ce08e0427ac2789bd7e62dc0d18d6246ece44 nut-2.0.4.ebuild 4799
+MISC ChangeLog 9344 RMD160 6fd79804fa38d952b44c95ef3818b185e6db8ec9 SHA1 26f2befce9dcdd88d6e6f95cbdc85389da08d214 SHA256 02b46a1545afc3ccae007ca0223260a9d25a8101aca355bd95eb2504df1f4095
+MD5 3e5ed8b1b5c8a707afe31f0d2990cb10 ChangeLog 9344
+RMD160 6fd79804fa38d952b44c95ef3818b185e6db8ec9 ChangeLog 9344
+SHA256 02b46a1545afc3ccae007ca0223260a9d25a8101aca355bd95eb2504df1f4095 ChangeLog 9344
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
 MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc metadata.xml 219
@@ -68,3 +77,6 @@ SHA256 017d3a946060089d62dfdd42621bacfc1b226a902c114a956e3326f77a2bc7dc files/di
 MD5 5a43e7f37bd0612cb2dd452deb50d5a3 files/digest-nut-2.0.3-r1 229
 RMD160 4d2ca56c0309afe9db50e1a97681135d9fa208a2 files/digest-nut-2.0.3-r1 229
 SHA256 017d3a946060089d62dfdd42621bacfc1b226a902c114a956e3326f77a2bc7dc files/digest-nut-2.0.3-r1 229
+MD5 e543f547d66497cff5e191b08c8ff8d9 files/digest-nut-2.0.4 229
+RMD160 d2fa5931dfa65c607c09b62a70c3281d69919e73 files/digest-nut-2.0.4 229
+SHA256 4d18f4ecac989c959db626584630384b449594a864db3308df3801807620e705 files/digest-nut-2.0.4 229
diff --git a/sys-power/nut/files/digest-nut-2.0.4 b/sys-power/nut/files/digest-nut-2.0.4
new file mode 100644
index 000000000000..25ad2547dc35
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.4
@@ -0,0 +1,3 @@
+MD5 59b6f3038a5ef64c584913e72bd850a2 nut-2.0.4.tar.gz 699424
+RMD160 7368967572bd8b2361c6fdd642308ecbb661a994 nut-2.0.4.tar.gz 699424
+SHA256 6a8fb79fd5eb89baa36d321c8ffc1b6ec05265242c0ff3495aac49f008295db2 nut-2.0.4.tar.gz 699424
diff --git a/sys-power/nut/files/upsstats-upsset-link-2.0.4.patch b/sys-power/nut/files/upsstats-upsset-link-2.0.4.patch
new file mode 100644
index 000000000000..882889199b16
--- /dev/null
+++ b/sys-power/nut/files/upsstats-upsset-link-2.0.4.patch
@@ -0,0 +1,10 @@
+--- nut-2.0.4.orig/conf/upsstats.html	2005-02-28 01:14:07.000000000 -0800
++++ nut-2.0.4/conf/upsstats.html	2006-05-18 12:56:34.206538641 -0700
+@@ -114,4 +114,6 @@
+ </table>
+ 
+ </td></tr>
+-</table></body></html>
++</table>
++<p style="text-align: center"><a href="upsset.cgi">Settings &amp; Commands</a></p>
++</body></html>
diff --git a/sys-power/nut/nut-2.0.4.ebuild b/sys-power/nut/nut-2.0.4.ebuild
new file mode 100644
index 000000000000..b6d3a4fa36bf
--- /dev/null
+++ b/sys-power/nut/nut-2.0.4.ebuild
@@ -0,0 +1,184 @@
+# 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.4.ebuild,v 1.1 2006/07/30 04:09:59 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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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"
+
+# public files should be 644 root:root
+NUT_PUBLIC_FILES="/etc/nut/{{hosts,upsset,ups,upssched}.conf,upsstats{,-single}.html}"
+# private files should be 640 root:nut - readable by nut, writeable by root,
+NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
+
+pkg_setup() {
+	enewgroup nut 84
+	enewuser nut 84 -1 /var/state/nut nut,tty
+	warningmsg
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/upsstats-upsset-link-${PV}.patch
+
+	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."
+		einfo "If you use lighttpd, see lighttpd_nut.conf in the documentation."
+	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
+
+	dodoc ${FILESDIR}/lighttpd_nut.conf
+
+	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
+
+	eval fperms 0640 ${NUT_PRIVATE_FILES}
+	eval fowners root:nut ${NUT_PRIVATE_FILES}
+
+	eval fperms 0644 ${NUT_PUBLIC_FILES}
+	eval fowners root:root ${NUT_PUBLIC_FILES}
+
+	# this is installed for 2.4 and fbsd guys
+	if ! has_version sys-fs/udev; then
+		insinto /etc/hotplug/usb
+		insopts -m 755
+		doins scripts/hotplug-ng/nut-usbups.hotplug
+	fi
+}
+
+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
+
+	eval chown root:nut ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
+	eval chmod 0640 ${ROOT}${NUT_PRIVATE_FILES} 2>/dev/null
+
+	eval chown root:root ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
+	eval chmod 0644 ${ROOT}${NUT_PUBLIC_FILES} 2>/dev/null
+
+	warningmsg
+}
+
+warningmsg() {
+	ewarn "Please note that NUT now runs under the 'nut' user."
+	ewarn "NUT is in the tty group for access to RS-232 UPS."
+	ewarn "However if you use a USB UPS you may need to look at the udev or"
+	ewarn "hotplug rules that are installed."
+}