[Logcheck-commits] Hannes von Haugwitz: i.d.s/amavisd-new: allow quarantine in "Passed SPAM" log line

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Wed Sep  7 19:35:41 2011 +0200

i.d.s/amavisd-new: allow quarantine in "Passed SPAM" log line

---

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

diff --git a/debian/changelog b/debian/changelog
index 9fa8025..313c364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ logcheck (1.3.14) unstable; urgency=low
     - ignore "kvm: emulating exchange as write" message
     - allow optional ". Opts: (null)" at the end of "mounted filesystem with
       (writeback|ordered) data mode" message
+  * ignore.d.server/amavisd-new:
+    - allow quarantine in "Passed SPAM" log line
 
   [ Gerfried Fuchs ]
   * Remove myself from uploaders.
diff --git a/rulefiles/linux/ignore.d.server/amavisd-new b/rulefiles/linux/ignore.d.server/amavisd-new
index 61809e1..d342968 100644
--- a/rulefiles/linux/ignore.d.server/amavisd-new
+++ b/rulefiles/linux/ignore.d.server/amavisd-new
@@ -1,4 +1,4 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed (CLEAN|SPAM(MY)?),( 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 (CLEAN|SPAM(MY)?),( LOCAL)?( \[(IPv6:)?[[:xdigit:].:]{3,39}\]){0,2} <[^>]*> -> <[^>]*>(,<[^>]*>)*,( quarantine: spam-[-+[: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 (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$