[Logcheck-commits] Frédéric Brière : Updated cron-apt "Fetched" rule to match new time formats

[Frédéric Brière]

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

Author: Frédéric Brière <fbriere at fbriere.net>
Date:   Mon Aug 17 16:21:24 2009 -0400

Updated cron-apt "Fetched" rule to match new time formats

apt 0.7.10 replaced "m" with "min" in TimeToStr(), and a space was added
in 0.7.21.  This new rule matches all three formats.

---

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

diff --git a/debian/changelog b/debian/changelog
index e061612..1055309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ logcheck (1.3.4) experimental; urgency=low
   * Updated libpam-mount "realpath of X is Y" rule
   * Added libpam-mount "Command successful" rule
   * Adjusted ssh "Authentication failure" rule for "invalid user"
+  * Updated cron-apt "Fetched" rule to match new time formats
 
  -- Frédéric Brière <fbriere at fbriere.net>  Mon, 17 Aug 2009 11:48:08 -0400
 
diff --git a/rulefiles/linux/ignore.d.server/cron-apt b/rulefiles/linux/ignore.d.server/cron-apt
index 5b5bafc..4da55cd 100644
--- a/rulefiles/linux/ignore.d.server/cron-apt
+++ b/rulefiles/linux/ignore.d.server/cron-apt
@@ -11,7 +11,7 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Del [-[:alnum:]_+.]+ \[[.[:digit:]]+[kM]?B\]$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Download complete and in download only mode$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: E: Some index files failed to download, they have been ignored, or old ones used instead\.$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Fetched [[:digit:].]+[kM]?B in ([[:digit:]]+m)?[[:digit:]]+s \([[:digit:].]+[kM]?B/s\)$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Fetched [[:digit:].]+[kM]?B in ([[:digit:]]+m(in)? ?)?[[:digit:]]+s \([[:digit:].]+[kM]?B/s\)$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Get:[[:digit:]]+ ((ht|f)tp|file)://[.[:alnum:]/_-]+ [./[:alnum:]-]+ [-[:alnum:]_+.]+ [+.:~[:alnum:]-]+ \[[.[:digit:]]+[kM]?B\]$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Need to get [[:digit:].]+([kM]?B)(/[.[:digit:]]+([kM]?B))* of archives\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ cron-apt: Reading [pP]ackage [lL]ists\.\.\.$