[Logcheck-commits] Hannes von Haugwitz: Re-remove v.i.d/amavisd-new

[Gerfried Fuchs]

Module: logcheck
Branch: lenny-backports
Commit: 3cd3b26f51088166ab43ef38425bd9edb1d8d242
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=3cd3b26f51088166ab43ef38425bd9edb1d8d242

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Tue Aug 10 08:41:17 2010 +0200

Re-remove v.i.d/amavisd-new

As we don't have corresponding matching rules in violations.d no
ignore file in violations.ignore.d is needed.

---

 debian/changelog                                |    8 ++++----
 debian/logcheck-database.preinst                |    2 ++
 rulefiles/linux/violations.ignore.d/amavisd-new |    2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e3b5e0..392ac97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,13 +16,13 @@ logcheck (1.3.12) UNRELEASED; urgency=low
     - added some rules to ignore WLAN disconnections
 
   [ Gerfried Fuchs ]
-  * Re-integrating ignore.d.server/amavisd-new violations.ignore.d/amavisd-new
-    after a long time (closes: #583155)
+  * Re-integrating ignore.d.server/amavisd-new after a long time
+    (closes: #583155)
   * Add Replaces: amavisd-new (<= 2:2.6.4-1) to logcheck-database for that.
-  * Remove these files from the debian/logcheck-database.preinst OLD_CONFFILES
+  * Remove this file from the debian/logcheck-database.preinst OLD_CONFFILES
     list.
 
- -- 
+ -- Hannes von Haugwitz <hannes at vonhaugwitz.com>  Tue, 10 Aug 2010 08:41:00 +0200
 
 logcheck (1.3.11) unstable; urgency=low
 
diff --git a/debian/logcheck-database.preinst b/debian/logcheck-database.preinst
index ce9288c..11cc9f7 100644
--- a/debian/logcheck-database.preinst
+++ b/debian/logcheck-database.preinst
@@ -72,6 +72,8 @@ OLD_CONFFILES_VERSION="1.3.4"
 OLD_CONFFILES="
   /etc/logcheck/cracking.d/logcheck           9c8e91bc2932e10e5532802f0f5a86b8
   /etc/logcheck/violations.ignore.d/innd      d41d8cd98f00b204e9800998ecf8427e
+  /etc/logcheck/violations.ignore.d/logcheck-amavisd-new \
+                                              0a2d041f4332fbaf9d326515f8ff58f9
   /etc/logcheck/violations.ignore.d/logcheck-sendmail \
                                               96fa759987265ff75d9b92a24b063efd
   /etc/logcheck/violations.ignore.d/su        f53c65f2bfb33f8a15b7e00057821a68 \
diff --git a/rulefiles/linux/violations.ignore.d/amavisd-new b/rulefiles/linux/violations.ignore.d/amavisd-new
deleted file mode 100644
index e1fa1b5..0000000
--- a/rulefiles/linux/violations.ignore.d/amavisd-new
+++ /dev/null
@@ -1,2 +0,0 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) (Blocked|Passed) BAD-HEADER,( \[[.:[:xdigit:]]+\]){2} <[^>]*> -> <[^>]*>, quarantine: badh-[-+[:alnum:]]+, Message-ID: [^[:space:]]*, mail_id: [-+[:alnum:]]+, Hits: -, queued_as: [[:xdigit:]]+, [[:digit:]]+ ms$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) (Blocked|Passed), <[^[:space:]]+> -> <[^[:space:]]+>, Message-ID: <[^[:space:]]+>, Hits: -$