3 files changed, 22 insertions, 4 deletions
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index eda6f83cb..14abf0ca3 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -15,10 +15,6 @@ 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
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
 	${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c
new file mode 100644
index 000000000..f2277bdbf
--- /dev/null
+++ b/package/watchdog/patches/patch-src_mntent_c
@@ -0,0 +1,11 @@
+--- watchdog-5.7.orig/src/mntent.c	2010-01-06 13:42:08.000000000 +0100
++++ watchdog-5.7/src/mntent.c	2010-02-06 04:39:34.804334839 +0100
+@@ -157,7 +157,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
new file mode 100644
index 000000000..6b5a82c1f
--- /dev/null
+++ b/package/watchdog/patches/patch-src_umount_c
@@ -0,0 +1,11 @@
+--- watchdog-5.7.orig/src/umount.c	2010-01-06 13:42:08.000000000 +0100
++++ watchdog-5.7/src/umount.c	2010-02-06 04:39:47.664334843 +0100
+@@ -212,7 +212,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;
+        }
+   }