Attachment 715452 Details for Bug 926937 – Patch to catch log format changes of amavisd-new 2.8.0

[patch] Patch to catch log format changes of amavisd-new 2.8.0

logwatch-service-amavisd-new-2.8.0.diff (text/plain), 2.19 KB, created by Peter Bieringer on 2013-03-24 10:41:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Bieringer

Created: 2013-03-24 10:41:38 UTC

Size: 2.19 KB

patch

obsolete

>--- /tmp/logwatch-7.4.0/scripts/services/amavis	2011-02-20 23:00:14.000000000 +0100
>+++ /etc/logwatch/scripts/services/amavis	2013-03-24 11:34:18.000000000 +0100
>@@ -3,6 +3,9 @@
> # $Id: amavis,v 1.56 2009/02/20 18:01:49 mike Exp $
> ##########################################################################
> # $Log: amavis,v $
>+#
>+# Extensions for amavisd-new 2.8.0
>+#
> # Revision 1.56  2009/02/20 18:01:49  mike
> # Patch from Ivan Varekova -mgt
> #
>@@ -75,7 +78,7 @@
>         or ($ThisLine =~ /^Module/)
>         or ($ThisLine =~ /^TIMING/)
>         or ($ThisLine =~ /^Checking/)
>-        or ($ThisLine =~ /^(ESMTP|FWD|SEND) via/)
>+        or ($ThisLine =~ /^(ESMTP|FWD|SEND) (via|from)/)
>         or ($ThisLine =~ /^spam_scan/)
>         or ($ThisLine =~ /^Not-Delivered/)
>         or ($ThisLine =~ /^SpamControl/)
>@@ -123,7 +126,7 @@
>         or ($ThisLine =~ /^user=.*, EUID/)
>         or ($ThisLine =~ /^starting.  \S*amavisd at/) ) {
>        # We don't care about these
>-   } elsif ($ThisLine =~ /^Passed( CLEAN)?, /) {
>+   } elsif ($ThisLine =~ /^Passed( CLEAN)?( {[\S,]+})?, /) {
>       $CleanMsgs++;
>    } elsif (($FileName, $From) = ( $ThisLine =~ /^(?:Blocked )?BANNED (?:name\/type )?$([^$]+)\)\, (?:\[([^\]]*)\] )*\<([^\>]*)\>/ )) {
> 
>@@ -133,7 +136,7 @@
>           $Banned{$FileName}{$From}++;
>       }; # if
> 
>-   } elsif (($Virus, $FromIP, $From) = ( $ThisLine =~ /^(?:Virus found - quarantined|INFECTED|Blocked INFECTED) $([^$]+)\)\, (?:\[([^\]]*)\] )*[$\<]([^\>$]*)[\)\>]/ )) {
>+   } elsif (($Virus, $FromIP, $From) = ( $ThisLine =~ /^(?:Virus found - quarantined|INFECTED|Blocked INFECTED) $([^$]+)\)( {[\S,]+})?, (?:\[([^\]]*)\](:\d+)? )*[$\<]([^\>$]*)[\)\>]/ )) {
> 
>       $InfectedMsgs++;
> 
>@@ -152,7 +155,7 @@
>         $Viruses{$Virus}{$From}++;
>       }; # if
> 
>-   } elsif (($FromIP, $Fromspam, $Towards) = ( $ThisLine =~ /^(?:Passed )?(?:SPAM|SPAMMY|Blocked SPAM|Blocked SPAMMY), (?:\[([^\]]*)\] )*[(<]([^>)]*)[)>] -\> [$\<]([^\>$]+)[\)\>]/ )) {
>+   } elsif (($FromIP, $Fromspam, $Towards) = ( $ThisLine =~ /^(?:Passed )?(?:SPAM|SPAMMY|Blocked SPAM|Blocked SPAMMY)( {[\S,]+})?, (?:\[([^\]]*)\](:\d+)? )*[(<]([^>)]*)[)>] -\> [$\<]([^\>$]+)[\)\>]/ )) {
>       $SpamMsgs++;
> 
>       if ($Fromspam =~ /^$/) {

Actions: View | Diff

Attachments on bug 926937: 715452