Version bump.

(Portage version: 2.0.54)

8 files changed, 129 insertions, 2 deletions

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 44d36b445f29..66645ccf8149 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/watchdog
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.8 2006/02/13 15:40:10 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.9 2006/04/18 09:46:05 brix Exp $
+
+*watchdog-5.2.5_p1 (18 Apr 2006)
+
+  18 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/watchdog-5.2.5_p1-conf.d, +files/watchdog-5.2.5_p1-init.d,
+  +files/watchdog-5.2.5_p1-sundries.patch,
+  +files/watchdog-5.2.5_p1-uclibc.patch, +watchdog-5.2.5_p1.ebuild:
+  Version bump.
 
   13 Feb 2006; Henrik Brix Andersen <brix@gentoo.org>
   -files/5.2.4-sundries.patch, -files/5.2.4-uclibc.patch,
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 610020501779..19db9b2f1fca 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -1,8 +1,14 @@
-MD5 d772e8df77bf9a4bb44e89b3a07e5f08 ChangeLog 2915
+MD5 87c90bb8737208b27a425381307d09ec ChangeLog 3199
 MD5 287794d799d9743d47a4cdcaea6eadb1 files/digest-watchdog-5.2.4_p5 139
+MD5 6ad7ba12ce51412cb95df32eb14e572f files/digest-watchdog-5.2.5_p1 138
 MD5 0e792c9c9654889661f8cccf2582417c files/watchdog-5.2.4_p5-conf.d 279
 MD5 5ac87cbcdd6b502c3c32847d24221fe7 files/watchdog-5.2.4_p5-init.d 547
 MD5 ba2c02768a2e772c14e6332dd6b2e65e files/watchdog-5.2.4_p5-sundries.patch 752
 MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/watchdog-5.2.4_p5-uclibc.patch 312
+MD5 0e792c9c9654889661f8cccf2582417c files/watchdog-5.2.5_p1-conf.d 279
+MD5 5ac87cbcdd6b502c3c32847d24221fe7 files/watchdog-5.2.5_p1-init.d 547
+MD5 ba2c02768a2e772c14e6332dd6b2e65e files/watchdog-5.2.5_p1-sundries.patch 752
+MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/watchdog-5.2.5_p1-uclibc.patch 312
 MD5 c58db060ae5f8ffd1d141930b0c7c02c metadata.xml 219
 MD5 2d89608080fd1e9229cc30b2f409a2d7 watchdog-5.2.4_p5.ebuild 1469
+MD5 82ab17dfeb08f41e2cf50b56ec49424a watchdog-5.2.5_p1.ebuild 1131
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1 b/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
new file mode 100644
index 000000000000..2d046a5a59a7
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
@@ -0,0 +1,2 @@
+MD5 cb4581c3af21559ecf054aa066045f3a watchdog_5.2.5-1.diff.gz 8240
+MD5 ec498ce0abf0a789b8ad748eb1109ed7 watchdog_5.2.5.orig.tar.gz 128599
diff --git a/sys-apps/watchdog/files/watchdog-5.2.5_p1-conf.d b/sys-apps/watchdog/files/watchdog-5.2.5_p1-conf.d
new file mode 100644
index 000000000000..35a9a5a333f8
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.5_p1-conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.5_p1-conf.d,v 1.1 2006/04/18 09:46:05 brix Exp $
+
+# for more info, see watchdog(8)
+WATCHDOG_OPTS=""
diff --git a/sys-apps/watchdog/files/watchdog-5.2.5_p1-init.d b/sys-apps/watchdog/files/watchdog-5.2.5_p1-init.d
new file mode 100644
index 000000000000..f0b2f520b640
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.5_p1-init.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.5_p1-init.d,v 1.1 2006/04/18 09:46:05 brix Exp $
+
+depend() {
+	need localmount
+	use logger
+}
+
+start() {
+	ebegin "Starting watchdog"
+	start-stop-daemon --start --quiet --exec /usr/sbin/watchdog \
+		-- ${WATCHDOG_OPTS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping watchdog"
+	start-stop-daemon --stop --retry 5 --quiet --exec /usr/sbin/watchdog
+	eend ${?}
+}
diff --git a/sys-apps/watchdog/files/watchdog-5.2.5_p1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.2.5_p1-sundries.patch
new file mode 100644
index 000000000000..2d3d0a1f2986
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.5_p1-sundries.patch
@@ -0,0 +1,19 @@
+--- include/sundries.h.orig	2004-08-06 01:33:43.525091352 -0400
++++ include/sundries.h	2004-08-06 01:33:58.254852088 -0400
+@@ -46,16 +46,7 @@
+ char *xstrconcat3 (const char *, const char *, const char *);
+ char *xstrconcat4 (const char *, const char *, const char *, const char *);
+ 
+-/* Here is some serious cruft.  */
+-#ifdef __GNUC__
+-#if defined(__GNUC_MINOR__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 5
+ void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn));
+-#else /* GNUC < 2.5 */
+-void die (int errcode, const char *fmt, ...);
+-#endif /* GNUC < 2.5 */
+-#else /* !__GNUC__ */
+-void die (int errcode, const char *fmt, ...);
+-#endif /* !__GNUC__ */
+ 
+ #ifdef HAVE_NFS
+ int nfsmount (const char *spec, const char *node, int *flags,
diff --git a/sys-apps/watchdog/files/watchdog-5.2.5_p1-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.5_p1-uclibc.patch
new file mode 100644
index 000000000000..1986ed88774a
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.5_p1-uclibc.patch
@@ -0,0 +1,11 @@
+--- src/fstab.c.orig	2004-08-23 15:32:22 +0000
++++ src/fstab.c	2004-08-23 15:32:36 +0000
+@@ -237,7 +237,7 @@
+ /* Ensure that the lock is released if we are interrupted.  */
+ static void
+ handler (int sig) {
+-     die (EX_USER, "%s", sys_siglist[sig]);
++     die (EX_USER, "%s", strsignal(sig));
+ }
+
+ static void
diff --git a/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild b/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild
new file mode 100644
index 000000000000..d79321686f56
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.5_p1.ebuild,v 1.1 2006/04/18 09:46:05 brix Exp $
+
+inherit eutils
+
+MY_P=${PN}_${PV/_p*/}
+S=${WORKDIR}/${P/_p*/}.orig
+PATCH_LEVEL=${PV##*_p}
+
+DESCRIPTION="A software watchdog"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/"
+SRC_URI="mirror://debian/pool/main/w/watchdog/${MY_P}.orig.tar.gz
+		mirror://debian/pool/main/w/watchdog/${MY_P}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sh ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-sundries.patch
+	epatch "${FILESDIR}"/${P}-uclibc.patch
+	epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newconfd ${FILESDIR}/${P}-conf.d ${PN}
+	newinitd ${FILESDIR}/${P}-init.d ${PN}
+
+	dodoc AUTHORS README TODO
+	docinto examples
+	dodoc examples/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To enable the start-up script run:"
+	einfo "  # rc-update add watchdog boot"
+	einfo
+}