diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
| commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
| tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/watchdog/patches | |
| parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
| parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/watchdog/patches')
| -rw-r--r-- | package/watchdog/patches/01-fstab-sys_siglist.patch | 11 | ||||
| -rw-r--r-- | package/watchdog/patches/patch-src_mntent_c | 16 | ||||
| -rw-r--r-- | package/watchdog/patches/patch-src_umount_c | 7 |
3 files changed, 6 insertions, 28 deletions
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 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; diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c index cf421ce79..6b5a82c1f 100644 --- a/package/watchdog/patches/patch-src_umount_c +++ b/package/watchdog/patches/patch-src_umount_c @@ -1,7 +1,6 @@ -$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 +--- 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 */ |