[Logcheck-commits] Hannes von Haugwitz: i.d.w/kernel: allow 'device number' in USB msgs

[Hannes von Haugwitz]

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

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Wed Sep  7 09:10:12 2011 +0200

i.d.w/kernel: allow 'device number' in USB msgs

---

 debian/changelog                            |    2 ++
 rulefiles/linux/ignore.d.workstation/kernel |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bb2dd2..51ab950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ logcheck (1.3.14) unstable; urgency=low
     - ignore 'cfg80211: Calling CRDA for country' message
     - ignore 'Monitor-Mwait' messages
     - ignore WLAN 'waiting for beacon' and 'beacon received' messages
+    - allow 'device number' in '(new|reset) (low|full|high) speed USB' and
+      'USB disconnect' messages
   * ignore.d.server/cron-apt:
     - allow optional whitespace between value and unit, thanks to
       Gabor Kiss (closes: #609649)
diff --git a/rulefiles/linux/ignore.d.workstation/kernel b/rulefiles/linux/ignore.d.workstation/kernel
index 1f67733..0caed97 100644
--- a/rulefiles/linux/ignore.d.workstation/kernel
+++ b/rulefiles/linux/ignore.d.workstation/kernel
@@ -22,12 +22,12 @@
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? hub [[:digit:]]+-[[:digit:]]+:[[:digit:]]+\.[[:digit:]]+: over-current change on port [[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? hub [[:digit:]]+-[[:digit:]]+:[[:digit:]]+\.[[:digit:]]+: port [[:digit:]]+ disabled by hub \(EMI\?\), re-enabling\.\.\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]+-[.[:digit:]]+: configuration #[[:digit:]] chosen from [[:digit:]]+ choices?$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]+-[.[:digit:]]+: (new|reset) (low|full|high) speed USB device using ([_[:alnum:]-]+ and )?address [[:digit:]]+$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]+-[.[:digit:]]+: (new|reset) (low|full|high) speed USB device (number [[:digit:]]+ using [_[:alnum:]-]+|using ([_[:alnum:]-]+ and )?address [[:digit:]]+)$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]+-[.[:digit:]]+: New USB device found, idVendor=[[:xdigit:]]+, idProduct=[[:xdigit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]+-[.[:digit:]]+: New USB device strings: Mfr=[[:digit:]]+, Product=[[:digit:]]+, SerialNumber=[[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]+-[.[:digit:]]+: (Product|Manufacturer|SerialNumber): .*$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? hub\.c: new USB device [.:[:digit:]-]+, assigned address [[:digit:]]$
-^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]-[.[:digit:]]+: USB disconnect, address [[:digit:]]+$
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb [[:digit:]]-[.[:digit:]]+: USB disconnect, (device number|address) [[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb.c: USB disconnect on device [.:[:digit:]-]+ address [[:digit:]]+$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? usb.c: USB device [[:digit:]]+ \(vend/prod [x/[[:digit:]]+\) is not claimed by any active driver\.$
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ kernel:( \[ *[[:digit:]]+\.[[:digit:]]+\])? USB Mass Storage device found at [[:digit:]]$