From fb919abbe7ab597d170cc283f609f59addaf8890 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@fedoraproject.org>
Date: Thu, 28 Aug 2008 09:18:24 +0000
Subject: [PATCH] fix clock rollback issue (#460230)

---
 rsyslog-3.21.3-clock.patch | 14 ++++++++++++++
 rsyslog.spec               |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 rsyslog-3.21.3-clock.patch

diff --git a/rsyslog-3.21.3-clock.patch b/rsyslog-3.21.3-clock.patch
new file mode 100644
index 0000000..74dcdc2
--- /dev/null
+++ b/rsyslog-3.21.3-clock.patch
@@ -0,0 +1,14 @@
+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
+ 	 */
diff --git a/rsyslog.spec b/rsyslog.spec
index c8f30ab..d754024 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -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 @@ Source1: rsyslog.init
 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 @@ IETF standard protocol.
 
 %prep
 %setup -q
+%patch -p1 -b .clock
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -191,6 +193,9 @@ fi
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Thu Aug 28 2008 Tomas Heinrich <theinric@redhat.com> 3.21.3-2
+- fix clock rollback issue (#460230)
+
 * Wed Aug 20 2008 Peter Vrabec <pvrabec@redhat.com> 3.21.3-1
 - upgrade to bugfix release