diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-04-13 09:26:07 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-04-13 09:26:07 +0000 |
commit | 04111bcb77adebeb93aa918b9e228bca7b745f98 (patch) | |
tree | 933a18e54cae44fbe2003930c13810e4c47dab7b /sys-apps/watchdog/files | |
parent | version bump (diff) | |
download | gentoo-2-04111bcb77adebeb93aa918b9e228bca7b745f98.tar.gz gentoo-2-04111bcb77adebeb93aa918b9e228bca7b745f98.tar.bz2 gentoo-2-04111bcb77adebeb93aa918b9e228bca7b745f98.zip |
No point in duplicating patches.
(Portage version: 2.1.2.3)
Diffstat (limited to 'sys-apps/watchdog/files')
-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 |
3 files changed, 0 insertions, 148 deletions
diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch deleted file mode 100644 index 0ad75afadf2e..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index cec4fb1f3502..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index fac3f0bde54a..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 |