[Logcheck-commits] Hannes von Haugwitz: Deleting ignore.d.server/oidentd (closes: #544686, #560428)

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Dec 11 17:23:30 2009 +0100

Deleting ignore.d.server/oidentd (closes: #544686, #560428)

This file is shipped by oidentd itself since version 2.0.8-3.

---

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

diff --git a/debian/changelog b/debian/changelog
index ba2e014..ad938cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 logcheck (1.3.5) UNRELEASED; urgency=low
 
   [ Hannes von Haugwitz ]
+  * Deleting obsolete conffiles in logcheck-database.preinst
+    - ignore.d.server/oidentd, also in oidentd (closes: #544686, #560428)
   * ignore.d.server/dhclient
     - adjusted rule to match new web address
   * ignore.d.workstation/xdm
diff --git a/debian/logcheck-database.preinst b/debian/logcheck-database.preinst
index c899e0d..0a94b32 100644
--- a/debian/logcheck-database.preinst
+++ b/debian/logcheck-database.preinst
@@ -22,6 +22,7 @@ set -e
 # add them to OLD_CONFFILES below, instead.
 
 REMOVED_CONFFILES="
+	/etc/logcheck/ignore.d.server/oidentd
 	/etc/logcheck/ignore.d.server/lpr
 	/etc/logcheck/ignore.d.server/ntp
 	/etc/logcheck/ignore.d.server/sendmail
diff --git a/rulefiles/linux/ignore.d.server/oidentd b/rulefiles/linux/ignore.d.server/oidentd
deleted file mode 100644
index 516012e..0000000
--- a/rulefiles/linux/ignore.d.server/oidentd
+++ /dev/null
@@ -1,4 +0,0 @@
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ oidentd\[[0-9]+\]: Connection from [._[:alnum:]-]+ \([0-9a-f.:]+\):[0-9]{1,5}$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ oidentd\[[0-9]+\]: Connection from [0-9a-f.:]+:[0-9]{1,5}$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ oidentd\[[0-9]+\]: \[[0-9a-f.:]+\.[0-9]{1,3}\] Successful lookup \(by forward\): [0-9]+ \([0-9]+\) , [0-9]+ : [_[:alnum:]-]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ oidentd\[[0-9]+\]: \[[._[:alnum:]-]+\] Successful lookup: [0-9]+ , [0-9]+ : [_[:alnum:]-]+ \([_[:alnum:]-]+\)$