[Logcheck-commits] Frédéric Brière : Deleting ignore.d.server/ sendmail (closes: #542265)

[Frédéric Brière]

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

Author: Frédéric Brière <fbriere at fbriere.net>
Date:   Sun Aug 23 17:16:44 2009 -0400

Deleting ignore.d.server/sendmail (closes: #542265)

This file was erroneously brought back to life by 1e1ad02, and is
already included in sendmail-base.

---

 debian/changelog                         |    2 ++
 debian/logcheck-database.preinst         |    4 +++-
 rulefiles/linux/ignore.d.server/sendmail |    2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f932be..b70a77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,8 @@ logcheck (1.3.4) experimental; urgency=low
     - further adjusted that rule for 2.6.31-rc1
   * logtail/logtail2 no longer ignore -o when called with only one argument
     (closes: #453309)
+  * Deleting obsolete conffiles in logcheck-database.preinst
+    - ignore.d.server/sendmail, also in sendmail-base (closes: #542265)
 
  -- Frédéric Brière <fbriere at fbriere.net>  Mon, 17 Aug 2009 11:48:08 -0400
 
diff --git a/debian/logcheck-database.preinst b/debian/logcheck-database.preinst
index a7e3eca..9f6fc2f 100644
--- a/debian/logcheck-database.preinst
+++ b/debian/logcheck-database.preinst
@@ -21,7 +21,9 @@ set -e
 # them later on will not work correctly.  If you ever forget, you'll need to
 # add them to OLD_CONFFILES below, instead.
 
-REMOVED_CONFFILES=""
+REMOVED_CONFFILES="
+	/etc/logcheck/ignore.d.server/sendmail
+"
 
 # List of conffiles which were once part of this package a long time ago, and
 # have never been cleaned up properly.  They will be removed if they are still
diff --git a/rulefiles/linux/ignore.d.server/sendmail b/rulefiles/linux/ignore.d.server/sendmail
deleted file mode 100644
index 59b14f7..0000000
--- a/rulefiles/linux/ignore.d.server/sendmail
+++ /dev/null
@@ -1,2 +0,0 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (sendmail|sm-(mta|msp|que))\[[0-9]+\]: [[:alnum:]]+: ruleset=check_mail, arg1=<.*>, relay=([._[:alnum:]@-]+ )?\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\]( \(may be forged\))?, reject=[0-9]+ [0-9]\.[0-9]\.[0-9] <.*>\.\.\. +[0-9]+Blocked by [._[:alnum:]:/-]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ (sendmail|sm-(mta|msp|que))\[[0-9]+\]: ruleset=check_relay, arg1=[._[:alnum:]-]+, arg2=[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}, relay=[._[:alnum:]-]+ \[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\], reject=[0-9]+ [0-9]\.[0-9]\.[0-9] [0-9]+Blocked by [._[:alnum:]:/-]+$