rpms/rsyslog/F-9 rsyslog-3.18.1-clock.patch, NONE, 1.1 rsyslog.spec, 1.41, 1.42

[Tomas Heinrich]

Author: theinric

Update of /cvs/extras/rpms/rsyslog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27846

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-3.18.1-clock.patch 
Log Message:
fix clock rollback issue (#460230)


rsyslog-3.18.1-clock.patch:

--- NEW FILE rsyslog-3.18.1-clock.patch ---
diff -up rsyslog-3.18.1/action.c.clock rsyslog-3.18.1/action.c
--- rsyslog-3.18.1/action.c.clock	2008-08-28 10:08:55.000000000 +0200
+++ rsyslog-3.18.1/action.c	2008-08-28 10:09:07.000000000 +0200
@@ -544,6 +544,10 @@ actionWriteToAction(action_t *pAction)
 	dbgprintf("Called action, logging to %s", module.GetStateName(pAction->pMod));
 
 	time(&now); /* we need this for message repeation processing AND $ActionExecOnlyOnceEveryInterval */
+	if(pAction->tLastExec > now) {
+		/* if we are traveling back in time, reset tLastExec */
+		pAction->tLastExec = (time_t) 0;
+	}
 	/* now check if we need to drop the message because otherwise the action would be too
 	 * frequently called. -- rgerhards, 2008-04-08
 	 */


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/F-9/rsyslog.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- rsyslog.spec	23 Jul 2008 14:47:46 -0000	1.41
+++ rsyslog.spec	28 Aug 2008 10:00:06 -0000	1.42
@@ -12,6 +12,7 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Patch0: rsyslog-3.18.1-clock.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -78,6 +79,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .clock
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -175,6 +177,9 @@
 %{_libdir}/rsyslog/omrelp.so
 
 %changelog
+* Thu Aug 28 2008 Tomas Heinrich <theinric at redhat.com> 3.18.1-2
+- fix clock rollback issue (#460230)
+
 * Wed Jul 23 2008 Peter Vrabec <theinric at redhat.com> 3.18.1-1
 - upgrade