fixing bug in apccontrol. closes 46075

5 files changed, 142 insertions, 13 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index e7533535f99f..f694d9305a28 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.29 2004/02/24 15:39:46 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.30 2004/04/21 21:12:00 mholzer Exp $
+
+*apcupsd-3.10.10-r1 (21 Apr 2004)
+
+  21 Apr 2004; Martin Holzer <mholzer@gentoo.org> apcupsd-3.10.10-r1.ebuild,
+  files/3.10.10/apccontrol.diff:
+  fixing bug in apccontrol. closes 46075
 
 *apcupsd-3.10.10 (24 Feb 2004)
 
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index a83c59bf37b4..450df4698bff 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,20 +1,28 @@
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 30b0bbdb54ea3c4d58685af2e5e028e6 apcupsd-3.10.10.ebuild 2535
-MD5 dee2c85d741f58d629fb037406818edd ChangeLog 5476
+MD5 24088bad71f10b1c52211537936d8dbc ChangeLog 5663
 MD5 7676d6e83cd6b250a5d90231782f0479 apcupsd-3.10.9.ebuild 2535
+MD5 30b0bbdb54ea3c4d58685af2e5e028e6 apcupsd-3.10.10.ebuild 2535
+MD5 edda3e383e4212c2714ccaf45c2005e0 apcupsd-3.10.10-r1.ebuild 2580
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 6ddd9dcf2b5e174b5a657309d42a571f apcupsd-3.10.8.ebuild 2535
+MD5 ab17d3fa671f63d263570aebe6f611b1 files/digest-apcupsd-3.10.9 123
+MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10-r1 124
 MD5 c5a0f1d4de26b7e7e76641d5c722cd9f files/digest-apcupsd-3.10.8 123
 MD5 41859fb08df1a1b50385b2e4a187a5cc files/digest-apcupsd-3.10.10 124
-MD5 ab17d3fa671f63d263570aebe6f611b1 files/digest-apcupsd-3.10.9 123
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.9/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.9/ucd-snmp.patch 425
+MD5 0a6d9da1e13f3a3a37fc77104eb8e2f2 files/3.10.5/apache.conf 163
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.9/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.9/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.8/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.8/ucd-snmp.patch 425
-MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.8/apache.conf 157
-MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.8/apcupsd.in.patch 315
-MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.10/smtp.patch 2663
-MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.10/ucd-snmp.patch 425
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.9/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.9/ucd-snmp.patch 425
+MD5 a587dd06ee42560a7ece7a73ed769f04 files/3.10.10/apccontrol.diff 340
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.10/apache.conf 157
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.10/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.10/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.10/ucd-snmp.patch 425
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.6/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.6/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.6/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.6/ucd-snmp.patch 425
+MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.8/apache.conf 157
+MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.8/apcupsd.in.patch 315
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.8/smtp.patch 2663
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.8/ucd-snmp.patch 425
diff --git a/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild
new file mode 100644
index 000000000000..47b3f89ebc5b
--- /dev/null
+++ b/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.10-r1.ebuild,v 1.1 2004/04/21 21:12:00 mholzer Exp $
+
+IUSE="doc snmp usb apache2"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz
+	ftp://ftp.apcupsd.com/pub/apcupsd/contrib/gd1.2.tar.gz"
+HOMEPAGE="http://www.sibbald.com/apcupsd/"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/baselayout-1.8.4
+	virtual/glibc
+	virtual/mta
+	snmp? ( net-analyzer/ucd-snmp )
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	usb? ( sys-apps/hotplug )"
+
+XPIDDIR=/var/run
+XLOGDIR=/var/log
+XLOCKDIR=/var/lock
+XSYSCONFDIR=/etc/apcupsd
+XPWRFAILDIR=${XSYSCONFDIR}
+
+src_unpack() {
+	unpack ${A}
+	cp -a ${WORKDIR}/gd1.2 ${S}/src/
+	cd ${S}/platforms/gentoo
+	epatch ${FILESDIR}/${PV}/apcupsd.in.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/ucd-snmp.patch
+	epatch ${FILESDIR}/${PV}/apccontrol.diff
+}
+
+src_compile() {
+	local myconf
+	use snmp && myconf="--enable-snmp"
+	APCUPSD_MAIL=/usr/sbin/sendmail ./configure \
+		--prefix=/usr \
+		--sbindir=/usr/sbin \
+		--sysconfdir=${XSYSCONFDIR} \
+		--with-pwrfail-dir=${XPWRFAILDIR} \
+		--with-lock-dir=${XLOCKDIR} \
+		--with-pid-dir=${XPIDDIR} \
+		--with-log-dir=${XLOGDIR} \
+		--with-upstype=usb \
+		--with-upscable=usb \
+		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+		--with-net-port=6666 \
+		--with-nis-port=3551 \
+		--enable-usb \
+		--enable-net \
+		--enable-oldnet \
+		--enable-master-slave \
+		--enable-powerflute \
+		--enable-pthreads \
+		--with-css-dir=/var/www/apcupsd \
+		--with-cgi-bin=/var/www/apcupsd \
+		--enable-cgi \
+		${myconf} \
+		|| die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "installed failed"
+
+	use apache2 || insinto /etc/apache/conf/addon-modules
+	use apache2 || newins  ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+
+	use apache2 && insinto /etc/apache2/conf/modules.d
+	use apache2 && newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+
+	cd ${D}/etc/apcupsd
+	epatch ${FILESDIR}/${PV}/smtp.patch
+
+	ln -s onbattery powerout
+
+	if [ "`use doc`x" != "x" ]
+	then
+		einfo "Installing full documentation into /usr/share/doc/${P}..."
+		cd ${S}/doc
+		dodoc README.*
+		docinto developers_manual
+		dodoc developers_manual/*
+		docinto logo
+		dodoc logo/*
+		docinto manual
+		dodoc manual/*
+		docinto old_documents
+		dodoc old_documents/*
+		docinto vim
+		dodoc vim/*
+	fi
+}
diff --git a/sys-apps/apcupsd/files/3.10.10/apccontrol.diff b/sys-apps/apcupsd/files/3.10.10/apccontrol.diff
new file mode 100644
index 000000000000..03ea3621a111
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.10/apccontrol.diff
@@ -0,0 +1,10 @@
+--- platforms/apccontrol.in.org	2004-04-21 23:03:00.000000000 +0200
++++ platforms/apccontrol.in	2004-04-21 23:03:07.000000000 +0200
+@@ -85,7 +85,6 @@
+ 	if [ -f @PWRFAILDIR@/powerfail ] ; then
+ 	   printf "Continuing with shutdown."  | wall
+ 	fi
+-	;;
+     ;;
+     failing)
+ 	echo "Battery power exhaused on UPS ${2}. Doing shutdown." | wall
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r1 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r1
new file mode 100644
index 000000000000..881b15a192e5
--- /dev/null
+++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.10-r1
@@ -0,0 +1,2 @@
+MD5 b69ccf4f4196582ab3e26bf6af937610 apcupsd-3.10.10.tar.gz 3767971
+MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595