[Logwatch-Devel] another update for latest amavisd-new realease

Who Knows quien-sabe at metaorg.com
Wed May 24 08:13:14 MST 2006


I missed one instance in the latest amavis script a few days ago. I have 
tested the change below and it works, but I am sure someone with a bit 
more regex skills would probably write a better expression.

diff -uNr --exclude=CVS logwatch.cvs/scripts/services/amavis 
logwatch.local/scripts/services/amavis
--- logwatch.cvs/scripts/services/amavis        2006-05-22 
06:19:13.000000000 -0700
+++ logwatch.local/scripts/services/amavis      2006-05-24 
08:05:11.553552762 -0700
@@ -123,7 +123,7 @@
         $Viruses{$Virus}{$From}++;
       }; # if

-   } elsif (($FromIP, $Fromspam, $Towards) = ( $ThisLine =~ /^(?:Passed 
)?(?:SPAM|SPAMMY|Blocked SPAM), (?:\[([^\]]*)\] )*[(<]([^>)]*)[)>] -\> 
[\(\<]([^\>\)]+)[\)\>]/ )) {
+   } elsif (($FromIP, $Fromspam, $Towards) = ( $ThisLine =~ /^(?:Passed 
)?(?:SPAM|SPAMMY|Blocked SPAM|Blocked SPAMMY), (?:\[([^\]]*)\] 
)*[(<]([^>)]*)[)>] -\> [\(\<]([^\>\)]+)[\)\>]/ )) {
       $SpamMsgs++;

       if ($Fromspam =~ /^$/) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: logwatch-7.3-amavis.1.patch
Type: text/x-patch
Size: 744 bytes
Desc: not available
Url : http://ip70-176-100-107.ph.ph.cox.net/pipermail/logwatch-devel/attachments/20060524/29d48a4e/logwatch-7.3-amavis.1.bin


More information about the Logwatch-Devel mailing list