Bug #322083: avoid baselayout1 parse errors in powerfail script. Bug #322425: Avoid /usr and /var during shutdown as they may be gone already.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 260 insertions, 8 deletions

diff --git a/sys-power/nut/ChangeLog b/sys-power/nut/ChangeLog
index 9a5748b96cb6..80c4b9a38b2b 100644
--- a/sys-power/nut/ChangeLog
+++ b/sys-power/nut/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/nut
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.74 2010/05/26 10:29:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/ChangeLog,v 1.75 2010/06/17 19:38:18 robbat2 Exp $
+
+*nut-2.4.3-r2 (17 Jun 2010)
+
+  17 Jun 2010; Robin H. Johnson <robbat2@gentoo.org> +nut-2.4.3-r2.ebuild,
+  files/nut.powerfail.initd:
+  Bug #322083: avoid baselayout1 parse errors in powerfail script. Bug
+  #322425: Avoid /usr and /var during shutdown as they may be gone already.
 
   26 May 2010; Robin H. Johnson <robbat2@gentoo.org>
   files/nut-2.4.3-lowspeed-buffer-size.patch:
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 9aeccc5682cc..bd66e5de1b9a 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -7,7 +7,8 @@ AUX nut-2.2.2-init.d-upsmon 655 RMD160 04ba8bdc74c296f7126dcc06a748fbeac630ab64
 AUX nut-2.2.2-no-libdummy.patch 1421 RMD160 aa7156a547922c38db419a69ccf70c3f83119a4a SHA1 49038db25dc33836adbcdab821286db7ade34b94 SHA256 1a9dfcd2b9bb96e43642f70087e290a27ae631fca0f8c2c9c976f417ec4007fb
 AUX nut-2.4.1-no-libdummy.patch 791 RMD160 2a8ed4c000b3bd2a271e1e169486a0cd1cbdb809 SHA1 a48e71e06bb590cb296b7deead51b7b31420d68b SHA256 c9cf34980e79a4b9f07c338d10bc4ef4e90608ee7543cbc483898ee4f3f4f2a4
 AUX nut-2.4.3-lowspeed-buffer-size.patch 725 RMD160 ac7a5dbe8e65dc7fe1376eb8c695a66c260be68c SHA1 d71e49841f023812bf3c5934b65dad016aaa97ef SHA256 74ed963e039413472907ebdbba07dd59ebf8e721214f32ce0fabe169597dc9b7
-AUX nut.powerfail.initd 1109 RMD160 48c26c0173ffcf4ef2c3228984757367285777e7 SHA1 4e80350d6430cb001fa210d519b5730d39172d58 SHA256 fa4a22c15427655fe09395b0f26a14964aafb2523010ed46c82f2d81d99b1be5
+AUX nut.powerfail.initd 1394 RMD160 62a6307e0c9e807e168a07cfe3464b16baaf3674 SHA1 78389de0c7a96bae65631931c04036ce9db508fb SHA256 9c895920d798a20a71fd73e3905ec20032ff4981379b0ba23cb39a4f22b3d318
+AUX nut.powerfail.initd.orig 1350 RMD160 aa4a4fbb5f7ffec30a9249c286c9c49cdc794bd7 SHA1 083dd034afac3cb83e893c81a1db0843631c175e SHA256 3622637c59c3167186abb5237659708aed6c6c039dfd044ca7181eee368bd2a9
 AUX upsd.rc6 733 RMD160 e95d9885a27059b16f17c6f124a43f158fef3b19 SHA1 7ffcd039a7a2e58f1608a7fe29898c13b3c4a762 SHA256 f78f9ef953e4f9b17f40eb36fe404118a39bb0baba9ccde0fb4ea0274440bb93
 AUX upsdrv.rc6-r1 490 RMD160 b13a0dcc1facd1d857d15838da65a5bc360daa83 SHA1 ffbcc64d07317e6a3275156bbdcbbb08497415aa SHA256 4b2f21251cdf789ebe0688ad27ad699940f5cfb0ddaa4d9c5d22f8343ccbfd84
 AUX upsmon.rc6 473 RMD160 6ad1ce54be6199d3399e77d008229acb2f02bc43 SHA1 bde917f09b74a9efc563d91b9dd74a4e8b793e3f SHA256 f338e5955c6f1e601cb0b90b95c00cbde47ef3dc56e970d8f42bb335203fbcc7
@@ -22,6 +23,7 @@ EBUILD nut-2.4.1-r1.ebuild 6721 RMD160 2a3cdc459357af9be1e20a0df95e80f0a647bdc0
 EBUILD nut-2.4.1-r2.ebuild 7211 RMD160 9cbd432a8ec3369a7b7767d6d12f4df42a801062 SHA1 717919fd733ebf52c433edaa9edd411a6413ecaa SHA256 022a8468e93f50029540a09a049784e022530a2816fdcccbfd72983255a93aae
 EBUILD nut-2.4.1.ebuild 6664 RMD160 b9ace7b62a6775df4187e4d9ae62e75ac9837811 SHA1 0d0ee71999aabf92086d4cd914f61914ea1ed9c0 SHA256 1573c28d84e120113605c06030d72ae3bf0eb1651ad53b02bdffa49fa703d7da
 EBUILD nut-2.4.3-r1.ebuild 7338 RMD160 cdf1e7bf2fd456d1cb4817294bf0e5d723751c0d SHA1 ffc205089b4206f37e907238cbd6ecb27cacc9b4 SHA256 27036a208da2a87e5c490ff38a59d1ab1edc6129b98e2ad05cb16dbb11d664ac
+EBUILD nut-2.4.3-r2.ebuild 7338 RMD160 80cb2115d8cde1ed42bcf8cdac4b82519c251bd3 SHA1 3dd6b1ddb864c45299f0b16814159062276cf584 SHA256 981e62afb0ce975482e7a7567fafc2b1bb219676fe47866e15beb7b80819b755
 EBUILD nut-2.4.3.ebuild 7274 RMD160 647de44925715507ac0187f29b03510c08a84a0a SHA1 7c3be9690415799144bfe5dd9a0eff0ade3f91ac SHA256 357d0bd23241e99e567f96825709f8b11b564de92f6c6c95ea58ac6e4513e485
-MISC ChangeLog 18214 RMD160 6f67c0557ec31f4527ebe92d7528377149b0f131 SHA1 3046a26ba5d14e9b3f5e8f52f763304a9f6929ac SHA256 d35d0d7d048e88c50319035b7fccaf3ea6a8683fc2c40c96cbdb0f7aed0f88a3
+MISC ChangeLog 18495 RMD160 ee2f21a5cfee5693fed16531d2e3065c74103dc6 SHA1 96dac177f3ab2fde76e44dd771d5bdf0ab70e29b SHA256 9e534bfc644fe368c6994217dbd17fdd13528de08c4a3be5bc5daf37d23c2b69
 MISC metadata.xml 219 RMD160 7737543ce33cd412792e332121aa1c6ed452adfc SHA1 6c360930b80d6f4168ba1a486a25ad176505ea63 SHA256 8b2ef93d0d6f03a1ad115651dc46a7752e7775a62a32a7046c3294e50b14725b
diff --git a/sys-power/nut/files/nut.powerfail.initd b/sys-power/nut/files/nut.powerfail.initd
index 077e62fbb03a..4d45a8e808f7 100644
--- a/sys-power/nut/files/nut.powerfail.initd
+++ b/sys-power/nut/files/nut.powerfail.initd
@@ -1,20 +1,28 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut.powerfail.initd,v 1.1 2010/01/09 20:17:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/files/nut.powerfail.initd,v 1.2 2010/06/17 19:38:18 robbat2 Exp $
 
 description='Signal the UPS to kill power in a power failure condition'
 
 depend() {
+	# This is only for baselayout2
+	if [ -f /etc/init.d/sysfs ]; then
+		keyword -jail -lxc -openvz -prefix -uml -vserver -xenu -timeout
+	fi
 	need mount-ro
-	keyword -jail -lxc -openvz -prefix -uml -vserver -xenu -timeout
 }
 
 start() {
+	if [ ! -f /etc/init.d/sysfs ]; then
+		eerror "The $SVCNAME init-script is written for baselayout-2!"
+		eerror "Please do not use it with baselayout-1!".
+		return 1
+	fi
 	local UPS_CTL UPS_POWERDOWN
 
 	if [ -f /etc/killpower ]; then
-		UPS_CTL=/usr/sbin/upsdrvctl
+		UPS_CTL=/sbin/upsdrvctl
 		UPS_POWERDOWN="${UPS_CTL} shutdown"
 	elif [ -f /etc/apcupsd/powerfail ]; then
 		UPS_CTL=/sbin/apcupsd
@@ -24,7 +32,7 @@ start() {
 		return 0
 	fi
 
-	if [ "$(runlevel | cut -d' ' -f2)" = "0" -a  -f "${UPS_CTL}" -a -x "${UPS_CTL}" ]; then
+	if [ -f "${UPS_CTL}" -a -x "${UPS_CTL}" ]; then
 		ebegin 'Signaling UPS to kill power'
 		${UPS_POWERDOWN}
 		eend $?
@@ -34,7 +42,8 @@ start() {
 		# If the sleep gets hit, something is wrong...
 		# do NOT restart the system.
 		while [ 1 ]; do sleep 60; done
-
+	else
+		ewarn "UPS powerfail script scheduled, and flags found, but ${UPS_CTL} missing."
 	fi
 }
 
diff --git a/sys-power/nut/nut-2.4.3-r2.ebuild b/sys-power/nut/nut-2.4.3-r2.ebuild
new file mode 100644
index 000000000000..8472d07d5582
--- /dev/null
+++ b/sys-power/nut/nut-2.4.3-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nut/nut-2.4.3-r2.ebuild,v 1.1 2010/06/17 19:38:18 robbat2 Exp $
+
+EAPI="2"
+
+inherit eutils fixheadtails autotools bash-completion
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="http://www.networkupstools.org/"
+# Nut mirrors are presently broken
+SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
+         http://www.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="cgi snmp usb ssl hal xml"
+
+RDEPEND="cgi? ( >=media-libs/gd-2[png] )
+		snmp? ( net-analyzer/net-snmp )
+		usb? ( =virtual/libusb-0* )
+		hal? ( >=sys-apps/hal-0.5.11 )
+		ssl? ( dev-libs/openssl )
+		xml? ( >=net-misc/neon-0.25.0 )
+		>=sys-fs/udev-114"
+DEPEND="$RDEPEND
+		>=sys-apps/sed-4
+		>=sys-devel/autoconf-2.58
+		dev-util/pkgconfig"
+
+# public files should be 644 root:root
+NUT_PUBLIC_FILES="/etc/nut/{ups,upssched}.conf"
+# private files should be 640 root:nut - readable by nut, writeable by root,
+NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
+# public files should be 644 root:root, only installed if USE=cgi
+NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
+
+pkg_setup() {
+	enewgroup nut 84
+	enewuser nut 84 -1 /var/lib/nut nut,uucp
+	# As of udev-104, NUT must be in uucp and NOT in tty.
+	gpasswd -d nut tty 2>/dev/null
+	gpasswd -a nut uucp 2>/dev/null
+	use hal && gpasswd -a haldaemon nut 2>/dev/null
+	# in some cases on old systems it wasn't in the nut group either!
+	gpasswd -a nut nut 2>/dev/null
+	warningmsg ewarn
+}
+
+src_prepare() {
+	ht_fix_file configure.in
+
+	epatch "${FILESDIR}"/${PN}-2.4.1-no-libdummy.patch
+	epatch "${FILESDIR}"/${PN}-2.4.3-lowspeed-buffer-size.patch
+
+	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+		-i configure.in || die "sed failed"
+
+	sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+		-i scripts/udev/Makefile.am || die "sed failed"
+
+	rm -f ltmain.sh m4/lt* m4/libtool.m4
+
+	WANT_AUTOCONF=2.5 eautoreconf || die "autoconf failed"
+}
+
+src_configure() {
+	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 \
+		--with-htmlpath=/usr/share/nut/html \
+		--datarootdir=/usr/share/nut \
+		--datadir=/usr/share/nut \
+		--with-dev \
+		$(use_with xml neon) \
+		$(use_with hal) \
+		$(use_with ssl) \
+		$(use_with usb) \
+		$(use_with snmp) \
+		$(use_with cgi) \
+		$(use_with cgi cgipath /usr/share/nut/cgi) \
+		${myconf} || die "econf failed"
+
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install || 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 cgi; then
+		elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+		elog "copy them to your web server's ScriptPath to activate (this is a"
+		elog "change from the old location)."
+		elog "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 INSTALL MAINTAINERS NEWS README UPGRADING \
+			docs/{FAQ,*.txt} || die
+
+	newdoc lib/README README.lib || die
+
+	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die
+
+	docinto cables
+	dodoc docs/cables/* || die
+
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsd upsd \
+		|| die "newinitd failed"
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv \
+		|| die "newinitd failed"
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsmon upsmon \
+		|| die "newinitd failed"
+	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail \
+		|| die "newinitd failed"
+
+	# This sets up permissions for nut to access a UPS
+	insinto /etc/udev/rules.d/
+	newins scripts/udev/nut-usbups.rules 70-nut-usbups.rules
+
+	keepdir /var/lib/nut
+
+	einfo "Setting up permissions on files and directories"
+	fperms 0700 /var/lib/nut
+	fowners nut:nut /var/lib/nut
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval fperms 0640 ${NUT_PRIVATE_FILES}
+	eval fowners root:nut ${NUT_PRIVATE_FILES}
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval fperms 0644 ${NUT_PUBLIC_FILES}
+	eval fowners root:root ${NUT_PUBLIC_FILES}
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval fperms 0644 ${NUT_CGI_FILES}
+		eval fowners root:root ${NUT_CGI_FILES}
+	fi
+
+	# this is installed for 2.4 and fbsd guys
+	if ! has_version sys-fs/udev; then
+		einfo "Installing non-udev hotplug support"
+		insinto /etc/hotplug/usb
+		insopts -m 755
+		doins scripts/hotplug/nut-usbups.hotplug
+	fi
+
+	if use hal; then
+		einfo "Installing HAL support"
+		insinto /usr/share/hal/fdi/information/20thirdparty/
+		doins scripts/hal/20-ups-nut-device.fdi
+		insinto /usr/libexec
+		insopts -m 755
+		doins drivers/hald-addon-*
+		rm "${D}"/lib/nut/hald-addon-*
+	fi
+
+	dobashcompletion "${S}"/scripts/misc/nut.bash_completion
+}
+
+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
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+	eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+		eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+	fi
+
+	warningmsg elog
+}
+
+warningmsg() {
+	msgfunc="$1"
+	[ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
+	${msgfunc} "Please note that NUT now runs under the 'nut' user."
+	${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
+	${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
+	${msgfunc} "hotplug rules that are installed, and alter them suitably."
+	${msgfunc} ''
+	${msgfunc} "If you use hald, you may be able to skip the normal init scripts."
+	${msgfunc} ''
+	${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+	${msgfunc} ''
+	${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
+	${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
+	${msgfunc} "have a service per UPS:"
+	${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
+	${msgfunc} ''
+	${msgfunc} 'If you want apcupsd to power off your UPS when it'
+	${msgfunc} 'shuts down your system in a power failure, you must'
+	${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+	${msgfunc} ''
+	${msgfunc} 'rc-update add nut.powerfail shutdown'
+	${msgfunc} ''
+
+}