Forgot to add some files. Closes #61714.

6 files changed, 159 insertions, 5 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 5663f5b48fcc..a07413e9b0e7 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/apcupsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.39 2004/08/25 21:28:33 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.40 2004/08/26 09:28:02 tantive Exp $
+
+  26 Aug 2004; Michael Imhof <tantive@gentoo.org> +files/3.10.15/apache.conf,
+  +files/3.10.15/apcupsd.in.patch, +files/3.10.15/smtp.patch,
+  +files/3.10.15/ucd-snmp.patch:
+  Forgot to add some files. Closes #61714.
 
 *apcupsd-3.10.15 (25 Aug 2004)
 
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index 76509f4d7042..413aef9f8020 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -6,7 +6,7 @@ MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 1435915e8d7f22af585b23335b45ced0 apcupsd-3.10.15.ebuild 2445
 MD5 c7e7009608d846b75ae57616e5063db0 apcupsd-3.10.10.ebuild 2506
 MD5 79fbd20420f039a3ade2d1772723939b apcupsd-3.10.10-r1.ebuild 2551
-MD5 c19161085d2b820c4f4b87a55c68aaef ChangeLog 7041
+MD5 9bcf61ddcbad56e7f94529ca79be85d1 ChangeLog 7258
 MD5 1edda758e443285ff65aaebcaf893f26 apcupsd-3.10.9.ebuild 2505
 MD5 3fe72118440066f4063e3040f7073726 apcupsd-3.10.8.ebuild 2505
 MD5 350594bbff4af6f9d84642680267a533 apcupsd-3.10.10-r2.ebuild 2683
@@ -41,7 +41,7 @@ MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.10/apcupsd.in.patch 315
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBLQTXKtJO8LeSoosRApvkAKCl2wxrUyGgPvLvEapG95ZOC34w6ACfSbBA
-wov+uxnCpAcGL+CSWJ5rjR4=
-=P2yo
+iD8DBQFBLa15KtJO8LeSoosRAgkqAJsEbNrka12XbP/6aRSJN49ZslUxkwCfaor1
+fOehokg8vJasEhA0Kpf3C40=
+=M6kT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/apcupsd/files/3.10.15/apache.conf b/sys-apps/apcupsd/files/3.10.15/apache.conf
new file mode 100644
index 000000000000..21305d257846
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.15/apache.conf
@@ -0,0 +1,8 @@
+Alias /apcupsd/ /var/www/apcupsd/
+
+<Directory "/var/www/apcupsd/">
+	AllowOverride AuthConfig
+	Options ExecCGI
+	Order allow,deny
+	Allow from all
+</Directory>
diff --git a/sys-apps/apcupsd/files/3.10.15/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.15/apcupsd.in.patch
new file mode 100644
index 000000000000..7bcb0f41c086
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.15/apcupsd.in.patch
@@ -0,0 +1,15 @@
+--- apcupsd.in	2002-09-14 14:03:18.000000000 +0200
++++ apcupsd.in.new	2003-11-06 16:34:28.000000000 +0100
+@@ -6,6 +6,12 @@
+ APCPID=@PIDDIR@/apcupsd.pid
+ APCUPSD=@sbindir@/apcupsd
+ 
++depend() {
++	after hotplug
++	after usb
++	after net
++}
++
+ start() {
+ 	rm -f /etc/apcupsd/powerfail
+ 	ebegin "Starting APC UPS daemon"
diff --git a/sys-apps/apcupsd/files/3.10.15/smtp.patch b/sys-apps/apcupsd/files/3.10.15/smtp.patch
new file mode 100644
index 000000000000..d0c6bbcbdd48
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.15/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
diff --git a/sys-apps/apcupsd/files/3.10.15/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.15/ucd-snmp.patch
new file mode 100644
index 000000000000..af9c363b2328
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.15/ucd-snmp.patch
@@ -0,0 +1,14 @@
+--- src/drivers/snmp/snmp.c 2003-04-05 14:58:00.000000000 +0200
++++ src/drivers/snmp/snmp.c 2003-08-21 14:25:11.000000000 +0200
+@@ -245,7 +245,10 @@
+     return ret;
+ }
+
+-int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
++/*int snmp_ups_program_eeprom(UPSINFO *ups, int command, char *data)
++ * Modified for debian
++*/
++int snmp_ups_program_eeprom(UPSINFO *ups, int command, void *data)
+ {
+     return 0;
+ }