Clean up permissions code, add lighttpd config, and patch for upsset.cgi link from upsstats.cgi.

Package-Manager: portage-2.1_rc1-r2

6 files changed, 231 insertions, 5 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 3be760e58ef6..4ed8f6634a02 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.2 2006/05/18 06:05:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.3 2006/05/18 23:28:07 robbat2 Exp $
+
+*nut-2.0.3-r1 (18 May 2006)
+
+  18 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lighttpd_nut.conf, +files/upsstats-upsset-link.patch,
+  +nut-2.0.3-r1.ebuild:
+  Clean up permissions code, add lighttpd config, and patch for upsset.cgi
+  link from upsstats.cgi.
 
 *nut-2.0.3 (18 May 2006)
 
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 6ba8f7ef61f4..d7df4bab2266 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -1,3 +1,7 @@
+AUX lighttpd_nut.conf 961 RMD160 636b45860713453dc88d7ed0392862735e329099 SHA1 1cde03638637f3b2e302ae939605f2f2b7f464fd SHA256 5604058313d3cfeba426c69a756944bc7cc3ddb3813db68582e69dff1a00f7cb size 961
+MD5 cb4007ab506c4c49dcf12a7a5516fff9 files/lighttpd_nut.conf 961
+RMD160 636b45860713453dc88d7ed0392862735e329099 files/lighttpd_nut.conf 961
+SHA256 5604058313d3cfeba426c69a756944bc7cc3ddb3813db68582e69dff1a00f7cb files/lighttpd_nut.conf 961
 AUX upsd.rc6 587 RMD160 3a4c313d7ea20551fd6ea2f6b46901a5a082245b SHA1 c8d5f3294aa2b9a267d304c1d0a0619c617c2313 SHA256 7ce640a11d1d74a260a10d313f7d688463d80ea9649c27a99f14f4f8526253d3 size 587
 MD5 75ae39e289ce8dbcc2b48bb1c2761e63 files/upsd.rc6 587
 RMD160 3a4c313d7ea20551fd6ea2f6b46901a5a082245b files/upsd.rc6 587
@@ -14,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.patch 321 RMD160 492b789e64d0a53c54fd54402742f04e7a362d33 SHA1 8f49d2504bf2a244d7875f7b67b1e73239f7ad0b SHA256 99ff9505010927ba252d50adb197eff06f1b06c0448f95e8f7ff5370fc230543 size 321
+MD5 45640141933ef31ba59a6a649e11e646 files/upsstats-upsset-link.patch 321
+RMD160 492b789e64d0a53c54fd54402742f04e7a362d33 files/upsstats-upsset-link.patch 321
+SHA256 99ff9505010927ba252d50adb197eff06f1b06c0448f95e8f7ff5370fc230543 files/upsstats-upsset-link.patch 321
 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
@@ -29,14 +37,18 @@ 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
+EBUILD nut-2.0.3-r1.ebuild 4329 RMD160 22a4a6aed814c85c58ea163d2205d67d0aa20fd9 SHA1 720066f97613708e5ce0e4d0586ab045d001f5f0 SHA256 45bf27a46e8d452011b3fc35b5a54cb35f3438e1f64ed526e82e65ff262c36fa size 4329
+MD5 b9b75bb9719c7e94c5908b92c594baeb nut-2.0.3-r1.ebuild 4329
+RMD160 22a4a6aed814c85c58ea163d2205d67d0aa20fd9 nut-2.0.3-r1.ebuild 4329
+SHA256 45bf27a46e8d452011b3fc35b5a54cb35f3438e1f64ed526e82e65ff262c36fa nut-2.0.3-r1.ebuild 4329
 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 ChangeLog 8320 RMD160 36534b995ad9a37c7b33f6b32c67d1af2dc4c512 SHA1 04780c2fbff5fcd0ceee270c645c5267af60b9c0 SHA256 968ecb56463e36bb381ac1949a424c575f04eec6e1be0209f7e32f09dfc6cc61 size 8320
+MD5 f323c77225409457b5087d43360e6c6f ChangeLog 8320
+RMD160 36534b995ad9a37c7b33f6b32c67d1af2dc4c512 ChangeLog 8320
+SHA256 968ecb56463e36bb381ac1949a424c575f04eec6e1be0209f7e32f09dfc6cc61 ChangeLog 8320
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b size 219
 MD5 a961228140ef319b2ddba54d99b6e401 metadata.xml 219
 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc metadata.xml 219
@@ -53,3 +65,6 @@ SHA256 4866c4f95b4b98a1189f00ea4e5d3447f4f7ee5bfff71dd9c59f6c25b4bf73ca files/di
 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
+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
diff --git a/sys-power/nut/files/digest-nut-2.0.3-r1 b/sys-power/nut/files/digest-nut-2.0.3-r1
new file mode 100644
index 000000000000..55c8a6e59877
--- /dev/null
+++ b/sys-power/nut/files/digest-nut-2.0.3-r1
@@ -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/files/lighttpd_nut.conf b/sys-power/nut/files/lighttpd_nut.conf
new file mode 100644
index 000000000000..7e5d4d1843cc
--- /dev/null
+++ b/sys-power/nut/files/lighttpd_nut.conf
@@ -0,0 +1,23 @@
+###############################################################################
+# Lighttpd configuration for using NUT under Gentoo Linux.
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/lighttpd_nut.conf,v 1.1 2006/05/18 23:28:07 robbat2 Exp $
+###############################################################################
+
+# Simple copy this to /etc/lighttpd/ and include it in your lighttpd.conf.
+# It will make NUT available at http://$HOST/nut/ 
+
+server.modules += ("mod_cgi")
+
+# If you want to limit it to some host, uncomment the host check and modify it to your needs.
+# $HTTP["host"] == "www2.example.org" {
+alias.url += ( "/nut/" => "/usr/share/nut/" )
+$HTTP["url"] =~ "^/nut/" {
+  dir-listing.activate = "disable"
+  cgi.assign = ( ".cgi" => "" )
+  index-file.names = ( "upsstats.cgi" )
+}
+# }
+
+# vim: set ft=conf foldmethod=marker et :
diff --git a/sys-power/nut/files/upsstats-upsset-link.patch b/sys-power/nut/files/upsstats-upsset-link.patch
new file mode 100644
index 000000000000..789a3f922c1a
--- /dev/null
+++ b/sys-power/nut/files/upsstats-upsset-link.patch
@@ -0,0 +1,10 @@
+--- nut-2.0.3.orig/conf/upsstats.html	2005-02-28 01:14:07.000000000 -0800
++++ nut-2.0.3/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.3-r1.ebuild b/sys-power/nut/nut-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..89f865eddfd1
--- /dev/null
+++ b/sys-power/nut/nut-2.0.3-r1.ebuild
@@ -0,0 +1,167 @@
+# 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-r1.ebuild,v 1.1 2006/05/18 23:28:07 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"
+
+# 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
+}
+
+src_unpack() {
+	unpack ${A}
+	
+	epatch ${FILESDIR}/upsstats-upsset-link.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}
+}
+
+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
+}