summaryrefslogtreecommitdiff
path: root/package/watchdog/patches/patch-src_mntent_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-04 10:34:02 +0200
commit5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch)
treecd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/watchdog/patches/patch-src_mntent_c
parent401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff)
parent4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: BUGS package/autoconf/Makefile
Diffstat (limited to 'package/watchdog/patches/patch-src_mntent_c')
-rw-r--r--package/watchdog/patches/patch-src_mntent_c16
1 files changed, 3 insertions, 13 deletions
diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c
index c00b6ff45..f2277bdbf 100644
--- a/package/watchdog/patches/patch-src_mntent_c
+++ b/package/watchdog/patches/patch-src_mntent_c
@@ -1,16 +1,6 @@
-$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) {
+--- 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;