rpms/rsyslog/devel rsyslog-3.21.3-clock.patch, NONE, 1.1 rsyslog.spec, 1.48, 1.49

[Tomas Heinrich]

Author: theinric

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25358

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


rsyslog-3.21.3-clock.patch:

--- NEW FILE rsyslog-3.21.3-clock.patch ---
diff -up rsyslog-3.21.3/action.c.clock rsyslog-3.21.3/action.c
--- rsyslog-3.21.3/action.c.clock	2008-08-28 10:23:10.000000000 +0200
+++ rsyslog-3.21.3/action.c	2008-08-28 10:37:24.000000000 +0200
@@ -577,6 +577,10 @@ dbgprintf("NTH: conf: %d, actual %d\n", 
 
 	dbgprintf("Called action, logging to %s\n", module.GetStateName(pAction->pMod));
 
+	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/devel/rsyslog.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- rsyslog.spec	20 Aug 2008 12:49:47 -0000	1.48
+++ rsyslog.spec	28 Aug 2008 09:18:24 -0000	1.49
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.21.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -12,6 +12,7 @@
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Patch0: rsyslog-3.21.3-clock.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -87,6 +88,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .clock
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -191,6 +193,9 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Thu Aug 28 2008 Tomas Heinrich <theinric at redhat.com> 3.21.3-2
+- fix clock rollback issue (#460230)
+
 * Wed Aug 20 2008 Peter Vrabec <pvrabec at redhat.com> 3.21.3-1
 - upgrade to bugfix release