rpms/logwatch/devel logwatch-7.3.6-pam_unix.patch, 1.1, 1.2 logwatch.spec, 1.102, 1.103 logwatch-7.3.4-pam_unix.patch, 1.2, NONE logwatch-7.3.6-pam_unix2.patch, 1.2, NONE logwatch-7.3.6-pam_unix3.patch, 1.1, NONE

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6365

Modified Files:
	logwatch-7.3.6-pam_unix.patch logwatch.spec 
Removed Files:
	logwatch-7.3.4-pam_unix.patch logwatch-7.3.6-pam_unix2.patch 
	logwatch-7.3.6-pam_unix3.patch 
Log Message:
- fix pam-unix script patches


logwatch-7.3.6-pam_unix.patch:

Index: logwatch-7.3.6-pam_unix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch-7.3.6-pam_unix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logwatch-7.3.6-pam_unix.patch	4 Jul 2007 12:26:52 -0000	1.1
+++ logwatch-7.3.6-pam_unix.patch	11 Nov 2008 11:04:20 -0000	1.2
@@ -1,6 +1,7 @@
---- logwatch-7.3.6/scripts/services/pam_unix.pom	2007-07-04 12:34:02.000000000 +0200
-+++ logwatch-7.3.6/scripts/services/pam_unix	2007-07-04 12:46:02.000000000 +0200
-@@ -112,7 +112,8 @@ while ($line = <STDIN>) {
+diff -up logwatch-7.3.6/scripts/services/pam_unix.pom logwatch-7.3.6/scripts/services/pam_unix
+--- logwatch-7.3.6/scripts/services/pam_unix.pom	2006-12-20 16:46:45.000000000 +0100
++++ logwatch-7.3.6/scripts/services/pam_unix	2008-11-11 11:12:35.000000000 +0100
+@@ -121,7 +121,8 @@ while ($line = <STDIN>) {
  	}
     #lowercase the service 
     $service = lc($service); 
@@ -10,3 +11,88 @@
  		if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
  			($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
        } elsif ($line =~ s/^session opened for user ([^ ]*) by ([^ ]*)\(uid=\d+\)/$1 by $2/) {
+@@ -148,6 +149,8 @@ while ($line = <STDIN>) {
+          $data{$service}{'Expired Accounts'}{$line}++;
+       } elsif ($line =~ s/bad username \[(.*)\]/$1/) {
+          $data{$service}{'Invalid Users'}{"Bad User: $line"}++;
++      } elsif ($line =~ s/auth could not identify password for \[(.*)\]/$1/) {
++         $data{$service}{'Not Identify Password For'}{$line}++;
+       } else {
+          $data{$service}{'Unknown Entries'}{$line}++;
+       }
+@@ -178,12 +181,16 @@ while ($line = <STDIN>) {
+    } elsif ($service eq 'gdm') {
+       if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
+          ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
++      } elsif ($line =~ s/auth could not identify password for \[(.*)\]/$1/) {
++          $data{$service}{'Not Identify Password For'}{$line}++;       
+       } elsif ($line =~ s/^authentication failure; logname=.*user=(.+)$/$1/) {
+          $data{$service}{'Authentication Failures'}{$line}++;
+       } elsif ($line =~ /session closed for user/) {
+          # ignore this line
+       } elsif ($line =~ /bad username \[\]/) {
+          # ignore this line
++      } elsif ($line =~ /conversation failed/) {
++         # ignore this line
+       } else {
+          $data{$service}{'Unknown Entries'}{$line}++;
+       }
+@@ -196,7 +203,7 @@ while ($line = <STDIN>) {
+        $data{$service}{'Authentication Failures'}{$line}++;
+      }
+      
+- } elsif ($service eq 'xdm') {
++   } elsif ($service eq 'xdm') {
+ 	 if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
+ 		 ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
+ 	 } elsif ($line =~ /session closed for user/) {
+@@ -249,7 +256,7 @@ while ($line = <STDIN>) {
+ 		   ($Detail >= 5) && $data{$service}{'Sessions Opened'}{$line}++;
+ 	   } elsif ($line =~ /session closed for user/) {
+ 		   # ignore this line
+-	   } elsif ($line =~ /^account root has password changed in future/) {
++	   } elsif ($line =~ /account (.+) has password changed in future/) {
+ 	          #I'm not sure whether this info could not be reported
+ 	   } else {
+ 		   $data{$service}{'Unknown Entries'}{$line}++;
+@@ -270,7 +277,7 @@ while ($line = <STDIN>) {
+       } else {
+          $data{$service}{'Unknown Entries'}{$line}++;
+       }
+-   } elsif ($service eq 'runuser') {
++   } elsif (($service eq 'runuser') or ($service eq 'runuser-l')){
+      if ($line =~/^session (opened)?(\/)?(closed)? for user [a-zA-Z\d]+/) {
+      } else {
+          $data{$service}{'Unknown Entries'}{$line}++;
+@@ -287,9 +294,28 @@ while ($line = <STDIN>) {
+          $data{$service}{'Not Identify Password For'}{$line}++;
+      } else {
+          $data{$service}{'Unknown Entries'}{$line}++;
+-     }
+-   } else {      
+-      $data{$service}{'Unknown Entries'}{$line}++;
++     }          
++   } elsif ($service eq 'polkit') {
++      if ($line =~ s/auth could not identify password for \[(.*)\]/$1/) {
++         $data{$service}{'Not Identify Password For'}{$line}++;
++      } elsif ($line =~ s/^authentication failure; logname=(\S*) uid=(\d+) .*user=(\S*)$/$1($2) -> $3/) {
++         $data{$service}{'Authentication Failures'}{$line}++;
++      } elsif ($line =~ /conversation failed/) {
++               # ignore this line
++      } else {
++           $data{$service}{'Unknown Entries'}{$line}++;
++      }
++   } elsif ($service eq 'virt-manager') {
++      if ($line =~ s/auth could not identify password for \[(.*)\]/$1/) {
++         $data{$service}{'Not Identify Password For'}{$line}++;
++      } elsif ($line =~ /conversation failed/) {
++               # ignore this line
++      } else {
++           $data{$service}{'Unknown Entries'}{$line}++;
++      }
++
++   } else {
++         $data{$service}{'Unknown Entries'}{$line}++;
+    }
+ }
+ 


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- logwatch.spec	30 Oct 2008 09:59:38 -0000	1.102
+++ logwatch.spec	11 Nov 2008 11:04:20 -0000	1.103
@@ -1,14 +1,13 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 33%{?dist}
+Release: 34%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
 Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
 Patch1: logwatch-7.2.1-nosegfault.patch
 Patch2: logwatch-7.3.1-vsftpd.patch
-Patch3: logwatch-7.3.4-pam_unix.patch
 Patch4: logwatch-7.3.6-secure.patch
 Patch5: logwatch-7.3.6-xntpd.patch
 Patch6: logwatch-7.3.4-sshd.patch
@@ -22,7 +21,6 @@
 Patch16: logwatch-7.3.6-zz-disk_space.patch
 Patch17: logwatch-7.3.6-cron2.patch
 Patch18: logwatch-7.3.6-cron3.patch
-Patch19: logwatch-7.3.6-pam_unix2.patch
 Patch20: logwatch-7.3.6-secure1.patch
 Patch21: logwatch-7.3.6-sudo.patch
 Patch22: logwatch-7.3.6-sshd1.patch
@@ -44,7 +42,6 @@
 Patch39: logwatch-7.3.6-init.patch
 Patch40: logwatch-7.3.6-cron5.patch
 Patch41: logwatch-7.3.6-logrotate.patch
-Patch44: logwatch-7.3.6-pam_unix3.patch
 Patch45: logwatch-7.3.6-init2.patch
 Patch46: logwatch-7.3.6-secure2.patch
 
@@ -63,7 +60,6 @@
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -77,7 +73,6 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -99,7 +94,6 @@
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-%patch44 -p1
 %patch45 -p1
 %patch46 -p1
 rm -f scripts/services/*.orig
@@ -213,6 +207,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Tue Nov 11 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-34
+- fix pam-unix script patches
+
 * Thu Oct 30 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-33
 - mark logwatch.conf as a configure file (#468655)
 


--- logwatch-7.3.4-pam_unix.patch DELETED ---


--- logwatch-7.3.6-pam_unix2.patch DELETED ---


--- logwatch-7.3.6-pam_unix3.patch DELETED ---