[Pkg-logwatch-general] r83 - in trunk: debian patches

[Willi Mann]

Author: willi-guest
Date: 2009-09-09 18:20:53 +0000 (Wed, 09 Sep 2009)
New Revision: 83

Added:
   trunk/patches/03-uw-imap-bug541152.diff
Modified:
   trunk/debian/changelog
Log:
  * Include patch for imapd to support loglines from uw-imapd, submitted by
    Marcin Szewczyk, closes: #541152



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-09-08 19:27:23 UTC (rev 82)
+++ trunk/debian/changelog	2009-09-09 18:20:53 UTC (rev 83)
@@ -5,7 +5,8 @@
   * Support cron with -L2 loglevel (closes: #542453)
   * Move logfiles ending with *.gz or *.bz2 to archive list, so they are 
     unpacked before being processed (closes: #536472)
-  * 
+  * Include patch for imapd to support loglines from uw-imapd, submitted by 
+    Marcin Szewczyk, closes: #541152
 
  -- Willi Mann <willi at wm1.at>  Mon, 07 Sep 2009 17:04:43 +0200
 

Added: trunk/patches/03-uw-imap-bug541152.diff
===================================================================
--- trunk/patches/03-uw-imap-bug541152.diff	                        (rev 0)
+++ trunk/patches/03-uw-imap-bug541152.diff	2009-09-09 18:20:53 UTC (rev 83)
@@ -0,0 +1,28 @@
+# Patch by "Marcin Szewczyk, Wodny" <wodny1 at gmail.com>
+# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541152
+diff -uNr logwatch-7.3.6.cvs20090906.b/scripts/services/imapd logwatch-7.3.6.cvs20090906/scripts/services/imapd
+--- logwatch-7.3.6.cvs20090906.b/scripts/services/imapd	2009-09-06 13:46:30.000000000 +0200
++++ logwatch-7.3.6.cvs20090906/scripts/services/imapd	2009-09-09 20:15:45.000000000 +0200
+@@ -37,7 +37,10 @@
+       ($ThisLine =~ /^couriertls: read: Connection reset by peer/ ) or
+       # timeouts are reported in some other scripts - maybe it should be here too?
+       ($ThisLine =~ /^couriertls: read: Connection timed out/ ) or
+-      ($ThisLine =~ /^LOGOUT, ip=\[(.*)\], rcvd=\d+, sent=\d+$/)
++      ($ThisLine =~ /^LOGOUT, ip=\[(.*)\], rcvd=\d+, sent=\d+$/) or
++      # uw-imapd
++      ($ThisLine =~ /^Moved \d+ bytes of new mail to.*$/) or
++      ($ThisLine =~ /^Unexpected client disconnect, while reading line.*$/)
+    ) {
+       # Don't care about these...
+    } elsif ( ($User, $Host) = ( $ThisLine =~ /^Login user=(.*?) host=(.*\[.*\])$/ ) ) {
+@@ -66,6 +69,10 @@
+    } elsif ( ($User, $Host) = ( $ThisLine =~ /^Logout user=(.*?) host=(.*\[.*\])$/) ) {
+       $Logout{$User}{$Host}++;
+       $Logout2{$User}++;
++   # More generic pattern for uw-imapd
++   } elsif ( ($User, $Host) = ( $ThisLine =~ /^Logout user=(.*?) host=(.*)$/) ) {
++      $Logout{$User}{$Host}++;
++      $Logout2{$User}++;
+    } elsif ( ($dummy, $User, $Host, $DownloadSize1, $DownloadSize2) = ( $ThisLine =~ /^(LOGOUT|TIMEOUT|DISCONNECTED), user=(.*?), ip=\[([^ ,]+)\](?:, port=\[\d+\])?, headers=(\d+), body=(\d+)/o ) ) {
+       $Logout{$User}{$Host}++;
+       $Logout2{$User}++;