Updated to patchlevel 5 from upstream. Don't check for /dev/watchdog as this package can be used without it (softboot functionality), bug #109541. Took ownership.

(Portage version: 2.0.51.22-r3)

5 files changed, 60 insertions, 0 deletions

diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.4_p5 b/sys-apps/watchdog/files/digest-watchdog-5.2.4_p5
new file mode 100644
index 000000000000..4b35dd5be9ca
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.4_p5
@@ -0,0 +1,2 @@
+MD5 c6ac132d92110eb2c4670d4f684105c3 watchdog_5.2.4.orig.tar.gz 127791
+MD5 a3455cb38c645ad81cfc9c5864830fb8 watchdog_5.2.4-5.diff.gz 14854
diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d b/sys-apps/watchdog/files/watchdog-5.2.4_p5-conf.d
new file mode 100644
index 000000000000..d61daf8930e7
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-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.4_p5-conf.d,v 1.1 2005/11/27 10:14:24 brix Exp $
+
+# for more info, see watchdog(8)
+WATCHDOG_OPTS=""
diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d b/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d
new file mode 100644
index 000000000000..927048606598
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-init.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# 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.4_p5-init.d,v 1.1 2005/11/27 10:14:24 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 --quiet --exec /usr/sbin/watchdog
+	eend ${?}
+}
diff --git a/sys-apps/watchdog/files/watchdog-5.2.4_p5-sundries.patch b/sys-apps/watchdog/files/watchdog-5.2.4_p5-sundries.patch
new file mode 100644
index 000000000000..2d3d0a1f2986
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-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.4_p5-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.4_p5-uclibc.patch
new file mode 100644
index 000000000000..1986ed88774a
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.4_p5-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