rpms/watchdog
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated the cleanup patch and sent upstream (second attempt).

Browse Source
This commit is contained in:
Richard W.M. Jones 2009-03-13 10:46:14 +00:00
parent 088c532870
commit bed3bf9e62
2 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
watchdog-5.5-cleanup.patch
View File

@ -1,6 +1,3 @@
Only in watchdog-5.5.cleanup: config.log
Only in watchdog-5.5.cleanup: config.status
Only in watchdog-5.5.cleanup/include: config.h
diff -ur watchdog-5.5.orig/include/extern.h watchdog-5.5.cleanup/include/extern.h diff -ur watchdog-5.5.orig/include/extern.h watchdog-5.5.cleanup/include/extern.h
--- watchdog-5.5.orig/include/extern.h 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/include/extern.h 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/include/extern.h 2009-03-13 10:34:52.000000000 +0000 +++ watchdog-5.5.cleanup/include/extern.h 2009-03-13 10:34:52.000000000 +0000
@ -17,13 +14,6 @@ diff -ur watchdog-5.5.orig/include/extern.h watchdog-5.5.cleanup/include/extern.
#define TS_SIZE 12 #define TS_SIZE 12
Only in watchdog-5.5.cleanup/include: extern.h~
Only in watchdog-5.5.cleanup/include: stamp-h1
Only in watchdog-5.5.cleanup: Makefile
Only in watchdog-5.5.cleanup/src: .deps
Only in watchdog-5.5.cleanup/src: file_stat.o
Only in watchdog-5.5.cleanup/src: file_table.o
Only in watchdog-5.5.cleanup/src: fstab.o
diff -ur watchdog-5.5.orig/src/iface.c watchdog-5.5.cleanup/src/iface.c diff -ur watchdog-5.5.orig/src/iface.c watchdog-5.5.cleanup/src/iface.c
--- watchdog-5.5.orig/src/iface.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/iface.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/iface.c 2009-03-13 10:21:43.000000000 +0000 +++ watchdog-5.5.cleanup/src/iface.c 2009-03-13 10:21:43.000000000 +0000
@ -36,9 +26,6 @@ diff -ur watchdog-5.5.orig/src/iface.c watchdog-5.5.cleanup/src/iface.c
#endif #endif
if (dev->parameter.iface.bytes == bytes) { if (dev->parameter.iface.bytes == bytes) {
Only in watchdog-5.5.cleanup/src: iface.c~
Only in watchdog-5.5.cleanup/src: iface.o
Only in watchdog-5.5.cleanup/src: ifdown.o
diff -ur watchdog-5.5.orig/src/keep_alive.c watchdog-5.5.cleanup/src/keep_alive.c diff -ur watchdog-5.5.orig/src/keep_alive.c watchdog-5.5.cleanup/src/keep_alive.c
--- watchdog-5.5.orig/src/keep_alive.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/keep_alive.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/keep_alive.c 2009-03-13 10:40:32.000000000 +0000 +++ watchdog-5.5.cleanup/src/keep_alive.c 2009-03-13 10:40:32.000000000 +0000
@ -60,9 +47,6 @@ diff -ur watchdog-5.5.orig/src/keep_alive.c watchdog-5.5.cleanup/src/keep_alive.
// write the buffer to the file // write the buffer to the file
rewind(hb); rewind(hb);
Only in watchdog-5.5.cleanup/src: keep_alive.c~
Only in watchdog-5.5.cleanup/src: keep_alive.o
Only in watchdog-5.5.cleanup/src: load.o
diff -ur watchdog-5.5.orig/src/lomount.c watchdog-5.5.cleanup/src/lomount.c diff -ur watchdog-5.5.orig/src/lomount.c watchdog-5.5.cleanup/src/lomount.c
--- watchdog-5.5.orig/src/lomount.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/lomount.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/lomount.c 2009-03-13 10:24:55.000000000 +0000 +++ watchdog-5.5.cleanup/src/lomount.c 2009-03-13 10:24:55.000000000 +0000
@ -83,10 +67,6 @@ diff -ur watchdog-5.5.orig/src/lomount.c watchdog-5.5.cleanup/src/lomount.c
loopinfo.lo_encrypt_key[8] = 0; loopinfo.lo_encrypt_key[8] = 0;
loopinfo.lo_encrypt_key_size = 8; loopinfo.lo_encrypt_key_size = 8;
pass = getpass ("Init (up to 16 hex digits): "); pass = getpass ("Init (up to 16 hex digits): ");
Only in watchdog-5.5.cleanup/src: lomount.c~
Only in watchdog-5.5.cleanup/src: lomount.o
Only in watchdog-5.5.cleanup/src: Makefile
Only in watchdog-5.5.cleanup/src: memory.o
diff -ur watchdog-5.5.orig/src/mntent.c watchdog-5.5.cleanup/src/mntent.c diff -ur watchdog-5.5.orig/src/mntent.c watchdog-5.5.cleanup/src/mntent.c
--- watchdog-5.5.orig/src/mntent.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/mntent.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/mntent.c 2009-03-13 10:25:47.000000000 +0000 +++ watchdog-5.5.cleanup/src/mntent.c 2009-03-13 10:25:47.000000000 +0000
@ -104,9 +84,6 @@ diff -ur watchdog-5.5.orig/src/mntent.c watchdog-5.5.cleanup/src/mntent.c
ss = sp = xmalloc(4*n+1); ss = sp = xmalloc(4*n+1);
while(1) { while(1) {
for (n = 0; n < sizeof(need_escaping); n++) { for (n = 0; n < sizeof(need_escaping); n++) {
Only in watchdog-5.5.cleanup/src: mntent.c~
Only in watchdog-5.5.cleanup/src: mntent.o
Only in watchdog-5.5.cleanup/src: mount.o
diff -ur watchdog-5.5.orig/src/net.c watchdog-5.5.cleanup/src/net.c diff -ur watchdog-5.5.orig/src/net.c watchdog-5.5.cleanup/src/net.c
--- watchdog-5.5.orig/src/net.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/net.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/net.c 2009-03-13 10:28:09.000000000 +0000 +++ watchdog-5.5.cleanup/src/net.c 2009-03-13 10:28:09.000000000 +0000
@ -135,8 +112,6 @@ diff -ur watchdog-5.5.orig/src/net.c watchdog-5.5.cleanup/src/net.c
(fd_set *) NULL, &dtimeout) >= 1) { (fd_set *) NULL, &dtimeout) >= 1) {
/* read reply */ /* read reply */
Only in watchdog-5.5.cleanup/src: net.c~
Only in watchdog-5.5.cleanup/src: net.o
diff -ur watchdog-5.5.orig/src/nfsmount.c watchdog-5.5.cleanup/src/nfsmount.c diff -ur watchdog-5.5.orig/src/nfsmount.c watchdog-5.5.cleanup/src/nfsmount.c
--- watchdog-5.5.orig/src/nfsmount.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/nfsmount.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/nfsmount.c 2009-03-13 10:28:33.000000000 +0000 +++ watchdog-5.5.cleanup/src/nfsmount.c 2009-03-13 10:28:33.000000000 +0000
@ -148,9 +123,6 @@ diff -ur watchdog-5.5.orig/src/nfsmount.c watchdog-5.5.cleanup/src/nfsmount.c
#include "sundries.h" #include "sundries.h"
#include "nfsmount.h" #include "nfsmount.h"
Only in watchdog-5.5.cleanup/src: nfsmount.c~
Only in watchdog-5.5.cleanup/src: nfsmount_clnt.o
Only in watchdog-5.5.cleanup/src: nfsmount.o
diff -ur watchdog-5.5.orig/src/nfsmount_xdr.c watchdog-5.5.cleanup/src/nfsmount_xdr.c diff -ur watchdog-5.5.orig/src/nfsmount_xdr.c watchdog-5.5.cleanup/src/nfsmount_xdr.c
--- watchdog-5.5.orig/src/nfsmount_xdr.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/nfsmount_xdr.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/nfsmount_xdr.c 2009-03-13 10:29:31.000000000 +0000 +++ watchdog-5.5.cleanup/src/nfsmount_xdr.c 2009-03-13 10:29:31.000000000 +0000
@ -280,8 +252,6 @@ diff -ur watchdog-5.5.orig/src/nfsmount_xdr.c watchdog-5.5.cleanup/src/nfsmount_
if (!xdr_dirpath (xdrs, &objp->ex_dir)) if (!xdr_dirpath (xdrs, &objp->ex_dir))
return FALSE; return FALSE;
if (!xdr_groups (xdrs, &objp->ex_groups)) if (!xdr_groups (xdrs, &objp->ex_groups))
Only in watchdog-5.5.cleanup/src: nfsmount_xdr.c~
Only in watchdog-5.5.cleanup/src: nfsmount_xdr.o
diff -ur watchdog-5.5.orig/src/pidfile.c watchdog-5.5.cleanup/src/pidfile.c diff -ur watchdog-5.5.orig/src/pidfile.c watchdog-5.5.cleanup/src/pidfile.c
--- watchdog-5.5.orig/src/pidfile.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/pidfile.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/pidfile.c 2009-03-13 10:30:08.000000000 +0000 +++ watchdog-5.5.cleanup/src/pidfile.c 2009-03-13 10:30:08.000000000 +0000
@ -296,8 +266,6 @@ diff -ur watchdog-5.5.orig/src/pidfile.c watchdog-5.5.cleanup/src/pidfile.c
#include "extern.h" #include "extern.h"
#include "watch_err.h" #include "watch_err.h"
Only in watchdog-5.5.cleanup/src: pidfile.c~
Only in watchdog-5.5.cleanup/src: pidfile.o
diff -ur watchdog-5.5.orig/src/shutdown.c watchdog-5.5.cleanup/src/shutdown.c diff -ur watchdog-5.5.orig/src/shutdown.c watchdog-5.5.cleanup/src/shutdown.c
--- watchdog-5.5.orig/src/shutdown.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/shutdown.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/shutdown.c 2009-03-13 10:35:53.000000000 +0000 +++ watchdog-5.5.cleanup/src/shutdown.c 2009-03-13 10:35:53.000000000 +0000
@ -357,9 +325,6 @@ diff -ur watchdog-5.5.orig/src/shutdown.c watchdog-5.5.cleanup/src/shutdown.c
close(fd_bck); close(fd_bck);
} }
close(fd_seed); close(fd_seed);
Only in watchdog-5.5.cleanup/src: shutdown.c~
Only in watchdog-5.5.cleanup/src: shutdown.o
Only in watchdog-5.5.cleanup/src: sundries.o
diff -ur watchdog-5.5.orig/src/temp.c watchdog-5.5.cleanup/src/temp.c diff -ur watchdog-5.5.orig/src/temp.c watchdog-5.5.cleanup/src/temp.c
--- watchdog-5.5.orig/src/temp.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/temp.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/temp.c 2009-03-13 10:36:04.000000000 +0000 +++ watchdog-5.5.cleanup/src/temp.c 2009-03-13 10:36:04.000000000 +0000
@ -372,8 +337,6 @@ diff -ur watchdog-5.5.orig/src/temp.c watchdog-5.5.cleanup/src/temp.c
#else /* USE_SYSLOG */ #else /* USE_SYSLOG */
perror(progname); perror(progname);
#endif /* USE_SYSLOG */ #endif /* USE_SYSLOG */
Only in watchdog-5.5.cleanup/src: temp.c~
Only in watchdog-5.5.cleanup/src: temp.o
diff -ur watchdog-5.5.orig/src/test_binary.c watchdog-5.5.cleanup/src/test_binary.c diff -ur watchdog-5.5.orig/src/test_binary.c watchdog-5.5.cleanup/src/test_binary.c
--- watchdog-5.5.orig/src/test_binary.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/test_binary.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/test_binary.c 2009-03-13 10:36:58.000000000 +0000 +++ watchdog-5.5.cleanup/src/test_binary.c 2009-03-13 10:36:58.000000000 +0000
@ -395,11 +358,6 @@ diff -ur watchdog-5.5.orig/src/test_binary.c watchdog-5.5.cleanup/src/test_binar
#endif /* USE_SYSLOG */ #endif /* USE_SYSLOG */
return res; return res;
} }
Only in watchdog-5.5.cleanup/src: test_binary.c~
Only in watchdog-5.5.cleanup/src: test_binary.o
Only in watchdog-5.5.cleanup/src: umount.o
Only in watchdog-5.5.cleanup/src: version.o
Only in watchdog-5.5.cleanup/src: watchdog
diff -ur watchdog-5.5.orig/src/watchdog.c watchdog-5.5.cleanup/src/watchdog.c diff -ur watchdog-5.5.orig/src/watchdog.c watchdog-5.5.cleanup/src/watchdog.c
--- watchdog-5.5.orig/src/watchdog.c 2009-02-25 11:12:59.000000000 +0000 --- watchdog-5.5.orig/src/watchdog.c 2009-02-25 11:12:59.000000000 +0000
+++ watchdog-5.5.cleanup/src/watchdog.c 2009-03-13 10:42:44.000000000 +0000 +++ watchdog-5.5.cleanup/src/watchdog.c 2009-03-13 10:42:44.000000000 +0000
@ -459,7 +417,3 @@ diff -ur watchdog-5.5.orig/src/watchdog.c watchdog-5.5.cleanup/src/watchdog.c
} }
} }
Only in watchdog-5.5.cleanup/src: watchdog.c~
Only in watchdog-5.5.cleanup/src: watchdog.o
Only in watchdog-5.5.cleanup/src: wd_keepalive
Only in watchdog-5.5.cleanup/src: wd_keepalive.o

4
watchdog.spec
View File

@ -1,7 +1,7 @@
Summary: Software and/or Hardware watchdog daemon Summary: Software and/or Hardware watchdog daemon
Name: watchdog Name: watchdog
Version: 5.5 Version: 5.5
Release: 4%{?dist} Release: 5%{?dist}
License: GPL+ License: GPL+
Group: System Environment/Daemons Group: System Environment/Daemons
@ -99,7 +99,7 @@ fi
%changelog %changelog
* Fri Mar 13 2009 Richard W.M. Jones <rjones@redhat.com> - 5.5-4 * Fri Mar 13 2009 Richard W.M. Jones <rjones@redhat.com> - 5.5-5
- Updated the cleanup patch and sent upstream. - Updated the cleanup patch and sent upstream.
* Fri Mar 13 2009 Richard W.M. Jones <rjones@redhat.com> - 5.5-3 * Fri Mar 13 2009 Richard W.M. Jones <rjones@redhat.com> - 5.5-3