Version bump, bug #162657.

Package-Manager: portage-2.1.2-r9

5 files changed, 239 insertions, 6 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 803a570128c7..e0bfcc4fb17c 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.25 2006/10/26 22:05:34 blubb Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.26 2007/02/25 02:57:28 robbat2 Exp $
+
+*nut-2.0.5 (25 Feb 2007)
+
+  25 Feb 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/upsstats-upsset-link-2.0.5.patch, +nut-2.0.5.ebuild:
+  Version bump, bug #162657.
 
   26 Oct 2006; <blubb@gentoo.org> nut-2.0.4-r1.ebuild:
   back to ~amd64 because libusb was de-keyworded as well; bug 148013 comment
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index a27674101eac..8aa7c76730da 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lighttpd_nut.conf 961 RMD160 636b45860713453dc88d7ed0392862735e329099 SHA1 1cde03638637f3b2e302ae939605f2f2b7f464fd SHA256 5604058313d3cfeba426c69a756944bc7cc3ddb3813db68582e69dff1a00f7cb
 MD5 cb4007ab506c4c49dcf12a7a5516fff9 files/lighttpd_nut.conf 961
 RMD160 636b45860713453dc88d7ed0392862735e329099 files/lighttpd_nut.conf 961
@@ -22,6 +25,10 @@ AUX upsstats-upsset-link-2.0.4.patch 321 RMD160 4e6af2d55d790659d21458ed6f494e3f
 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-2.0.5.patch 625 RMD160 69253155db06c10ea4f8c5b0dd4c66388128323b SHA1 d0158643ebe1ec828d1f479560bb14205b767668 SHA256 d7cc3c65878628e35937d29198570ea755e5798408ed531c38d2e3999c255ff4
+MD5 2f3981ebdc0776e36705949825ef8a9a files/upsstats-upsset-link-2.0.5.patch 625
+RMD160 69253155db06c10ea4f8c5b0dd4c66388128323b files/upsstats-upsset-link-2.0.5.patch 625
+SHA256 d7cc3c65878628e35937d29198570ea755e5798408ed531c38d2e3999c255ff4 files/upsstats-upsset-link-2.0.5.patch 625
 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
@@ -30,6 +37,7 @@ DIST nut-2.0.0.tar.gz 530492 RMD160 7f36296b61b79fe13d78c65a66aa034b60e1c0d2 SHA
 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
+DIST nut-2.0.5.tar.gz 809006 RMD160 e5f90a73932e038d3dfee8cb32faf097d99a7e0b SHA1 d2c07adeac524b8463677c756a90f2f22084f35e SHA256 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203
 EBUILD nut-2.0.0-r1.ebuild 3200 RMD160 3595fc2e5d8a29cd10fe414f134024f17e7da51b SHA1 a4cee5c2ab1fa65fd10f91dbcddd9c036da11172 SHA256 5f88ebc0fab574d7fa1de18244a92a35078f2d734b90789f16393a73a23cb555
 MD5 37beee60f1e35622aeba86aa4714e505 nut-2.0.0-r1.ebuild 3200
 RMD160 3595fc2e5d8a29cd10fe414f134024f17e7da51b nut-2.0.0-r1.ebuild 3200
@@ -58,10 +66,14 @@ EBUILD nut-2.0.4.ebuild 4799 RMD160 4fbcbaa4c7e719146fa2e64729521865f9b9151f SHA
 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 10778 RMD160 6c5c21c36f83b08168ccbbba493ddab6ca78dad3 SHA1 df922fe86fcfecded820e1f809b1ec68b5071c11 SHA256 51fe54a7d7cd5038c66ea326f361105a8e05f29d2adee0d56191038f3bf2b718
-MD5 5e2cfb738e38344062fc19495e5d6cd2 ChangeLog 10778
-RMD160 6c5c21c36f83b08168ccbbba493ddab6ca78dad3 ChangeLog 10778
-SHA256 51fe54a7d7cd5038c66ea326f361105a8e05f29d2adee0d56191038f3bf2b718 ChangeLog 10778
+EBUILD nut-2.0.5.ebuild 4930 RMD160 835061ba098fbf0a7aed93c70ef952dbb7db65ea SHA1 7607727f30249a1807b3ec1b0c3f9f2d05672e14 SHA256 6868ea0421c1d00bfcb92a6b171cdd87708331eb0aa6222d2a17a92b7c24c4a6
+MD5 c0fb244aeb3be8e84ee2b8db04b7c717 nut-2.0.5.ebuild 4930
+RMD160 835061ba098fbf0a7aed93c70ef952dbb7db65ea nut-2.0.5.ebuild 4930
+SHA256 6868ea0421c1d00bfcb92a6b171cdd87708331eb0aa6222d2a17a92b7c24c4a6 nut-2.0.5.ebuild 4930
+MISC ChangeLog 10951 RMD160 4e4ffd42b1f5df1bb9e434c59359f5c0820d4fb5 SHA1 e19376e36685d18230b586085e2747199e4fc1ac SHA256 7ca34af28f78242041b220441163995d75033f221f8bd3c820352919219e4c9b
+MD5 800666d3388db7c200384d4ed321e2af ChangeLog 10951
+RMD160 4e4ffd42b1f5df1bb9e434c59359f5c0820d4fb5 ChangeLog 10951
+SHA256 7ca34af28f78242041b220441163995d75033f221f8bd3c820352919219e4c9b ChangeLog 10951
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
 MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc metadata.xml 219
@@ -87,3 +99,14 @@ SHA256 4d18f4ecac989c959db626584630384b449594a864db3308df3801807620e705 files/di
 MD5 e543f547d66497cff5e191b08c8ff8d9 files/digest-nut-2.0.4-r1 229
 RMD160 d2fa5931dfa65c607c09b62a70c3281d69919e73 files/digest-nut-2.0.4-r1 229
 SHA256 4d18f4ecac989c959db626584630384b449594a864db3308df3801807620e705 files/digest-nut-2.0.4-r1 229
+MD5 270b9f0a8aca065d2bff7c6ed52c096d files/digest-nut-2.0.5 229
+RMD160 af5257a0dbc5ad3ba25177d900e971613d1d676e files/digest-nut-2.0.5 229
+SHA256 edfec92b45e8c6d3dff87771a2a0535666d38fdba5c150a00b518ee9f4fcdff3 files/digest-nut-2.0.5 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks - The text below is a digital signature. If it doesn't make any sense to you, ignore it.
+
+iD8DBQFF4PwlPgYlrpyh79cRAkHnAJ90XymAwPOvcZLYyIH8yZKIme4xLQCfSIQP
+DhAOmpZ05IluhT+IrWqsrjc=
+=FVvp
+-----END PGP SIGNATURE-----
diff --git a/sys-power/nut/files/digest-nut-2.0.5 b/sys-power/nut/files/digest-nut-2.0.5
new file mode 100644
index 000000000000..782b3150a09e
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.5
@@ -0,0 +1,3 @@
+MD5 b08fde86191154bbcfda860f95a5dca2 nut-2.0.5.tar.gz 809006
+RMD160 e5f90a73932e038d3dfee8cb32faf097d99a7e0b nut-2.0.5.tar.gz 809006
+SHA256 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203 nut-2.0.5.tar.gz 809006
diff --git a/sys-power/nut/files/upsstats-upsset-link-2.0.5.patch b/sys-power/nut/files/upsstats-upsset-link-2.0.5.patch
new file mode 100644
index 000000000000..db48b1aa3eae
--- /dev/null
+++ b/sys-power/nut/files/upsstats-upsset-link-2.0.5.patch
@@ -0,0 +1,15 @@
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Date: Sat, 24 Feb 2007 18:43:09 -0800
+
+Include a link to the upsset page from the stats page.
+
+--- nut-2.0.5.orig/conf/upsstats.html	2006-11-07 18:08:45.000000000 -0800
++++ nut-2.0.5/conf/upsstats.html	2007-02-24 18:41:06.000000000 -0800
+@@ -177,6 +177,7 @@
+ 
+ </td></tr>
+ </table>
++<p style="text-align: center"><a href="upsset.cgi">Settings &amp; Commands</a></p>
+ 
+ <hr /><div><small>
+ <a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="float:right" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!" height="31" width="88"/></a>
diff --git a/sys-power/nut/nut-2.0.5.ebuild b/sys-power/nut/nut-2.0.5.ebuild
new file mode 100644
index 000000000000..22c46f6aa356
--- /dev/null
+++ b/sys-power/nut/nut-2.0.5.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.0.5.ebuild,v 1.1 2007/02/25 02:57:28 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-0.1.12 )
+		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
+	# try to add nut to the tty group for old cases where it already existed
+	gpasswd -a nut tty
+	warningmsg
+}
+
+src_unpack() {
+	unpack ${A}
+
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/upsstats-upsset-link-2.0.5.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 ChangeLog 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."
+}