Version bump.

(Portage version: 2.1-r1)

8 files changed, 118 insertions, 1 deletions

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 1b76f5385520..cd086745f88b 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.11 2006/06/10 09:24:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.12 2006/06/25 10:50:21 brix Exp $
+
+*watchdog-5.2.6_p1 (25 Jun 2006)
+
+  25 Jun 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/watchdog-5.2.6_p1-conf.d, +files/watchdog-5.2.6_p1-init.d,
+  +files/watchdog-5.2.6_p1-sundries.patch,
+  +files/watchdog-5.2.6_p1-uclibc.patch, +watchdog-5.2.6_p1.ebuild:
+  Version bump.
 
   10 Jun 2006; Michael Hanselmann <hansmi@gentoo.org>
   watchdog-5.2.5_p1.ebuild:
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1 b/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
index 2d046a5a59a7..98b78e6f4d49 100644
--- a/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
@@ -1,2 +1,6 @@
 MD5 cb4581c3af21559ecf054aa066045f3a watchdog_5.2.5-1.diff.gz 8240
+RMD160 89da831a61ee68c84615749f5dfe1a36b512faef watchdog_5.2.5-1.diff.gz 8240
+SHA256 2861c5239ac75534dcd61ee5b4de04271bc583f77c79b7591ecd87efc0599da6 watchdog_5.2.5-1.diff.gz 8240
 MD5 ec498ce0abf0a789b8ad748eb1109ed7 watchdog_5.2.5.orig.tar.gz 128599
+RMD160 168284e7e75f93422ddbc91227362613f2ed1fb4 watchdog_5.2.5.orig.tar.gz 128599
+SHA256 848835daa60ef1874e753571d9becf8806ac116f5fd1564da10f62224f8cf84f watchdog_5.2.5.orig.tar.gz 128599
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.6_p1 b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p1
new file mode 100644
index 000000000000..54b797531157
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p1
@@ -0,0 +1,6 @@
+MD5 725b822a3d460b3100ad9e7aaff4bda7 watchdog_5.2.6-1.diff.gz 752
+RMD160 17379b4e9f94741d642b0ee5258163d710d1f702 watchdog_5.2.6-1.diff.gz 752
+SHA256 d31953eedc83dcb39982bd6579ba001af587192627cccdc35674c56873eb7a51 watchdog_5.2.6-1.diff.gz 752
+MD5 43c33708ac07d458bdbd416812481bab watchdog_5.2.6.orig.tar.gz 138446
+RMD160 accd68437bb986583f02ec9fe7af0c996a7dcaaf watchdog_5.2.6.orig.tar.gz 138446
+SHA256 84f08d17eebb052e165ce69cf4bbf86ff3da8ec2c3f078391a6d999f90b66baf watchdog_5.2.6.orig.tar.gz 138446
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6_p1-conf.d b/sys-apps/watchdog/files/watchdog-5.2.6_p1-conf.d
new file mode 100644
index 000000000000..c873a4217d97
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_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.6_p1-conf.d,v 1.1 2006/06/25 10:50:21 brix Exp $
+
+# for more info, see watchdog(8)
+WATCHDOG_OPTS=""
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6_p1-init.d b/sys-apps/watchdog/files/watchdog-5.2.6_p1-init.d
new file mode 100644
index 000000000000..6a9fb1cafc7d
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_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.6_p1-init.d,v 1.1 2006/06/25 10:50:21 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.6_p1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.2.6_p1-sundries.patch
new file mode 100644
index 000000000000..2d3d0a1f2986
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_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.6_p1-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.6_p1-uclibc.patch
new file mode 100644
index 000000000000..1986ed88774a
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_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.6_p1.ebuild b/sys-apps/watchdog/watchdog-5.2.6_p1.ebuild
new file mode 100644
index 000000000000..496f57b36079
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.2.6_p1.ebuild
@@ -0,0 +1,41 @@
+# 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.6_p1.ebuild,v 1.1 2006/06/25 10:50:21 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_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/*
+}