rpms/logwatch/devel logwatch-7.1-pam_unix.patch, NONE, 1.1 logwatch.spec, 1.32, 1.33 logwatch-4.3.2-nounicode.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.1-pam_unix.patch 
Removed Files:
	logwatch-4.3.2-nounicode.patch 
Log Message:
 - removed nounicode patch
 - added patch to fix pam_unix logs parsing (#178058)



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

--- NEW FILE logwatch-7.1-pam_unix.patch ---
--- 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
@@ -78,12 +78,15 @@
    } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) {
       $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/;
    #for debian woody
-   } elsif ( ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // )) {
+   } elsif ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // ) {
       $service =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \(([^ ]*)\) .*/$1/;
+   } elsif ( $line =~ s/^... .. ..:..:.. .+ pam_unix(.+:.+): //  ) {
+      $service =~ s/^... .. ..:..:.. .+ pam_unix\((.+):.+\): .*$/$1/;
+   #new version 
 	} else {
 		next;
 	}
-   #lowercase the service
+   #lowercase the service 
    $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
@@ -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
       ( $ThisLine =~ /^(.*)\(pam_unix\)/) or
+      ( $ThisLine =~ /pam_unix\(.*:.*\)/) or
       ( $ThisLine =~ m/^[^ ]+\[\d+\]: connect from localhost$/ ) or
       ( $ThisLine =~ /^\/usr\/bin\/sudo:/) or
       ( $ThisLine =~ /^halt:/) or


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- logwatch.spec	23 Dec 2005 09:45:24 -0000	1.32
+++ logwatch.spec	18 Jan 2006 13:26:23 -0000	1.33
@@ -1,12 +1,11 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.1
-Release: 5
+Release: 6
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
 Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz
-Patch1: logwatch-4.3.2-nounicode.patch
 Patch2: logwatch-7.0-nosegfault.patch
 Patch3: logwatch-7.1-sshd.patch
 Patch4: logwatch-7.1-samba.patch
@@ -15,6 +14,7 @@
 Patch7: logwatch-7.1-iptables.patch
 Patch8: logwatch-7.1-audit.patch
 Patch9: logwatch-7.1-http.patch
+Patch10: logwatch-7.1-pam_unix.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -28,7 +28,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 %patch2 -p1 
 %patch3 -p1 
 %patch4 -p1
@@ -37,6 +36,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1 -b .pom
 
 %install
 
@@ -138,6 +138,10 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Wed Dec 18 2006 Ivana Varekova <varekova at redhat.com> 7.1-6
+- removed nounicode patch
+- added patch to fix pam_unix logs parsing (#178058)
+
 * Fri Dec 23 2005 Ivana Varekova <varekova at redhat.com> 7.1-5
 - fix http exploits problem (bug 176324 - comment 2)
 


--- logwatch-4.3.2-nounicode.patch DELETED ---