[Logcheck-commits] Hannes von Haugwitz: i.d.s/amavisd-new: match local mails

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Tue Aug 10 20:51:50 2010 +0200

i.d.s/amavisd-new: match local mails

closes: #563348

---

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

diff --git a/debian/changelog b/debian/changelog
index 392ac97..c56c7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,7 @@ logcheck (1.3.12) UNRELEASED; urgency=low
 
   [ Gerfried Fuchs ]
   * Re-integrating ignore.d.server/amavisd-new after a long time
-    (closes: #583155)
+    (closes: #583155, #563348)
   * Add Replaces: amavisd-new (<= 2:2.6.4-1) to logcheck-database for that.
   * Remove this file from the debian/logcheck-database.preinst OLD_CONFFILES
     list.
diff --git a/rulefiles/linux/ignore.d.server/amavisd-new b/rulefiles/linux/ignore.d.server/amavisd-new
index 874e688..e64a484 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,( \[[.:[: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 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:]]+\) 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$