From 359ff4e8dd396add27cc56bad682ed858e766a72 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 14 Jan 2013 10:31:22 +0100
Subject: [PATCH] Fix dovecot timestamp misparsing (related: rhbz#886193)

---
 logwatch-dovecot-timestamps.patch | 16 ++++++++++++++++
 logwatch.spec                     |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 logwatch-dovecot-timestamps.patch

diff --git a/logwatch-dovecot-timestamps.patch b/logwatch-dovecot-timestamps.patch
new file mode 100644
index 0000000..e730a60
--- /dev/null
+++ b/logwatch-dovecot-timestamps.patch
@@ -0,0 +1,16 @@
+Fix timestamp misparsing (caused by commit in svn r.125).
+
+Author: Jan Synacek <jsynacek@redhat.com>
+RH-Bugzilla: #886193
+
+--- logwatch-svn127/scripts/services/dovecot.orig	2013-01-11 11:15:10.000000000 +0100
++++ logwatch-svn127/scripts/services/dovecot	2013-01-14 10:17:54.347703271 +0100
+@@ -135,7 +135,7 @@ my $dovecottag = qr/dovecot:(?:\s*\[[^]]
+ while (defined($ThisLine = <STDIN>)) {
+      # remove timestamp.  We can't use *RemoveHeaders because we need the
+      # service name
+-     $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d //;
++     $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d (?:[^\s:]* |)//;
+      if ( ($ThisLine =~ /(?:ssl-build-param|ssl-params): SSL parameters regeneration completed/) or
+           ($ThisLine =~ /ssl-params: Generating SSL parameters/) or
+           ($ThisLine =~ /auth-worker/) or
diff --git a/logwatch.spec b/logwatch.spec
index e537b26..5c601d8 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -28,6 +28,7 @@ Patch16: logwatch-secure-userhelper.patch
 Patch17: logwatch-http-error.patch
 # Not upstreamed yet
 Patch18: logwatch-secure-username.patch
+Patch19: logwatch-dovecot-timestamps.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 Requires: perl(Sys::CPU)
@@ -51,6 +52,7 @@ of the package on many systems.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -144,6 +146,7 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
 * Fri Jan 11 2013 Jan Synáček <jsynacek@redhat.com> - 7.4.0-22.20130102svn127
 - Add secure-username patch to properly ignore "password check failed for user"
   (rhbz#894272)
+- Fix dovecot timestamp misparsing (related: rhbz#886193)
 
 * Wed Jan 09 2013 Jan Synáček <jsynacek@redhat.com> - 7.4.0-21.20130102svn127
 - Update to revision 127 and drop ustreamed patches