[Logcheck-commits] Jeremy L. Gaddis: i.d.s/amavisd-new: adjusted rule to match new format

[Jeremy L. Gaddis]

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

Author: Jeremy L. Gaddis <jlgaddis at gnu.org>
Date:   Sat Apr 30 06:40:05 2011 -0400

i.d.s/amavisd-new: adjusted rule to match new format

---

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

diff --git a/debian/changelog b/debian/changelog
index dd30271..d5b8828 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,9 @@ logcheck (1.3.14) unstable; urgency=low
   * ignore.d.server/webmin:
     - adjusted rule to match new output format, thanks to Tim
       Riemenschneider (closes: #590559)
+  * ignore.d.server/amavisd-new:
+    - adjusted rule to match new output format, thanks to Adrian Lang
+      (closes: #624197)
   * debian/copyright:
     - updated copyright year to 2011
     - added myself as team member
diff --git a/rulefiles/linux/ignore.d.server/amavisd-new b/rulefiles/linux/ignore.d.server/amavisd-new
index 34c7dbc..61809e1 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),( 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} <[^>]*> -> <[^>]*>(,<[^>]*>)*,( 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$