diff --git a/.gitignore b/.gitignore index a4b1ad5..9950ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ logwatch-7.3.6.tar.gz /logwatch-svn127.tar.xz /logwatch-svn140.tar.xz /logwatch-svn198.tar.xz +/logwatch-svn242.tar.xz diff --git a/logwatch-named-dnssec.patch b/logwatch-named-dnssec.patch index 4c9ab0c..ee663ee 100644 --- a/logwatch-named-dnssec.patch +++ b/logwatch-named-dnssec.patch @@ -4,9 +4,9 @@ Author: Frank Crawford RH-Bugzilla: #666394 Backported-By: Jan Synacek ---- logwatch-svn198/scripts/services/named 2014-06-24 23:27:49.000000000 +0200 -+++ logwatch-svn198-new/scripts/services/named 2014-07-04 10:13:12.216468271 +0200 -@@ -228,6 +228,7 @@ +--- logwatch-svn242/scripts/services/named 2014-09-09 18:08:00.000000000 +0200 ++++ logwatch-svn242-new/scripts/services/named 2014-09-24 07:54:13.582370611 +0200 +@@ -116,6 +116,7 @@ ($ThisLine =~ /too many timeouts resolving '.*' .*: disabling EDNS/) or ($ThisLine =~ /too many timeouts resolving '.*' .*: reducing the advertised EDNS UDP packet size to .* octets/) or ($ThisLine =~ /reloading zones succeeded/) or @@ -14,7 +14,7 @@ Backported-By: Jan Synacek ($ThisLine =~ /success resolving '.*' \(in '.*'?\) after disabling EDNS/) or ($ThisLine =~ /success resolving '.*' \(in '.*'?\) after reducing the advertised EDNS UDP packet size to 512 octets/) or ($ThisLine =~ /the working directory is not writable/) or -@@ -249,6 +250,11 @@ +@@ -137,6 +138,11 @@ ($ThisLine =~ /refresh in progress, refresh check queued/) or ($ThisLine =~ /refresh: NODATA response from master/) or ($ThisLine =~ /update with no effect/) or @@ -26,7 +26,7 @@ Backported-By: Jan Synacek ($ThisLine =~ /validating \@0x[[:xdigit:]]+: .* no valid signature found/) or ($ThisLine =~ /^sizing zone task pool based on \d+ zones/) or ($ThisLine =~ /^BIND \d+ is maintained by Internet Systems Consortium/) or -@@ -276,7 +282,8 @@ +@@ -169,7 +175,8 @@ $ShutdownNamed++; } elsif ( $ThisLine =~ /named shutdown failed/ ) { $ShutdownNamedFail++; @@ -36,10 +36,10 @@ Backported-By: Jan Synacek $DeniedZoneTransfers{$Host}{$Zone}++; } elsif ( ($Zone) = ( $ThisLine =~ /zone (.+) zone transfer deferred due to quota/ ) ) { $DeferredZoneTransfers{$Zone}++; -@@ -300,14 +307,13 @@ - $ZoneLoaded{$Zone}++; +@@ -195,14 +202,13 @@ + $ConnectionRefused{$Addr}{$Server}++; } elsif ( (undef,$Addr,undef,$Server) = ( $ThisLine =~ /ame server (on|resolving) '(.+)' \(in .+\):\s+(\[.+\]\.\d+)?\s*'?(.+)'?:?/ ) ) { - $LameServer{"$Addr ($Server)"}++; + $LameServer{$Addr}{$Server}++; - } elsif ( ($Zone) = ( $ThisLine =~ /Zone \"(.+)\" was removed/ ) ) { + } elsif ( (($Zone) = ( $ThisLine =~ /Zone \"(.+)\" was removed/ )) or + (($Zone) = ( $ThisLine =~ /zone (.+): \(.*\) removed/ )) ) { @@ -53,7 +53,7 @@ Backported-By: Jan Synacek } elsif ( ($Zone) = ( $ThisLine =~ /zone (.+)\/IN: refused notify from non-master/ ) ) { $ZoneRefusedNotify{$Zone}++; # } elsif ( ($Rhost,$Ldom,$Reason) = ( $ThisLine =~ /client ([\d\.a-fA-F:]+) bad zone transfer request: '(.+)': (.+)$/ ) ) { -@@ -330,13 +336,13 @@ +@@ -225,13 +231,13 @@ } elsif ( ($Client) = ( $ThisLine =~ /warning: client (.*) no more TCP clients/ ) ) { $FullClient = LookupIP ($Client); $DeniedTCPClient{$FullClient}++; @@ -69,7 +69,7 @@ Backported-By: Jan Synacek $ViewName = ($ViewName ? "/$ViewName" : ""); $UpdateDenied{"$Rhost ($Ldom$ViewName)"}++; } elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([\d\.]+)#\d+: update forwarding '(.*)' denied/)) { -@@ -393,6 +399,18 @@ +@@ -288,6 +294,18 @@ $NoSOA{$Client}++; } elsif (($Hint) = ($ThisLine =~ /checkhints: (.*)/) ) { $Hints{$Hint}++; @@ -85,10 +85,10 @@ Backported-By: Jan Synacek + } elsif (($Error,$Host) = ($ThisLine =~ /error \((.*)\) resolving '([^']+)':/)) { + $DNSSECError{$Error}{'__Total__'}++; + $DNSSECError{$Error}{$Host}++; - } else { - # Report any unmatched entries... - # remove PID from named messages -@@ -735,6 +753,51 @@ + } elsif ($ThisLine =~ /^samba_dlz:/) { + if ( ($Rhost, $Error) = ($ThisLine =~ /disallowing update of signer=.* name=(.*) type=.* error=(.*)/ )) { + $UpdateDenied{"$Rhost ($Error)"}++; +@@ -648,6 +666,51 @@ } } @@ -140,4 +140,3 @@ Backported-By: Jan Synacek if (keys %OtherList) { print "\n**Unmatched Entries**\n"; foreach $line (sort {$a cmp $b} keys %OtherList) { - diff --git a/logwatch-xntpd.patch b/logwatch-xntpd.patch index ad0d8bc..adfb54e 100644 --- a/logwatch-xntpd.patch +++ b/logwatch-xntpd.patch @@ -2,11 +2,9 @@ Update ntpd log parsing. RH-Bugzilla: #673756 -Index: scripts/services/xntpd -=================================================================== ---- scripts/services/xntpd (revision 85) -+++ scripts/services/xntpd (working copy) -@@ -142,6 +142,7 @@ +--- scripts/services/xntpd 2014-09-09 13:27:00.000000000 +0200 ++++ scripts/services/xntpd 2014-09-24 08:00:29.929655076 +0200 +@@ -67,6 +67,7 @@ ($ThisLine =~ m/tickadj = /) or # startup ($ThisLine =~ m/precision = /) or # startup ($ThisLine =~ m/ (succeeded|failed)/) or # startup @@ -14,16 +12,16 @@ Index: scripts/services/xntpd ($ThisLine =~ m/kernel time (discipline|sync) status/) or # startup ($ThisLine =~ m/kernel time sync (dis|en)abled /) or # startup ($ThisLine =~ m/frequency initialized/) or # startup -@@ -154,6 +155,8 @@ +@@ -79,6 +80,8 @@ ($ThisLine =~ /Listening on interface .* Disabled/) or ($ThisLine =~ /Listen and drop on /) or ($ThisLine =~ /Listening on routing socket on/) or + ($ThisLine =~ /.* interface .* -> \(null\)/) or -+ ($ThisLine =~/Deferring DNS for/) or - ($ThisLine =~ /ntp_io: estimated max descriptors: \d*, initial socket boundary: \d*/) or - ($ThisLine =~ /peers refreshed$/) or - ($ThisLine =~ /restrict: error in address/) or -@@ -177,7 +180,7 @@ ++ ($ThisLine =~ /Deferring DNS for/) or + ($ThisLine =~ /ntp_io: estimated max descriptors: \d*, initial socket boundary: \d*/) or + ($ThisLine =~ /peers refreshed$/) or + ($ThisLine =~ /restrict: error in address/) or +@@ -102,7 +105,7 @@ } elsif ( my (undef,$TimeStep) = ($ThisLine =~ /(offset) ([^ ]+) sec/ )) { push @TimeReset, $TimeStep; # MEv end no leadin to line @@ -32,12 +30,12 @@ Index: scripts/services/xntpd $Interfaces{$ListenOn}++; } elsif ( my ($ListenOn) = ($ThisLine =~ /Listen normally on \d+ (.*)/ )) { $Interfaces{$ListenOn}++; -@@ -196,7 +199,7 @@ +@@ -121,7 +124,7 @@ $TwoInst{$name}++; } elsif ( my ($Error) = ($ThisLine =~ /(no server(s reachable| suitable for synchronization found))/ )) { $Errors{$Error}++; - } elsif ( my ($Error) = ($ThisLine =~ /(can't find host \S+|no servers can be used, exiting)/ )) { -+ } elsif ( my ($Error) = ($ThisLine =~ /([Cc]an't find host \S+|no servers can be used, exiting)/ )) { ++ } elsif ( my ($Error) = ($ThisLine =~ /([Cc]an't find host \S+|no servers can be used, exiting)/ ) $Errors{$Error}++; } elsif ( my ($Error) = ($ThisLine =~ /(sendto\(\S+\): Network is unreachable)/ )) { $Errors{$Error}++; diff --git a/logwatch.spec b/logwatch.spec index 3f7bf39..9e9d6ed 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,15 +1,15 @@ -%global revision 198 +%global revision 242 Summary: A log file analysis program Name: logwatch -Version: 7.4.0 -Release: 33.20140704svn%{revision}%{?dist} +Version: 7.4.1 +Release: 1.20140924svn%{revision}%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r 198 https://svn.code.sf.net/p/logwatch/code/ logwatch-svn198 -# tar cJvf logwatch-svn198.tar.xz logwatch-svn198 +# svn export -r 242 https://svn.code.sf.net/p/logwatch/code/ logwatch-svn242 +# tar --transform "s/trunk/logwatch-svn242/" -cJvf logwatch-svn242.tar.xz -C logwatch-svn242 trunk Source0: logwatch-svn%{revision}.tar.xz #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Needs proper fix. Not applied by the upstream. @@ -147,6 +147,9 @@ echo "# Configuration overrides for specific logfiles/services may be placed her %{_mandir}/man*/* %changelog +* Wed Sep 24 2014 Jan Synacek - 7.4.1-1.20140924svn242 +- Update to 7.4.1 (revision 242) (rhbz#1145898) + * Fri Jul 4 2014 Jan Synáček - 7.4.0-33.20140704svn198 - Fix bad backport diff --git a/sources b/sources index 82427e7..f70cb27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0971dd28d60fcb03a62a13c1ef23c775 logwatch-svn198.tar.xz +915e9f929d495e586cfa687ba5f5d84c logwatch-svn242.tar.xz