see ChangeLog

4 files changed, 126 insertions, 4 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 3701e63d7c88..ae4960e45e63 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2003/11/01 12:42:04 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.21 2003/11/01 19:57:41 tantive Exp $
+
+  01 Nov 2003; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.6.ebuild:
+  Changed various things. Corrected paths for apache2, added a patch for 
+  the scripts in /etc/apcupsd. Linked onbattery to powerout.
+  Closes #25379 and #32471.
 
 *apcupsd-3.10.6 (01 Nov 2003)
 
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index 0ed38ad22781..435e72b92937 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,8 +1,8 @@
 MD5 37a17ef92e0fa96f32d68b794be5e396 apcupsd-3.10.5-r2.ebuild 1896
 MD5 51d33fa0d6b6fec4502f239d89f112b1 apcupsd-3.10.5-r3.ebuild 1993
-MD5 37da4191880751ab19a0bf2e051361ca ChangeLog 3421
+MD5 283e8c353e47e2962f6b238ac08a0b42 ChangeLog 3658
 MD5 95fbe0b2c22a6ac60e34a6449c2a90d6 apcupsd-3.10.5-r4.ebuild 2180
-MD5 8a50942c126ffbdce36cacb9e56c0c3e apcupsd-3.10.6.ebuild 2337
+MD5 7a09e1450254503dc63823c8841653f1 apcupsd-3.10.6.ebuild 2423
 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r4 123
 MD5 f66859d42d0af37659622f78b276a8bc files/digest-apcupsd-3.10.6 123
 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r3 123
@@ -11,4 +11,5 @@ MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r2 123
 MD5 b3e098cb7179d63d6c017deb7c9c6f08 files/apccontrol 4230
 MD5 158b1f6f027c57fec3b78f3f2f5b991f files/apcupsd 719
 MD5 0a6d9da1e13f3a3a37fc77104eb8e2f2 files/3.10.5/apache.conf 163
+MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.6/smtp.patch 2663
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.6/apache.conf 157
diff --git a/sys-apps/apcupsd/apcupsd-3.10.6.ebuild b/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
index 9bc4e674a9d4..1e94ae9c1c25 100644
--- a/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
+++ b/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.6.ebuild,v 1.5 2003/11/01 15:52:12 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.6.ebuild,v 1.6 2003/11/01 19:57:41 tantive Exp $
 
 IUSE="doc snmp usb apache2"
 
@@ -74,6 +74,10 @@ src_install () {
 	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
diff --git a/sys-apps/apcupsd/files/3.10.6/smtp.patch b/sys-apps/apcupsd/files/3.10.6/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.6/smtp.patch
@@ -0,0 +1,112 @@
+diff -u old/changeme new/changeme
+--- old/changeme	2003-11-01 11:31:10.000000000 -0500
++++ new/changeme	2003-11-01 11:27:09.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/commfailure new/commfailure
+--- old/commfailure	2003-11-01 11:31:26.000000000 -0500
++++ new/commfailure	2003-11-01 11:27:13.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/commok new/commok
+--- old/commok	2003-11-01 11:31:33.000000000 -0500
++++ new/commok	2003-11-01 11:27:16.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/mainsback new/mainsback
+--- old/mainsback	2003-11-01 11:30:55.000000000 -0500
++++ new/mainsback	2003-11-01 11:27:21.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/masterconnect new/masterconnect
+--- old/masterconnect	2003-11-01 11:31:43.000000000 -0500
++++ new/masterconnect	2003-11-01 11:27:30.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/mastertimeout new/mastertimeout
+--- old/mastertimeout	2003-11-01 11:31:52.000000000 -0500
++++ new/mastertimeout	2003-11-01 11:27:33.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0
+diff -u old/onbattery new/onbattery
+--- old/onbattery	2003-11-01 11:32:03.000000000 -0500
++++ new/onbattery	2003-11-01 11:27:35.000000000 -0500
+@@ -13,9 +13,10 @@
+ #
+ (
+    echo "Subject: $MSG"
+-   echo " "
++   echo "To: $SYSADMIN"
++   echo
+    echo "$MSG"
+    echo " "
+    /usr/sbin/apcaccess status
+-) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
++) | $APCUPSD_MAIL $SYSADMIN
+ exit 0