update to latest upstream version

add a default config file with watchdog enabled.
Enable watchdog in /etc/rc.conf by default.

6 files changed, 46 insertions, 52 deletions

diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 1424b29fd..eda6f83cb 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		watchdog
-PKG_VERSION:=		5.4
+PKG_VERSION:=		5.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		66480128b9dabcced2e4c8db3e60fa50
+PKG_MD5SUM:=		31766450ecfc9aff70fe966c0b9df06d
 PKG_DESCR:=		watchdog daemon
 PKG_SECTION:=		sys
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=watchdog/}
@@ -16,16 +16,13 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" \
-			INCLS="-I. -I${STAGING_DIR}/usr/include" \
-			LIBS="-L${STAGING_DIR}/usr/lib"
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
-	${INSTALL_DATA} ${WRKINST}/etc/watchdog.conf ${IDIR_WATCHDOG}/etc/
+	${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \
-		       ${WRKINST}/usr/sbin/wd_keepalive ${IDIR_WATCHDOG}/usr/sbin/
+		       ${IDIR_WATCHDOG}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/watchdog/files/watchdog.conf b/package/watchdog/files/watchdog.conf
new file mode 100644
index 000000000..0314adcfb
--- /dev/null
+++ b/package/watchdog/files/watchdog.conf
@@ -0,0 +1,41 @@
+#ping			= 172.31.14.1
+#ping			= 172.26.1.255
+#interface		= eth0
+#file			= /var/log/messages
+#change			= 1407
+
+# Uncomment to enable test. Setting one of these values to '0' disables it.
+# These values will hopefully never reboot your machine during normal use
+# (if your machine is really hung, the loadavg will go much higher than 25)
+#max-load-1		= 24
+#max-load-5		= 18
+#max-load-15		= 12
+
+# Note that this is the number of pages!
+# To get the real size, check how large the pagesize is on your machine.
+#min-memory		= 1
+
+#repair-binary		= /usr/sbin/repair
+#test-binary		= 
+#test-timeout		= 
+
+watchdog-device	= /dev/watchdog
+watchdog-timeout = 20
+
+# Defaults compiled into the binary
+#temperature-device	=
+#max-temperature	= 120
+
+# Defaults compiled into the binary
+#admin			= root
+#interval		= 10
+#logtick                = 1
+
+# This greatly decreases the chance that watchdog won't be scheduled before
+# your machine is really loaded
+realtime		= yes
+priority		= 1
+
+# Check if syslogd is still running by enabling the following line
+#pidfile		= /var/run/syslogd.pid   
+
diff --git a/package/watchdog/files/watchdog.postinst b/package/watchdog/files/watchdog.postinst
index 17d144395..a44195149 100644
--- a/package/watchdog/files/watchdog.postinst
+++ b/package/watchdog/files/watchdog.postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-add_rcconf watchdog watchdog NO
+add_rcconf watchdog watchdog YES
diff --git a/package/watchdog/patches/01-fstab-sys_siglist.patch b/package/watchdog/patches/01-fstab-sys_siglist.patch
deleted file mode 100644
index 604ecdcb6..000000000
--- a/package/watchdog/patches/01-fstab-sys_siglist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- watchdog-5.2.4.orig.orig/src/fstab.c	2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/fstab.c	2008-10-16 12:56:40.000000000 +0200
-@@ -237,7 +237,7 @@ static int old_lockfile = 1;
- /* 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", "sys_siglist[sig]");
- }
- 
- static void
diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c
deleted file mode 100644
index c00b6ff45..000000000
--- a/package/watchdog/patches/patch-src_mntent_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- watchdog-5.2.4.orig.orig/src/mntent.c	2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/mntent.c	2008-10-16 13:00:20.000000000 +0200
-@@ -6,7 +6,7 @@
- #endif
- 
- #include <stdio.h>
--#include <string.h>		/* for index */
-+#include <string.h>		/* for strchr */
- #include <ctype.h>		/* for isdigit */
- #include "wd_mntent.h"
- #include "sundries.h"		/* for xmalloc */
-@@ -155,7 +155,7 @@ my_getmntent (mntFILE *mfp) {
- 		if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL)
- 			return NULL;
- 
--		s = index (buf, '\n');
-+		s = strchr (buf, '\n');
- 		if (s == NULL) {
- 			/* extremely long line - assume file was corrupted */
- 			mfp->mntent_errs = 1;
diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c
deleted file mode 100644
index cf421ce79..000000000
--- a/package/watchdog/patches/patch-src_umount_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- watchdog-5.2.4.orig.orig/src/umount.c	2003-01-28 07:47:38.000000000 +0100
-+++ watchdog-5.2.4.orig/src/umount.c	2008-10-16 13:00:07.000000000 +0200
-@@ -210,7 +210,7 @@ umount_one (const char *spec, const char
- 	    if (res < 0)
- 		 umnt_err2 = errno;
- 	    /* Do not complain about remote NFS mount points */
--	    if (errno == ENOENT && index(spec, ':'))
-+	    if (errno == ENOENT && strchr(spec, ':'))
- 		 umnt_err2 = 0;
-        }
-   }