rpms/watchdog/devel watchdog-5.5-cleanup.patch, 1.2, 1.3 watchdog.spec, 1.3, 1.4
Richard W.M. Jones
rjones at fedoraproject.org
Fri Mar 13 10:46:14 UTC 2009
Author: rjones
Update of /cvs/pkgs/rpms/watchdog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4297
Modified Files:
watchdog-5.5-cleanup.patch watchdog.spec
Log Message:
Updated the cleanup patch and sent upstream (second attempt).
watchdog-5.5-cleanup.patch:
Index: watchdog-5.5-cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/watchdog/devel/watchdog-5.5-cleanup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- watchdog-5.5-cleanup.patch 13 Mar 2009 10:44:58 -0000 1.2
+++ watchdog-5.5-cleanup.patch 13 Mar 2009 10:46:14 -0000 1.3
@@ -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
--- 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
@@ -17,13 +14,6 @@
#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
--- 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
@@ -36,9 +26,6 @@
#endif
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
--- 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
@@ -60,9 +47,6 @@
// write the buffer to the file
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
--- 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
@@ -83,10 +67,6 @@
loopinfo.lo_encrypt_key[8] = 0;
loopinfo.lo_encrypt_key_size = 8;
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
--- 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
@@ -104,9 +84,6 @@
ss = sp = xmalloc(4*n+1);
while(1) {
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
--- 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
@@ -135,8 +112,6 @@
(fd_set *) NULL, &dtimeout) >= 1) {
/* 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
--- 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
@@ -148,9 +123,6 @@
#include "sundries.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
--- 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
@@ -280,8 +252,6 @@
if (!xdr_dirpath (xdrs, &objp->ex_dir))
return FALSE;
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
--- 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
@@ -296,8 +266,6 @@
#include "extern.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
--- 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
@@ -357,9 +325,6 @@
close(fd_bck);
}
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
--- 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
@@ -372,8 +337,6 @@
#else /* USE_SYSLOG */
perror(progname);
#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
--- 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
@@ -395,11 +358,6 @@
#endif /* USE_SYSLOG */
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
--- 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
@@ -459,7 +417,3 @@
}
}
-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
Index: watchdog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/watchdog/devel/watchdog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- watchdog.spec 13 Mar 2009 10:44:58 -0000 1.3
+++ watchdog.spec 13 Mar 2009 10:46:14 -0000 1.4
@@ -1,7 +1,7 @@
Summary: Software and/or Hardware watchdog daemon
Name: watchdog
Version: 5.5
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPL+
Group: System Environment/Daemons
@@ -99,7 +99,7 @@
%changelog
-* Fri Mar 13 2009 Richard W.M. Jones <rjones at redhat.com> - 5.5-4
+* Fri Mar 13 2009 Richard W.M. Jones <rjones at redhat.com> - 5.5-5
- Updated the cleanup patch and sent upstream.
* Fri Mar 13 2009 Richard W.M. Jones <rjones at redhat.com> - 5.5-3
More information about the fedora-extras-commits
mailing list