[Logcheck-commits] Hannes von Haugwitz: i.d.s/amavisd-new: applied changes by C. Dröge

[Hannes von Haugwitz]

Module: logcheck
Branch: master
Commit: fb6c9255b37581783e97d94cbf546c7ee237dd4e
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=fb6c9255b37581783e97d94cbf546c7ee237dd4e

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Wed Sep  1 10:28:44 2010 +0200

i.d.s/amavisd-new: applied changes by C. Dröge

closes: #594605

---

 debian/changelog                            |    7 +++++++
 rulefiles/linux/ignore.d.server/amavisd-new |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e63d7b7..98f9597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ logcheck (1.3.13) UNRELEASED; urgency=low
   * violations.ignore.d/logcheck-sudo:
     - match COMMAND=list and TTY=console, thanks to Michel Messerschmidt for
       the patch (closes: #593482)
+  * ignore.d.server/amavisd-new:
+    - applied changes by Christian Dröge (closes: #594605):
+      - IPv6 support for IP addresses
+      - allow PASSED SPAM in log
+      - optional minus sign after "Hits:"
+      - optional quarantine in log line
+      - optional Message-ID
 
  -- Hannes von Haugwitz <hannes at vonhaugwitz.com>  Tue, 31 Aug 2010 18:17:54 +0200
 
diff --git a/rulefiles/linux/ignore.d.server/amavisd-new b/rulefiles/linux/ignore.d.server/amavisd-new
index e64a484..34c7dbc 100644
--- a/rulefiles/linux/ignore.d.server/amavisd-new
+++ b/rulefiles/linux/ignore.d.server/amavisd-new
@@ -1,5 +1,5 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed CLEAN,( LOCAL)?( \[[.:[:xdigit:]]+\]){0,2} <[^>]*> -> <[^>]*>(,<[^>]*>)*, Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-[.[:digit:]]*)+, size: [[:xdigit:]]+, queued_as: [[:xdigit:]]+( OK id=[-[:alnum:]]+)?, [[:digit:]]+ ms$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed (INFECTED \([-._[:alnum:]]+\)|BAD-HEADER),( \[[.:[:xdigit:]]+\]){1,2} <[^>]*> -> <[^>]*>, quarantine: (virus|badh)-[-+[:alnum:]]+, Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-[.[:digit:]]*)+, size: [[:xdigit:]]+, queued_as: [[:xdigit:]]+( OK id=[-[:alnum:]]+)?, [[:digit:]]+ ms$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed (CLEAN|SPAM),( LOCAL)?( \[(IPv6:)?[[:xdigit:].:]{3,39}\]){0,2} <[^>]*> -> <[^>]*>(,<[^>]*>)*,( Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,)?( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-?[.[:digit:]]*)+, size: [[:xdigit:]]+, queued_as: [[:xdigit:]]+( OK id=[-[:alnum:]]+)?, [[:digit:]]+ ms$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed (INFECTED \([-._[:alnum:]]+\)|BAD-HEADER),( \[(IPv6:)?[[:xdigit:].:]{3,39}\]){1,2} <[^>]*> -> <[^>]*>,( quarantine: (virus|badh)-[-+[:alnum:]]+,)? Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-?[.[:digit:]]*)+, size: [[:xdigit:]]+, queued_as: [[:xdigit:]]+( OK id=[-[:alnum:]]+)?, [[:digit:]]+ ms$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) NOTICE: Not sending DSN in response to bulk mail from <[^.]*> containing [[:upper:] ]+, mail intentionally dropped$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) INFO: unfolded [[:digit:]]+ illegal all-whitespace continuation lines$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) WARN: address modified \((sender|recipient)\): <[^>]+> -> <[^>]+>$