diff options
author | Christian Heim <phreak@gentoo.org> | 2007-04-11 19:40:10 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2007-04-11 19:40:10 +0000 |
commit | 464d3d8f119d664ba92c6e4e0231ab99125a9ef8 (patch) | |
tree | a04173a758e51a740c9b2f208ffc4e0f1f73b2fc /sys-apps/watchdog/files | |
parent | ppc stable, bug #144833 (diff) | |
download | gentoo-2-464d3d8f119d664ba92c6e4e0231ab99125a9ef8.tar.gz gentoo-2-464d3d8f119d664ba92c6e4e0231ab99125a9ef8.tar.bz2 gentoo-2-464d3d8f119d664ba92c6e4e0231ab99125a9ef8.zip |
Version bump, thanks to Martin von Gagern <Martin.vGagern at gmx.net> in #171786.
(Portage version: 2.1.2.3)
Diffstat (limited to 'sys-apps/watchdog/files')
-rw-r--r-- | sys-apps/watchdog/files/digest-watchdog-5.3.1_p2 | 6 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog-5.3.1-headers.patch | 114 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch | 21 | ||||
-rw-r--r-- | sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch | 13 |
4 files changed, 154 insertions, 0 deletions
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.3.1_p2 b/sys-apps/watchdog/files/digest-watchdog-5.3.1_p2 new file mode 100644 index 000000000000..5808a5c3b6c5 --- /dev/null +++ b/sys-apps/watchdog/files/digest-watchdog-5.3.1_p2 @@ -0,0 +1,6 @@ +MD5 3cc55c4dafcc6010cc1e2f2ce06467f9 watchdog_5.3.1-2.diff.gz 1232 +RMD160 f8c39573e6b796751130f20a4daead7e061bdbea watchdog_5.3.1-2.diff.gz 1232 +SHA256 7c0f3969cbd81c00e32a5955fc51b03f8d14cd1f266167a064315e521f8ad3bb watchdog_5.3.1-2.diff.gz 1232 +MD5 e14e9e54ef839f9f74b62c175298914d watchdog_5.3.1.orig.tar.gz 167983 +RMD160 dd18d00e5a1ff450c2cfba8eaa57f0476b649280 watchdog_5.3.1.orig.tar.gz 167983 +SHA256 0831b0dcd6823a8b20139c7ce37301d16d4188197c05249b8de65c1b37f075cc watchdog_5.3.1.orig.tar.gz 167983 diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch new file mode 100644 index 000000000000..0ad75afadf2e --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch @@ -0,0 +1,114 @@ +Index: watchdog-5.3.1/src/fstab.c +=================================================================== +--- watchdog-5.3.1.orig/src/fstab.c ++++ watchdog-5.3.1/src/fstab.c +@@ -4,6 +4,7 @@ + #include "config.h" + #endif + ++#define _GNU_SOURCE /* for strsignal() */ + #include <unistd.h> + #include <errno.h> + #include <stdio.h> +Index: watchdog-5.3.1/src/nfsmount.c +=================================================================== +--- watchdog-5.3.1.orig/src/nfsmount.c ++++ watchdog-5.3.1/src/nfsmount.c +@@ -43,6 +43,7 @@ + #include <rpc/pmap_prot.h> + #include <rpc/pmap_clnt.h> + #include <sys/socket.h> ++#include <time.h> + #include <sys/time.h> + #include <sys/utsname.h> + #include <sys/stat.h> +Index: watchdog-5.3.1/src/pidfile.c +=================================================================== +--- watchdog-5.3.1.orig/src/pidfile.c ++++ watchdog-5.3.1/src/pidfile.c +@@ -6,6 +6,10 @@ + + #include <errno.h> + #include <fcntl.h> ++#include <unistd.h> ++#include <sys/types.h> ++#include <stdlib.h> ++#include <signal.h> + #include "extern.h" + #include "watch_err.h" + +Index: watchdog-5.3.1/src/shutdown.c +=================================================================== +--- watchdog-5.3.1.orig/src/shutdown.c ++++ watchdog-5.3.1/src/shutdown.c +@@ -4,6 +4,8 @@ + #include "config.h" + #endif + ++#define _GNU_SOURCE /* for getsid() */ ++ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> +@@ -14,6 +16,7 @@ + #include <signal.h> + #include <string.h> + #include <stdlib.h> ++#include <time.h> + #include <utmp.h> + #include <sys/mman.h> + #include <sys/param.h> +Index: watchdog-5.3.1/src/test_binary.c +=================================================================== +--- watchdog-5.3.1.orig/src/test_binary.c ++++ watchdog-5.3.1/src/test_binary.c +@@ -8,6 +8,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <sys/wait.h> ++#include <time.h> + #include "extern.h" + #include "watch_err.h" + +Index: watchdog-5.3.1/src/watchdog.c +=================================================================== +--- watchdog-5.3.1.orig/src/watchdog.c ++++ watchdog-5.3.1/src/watchdog.c +@@ -13,6 +13,8 @@ + + #include "extern.h" + ++#include <sys/stat.h> ++#include <libgen.h> + #include <errno.h> + #include <fcntl.h> + #include <getopt.h> +@@ -23,7 +25,6 @@ + #include <arpa/inet.h> + #include <sys/mman.h> + #include <sys/wait.h> +-#define __USE_GNU + #include <string.h> + + #if !defined(__GLIBC__) /* __GLIBC__ */ +Index: watchdog-5.3.1/src/wd_keepalive.c +=================================================================== +--- watchdog-5.3.1.orig/src/wd_keepalive.c ++++ watchdog-5.3.1/src/wd_keepalive.c +@@ -14,6 +14,7 @@ + #include "config.h" + #endif + ++#define _GNU_SOURCE + #include <errno.h> + #include <fcntl.h> + #include <sched.h> +@@ -22,7 +23,7 @@ + #include <stdlib.h> + #include <sys/mman.h> + #include <sys/wait.h> +-#define __USE_GNU ++#include <unistd.h> + #include <string.h> + #include <syslog.h> + diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch new file mode 100644 index 000000000000..cec4fb1f3502 --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch @@ -0,0 +1,21 @@ +Index: watchdog-5.3.1/include/sundries.h +=================================================================== +--- watchdog-5.3.1.orig/include/sundries.h ++++ watchdog-5.3.1/include/sundries.h +@@ -46,16 +46,7 @@ char *xstrconcat2 (const char *, const c + 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.3.1-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch new file mode 100644 index 000000000000..fac3f0bde54a --- /dev/null +++ b/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch @@ -0,0 +1,13 @@ +Index: watchdog-5.3.1/src/fstab.c +=================================================================== +--- watchdog-5.3.1.orig/src/fstab.c ++++ watchdog-5.3.1/src/fstab.c +@@ -240,7 +240,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", strsignal(sig)); + } + + static void |