diff --git a/logwatch-7.3.6-named10.patch b/logwatch-7.3.6-named10.patch new file mode 100644 index 0000000..5057fc0 --- /dev/null +++ b/logwatch-7.3.6-named10.patch @@ -0,0 +1,42 @@ +--- logwatch-7.3.6/scripts/services/named 2010-10-09 17:10:21.000000000 +0100 ++++ logwatch-7.3.6-fedora/scripts/services/named 2010-10-09 17:16:40.000000000 +0100 +@@ -195,12 +195,10 @@ + ($ThisLine =~ /max open files \([0-9]*\) is smaller than max sockets \([0-9]*\)/) or + ($ThisLine =~ /clients-per-query (?:de|in)creased to .*/) or + ($ThisLine =~ /^must-be-secure resolving '.*': .*/) or +- ($ThisLine =~ /^no valid DS resolving '.*': .*/) or +- ($ThisLine =~ /^no valid KEY resolving '.*': .*/) or +- ($ThisLine =~ /^no valid RRSIG resolving '.*': .*/) or ++ ($ThisLine =~ /^(error \()?no valid (DS|KEY|RRSIG)\)? resolving '.*': .*/) or + ($ThisLine =~ /^not insecure resolving '.*': .*/) or + ($ThisLine =~ /^validating \@0x[[:xdigit:]]+: .* DS: must be secure failure/) or +- ($ThisLine =~ /^broken trust chain resolving '.*': .*/) ++ ($ThisLine =~ /^(error \()?broken trust chain\)? resolving '.*': .*/) + # too many timeouts resolving 'ns-ext.nrt1.isc.org/AAAA' (in '.'?): disabling EDNS: 3 Time(s) + ) { + # Don't care about these... +@@ -274,9 +272,10 @@ + $MasterFailure{"$Zone from $Host"}{$Reason}++; + } elsif ( ($Zone) = ($ThisLine =~ /zone ([^\/]+)\/.+: refresh: non-authoritative answer from master/)) { + $NonAuthoritative{$Zone}++; +- } elsif ( ($ThisLine =~ /unexpected RCODE \((.*)\) resolving/) ){ ++ } elsif ( ($ThisLine =~ /(?:error \()?unexpected RCODE\)? \(?(.*?)\)? resolving/) ){ + $UnexpRCODE{$1}++; +- } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [.0-9a-fA-F:#]+/) ) { ++ } elsif ( ($ThisLine =~ /(?:error \()?FORMERR\)? resolving '[^ ]+: [.0-9a-fA-F:#]+/) or ++ ($ThisLine =~ /DNS format error from [^ ]+ resolving [^ ]+( for client [^ ]+)?: .*/) ) { + chomp($ThisLine); + $FormErr{$ThisLine}++; + } elsif ( ($ThisLine =~ /found [0-9]* CPU(s)?, using [0-9]* worker thread(s)?/) ) { +@@ -300,9 +299,9 @@ + $UnknownCCCommands{$CCC}++; + } elsif (($CCC) = ($ThisLine =~ /received control channel command '(.*)'/)) { + $CCCommands{$CCC}++; +- } elsif (($Name,$Address) = ($ThisLine =~ /network unreachable resolving '(.*)': (.*)/)) { ++ } elsif (($Name,$Address) = ($ThisLine =~ /(?:error \()?network unreachable\)? resolving '(.*)': (.*)/)) { + $NUR{$Name}{$Address}++; +- } elsif (($Name,$Address) = ($ThisLine =~ /host unreachable resolving '(.*)': (.*)/)) { ++ } elsif (($Name,$Address) = ($ThisLine =~ /(?:error \()?host unreachable\)? resolving '(.*)': (.*)/)) { + $HUR{$Name}{$Address}++; + } else { + # Report any unmatched entries... diff --git a/logwatch.spec b/logwatch.spec index e119813..5014910 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 57%{?dist} +Release: 58%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -147,6 +147,10 @@ Patch75: logwatch-7.3.6-fetchmail.patch # Already included upstream (rev 9) Patch76: logwatch-7.3.6-named9.patch +# Match "DNS format error", and variants of existing messages +# Submitted upstream +Patch77: logwatch-7.3.6-named10.patch + Requires: textutils sh-utils grep mailx Requires: perl(Date::Manip) BuildArchitectures: noarch @@ -224,6 +228,7 @@ of the package on many systems. %patch74 -p1 %patch75 -p1 %patch76 -p1 +%patch77 -p1 rm -f scripts/services/*.orig %build @@ -343,6 +348,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %doc License project/CHANGES %changelog +* Sat Oct 9 2010 Richard Fearn 7.3.6-58 +- named: match "DNS format error", and variants of existing messages + * Sat Oct 9 2010 Richard Fearn 7.3.6-57 - named: match "clients-per-query increased" as well as "decreased"