[logwatch/f15/master] Update with latest Rawhide patches
Frank Crawford
frankcrawford at fedoraproject.org
Thu Mar 31 11:58:51 UTC 2011
commit 0c5f634e7495805d904b4bba29f60756bfe168ad
Author: Frank Crawford <frank at crawford.emu.id.au>
Date: Thu Mar 31 22:58:07 2011 +1100
Update with latest Rawhide patches
logwatch-dovecot.patch | 21 +++++++
logwatch-manpage.patch | 11 ++++
logwatch-named-dnssec.patch | 137 +++++++++++++++++++++++++++++++++++++++++++
logwatch-smartd.patch | 11 ++++
logwatch-xntpd.patch | 38 ++++++++++++
logwatch.spec | 23 +++++++-
6 files changed, 239 insertions(+), 2 deletions(-)
---
diff --git a/logwatch-dovecot.patch b/logwatch-dovecot.patch
new file mode 100644
index 0000000..6f459cb
--- /dev/null
+++ b/logwatch-dovecot.patch
@@ -0,0 +1,21 @@
+--- logwatch-svn25/scripts/services/dovecot.orig 2011-02-01 08:01:34.000000000 +1100
++++ logwatch-svn25/scripts/services/dovecot 2011-03-31 21:51:13.000000000 +1100
+@@ -139,15 +139,15 @@ while (defined($ThisLine = <STDIN>)) {
+ $ConnectionSieve{$Host}++;
+ $Connection{$Host}++;
+ }
+- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: (?:deliver|lmtp)\((.*)\): (?:sieve: )?msgid=.*: (?:saved|stored) mail (?:in)to (\S+)/ ) ) {
++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: (?:deliver|lmtp)\((.*)\): (?:sieve: )?msgid=.*: (?:saved|stored) mail (?:in)to (.*)/ ) ) {
+ $Deliver{$User}{$Mailbox}++;
+
+ #For Dovecot 2.0
+- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: lda\((.*)\): msgid=.*: saved mail to (\S+)/ ) ) {
++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: lda\((.*)\): msgid=.*: saved mail to (.*)/ ) ) {
+ $Deliver{$User}{$Mailbox}++;
+
+ # For Sieve-based delivery
+- } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: lda\((.*)\): sieve: msgid=.*: stored mail into mailbox '(\S+)'/ ) ) {
++ } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: lda\((.*)\): sieve: msgid=.*: stored mail into mailbox '(.*)'/ ) ) {
+ $Deliver{$User}{$Mailbox}++;
+
+ # This is for Dovecot 1.0 series
diff --git a/logwatch-manpage.patch b/logwatch-manpage.patch
new file mode 100644
index 0000000..359525a
--- /dev/null
+++ b/logwatch-manpage.patch
@@ -0,0 +1,11 @@
+--- logwatch/logwatch.8 2010-12-16 10:20:09.000000000 +0000
++++ logwatch/logwatch.8 2010-12-22 00:49:45.000000000 +0000
+@@ -43,7 +43,7 @@
+ This is the detail level of the report.
+ .I level
+ can be a positive integer, or high, med, low, which correspond to the
+-integers 10, 5, and 0, repectively.
++integers 10, 5, and 0, respectively.
+ .IP "\fB--logfile\fR log-file-group"
+ This will force Logwatch to process only the set of logfiles
+ defined by
diff --git a/logwatch-named-dnssec.patch b/logwatch-named-dnssec.patch
new file mode 100644
index 0000000..f0633ea
--- /dev/null
+++ b/logwatch-named-dnssec.patch
@@ -0,0 +1,137 @@
+diff -up logwatch-svn46/scripts/services/named.dnssec logwatch-svn46/scripts/services/named
+--- logwatch-svn46/scripts/services/named.dnssec 2011-03-28 13:54:24.212725223 +0200
++++ logwatch-svn46/scripts/services/named 2011-03-28 14:08:21.044509429 +0200
+@@ -228,6 +228,7 @@ while (defined($ThisLine = <STDIN>)) {
+ ($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
++ ($ThisLine =~ /generating session key/) or
+ ($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 @@ while (defined($ThisLine = <STDIN>)) {
+ ($ThisLine =~ /refresh in progress, refresh check queued/) or
+ ($ThisLine =~ /refresh: NODATA response from master/) or
+ ($ThisLine =~ /update with no effect/) or
++ ($ThisLine =~ /reading built-in trusted keys from file/) or
++ ($ThisLine =~ /using built-in trusted-keys/) or
++ ($ThisLine =~ /set up managed keys zone/) or
++ # the following seems okay since it says "success"
++ ($ThisLine =~ /managed-keys-zone .*: No DNSKEY RRSIGs found for '.*': success/) or
+ # ignore this line because the following line describes the error
+ ($ThisLine =~ /unexpected error/)
+ ) {
+@@ -269,7 +275,8 @@ while (defined($ThisLine = <STDIN>)) {
+ $ShutdownNamed++;
+ } elsif ( $ThisLine =~ /named shutdown failed/ ) {
+ $ShutdownNamedFail++;
+- } elsif ( ($Host, $Zone) = ( $ThisLine =~ /client ([^\#]+)#[^\:]+: zone transfer '(.+)' denied/ ) ) {
++ } elsif ( (($Host, $Zone) = ( $ThisLine =~ /client ([^\#]+)#[^\:]+: (?:view \w+: )?zone transfer '(.+)' denied/ )) or
++ (($Host, $Zone) = ( $ThisLine =~ /client ([^\#]+)#[^\:]+: (?:view \w+: )?bad zone transfer request: '(.+)':/ )) ) {
+ $DeniedZoneTransfers{$Host}{$Zone}++;
+ } elsif ( ($Zone) = ( $ThisLine =~ /zone (.+) zone transfer deferred due to quota/ ) ) {
+ $DeferredZoneTransfers{$Zone}++;
+@@ -291,14 +298,13 @@ while (defined($ThisLine = <STDIN>)) {
+ $ZoneLoaded{$Zone}++;
+ } elsif ( (undef,$Addr,undef,$Server) = ( $ThisLine =~ /ame server (on|resolving) '(.+)' \(in .+\):\s+(\[.+\]\.\d+)?\s*'?(.+)'?:?/ ) ) {
+ $LameServer{"$Addr ($Server)"}++;
+- } elsif ( ($Zone) = ( $ThisLine =~ /Zone \"(.+)\" was removed/ ) ) {
++ } elsif ( (($Zone) = ( $ThisLine =~ /Zone \"(.+)\" was removed/ )) or
++ (($Zone) = ( $ThisLine =~ /zone (.+): \(.*\) removed/ )) ) {
+ $ZoneRemoved{$Zone}++;
+ } elsif ( ($Zone) = ( $ThisLine =~ /received notify for zone '(.*)'/ ) ) {
+ $ZoneReceivedNotify{$Zone}++;
+ } elsif ( ($Zone) = ( $ThisLine =~ /zone (.*): notify from .* up to date/ ) ) {
+ $ZoneReceivedNotify{$Zone}++;
+- } elsif ( ($Zone) = ( $ThisLine =~ /zone (.*): notify from .* up to date/ ) ) {
+- $ZoneReceivedNotify{$Zone}++;
+ } 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: '(.+)': (.+)$/ ) ) {
+@@ -321,13 +327,13 @@ while (defined($ThisLine = <STDIN>)) {
+ } elsif ( ($Client) = ( $ThisLine =~ /warning: client (.*) no more TCP clients/ ) ) {
+ $FullClient = LookupIP ($Client);
+ $DeniedTCPClient{$FullClient}++;
+- } elsif ( ($Client) = ( $ThisLine =~ /client (.*)#\d+: query \(cache\) denied/ ) ) {
++ } elsif ( ($Client) = ( $ThisLine =~ /client (.*)#\d+: (?:view \w+: )?query \(cache\) denied/ ) ) {
+ $FullClient = LookupIP ($Client);
+ $DeniedQuery{$FullClient}++;
+ } elsif ( ($Client) = ( $ThisLine =~ /client (.*)#\d+: query '.*\/IN' denied/ ) ) {
+ $FullClient = LookupIP ($Client);
+ $DeniedQueryNoCache{$FullClient}++;
+- } elsif ( ($Rhost, $ViewName, $Ldom) = ($ThisLine =~ /client ([\.0-9a-fA-F:]+)#\d+:(?: view ([^ ]+):)? update '(.*)' denied/)) {
++ } elsif ( ($Rhost, $ViewName, $Ldom) = ($ThisLine =~ /client ([\.0-9a-fA-F:]+)#\d+: (?:view \w+: )?update '(.*)' denied/)) {
+ $ViewName = ($ViewName ? "/$ViewName" : "");
+ $UpdateDenied{"$Rhost ($Ldom$ViewName)"}++;
+ } elsif ( ($Rhost, $Ldom) = ($ThisLine =~ /client ([\d\.]+)#\d+: update forwarding '(.*)' denied/)) {
+@@ -384,6 +390,18 @@ while (defined($ThisLine = <STDIN>)) {
+ $NoSOA{$Client}++;
+ } elsif (($Hint) = ($ThisLine =~ /checkhints: (.*)/) ) {
+ $Hints{$Hint}++;
++ } elsif (($Zone,$RR) = ($ThisLine =~ /^\s*validating \@0x[[:xdigit:]]+: (.*) (\w+): got insecure response; parent indicates it should be secure/)) {
++ $DNSSECInsec{'__Total__'}++;
++ $DNSSECInsec{$Zone}{$RR}++;
++ } elsif (($Zone,$RR) = ($ThisLine =~ /^\s*validating \@0x[[:xdigit:]]+: (.*) (\w+): no valid signature found/)) {
++ $DNSSECInvalid{'__Total__'}++;
++ $DNSSECInvalid{$Zone}{$RR}++;
++ } elsif (($Zone,$RR) = ($ThisLine =~ /^\s*validating \@0x[[:xdigit:]]+: (.*) (\w+): bad cache hit/)) {
++ $DNSSECBadCache{'__Total__'}++;
++ $DNSSECBadCache{$Zone}{$RR}++;
++ } elsif (($Error,$Host) = ($ThisLine =~ /error \((.*)\) resolving '([^']+)':/)) {
++ $DNSSECError{$Error}{'__Total__'}++;
++ $DNSSECError{$Error}{$Host}++;
+ } else {
+ # Report any unmatched entries...
+ # remove PID from named messages
+@@ -713,6 +731,51 @@ if (keys %Hints) {
+ }
+ }
+
++if (($Detail >= 5) and (keys %DNSSECInsec)) {
++ print "\n DNSSEC Insecure Responses: " . $DNSSECInsec{'__Total__'} . " Time(s)\n";
++ foreach $Zone (sort keys %DNSSECInsec) {
++ if (($Detail >= 10) and ($Zone =~ /.+/) and ($Zone ne '__Total__')) {
++ foreach $RR (sort keys %{$DNSSECInsec{$Zone}}) {
++ print " " . "$Zone/$RR: " . $DNSSECInsec{$Zone}{$RR} . " Time(s)\n";
++ }
++ }
++ }
++}
++
++if (($Detail >= 5) and (keys %DNSSECInvalid)) {
++ print "\n DNSSEC No Valid Signature: " . $DNSSECInvalid{'__Total__'} . " Time(s)\n";
++ foreach $Zone (sort keys %DNSSECInvalid) {
++ if (($Detail >= 10) and ($Zone =~ /.+/) and ($Zone ne '__Total__')) {
++ foreach $RR (sort keys %{$DNSSECInvalid{$Zone}}) {
++ print " " . "$Zone/$RR: " . $DNSSECInvalid{$Zone}{$RR} . " Time(s)\n";
++ }
++ }
++ }
++}
++
++if (($Detail >= 5) and (keys %DNSSECBadCache)) {
++ print "\n DNSSEC Bad Cache hit: " . $DNSSECBadCache{'__Total__'} . " Time(s)\n";
++ foreach $Zone (sort keys %DNSSECBadCache) {
++ if (($Detail >= 10) and ($Zone =~ /.+/) and ($Zone ne '__Total__')) {
++ foreach $RR (sort keys %{$DNSSECBadCache{$Zone}}) {
++ print " " . "$Zone/$RR: " . $DNSSECBadCache{$Zone}{$RR} . " Time(s)\n";
++ }
++ }
++ }
++}
++
++if (($Detail >= 5) and (keys %DNSSECError)) {
++ print "\n DNS Errors:\n";
++ foreach $Error (sort keys %DNSSECError) {
++ print " $Error: " . $DNSSECError{$Error}{'__Total__'} . " Time(s)\n";
++ if ($Detail >= 10) {
++ foreach $Host (sort keys %{$DNSSECError{$Error}}) {
++ print " " . "$Host: " . $DNSSECError{$Error}{$Host} . " Time(s)\n" unless ($Host eq '__Total__');
++ }
++ }
++ }
++}
++
+ if (keys %OtherList) {
+ print "\n**Unmatched Entries**\n";
+ foreach $line (sort {$a cmp $b} keys %OtherList) {
diff --git a/logwatch-smartd.patch b/logwatch-smartd.patch
new file mode 100644
index 0000000..36cbfe0
--- /dev/null
+++ b/logwatch-smartd.patch
@@ -0,0 +1,11 @@
+--- logwatch/scripts/services/smartd 2011-01-14 03:41:32.000000000 +1100
++++ logwatch/scripts/services/smartd 2011-01-21 23:08:22.000000000 +1100
+@@ -116,7 +116,7 @@
+ # ignore empty lines
+ } elsif ( ($ThisLine =~ /^smartd version/)
+ || ($ThisLine =~ /^Home page/)
+- || ($ThisLine =~ /^smartd .* Copyright \(C\) [0-9-]+ by Bruce Allen/)
++ || ($ThisLine =~ /^smartd .*Copyright \(C\) [0-9-]+ by Bruce Allen/)
+ || ($ThisLine =~ /configuration file/i)
+ || ($ThisLine =~ /\[trip Temperature is \d+ Celsius\]/)
+ || ($ThisLine =~ /^Monitoring/)
diff --git a/logwatch-xntpd.patch b/logwatch-xntpd.patch
new file mode 100644
index 0000000..840aafd
--- /dev/null
+++ b/logwatch-xntpd.patch
@@ -0,0 +1,38 @@
+diff -up logwatch-svn46/scripts/services/xntpd.improve logwatch-svn46/scripts/services/xntpd
+--- logwatch-svn46/scripts/services/xntpd.improve 2011-03-28 14:47:20.203582860 +0200
++++ logwatch-svn46/scripts/services/xntpd 2011-03-28 14:48:14.978714233 +0200
+@@ -142,6 +142,7 @@ while (defined(my $ThisLine = <STDIN>))
+ ($ThisLine =~ m/tickadj = /) or # startup
+ ($ThisLine =~ m/precision = /) or # startup
+ ($ThisLine =~ m/ (succeeded|failed)/) or # startup
++ ($ThisLine =~ m/sendto\(\S+\): Success/) or # startup
+ ($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 @@ while (defined(my $ThisLine = <STDIN>))
+ ($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*/)
+ ) {
+ # Ignore these
+@@ -174,7 +177,7 @@ while (defined(my $ThisLine = <STDIN>))
+ } elsif ( my (undef,$TimeStep) = ($ThisLine =~ /(offset) ([^ ]+) sec/ )) {
+ push @TimeReset, $TimeStep;
+ # MEv end no leadin to line
+- } elsif ( my ($ListenOn) = ($ThisLine =~ /Listening on interface (.*)(?: Enabled)?/ )) {
++ } elsif ( my ($ListenOn) = ($ThisLine =~ /Listening on interface(?: #\d+)? (.*)(?: Enabled)?/ )) {
+ $Interfaces{$ListenOn}++;
+ } elsif ( my ($ListenOn) = ($ThisLine =~ /Listen normally on \d+ (.*)/ )) {
+ $Interfaces{$ListenOn}++;
+@@ -193,7 +196,7 @@ while (defined(my $ThisLine = <STDIN>))
+ $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)/ )) {
+ $Errors{$Error}++;
+ } elsif ( my ($Error) = ($ThisLine =~ /(sendto\(\S+\): Network is unreachable)/ )) {
+ $Errors{$Error}++;
diff --git a/logwatch.spec b/logwatch.spec
index 89f8f54..a6d4767 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -1,7 +1,7 @@
Summary: A log file analysis program
Name: logwatch
Version: 7.3.6
-Release: 67.20110203svn25%{?dist}
+Release: 68.20110203svn25%{?dist}
License: MIT
Group: Applications/System
URL: http://www.logwatch.org/
@@ -24,6 +24,13 @@ Patch1: logwatch-oldfiles.patch
Patch2: logwatch-sanitize-log-filenames.patch
# Fixes not yet in upstream for /var/log/secure (rhbz#673760)
Patch3: logwatch-secure.patch
+# Fixes not yet in upstream for DNSSEC messages in named service (rhbz#666394)
+Patch4: logwatch-named-dnssec.patch
+# Manpage typo
+Patch5: logwatch-manpage.patch
+Patch6: logwatch-xntpd.patch
+Patch7: logwatch-smartd.patch
+Patch8: logwatch-dovecot.patch
Requires: textutils sh-utils grep mailx
Requires: perl(Date::Manip)
BuildArchitectures: noarch
@@ -40,6 +47,11 @@ of the package on many systems.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
rm -f scripts/services/*.orig
%build
@@ -134,7 +146,14 @@ echo "# Configuration overrides for specific logfiles/services may be placed her
%doc LICENSE
%changelog
-* Sun Mar 13 2011 Frank Crawford <frank at crawford.emu.id.au> - 7.3.6-67.20110203svn25
+* Thu Mar 31 2011 Frank Crawford <frank at crawford.emu.id.au> - 7.3.6-68.20110203svn25
+- Added -dovecot patch to handle directory names with whitespaces (rhbz#645962)
+- Added -smartd patch to suppress copyright message for smartd module (rhbz#673758)
+- Added -xntpd patch (rhbz#673756)
+- Added -manpage patch fixing a typo in logwatch(8) (rhbz#664883)
+- Added -named-dnessec patch to handle DNSSEC messages in named (rhbz#666394)
+
+* Sun Mar 13 2011 Frank Crawford <frank at crawford.emu.id.au> - 7.3.6-67.20110203svn25
- Handle additional messages in /var/log/secure (rhbz#673760)
* Mon Feb 28 2011 Karel Klic <kklic at redhat.com> - 7.3.6-66.20110203svn25
More information about the scm-commits
mailing list