added patch to compile with ucd-snmp

4 files changed, 26 insertions, 5 deletions

diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog
index 069730ace471..b8690d3d5a91 100644
--- a/sys-apps/apcupsd/ChangeLog
+++ b/sys-apps/apcupsd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2003/11/06 15:44:17 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.23 2003/12/04 22:20:14 lanius Exp $
+
+  04 Dec 2003; Heinrich Wendel <lanius@gentoo.org> apcupsd-3.10.6.ebuild,
+  files/3.10.6/ucd-snmp.patch:
+  added patch to compile with ucd-snmp
 
   06 Nov 2003; Michael Imhof <tantive@gentoo.org> apcupsd-3.10.6.ebuild:
   Added a patch for the init-script. Makes sure apcupsd is started after
diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest
index db47d3fcf7b9..945c8f6e5ab3 100644
--- a/sys-apps/apcupsd/Manifest
+++ b/sys-apps/apcupsd/Manifest
@@ -1,9 +1,9 @@
 MD5 51d33fa0d6b6fec4502f239d89f112b1 apcupsd-3.10.5-r3.ebuild 1993
 MD5 37a17ef92e0fa96f32d68b794be5e396 apcupsd-3.10.5-r2.ebuild 1896
 MD5 95fbe0b2c22a6ac60e34a6449c2a90d6 apcupsd-3.10.5-r4.ebuild 2180
-MD5 1122e44315cc96df914baf7dead7a7ae ChangeLog 3845
-MD5 8b38aca4e779e11e0569c860f8f851a4 metadata.xml 204
-MD5 6b99552be13840866d0634739abceb81 apcupsd-3.10.6.ebuild 2481
+MD5 987715f7815645667b48affbf0eaff52 ChangeLog 3989
+MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165
+MD5 090ee030df26c309286f279952a730b6 apcupsd-3.10.6.ebuild 2530
 MD5 32ee68a9e4bf0033543a302d00b8cbf4 files/halt 519
 MD5 f66859d42d0af37659622f78b276a8bc files/digest-apcupsd-3.10.6 123
 MD5 b3e098cb7179d63d6c017deb7c9c6f08 files/apccontrol 4230
@@ -13,5 +13,6 @@ MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r3 123
 MD5 f7092406e32869eb0535d85b4c09be0d files/digest-apcupsd-3.10.5-r4 123
 MD5 0a6d9da1e13f3a3a37fc77104eb8e2f2 files/3.10.5/apache.conf 163
 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.6/apache.conf 157
+MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.6/ucd-snmp.patch 425
 MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.6/apcupsd.in.patch 315
 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.6/smtp.patch 2663
diff --git a/sys-apps/apcupsd/apcupsd-3.10.6.ebuild b/sys-apps/apcupsd/apcupsd-3.10.6.ebuild
index 1f9fb26ab274..d1f03875249e 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.11 2003/11/12 19:26:24 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.6.ebuild,v 1.12 2003/12/04 22:20:14 lanius Exp $
 
 IUSE="doc snmp usb apache2"
 
@@ -32,6 +32,8 @@ src_unpack() {
 	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
 }
 
 src_compile() {
diff --git a/sys-apps/apcupsd/files/3.10.6/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.6/ucd-snmp.patch
new file mode 100644
index 000000000000..af9c363b2328
--- /dev/null
+++ b/sys-apps/apcupsd/files/3.10.6/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;
+ }