diff --git a/logwatch-7.3.6-cron.patch b/logwatch-7.3.6-cron.patch index 1223d37..8768dcb 100644 --- a/logwatch-7.3.6-cron.patch +++ b/logwatch-7.3.6-cron.patch @@ -1,6 +1,6 @@ --- logwatch-7.3.6/scripts/services/cron.pom 2007-02-16 04:13:51.000000000 +0100 -+++ logwatch-7.3.6/scripts/services/cron 2007-07-10 09:42:57.000000000 +0200 -@@ -98,7 +98,13 @@ while (defined($ThisLine = )) { ++++ logwatch-7.3.6/scripts/services/cron 2007-08-09 14:35:43.000000000 +0200 +@@ -98,7 +98,12 @@ while (defined($ThisLine = )) { ($ThisLine =~ /INFO \(Running \@(re)?boot jobs\)/) or ($ThisLine =~ /INFO \(Skipping \@(re)?boot jobs -- not system startup\)/) or ($ThisLine =~ /INFO \(not boot nor reboot\)/) or @@ -9,13 +9,12 @@ + ($ThisLine =~ /ready to process filesystem events/) or # newsyslog on OpenBSD + ($ThisLine =~ /loading (system|user) tables/) or + ($ThisLine =~ /loading table .*/) or -+ ($ThisLine =~ /cannot exec process: No such file or directory/) or + ($ThisLine =~ /void Inotify::Remove\(InotifyWatch\*\): removing watch failed/) or + ($ThisLine =~ /error: \(22\) Invalid argument/) ) { # Ignore } elsif ( -@@ -175,6 +181,28 @@ while (defined($ThisLine = )) { +@@ -175,6 +180,29 @@ while (defined($ThisLine = )) { if ( $ntpdatemaxoffset < $offset ) { $ntpdatemaxoffset = $offset; } } elsif ($ThisLine =~ /ntpdate\[\d+\]: no server suitable for synchronization found/) { $ntpdatenosync++; @@ -38,7 +37,8 @@ + } elsif ( ($ThisLine =~ /incrond/) && + ( (($Error) = ($ThisLine =~ /(cannot create watch for (system table|user) .*: \(2\) No such file or directory)/)) || + (($Error) = ($ThisLine =~ /(access denied on (.*) - events will be discarded silently)/)) || -+ (($Error) = ($ThisLine =~ /(unhandled exception occurred)/)) ++ (($Error) = ($ThisLine =~ /(unhandled exception occurred)/)) || ++ (($Error) = ($ThisLine =~ /(cannot exec process.*)/)) + ) ) { + $INCRONDErr{$Error}++; } else { diff --git a/logwatch-7.3.6-cron2.patch b/logwatch-7.3.6-cron2.patch new file mode 100644 index 0000000..a6ee08b --- /dev/null +++ b/logwatch-7.3.6-cron2.patch @@ -0,0 +1,28 @@ +--- logwatch-7.3.6/scripts/services/cron.pom 2007-08-09 15:36:39.000000000 +0200 ++++ logwatch-7.3.6/scripts/services/cron 2007-08-09 15:35:34.000000000 +0200 +@@ -203,6 +203,10 @@ while (defined($ThisLine = )) { + (($Error) = ($ThisLine =~ /(cannot exec process.*)/)) + ) ) { + $INCRONDErr{$Error}++; ++ } elsif ( ($ThisLine =~ /crond/) && ++ (($Error) = ($ThisLine =~ /(failed to open PAM security session: Permission denied)/)) ++ ) { ++ $CRONDErr{$Error}++; + } else { + # Report any unmatched entries... + push @OtherList, "$ThisLine\n"; +@@ -328,6 +332,14 @@ if ((%INCRONDSTDe) || (%INCRONDUTDe)) { + } + } + ++if (%CRONDErr) { ++ printf "\n crond daemon errors \n"; ++ for $key (keys %CRONDErr) { ++ print " " . $key . ": " . $CRONDErr{$key} . " time(s)\n"; ++ } ++} ++ ++ + if (%INCRONDErr) { + printf "\n incrond daemon errors \n"; + for $key (keys %INCRONDErr) { diff --git a/logwatch.spec b/logwatch.spec index 9b5df13..6c7ae0f 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -20,6 +20,7 @@ Patch13: logwatch-7.3.6-pam_unix.patch Patch14: logwatch-7.3.6-named3.patch Patch15: logwatch-7.3.6-cron.patch Patch16: logwatch-7.3.6-zz-disk_space.patch +Patch17: logwatch-7.3.6-cron2.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +48,7 @@ of the package on many systems. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build @@ -159,6 +161,9 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Thu Aug 9 2007 Ivana Varekova 7.3.6-6 +- add cron patch + * Tue Jul 10 2007 Ivana Varekova 7.3.6-5 - Resolves: #247511 add zz-disk_space patch