update apcupsd to fix bugs 9942 and 16392

6 files changed, 134 insertions, 1 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index aaa882cacb34..1bc90dc57a52 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.11 2003/02/24 23:43:09 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.12 2003/02/26 22:41:29 zwelch Exp $
+
+*apcupsd-3.10.5-r1 (26 Feb 2003)
+
+  26 Feb 2003; Zach Welch <zwelch@gentoo.org> apcupsd-3.10.5-r1.ebuild,
+  files/3.10.5/apache.conf, files/3.10.5/init.patch,
+  files/3.10.5/restart.patch:
+  Add --enable-oldnet, fix restart race, add init script depend, add
+  apache add-on configuration file; fixes bugs 9942 and 16392
 
 *apcupsd-3.10.5 (23 Feb 2003)
 
diff --git a/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild b/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild
new file mode 100644
index 000000000000..f99003c374a9
--- /dev/null
+++ b/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.5-r1.ebuild,v 1.1 2003/02/26 22:41:29 zwelch Exp $
+
+inherit eutils
+
+IUSE="doc"
+
+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 ~ppc arm"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-apps/baselayout-1.8.4
+	virtual/glibc
+	virtual/mta
+	sys-libs/ncurses"
+
+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/
+#	cp -a ${S} ${S}-orig
+	epatch "${FILESDIR}/${PV}/init.patch"
+	epatch "${FILESDIR}/${PV}/restart.patch"
+}
+
+src_compile() {
+	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-powerflute \
+		--enable-pthreads \
+		--with-css-dir=/home/httpd/apcupsd \
+		--with-cgi-bin=/home/httpd/apcupsd \
+		--enable-cgi \
+		|| die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install
+
+	insinto /etc/apache/conf/addon-modules
+	newins ${FILESDIR}/${PV}/apache.conf apcupsd.conf
+
+	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.5/apache.conf b/sys-apps/apcupsd/files/3.10.5/apache.conf
new file mode 100644
index 000000000000..e99d79350d97
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.5/apache.conf
@@ -0,0 +1,8 @@
+Alias /apcupsd/ /home/httpd/apcupsd/
+
+<Directory "/home/httpd/apcupsd/">
+	AllowOverride AuthConfig
+	Options ExecCGI
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/sys-apps/apcupsd/files/3.10.5/init.patch b/sys-apps/apcupsd/files/3.10.5/init.patch
new file mode 100644
index 000000000000..a79ff62e0f5b
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.5/init.patch
@@ -0,0 +1,14 @@
+diff -aur apcupsd-3.10.5-orig/platforms/gentoo/apcupsd.in apcupsd-3.10.5/platforms/gentoo/apcupsd.in
+--- apcupsd-3.10.5-orig/platforms/gentoo/apcupsd.in	2002-09-14 05:03:18.000000000 -0700
++++ apcupsd-3.10.5/platforms/gentoo/apcupsd.in	2003-02-26 13:42:45.000000000 -0800
+@@ -6,6 +6,10 @@
+ APCPID=@PIDDIR@/apcupsd.pid
+ APCUPSD=@sbindir@/apcupsd
+ 
++depend() {
++	need net
++}
++
+ start() {
+ 	rm -f /etc/apcupsd/powerfail
+ 	ebegin "Starting APC UPS daemon"
diff --git a/sys-apps/apcupsd/files/3.10.5/restart.patch b/sys-apps/apcupsd/files/3.10.5/restart.patch
new file mode 100644
index 000000000000..3b530e37e0a3
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.5/restart.patch
@@ -0,0 +1,15 @@
+diff -aur apcupsd-3.10.5-orig/platforms/gentoo/apcupsd.in apcupsd-3.10.5/platforms/gentoo/apcupsd.in
+--- apcupsd-3.10.5-orig/platforms/gentoo/apcupsd.in	2003-02-26 14:09:57.000000000 -0800
++++ apcupsd-3.10.5/platforms/gentoo/apcupsd.in	2003-02-26 14:14:06.000000000 -0800
+@@ -22,3 +22,11 @@
+ 	start-stop-daemon --stop --quiet --pidfile $APCPID
+ 	eend $?
+ } 
++
++restart() {
++	svc_stop
++	# need to sleep or new process may choke grabbing
++	#  the dying processes network socket
++	sleep 1
++	svc_start
++}
diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r1 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r1
new file mode 100644
index 000000000000..7bb96a139a01
--- /dev/null
+++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.5-r1
@@ -0,0 +1,2 @@
+MD5 f182db64c8acdae18f896ecdc064a239 apcupsd-3.10.5.tar.gz 2749777
+MD5 d9a0ddf7918c93ca28fa5832a4af54d8 gd1.2.tar.gz 64595