[Logcheck-commits] martin f. krafft: Conflict with amavisd-new (<< 1:2.5.2-1), since amavisd-new now maintains

[Frédéric Brière]

Module: logcheck
Branch: refs/tags/1.2.63
Commit: e0d00aba4b25e7f7e77876aa32ae88672a03f9cf
URL:    http://git.debian.org/?p=logcheck/logcheck.git/?a=commit;h=e0d00aba4b25e7f7e77876aa32ae88672a03f9cf

Author: martin f. krafft <madduck at debian.org>
Date:   Sun Sep 30 15:58:57 2007 +0100

Conflict with amavisd-new (<< 1:2.5.2-1), since amavisd-new now maintains
its own filters. Thus, remove them from this package.

---

 debian/changelog                                   |   11 +++++++++--
 debian/control                                     |    1 +
 debian/logcheck-database.lintian-overrides         |    2 --
 rulefiles/linux/ignore.d.server/amavisd-new        |    5 -----
 .../linux/violations.ignore.d/logcheck-amavisd-new |    1 -
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d40b11..275380b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-logcheck (1.2.62~unreleased.5) unstable; urgency=low
+logcheck (1.2.63) unstable; urgency=low
+
+  * Conflict with amavisd-new (<< 1:2.5.2-1), since amavisd-new now maintains
+    its own filters. Thus, remove them from this package.
+
+ -- martin f. krafft <madduck at debian.org>  Sun, 30 Sep 2007 15:57:43 +0100
+
+logcheck (1.2.62) unstable; urgency=low
 
   * remove ignore.d.server/thttpd because thttpd package provides a better
     version (closes: #441504).
@@ -53,7 +60,7 @@ logcheck (1.2.62~unreleased.5) unstable; urgency=low
     - ignore messages about denied queries (closes: #443886).
     - ignore all messages about unexpected RCODEs (closes: #443908).
 
- -- martin f. krafft <madduck at debian.org>  Mon, 24 Sep 2007 23:44:49 +0100
+ -- martin f. krafft <madduck at debian.org>  Mon, 24 Sep 2007 23:47:10 +0100
 
 logcheck (1.2.61) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5640315..1f8111e 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Package: logcheck-database
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: logcheck (<= 1.1.1-9)
+Conflicts: amavisd-new (<< 1:2.5.2-1)
 Description: database of system log rules for the use of log checkers
  This database is part of the Logcheck package, but might be used by others.
  It brings a database of regular expressions for matching system log entries
diff --git a/debian/logcheck-database.lintian-overrides b/debian/logcheck-database.lintian-overrides
index 0df7c79..facf0b9 100644
--- a/debian/logcheck-database.lintian-overrides
+++ b/debian/logcheck-database.lintian-overrides
@@ -5,7 +5,6 @@ logcheck-database binary: non-standard-file-perm etc/logcheck/violations.d/logch
 logcheck-database binary: non-standard-file-perm etc/logcheck/violations.d/smartd 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/violations.d/su 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/violations.d/sudo 0640 != 0644
-logcheck-database binary: non-standard-file-perm etc/logcheck/violations.ignore.d/logcheck-amavisd-new 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/violations.ignore.d/logcheck-bind 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/violations.ignore.d/logcheck-bluez-utils 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/violations.ignore.d/logcheck-courier 0640 != 0644
@@ -66,7 +65,6 @@ logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.workstati
 logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.workstation/xdm 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.server/acpid 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.server/amandad 0640 != 0644
-logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.server/amavisd-new 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.server/anacron 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.server/anon-proxy 0640 != 0644
 logcheck-database binary: non-standard-file-perm etc/logcheck/ignore.d.server/apache 0640 != 0644
diff --git a/rulefiles/linux/ignore.d.server/amavisd-new b/rulefiles/linux/ignore.d.server/amavisd-new
deleted file mode 100644
index 344c713..0000000
--- a/rulefiles/linux/ignore.d.server/amavisd-new
+++ /dev/null
@@ -1,5 +0,0 @@
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) Passed CLEAN,( \[[.:[:xdigit:]]+\]){1,2} <[^>]*> -> <[^>]*>(,<[^>]*>)*, Message-ID: <[^>]+>( \((added by[^)]+|sfid-[_[:xdigit:]]+)\))?,( Resent-Message-ID: <[^>]+>,)? mail_id: [-+[:alnum:]]+, Hits: (-[.[:digit:]]*)+, queued_as: [[:xdigit:]]+, [[: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:]]+)\))?, mail_id: [-+[:alnum:]]+, Hits: -, queued_as: [[:xdigit:]]+, [[: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$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ amavis\[[[:digit:]]+\]: \([-[:digit:]]+\) WARN: address modified \((sender|recipient)\): <[^>]+> -> <[^>]+>$
diff --git a/rulefiles/linux/violations.ignore.d/logcheck-amavisd-new b/rulefiles/linux/violations.ignore.d/logcheck-amavisd-new
deleted file mode 100644
index 1929156..0000000
--- a/rulefiles/linux/violations.ignore.d/logcheck-amavisd-new
+++ /dev/null
@@ -1 +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$