From 41d70feeb04a81655a88c786a8c8ef1662e5e754 Mon Sep 17 00:00:00 2001 From: Michael Imhof Date: Fri, 12 Nov 2004 01:07:37 +0000 Subject: [PATCH] Version bumped. --- sys-apps/apcupsd/ChangeLog | 9 +- sys-apps/apcupsd/Manifest | 14 ++- sys-apps/apcupsd/apcupsd-3.10.16.ebuild | 104 ++++++++++++++++ sys-apps/apcupsd/files/3.10.16/apache.conf | 8 ++ .../apcupsd/files/3.10.16/apcupsd.in.patch | 15 +++ sys-apps/apcupsd/files/3.10.16/smtp.patch | 112 ++++++++++++++++++ sys-apps/apcupsd/files/3.10.16/ucd-snmp.patch | 14 +++ sys-apps/apcupsd/files/digest-apcupsd-3.10.16 | 1 + 8 files changed, 272 insertions(+), 5 deletions(-) create mode 100644 sys-apps/apcupsd/apcupsd-3.10.16.ebuild create mode 100644 sys-apps/apcupsd/files/3.10.16/apache.conf create mode 100644 sys-apps/apcupsd/files/3.10.16/apcupsd.in.patch create mode 100644 sys-apps/apcupsd/files/3.10.16/smtp.patch create mode 100644 sys-apps/apcupsd/files/3.10.16/ucd-snmp.patch create mode 100644 sys-apps/apcupsd/files/digest-apcupsd-3.10.16 diff --git a/sys-apps/apcupsd/ChangeLog b/sys-apps/apcupsd/ChangeLog index 8373128397ce..b839625cfa28 100644 --- a/sys-apps/apcupsd/ChangeLog +++ b/sys-apps/apcupsd/ChangeLog @@ -1,6 +1,13 @@ # 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.49 2004/10/29 22:34:35 tantive Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/ChangeLog,v 1.50 2004/11/12 01:07:37 tantive Exp $ + +*apcupsd-3.10.16 (12 Nov 2004) + + 12 Nov 2004; Michael Imhof +files/3.10.16/apache.conf, + +files/3.10.16/apcupsd.in.patch, +files/3.10.16/smtp.patch, + +files/3.10.16/ucd-snmp.patch, +apcupsd-3.10.16.ebuild: + Version bumped. 30 Oct 2004; Michael Imhof -files/3.10.13/apache.conf, -files/3.10.13/apcupsd.in.patch, -files/3.10.13/smtp.patch, diff --git a/sys-apps/apcupsd/Manifest b/sys-apps/apcupsd/Manifest index 6471a40c1769..9a1328099144 100644 --- a/sys-apps/apcupsd/Manifest +++ b/sys-apps/apcupsd/Manifest @@ -1,10 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 a9d6ca4722a22fed35f45c47aca54333 apcupsd-3.10.16.ebuild 2488 MD5 27ae5add10fc42e77804f1ecd768df87 metadata.xml 226 MD5 74e598a06446374ea9bbc4c86d8501a7 apcupsd-3.10.15-r1.ebuild 2486 -MD5 4055b4d3bce842c24a02b7b211794ca4 ChangeLog 9000 +MD5 44ff47cb475b265dc9a400dd2289a101 ChangeLog 9249 +MD5 ed12d329ca566b8f2632d425828ea5d7 files/digest-apcupsd-3.10.16 68 MD5 ec48a12c6d8b56aeffbeaa629f8835ad files/digest-apcupsd-3.10.15-r1 68 +MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.16/smtp.patch 2663 +MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.16/ucd-snmp.patch 425 +MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.16/apache.conf 157 +MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.16/apcupsd.in.patch 315 MD5 8f1a2aa4fd0307c2cfe3733e8454d3c2 files/3.10.15/smtp.patch 2663 MD5 ac24c9a1e199dfd66650ca55ce1e33f4 files/3.10.15/ucd-snmp.patch 425 MD5 69cfaea0e3937c778c710b8120cbd379 files/3.10.15/apache.conf 157 @@ -12,7 +18,7 @@ MD5 2a93b5c4f2574caa199b3d93cf838e8c files/3.10.15/apcupsd.in.patch 315 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBgsWGKtJO8LeSoosRAuKJAKCJ3eB6DMxb0bfHdNpGiSXUrnvNXgCeK2Au -QD6QuM/Isb7t4xeKD5TWLVI= -=ckKx +iD8DBQFBlBpXKtJO8LeSoosRAoXbAJ9q+nIuhN16yuAnHC2EAoQtNLHRkgCglMDW +3HHl2DOi/PaKseFZ87yL41o= +=oWnw -----END PGP SIGNATURE----- diff --git a/sys-apps/apcupsd/apcupsd-3.10.16.ebuild b/sys-apps/apcupsd/apcupsd-3.10.16.ebuild new file mode 100644 index 000000000000..3d217768968f --- /dev/null +++ b/sys-apps/apcupsd/apcupsd-3.10.16.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/apcupsd-3.10.16.ebuild,v 1.1 2004/11/12 01:07:37 tantive Exp $ + +inherit eutils + +DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown" +HOMEPAGE="http://www.sibbald.com/apcupsd/" +SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc ~sparc" +IUSE="doc snmp usb apache2" + +DEPEND=">=sys-apps/baselayout-1.8.4 + virtual/libc + virtual/mta + snmp? ( virtual/snmp ) + >=media-libs/gd-1.8.4 + 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} + cd ${S}/platforms/gentoo + epatch ${FILESDIR}/${PV}/apcupsd.in.patch + cd ${S} + if has_version net-analyzer/ucd-snmp; then + epatch ${FILESDIR}/${PV}/ucd-snmp.patch + fi +} + +src_compile() { + local myconf + use snmp && myconf="--enable-net-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/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 + 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.16/apache.conf b/sys-apps/apcupsd/files/3.10.16/apache.conf new file mode 100644 index 000000000000..21305d257846 --- /dev/null +++ b/sys-apps/apcupsd/files/3.10.16/apache.conf @@ -0,0 +1,8 @@ +Alias /apcupsd/ /var/www/apcupsd/ + + + AllowOverride AuthConfig + Options ExecCGI + Order allow,deny + Allow from all + diff --git a/sys-apps/apcupsd/files/3.10.16/apcupsd.in.patch b/sys-apps/apcupsd/files/3.10.16/apcupsd.in.patch new file mode 100644 index 000000000000..7bcb0f41c086 --- /dev/null +++ b/sys-apps/apcupsd/files/3.10.16/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.16/smtp.patch b/sys-apps/apcupsd/files/3.10.16/smtp.patch new file mode 100644 index 000000000000..d0c6bbcbdd48 --- /dev/null +++ b/sys-apps/apcupsd/files/3.10.16/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.16/ucd-snmp.patch b/sys-apps/apcupsd/files/3.10.16/ucd-snmp.patch new file mode 100644 index 000000000000..af9c363b2328 --- /dev/null +++ b/sys-apps/apcupsd/files/3.10.16/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; + } diff --git a/sys-apps/apcupsd/files/digest-apcupsd-3.10.16 b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16 new file mode 100644 index 000000000000..c76addf36fa3 --- /dev/null +++ b/sys-apps/apcupsd/files/digest-apcupsd-3.10.16 @@ -0,0 +1 @@ +MD5 07de8f7d7488b6ef91f128f51713f4ea apcupsd-3.10.16.tar.gz 5037822 -- 2.26.2