diff --git a/logwatch-7.3.1-vsftpd.patch b/logwatch-7.3.1-vsftpd.patch new file mode 100644 index 0000000..34c6a86 --- /dev/null +++ b/logwatch-7.3.1-vsftpd.patch @@ -0,0 +1,57 @@ +--- logwatch-7.3.1/scripts/logwatch.pl.pom 2006-09-16 06:04:14.000000000 +0200 ++++ logwatch-7.3.1/scripts/logwatch.pl 2006-11-29 13:16:22.000000000 +0100 +@@ -917,11 +917,16 @@ + my $FilterText = " "; + foreach (sort keys %{$LogFileData{$LogFile}}) { + my $cmd = $_; ++ + if ($cmd =~ s/^\d+-\*//) { + if (-f "$ConfigDir/scripts/shared/$cmd") { + $FilterText .= ("| $PerlVersion $ConfigDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" ); + } elsif (-f "$BaseDir/scripts/shared/$cmd") { +- $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" ); ++ if ($LogFile =~ /^vsftpd$/ ) { ++ $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/applyvsftpddate '$LogFileData{$LogFile}{$_}'" ); ++ } else { ++ $FilterText .= ("| $PerlVersion $BaseDir/scripts/shared/$cmd '$LogFileData{$LogFile}{$_}'" ); ++ } + } else { + die "Cannot find shared script $cmd\n"; + } +--- logwatch-7.3.1/scripts/shared/applyvsftpddate.pom 2006-11-29 13:13:28.000000000 +0100 ++++ logwatch-7.3.1/scripts/shared/applyvsftpddate 2006-11-29 13:10:26.000000000 +0100 +@@ -0,0 +1,34 @@ ++########################################################################## ++# $Id: applystddate,v 1.18 2005/10/22 00:19:56 bjorn Exp $ ++########################################################################## ++ ++######################################################## ++# This was written and is maintained by: ++# Kirk Bauer ++# ++# Please send all comments, suggestions, bug reports, ++# etc, to logwatch-devel@logwatch.org ++######################################################## ++ ++use Logwatch ':dates'; ++ ++my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0; ++ ++$SearchDate = TimeFilter('%b %e %H:%M:%S 20%y'); ++ ++# The date might be "Dec 09", but it needs to be "Dec 9"... ++#$SearchDate =~ s/ 0/ /; ++# The format of Fri Nov 29 20:59:09 2005 ++ ++if ( $Debug > 5 ) { ++ print STDERR "DEBUG: Inside ApplyStdDate...\n"; ++ print STDERR "DEBUG: Looking For: " . $SearchDate . "\n"; ++} ++ ++while (defined($ThisLine = )) { ++ if ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate/o) { ++ print "$ThisLine"; ++ } ++} ++ ++# vi: shiftwidth=3 syntax=perl tabstop=3 et diff --git a/logwatch.spec b/logwatch.spec index 27662f2..adeb0c0 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program. Name: logwatch Version: 7.3.1 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -16,6 +16,8 @@ Patch13: logwatch-7.3.1-named.patch Patch14: logwatch-7.3.1-openvpn.patch Patch15: logwatch-7.3.1-mountd.patch Patch16: logwatch-7.3.1-automount2.patch +Patch17: logwatch-7.3.1-postfix2.patch +Patch18: logwatch-7.3.1-vsftpd.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build @@ -39,6 +41,8 @@ of the package on many systems. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 %install @@ -143,6 +147,10 @@ rm -rf %{buildroot} %doc License project/CHANGES project/TODO %changelog +* Wed Nov 29 2006 Ivana Varekova 7.3.1-7 +- add postfix service patch (#208909) +- add vsftpd service patch (#217226) + * Tue Nov 28 2006 Ivana Varekova 7.3.1-6 - add automount and mountd service patch