diff --git a/logwatch-dovecot.patch b/logwatch-dovecot.patch index c378a1e..111e998 100644 --- a/logwatch-dovecot.patch +++ b/logwatch-dovecot.patch @@ -4,11 +4,9 @@ Author: Frank Crawford Author: Karel Klic RH-Bugzilla: #645962 -Index: scripts/services/dovecot -=================================================================== ---- scripts/services/dovecot (revision 85) -+++ scripts/services/dovecot (working copy) -@@ -121,7 +121,7 @@ +--- logwatch-svn127/scripts/services/dovecot.orig 2012-12-30 17:24:53.000000000 +0100 ++++ logwatch-svn127/scripts/services/dovecot 2013-01-09 09:09:45.256236296 +0100 +@@ -150,7 +150,7 @@ while (defined($ThisLine = )) { # We don't care about these } elsif ( $ThisLine =~ /Killed with signal /) { $End++; @@ -16,8 +14,8 @@ Index: scripts/services/dovecot + } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up( \(.*\))?$/) { $Restarts++; $End = 0; - } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) { -@@ -147,15 +147,16 @@ + } elsif ( ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) or +@@ -181,15 +181,15 @@ while (defined($ThisLine = )) { } # 'lda' for dovecot 2.0, 'deliver' for earlier versions @@ -26,8 +24,8 @@ Index: scripts/services/dovecot $Deliver{$User}{$Mailbox}++; # For Sieve-based delivery - } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda\(|deliver\(|lmtp\(\d+, )(.*)\): (?:[^:]+: )?sieve: msgid=.*: stored mail into mailbox '(\S+)'/ ) ) { -+ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) { +- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda\(|deliver\(|lmtp\(\d+, )(.*)\): (?:[^:]+: )?sieve: msgid=.*: stored mail into mailbox '([^']*)'/ ) ) { ++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^$dovecottag (?:lda|deliver)\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) { $Deliver{$User}{$Mailbox}++; # LMTP-based delivery diff --git a/logwatch.spec b/logwatch.spec index c40e4a9..48938e0 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -140,6 +140,7 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %changelog * Wed Jan 09 2013 Jan Synáček - 7.4.0-21.20130102svn127 - Update to revision 127 and drop ustreamed patches +- Update dovecot patch * Mon Dec 10 2012 Jan Synáček - 7.4.0-20.20120619svn110 - Comment patches