rpms/logwatch/FC-5 logwatch-7.3.1-vsftpd.patch, NONE, 1.1 logwatch-7.3.2-sshd.patch, NONE, 1.1 logwatch.spec, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/logwatch/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv25103

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.1-vsftpd.patch logwatch-7.3.2-sshd.patch 
Log Message:
- fix 217226 - vsftpd problem
- fix 222263 - sshd problem


logwatch-7.3.1-vsftpd.patch:
 logwatch.pl            |    7 ++++++-
 shared/applyvsftpddate |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-vsftpd.patch ---
--- 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 <kirk at kaybee.org>
+#
+# Please send all comments, suggestions, bug reports,
+#    etc, to logwatch-devel at 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 = <STDIN>)) {
+   if ($ThisLine =~ m/(Mon|Tue|Wed|Thu|Fri|Sat|Sun) $SearchDate/o) {
+      print "$ThisLine";
+   }
+}
+
+# vi: shiftwidth=3 syntax=perl tabstop=3 et

logwatch-7.3.2-sshd.patch:
 sshd |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.2-sshd.patch ---
--- logwatch-7.3.2/scripts/services/sshd.pom	2006-11-12 21:59:31.000000000 +0100
+++ logwatch-7.3.2/scripts/services/sshd	2007-01-16 09:47:10.000000000 +0100
@@ -328,7 +328,7 @@
       if ($IlegUser =~ /illegal user/) {$IllegalUsers{$Host}{"$User/$Method"}++;}
    } elsif ( my ($User) = ($ThisLine =~ /^User ([^ ]*) not allowed because account is locked/)) {
       $LockedAccount{$User}++;
-   } elsif ( my ($User) = ($ThisLine =~ /^User ([^ ]*) not allowed because not listed in AllowUsers/)) {
+   } elsif ( my ($User) = ($ThisLine =~ /^User ([^ ]*)( from [0-9.]*)? not allowed because not listed in AllowUsers/)) {
       $AllowUsers{$User}++;
    } elsif ( ($User) = ($ThisLine =~ /^User ([^ ]*) not allowed because shell (\S+) does not exist/)) {
       $NoShellUsers{$User}++;


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/FC-5/logwatch.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- logwatch.spec	4 Apr 2006 07:43:33 -0000	1.36
+++ logwatch.spec	16 Jan 2007 09:26:48 -0000	1.37
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.2.1
-Release: 1.fc5
+Release: 2.fc5
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -15,6 +15,8 @@
 Patch8: logwatch-7.2.1-audit.patch
 Patch9: logwatch-7.2.1-secure.patch
 Patch10: logwatch-7.2.1-mountd.patch
+Patch11: logwatch-7.3.2-sshd.patch
+Patch12: logwatch-7.3.1-vsftpd.patch
 
 
 Requires: textutils sh-utils grep mailx
@@ -38,6 +40,8 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1 
+%patch11 -p1
+%patch12 -p1
 
 %install
 
@@ -139,6 +143,10 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Tue Jan 15 2007 Ivana Varekova <varekova at redhat.com> 7.2.1-2
+- fix 217226 - vsftpd problem
+- fix 222263 - sshd problem
+
 * Tue Apr  4 2006 Ivana Varekova <varekova at redhat.com> 7.2.1-1.fc5
 - update to 7.2.1
 - add new service patches