rpms/logwatch/devel logwatch-7.3.6-cron3.patch, NONE, 1.1 logwatch-7.3.6-pam_unix2.patch, NONE, 1.1 logwatch.spec, 1.75, 1.76

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21699

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-cron3.patch logwatch-7.3.6-pam_unix2.patch 
Log Message:
- add cron service patch
- add pam-unix service patch



logwatch-7.3.6-cron3.patch:

--- NEW FILE logwatch-7.3.6-cron3.patch ---
diff -up logwatch-7.3.6/scripts/services/cron.pom logwatch-7.3.6/scripts/services/cron
--- logwatch-7.3.6/scripts/services/cron.pom	2007-10-10 14:22:10.000000000 +0200
+++ logwatch-7.3.6/scripts/services/cron	2007-10-10 14:23:16.000000000 +0200
@@ -207,6 +207,9 @@ while (defined($ThisLine = <STDIN>)) {
 	(($Error) = ($ThisLine =~ /(failed to open PAM security session: Permission denied)/)) 
 	) {
       $CRONDErr{$Error}++;
+   } elsif (( ($Error) = ($ThisLine =~ /ERROR: (failed to change SELinux context)/)) or
+           (($Error) = ($ThisLine =~ /ERROR:(Could not set exec context to .* for .*)/))) {
+      $SELCONTErr{$Error}++;
    } else {
       # Report any unmatched entries...
       push @OtherList, "$ThisLine\n";
@@ -337,8 +340,7 @@ if (%CRONDErr) {
   for $key (keys %CRONDErr) {
     print "    " . $key . ": " . $CRONDErr{$key} . " time(s)\n";
   }
-}
-          
+}          
 
 if (%INCRONDErr) {
   printf "\n  incrond daemon errors \n";
@@ -347,6 +349,14 @@ if (%INCRONDErr) {
   }
 }
 
+if (%SELCONTErr) {
+  printf "\n  SELinux context error \n";
+  for $key (keys %SELCONTErr) {
+    print "    " . $key . ": " . $SELCONTErr{$key} . "time(s)\n";
+  }
+}
+
+
 if ($#OtherList >= 0) {
    print "\n**Unmatched Entries**\n";
    print @OtherList;

logwatch-7.3.6-pam_unix2.patch:

--- NEW FILE logwatch-7.3.6-pam_unix2.patch ---
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	2007-10-10 14:24:10.000000000 +0200
+++ logwatch-7.3.6/scripts/services/pam_unix	2007-10-10 14:24:37.000000000 +0200
@@ -265,7 +265,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 =~ s/^session opened for user (.+)/$1/) {
          $data{$service}{'Sessions Opened'}{$line}++;
       } elsif ($line =~ s/^session closed for user (.+)/$1/) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- logwatch.spec	9 Aug 2007 14:00:33 -0000	1.75
+++ logwatch.spec	10 Oct 2007 12:46:54 -0000	1.76
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -21,6 +21,8 @@
 Patch15: logwatch-7.3.6-cron.patch
 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
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +51,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 
@@ -161,6 +165,10 @@
 %doc License project/CHANGES 
 
 %changelog
+* Wed Oct 10 2007 Ivana Varekova <varekova at redhat.com> 7.3.6-7
+- add cron service patch
+- add pam-unix service patch
+
 * Thu Aug  9 2007 Ivana Varekova <varekova at redhat.com> 7.3.6-6
 - add cron patch