rpms/logwatch/devel logwatch-7.1-pam_unix.patch, 1.1, 1.2 logwatch.spec, 1.33, 1.34

[fedora-cvs-commits at redhat.com]

Author: varekova

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

Modified Files:
	logwatch-7.1-pam_unix.patch logwatch.spec 
Log Message:
- extended pam_unix patch (fix sshd service)


logwatch-7.1-pam_unix.patch:
 pam_unix |    7 +++++--
 secure   |    1 +
 sshd     |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

Index: logwatch-7.1-pam_unix.patch
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch-7.1-pam_unix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.1-pam_unix.patch	18 Jan 2006 13:26:22 -0000	1.1
+++ logwatch-7.1-pam_unix.patch	20 Jan 2006 12:03:30 -0000	1.2
@@ -1,5 +1,15 @@
+--- logwatch-7.1/scripts/services/sshd.pom	2006-01-20 11:09:16.000000000 +0100
++++ logwatch-7.1/scripts/services/sshd	2006-01-20 12:04:41.000000000 +0100
+@@ -176,6 +176,7 @@
+        ($ThisLine =~ m/^nss_ldap: reconnect/) or
+        ($ThisLine =~ m/^pam_ldap: error trying to bind as user "[^"]+" \(Invalid credentials\)/) or
+        ($ThisLine =~ m/^\(pam_unix\) .*/) or
++       ($ThisLine =~ m/^pam_unix\(.*:.*\)/) or
+        # We won't count the following two because they're always followed by a
+        # failed login entry...
+        ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or
 --- logwatch-7.1/scripts/services/pam_unix.pom	2005-09-26 20:19:03.000000000 +0200
-+++ logwatch-7.1/scripts/services/pam_unix	2006-01-18 14:08:34.033899064 +0100
++++ logwatch-7.1/scripts/services/pam_unix	2006-01-20 11:09:16.689069248 +0100
 @@ -78,12 +78,15 @@
     } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) {
        $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/;
@@ -18,8 +28,8 @@
     $service = lc($service); 
  	if (($service eq 'sshd') or ($service eq 'login') or ($service eq 'ftp') or ($service eq 'rsh')) {
  		if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
---- logwatch-7.1/scripts/services/secure.pom	2006-01-18 14:07:00.784075192 +0100
-+++ logwatch-7.1/scripts/services/secure	2006-01-18 14:07:01.042035976 +0100
+--- logwatch-7.1/scripts/services/secure.pom	2006-01-20 11:09:16.478101320 +0100
++++ logwatch-7.1/scripts/services/secure	2006-01-20 11:09:16.732062712 +0100
 @@ -105,6 +105,7 @@
        ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or
        ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- logwatch.spec	18 Jan 2006 13:26:23 -0000	1.33
+++ logwatch.spec	20 Jan 2006 12:03:31 -0000	1.34
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.1
-Release: 6
+Release: 7
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -36,7 +36,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1 -b .pom
+%patch10 -p1 
 
 %install
 
@@ -138,7 +138,10 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
-* Wed Dec 18 2006 Ivana Varekova <varekova at redhat.com> 7.1-6
+* Fri Jan 20 2006 Ivana Varekova <varekova at redhat.com> 7.1-7
+- extended pam_unix patch (fix sshd service)
+
+* Wed Jan 18 2006 Ivana Varekova <varekova at redhat.com> 7.1-6
 - removed nounicode patch
 - added patch to fix pam_unix logs parsing (#178058)