diff --git a/logwatch-7.3.4-named.patch b/logwatch-7.3.4-named.patch new file mode 100644 index 0000000..d9c3878 --- /dev/null +++ b/logwatch-7.3.4-named.patch @@ -0,0 +1,87 @@ +--- logwatch-7.3.4/scripts/services/named.pom 2007-02-16 04:36:25.000000000 +0100 ++++ logwatch-7.3.4/scripts/services/named 2007-05-07 14:47:29.000000000 +0200 +@@ -156,7 +156,15 @@ + # The message about the end of transfer is the interesting one + ($ThisLine =~ /: Transfer started./) or + ($ThisLine =~ /D-BUS service (disabled|enabled)./) or +- ($ThisLine =~ /D-BUS dhcdbd subscription disabled./) ++ ($ThisLine =~ /D-BUS dhcdbd subscription disabled./) or ++ ($ThisLine =~ /automatic empty zone/) or ++ ($ThisLine =~ /binding TCP socket: address in use/) or ++ ($ThisLine =~ /dbus_mgr initialization failed. D-BUS service is disabled./) or ++ ($ThisLine =~ /dbus_svc_add_filter failed/) or ++ ($ThisLine =~ /isc_log_open 'named.run' failed: permission denied/) or ++ ($ThisLine =~ /weak RSASHA1 \(5\) key found \(exponent=3\)/) or ++ ($ThisLine =~ /Bad file descriptor/) or ++ ($ThisLine =~ /open: .*: file not found/) + ) { + # Don't care about these... + } elsif ( +@@ -237,8 +245,19 @@ + chomp($ThisLine); + $StartLog{$ThisLine}++; + } elsif ( (($File,$Line,$Problem) = ($ThisLine =~ /\/etc\/(rndc.key|named.conf):([0-9]+): (unknown option '[^ ]*')/)) or +- (($File,$Line,$Problem) = ($ThisLine =~ /\/etc\/(rndc.key|named.conf):([0-9]+): ('[^ ]' expected near end of file)/)) ) { ++ (($File,$Line,$Problem) = ($ThisLine =~ /\/etc\/(rndc.key|named.conf):([0-9]+): ('[^ ]' expected near end of file)/)) or ++ (($File,$Line,$Problem) = ($ThisLine =~ /\/etc\/(named.*.conf):([0-9]+): (.*)/)) or ++ (($File,$Line,$Problem) = ($ThisLine =~ /()()(could not configure root hints from '.*': file not found)/))) { + $ConfProb{$File}{"$Line,$Problem"}++; ++ } elsif ( (($ErrorText) = ($ThisLine =~ /^(RUNTIME_CHECK.*)/))or ++ (($ErrorText) = ($ThisLine =~ /^(.* REQUIRE.* failed.*)$/)) or ++ (($ErrorText) = ($ThisLine =~ /(.*: fatal error)/)) ) { ++ $NError{$ErrorText}++; ++ } elsif ( ($From,$Log) = ($ThisLine =~ /invalid command from ([.0-9]*)#[0-9]*: (.*)/) ) { ++ $CCMessages{"$From,$Log"}++; ++ } elsif ( (($Log) = ($ThisLine =~ /(freezing .*zone.*)/)) or ++ (($Log) = ($ThisLine =~ /(thawing .*zone.*)/)) ) { ++ $CCMessages2{$Log}++; + } else { + # Report any unmatched entries... + # remove PID from named messages +@@ -413,10 +432,18 @@ + if (keys %ConfProb) { + print "\n Errors in configuration files\n"; + foreach $File (sort keys %ConfProb) { +- print " file " . $File . "\n"; +- foreach (keys %{$ConfProb{$File}}) { +- ($Line,$Problem) = split ","; +- print " " . $File . ":" . "$Line" . ": " . $Problem . ": " . $ConfProb{$File}{"$Line,$Problem"} . " Time(s)\n"; ++ if ($File =~ /.+/) { ++ print " file " . $File . "\n"; ++ foreach (keys %{$ConfProb{$File}}) { ++ ($Line,$Problem) = split ","; ++ print " " . $File . ":" . "$Line" . ": " . $Problem . ": " . $ConfProb{$File}{"$Line,$Problem"} . " Time(s)\n"; ++ } ++ } ++ else { ++ foreach (keys %{$ConfProb{$File}}) { ++ ($Line,$Problem) = split ","; ++ print " " . $Problem . ": " . $ConfProb{$File}{"$Line,$Problem"} . " Time(s)\n"; ++ } + } + } + } +@@ -442,6 +469,23 @@ + } + } + ++if (keys %NError) { ++ print "\n Errors:\n"; ++ foreach $ThisOne (keys %NError) { ++ print " " . $ThisOne . ": " . $NError{$ThisOne} . " Time(s)\n"; ++ } ++} ++ ++if ((keys %CCMessages) or (keys %CCMessages2)){ ++ print "\n Messages from control channel\n"; ++ foreach (keys %CCMessages) { ++ ($From,$Log) = split ","; ++ print " " . $From . ": " . $Log . ": " . $CCMessages{"$From,$Log"} . " Time(s)\n"; ++ } ++ foreach $ThisOne (keys %CCMessages2) { ++ print " " . $ThisOne . ": " . $CCMessages2{$ThisOne} . " Time(s)\n"; ++ } ++} + + if (keys %OtherList) { + print "\n**Unmatched Entries**\n"; diff --git a/logwatch-7.3.4-sshd3.patch b/logwatch-7.3.4-sshd3.patch new file mode 100644 index 0000000..270d36b --- /dev/null +++ b/logwatch-7.3.4-sshd3.patch @@ -0,0 +1,12 @@ +--- logwatch-7.3.4/scripts/services/sshd.pom 2007-01-29 21:09:17.000000000 +0100 ++++ logwatch-7.3.4/scripts/services/sshd 2007-05-07 12:14:01.000000000 +0200 +@@ -223,7 +223,8 @@ + ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or + ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ ) or + ($ThisLine =~ /pam_krb5: authentication succeeds for `([^ ]*)'/) or +- ( $ThisLine =~ /pam_succeed_if\(.*:.*\): error retrieving information about user [a-zA-Z]*/ ) ++ ($ThisLine =~ /pam_succeed_if\(.*:.*\): error retrieving information about user [a-zA-Z]*/ ) or ++ ($ThisLine =~ /^debug1: /) + ) { + # Ignore these + } elsif ( my ($Method,$User,$Host,$Port) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) { diff --git a/logwatch.spec b/logwatch.spec index 41dfbe8..12d58e9 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.4 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -14,6 +14,8 @@ Patch5: logwatch-7.3.4-xntpd.patch Patch6: logwatch-7.3.4-sshd.patch Patch7: logwatch-7.3.4-xntpd2.patch Patch8: logwatch-7.3.4-mailto.patch +Patch9: logwatch-7.3.4-sshd3.patch +Patch10: logwatch-7.3.4-named.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,6 +37,8 @@ of the package on many systems. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %build @@ -147,6 +151,9 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Mon May 7 2007 Ivana Varekova 7.3.4-8 +- add named and sshd service patches + * Fri Apr 20 2007 Ivana Varekova 7.3.4-7 - Resolves: 236618 (add anacron setting of mailto accept)