rpms/logwatch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update dovecot patch

Browse Source
This commit is contained in:
Jan Synacek 2013-01-09 09:53:54 +01:00
parent 3a1d92e79e
commit 1af5caf56e
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
logwatch-dovecot.patch
View File

@ -4,11 +4,9 @@ Author: Frank Crawford <frank@crawford.emu.id.au>
Author: Karel Klic <kklic@redhat.com>
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 = <STDIN>)) {
# 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 = <STDIN>)) {
}
# '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

1
logwatch.spec
View File

@ -140,6 +140,7 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%changelog
* Wed Jan 09 2013 Jan Synáček <jsynacek@redhat.com> - 7.4.0-21.20130102svn127
- Update to revision 127 and drop ustreamed patches
- Update dovecot patch
* Mon Dec 10 2012 Jan Synáček <jsynacek@redhat.com> - 7.4.0-20.20120619svn110
- Comment patches