rpms/logwatch/devel logwatch-7.3.6-named7.patch, NONE, 1.1 logwatch.spec, 1.124, 1.125

[Karel Klíč]

Author: kklic

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16937

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-named7.patch 
Log Message:
Added named7 patch from #555980

logwatch-7.3.6-named7.patch:
 named |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE logwatch-7.3.6-named7.patch ---
--- logwatch/scripts/services/named	2009-08-11 21:59:52.000000000 +1000
+++ named	2010-01-16 18:29:17.000000000 +1100
@@ -174,7 +174,7 @@
       ($ThisLine =~ /weak RSASHA1 \(5\) key found \(exponent=3\)/) or 
       ($ThisLine =~ /Bad file descriptor/) or 
       ($ThisLine =~ /open: .*: file not found/) or
-      ($ThisLine =~ /queries: client [0-9.#:]* view localhost_resolver: query: .* IN .*/) or
+      ($ThisLine =~ /queries: client [.0-9a-fA-F#:]* view localhost_resolver: query: .* IN .*/) or
       ($ThisLine =~ /zone .*: NS '.*' is a CNAME \(illegal\)/) or
       ($ThisLine =~ /zone .*: zone serial unchanged. zone may fail to transfer to slaves/) or
       ($ThisLine =~ /zone .*: loading from master file .* failed/) or
@@ -252,7 +252,7 @@
    } elsif ( ($Client) = ( $ThisLine =~ /client (.*)#\d+: query \(cache\) denied/ ) ) {
       $FullClient = LookupIP ($Client);
       $DeniedQuery{$FullClient}++;
-   } elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([\d\.]+)#\d+: update '(.*)' denied/)) {
+   } elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([.0-9a-fA-F:]+)#\d+: update '(.*)' denied/)) {
       $UpdateDenied{"$Rhost ($Ldom)"}++;
    } elsif ( ($Zone) = ($ThisLine =~ /zone '([0-9a-zA-Z.-]+)' allows updates by IP address, which is insecure/)) {
       $InsecUpdate{$Zone}++;
@@ -266,7 +266,7 @@
       $NonAuthoritative{$Zone}++;
    } elsif ( ($ThisLine =~ /unexpected RCODE \((.*)\) resolving/) ){
       $UnexpRCODE{$1}++;
-   } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [0-9.#]+/) ) {
+   } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [.0-9a-fA-F:#]+/) ) {
       chomp($ThisLine);
       $FormErr{$ThisLine}++;
    } elsif ( ($ThisLine =~ /found [0-9]* CPU(s)?, using [0-9]* worker thread(s)?/) ) {
@@ -281,7 +281,7 @@
 	     (($ErrorText) = ($ThisLine =~ /^(.* REQUIRE.* failed.*)$/)) or
 	     (($ErrorText) = ($ThisLine =~ /(.*: fatal error)/)) ) {
       $NError{$ErrorText}++;
-   } elsif ( ($From,$Log) = ($ThisLine =~ /invalid command from ([.0-9]*)#[0-9]*: (.*)/) ) {
+   } elsif ( ($From,$Log) = ($ThisLine =~ /invalid command from ([.0-9a-fA-F:]*)#[0-9]*: (.*)/) ) {
       $CCMessages{"$From,$Log"}++;
    } elsif ( (($Log) = ($ThisLine =~ /(freezing .*zone.*)/)) or
 	     (($Log) = ($ThisLine =~ /(thawing .*zone.*)/)) ) {
@@ -297,7 +297,7 @@
    } else {
       # Report any unmatched entries...
       # remove PID from named messages
-      $ThisLine =~ s/(client [.0-9]+)\S+/$1/;
+      $ThisLine =~ s/(client [.0-9a-fA-F:]+)\S+/$1/;
       chomp($ThisLine);
       $OtherList{$ThisLine}++;
    }


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- logwatch.spec	3 Feb 2010 11:37:32 -0000	1.124
+++ logwatch.spec	3 Feb 2010 11:43:45 -0000	1.125
@@ -66,6 +66,7 @@ Patch64: logwatch-7.3.6-pam_unix4.patch
 Patch66: logwatch-7.3.6-named6.patch
 Patch67: logwatch-7.3.6-sshd3.patch
 Patch68: logwatch-7.3.6-dhcpd2.patch
+Patch69: logwatch-7.3.6-named7.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,6 +138,7 @@ of the package on many systems.
 %patch66 -p1
 %patch67 -p1
 %patch68 -p1
+%patch69 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -265,6 +267,7 @@ rm -rf %{buildroot}
 - Added patch from #555735: DHCPDv6 messages are not recognised
 - Removed logwatch-7.3.6-dhcpd.patch, obsoleted by #555735
 - Added lines from #550873 to the logwatch-7.3.6-named6.patch
+- Added named7 patch from #555980
 
 * Wed Dec  2 2009 Karel Klic <kklic at redhat.com> 7.3.6-49
 - Add 802.1q subinterface support to iptables report; iptables.patch (#507743)