rpms/logwatch/devel logwatch-7.3.1-audit.patch, NONE, 1.1 logwatch-7.3.1-cron.patch, NONE, 1.1 logwatch-7.3.1-init2.patch, NONE, 1.1 logwatch-7.3.1-pam_unix.patch, NONE, 1.1 logwatch.spec, 1.51, 1.52

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Dec 20 14:11:27 UTC 2006


Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.1-audit.patch logwatch-7.3.1-cron.patch 
	logwatch-7.3.1-init2.patch logwatch-7.3.1-pam_unix.patch 
Log Message:
- add cron, pam_unix, audit, init service patches


logwatch-7.3.1-audit.patch:
 audit |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-audit.patch ---
--- logwatch-7.3.1/scripts/services/audit.pom	2006-09-15 17:40:58.000000000 +0200
+++ logwatch-7.3.1/scripts/services/audit	2006-12-20 14:45:47.000000000 +0100
@@ -77,7 +77,8 @@
 	( $ThisLine =~ /: enforcing=[0-9]+ old_enforcing=[0-9]+ auid=[0-9]+/) or
 	( $ThisLine =~ /: policy loaded auid=[0-9]+/) or
 	( $ThisLine =~ /: user pid=[0-9]+ uid=[0-9]+ auid=[0-9]+ subj=system_u:system_r:system_dbusd_t:[0-9a-z]+ msg=/) or
-	( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): (selinux=[0-9]+|auid=[0-9]+|prom=[0-9]+|old_prom=[0-9]+|dev=[^ ]+| )+$/)
+	( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): (selinux=[0-9]+|auid=[0-9]+|prom=[0-9]+|old_prom=[0-9]+|dev=[^ ]+| )+$/) or
+        ( $ThisLine =~ /auditd[ ]+S [0-9A-F]+  [0-9]+  [0-9]+[ ]+[0-9]([ ]*[0-9]+[ ]*|[ ]*)[0-9]+  [0-9]+ \(NOTLB\)/)	          
     ) { 
 	# Ignore these entries
     } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) {

logwatch-7.3.1-cron.patch:
 cron |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-cron.patch ---
--- logwatch-7.3.1/scripts/services/cron.pom	2006-07-28 19:40:12.000000000 +0200
+++ logwatch-7.3.1/scripts/services/cron	2006-12-20 13:08:49.000000000 +0100
@@ -84,7 +84,10 @@
       ($ThisLine =~ /INFO \(pidfile fd = \d+\)/) or
       ($ThisLine =~ /rsyncd/) or
       ($ThisLine =~ /INFO \(Running \@reboot jobs\)/) or
-      ($ThisLine =~ /logfile turned over/) # newsyslog on OpenBSD
+      ($ThisLine =~ /logfile turned over/) or # newsyslog on OpenBSD
+      ($ThisLine =~ /INFO \(not boot nor reboot\)/) or
+      ($ThisLine =~ /INFO \(Running \@boot jobs\)/) or
+      ($ThisLine =~ /INFO \(Skipping \@boot jobs -- not system startup\)/)
    ) {
       # Ignore
    } elsif (

logwatch-7.3.1-init2.patch:
 init |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-init2.patch ---
--- logwatch-7.3.1/scripts/services/init.pom	2006-12-20 14:46:54.000000000 +0100
+++ logwatch-7.3.1/scripts/services/init	2006-12-20 14:57:46.000000000 +0100
@@ -14,7 +14,9 @@
 $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
 
 while (defined($ThisLine = <STDIN>)) {
-   if ( $ThisLine =~ /open\(.*\): No such file or directory/) {
+   if (( $ThisLine =~ /open\(.*\): No such file or directory/)  or 
+      ( $ThisLine =~ /Id "r" respawning too fast: disabled for 5 minutes/) or 
+      ( $ThisLine =~ /Re-reading inittab/)) {
       # We don't care about these     
    }
    elsif ( $ThisLine =~ s/Switching to runlevel: (.)\s*$/$1/ ) {

logwatch-7.3.1-pam_unix.patch:
 pam_unix |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3.1-pam_unix.patch ---
--- logwatch-7.3.1/scripts/services/pam_unix.pom	2006-09-15 17:40:58.000000000 +0200
+++ logwatch-7.3.1/scripts/services/pam_unix	2006-12-20 13:49:24.000000000 +0100
@@ -152,6 +152,8 @@
          # ignore this line
       } elsif ($line =~ s/session opened for user (.+) by (.+)$/$2 -> $1/) {
          $data{$service}{'Sessions Opened'}{$line}++;
+      } elsif ($line =~ /^account root has password changed in future/) { 
+             #I'm not sure whether this info could not be reported      
       } else {
          $data{$service}{'Unknown Entries'}{$line}++;
       }
@@ -232,11 +234,13 @@
       if ($line =~ s/^authentication failure; .*uid=(\d+) euid=(\d+) tty=(.+) ruser= rhost=  user=(.+)$/$4($1,$2) on display $3/) {
          $data{$service}{'Authentication Failures'}{$line}++;
       }
-   } elsif ($service =~ /^crond?$/ ) {
+   } elsif ($service =~ /^(f)?crond?$/ ) {
 	   if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) {
 		   ($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/) {
+	          #I'm not sure whether this info could not be reported
 	   } else {
 		   $data{$service}{'Unknown Entries'}{$line}++;
 	   }
@@ -260,7 +264,20 @@
      if ($line =~/^session (opened)?(\/)?(closed)? for user [a-zA-Z\d]+/) {
      } else {
          $data{$service}{'Unknown Entries'}{$line}++;
-     }    
+     }
+   } elsif ($service eq 'atd') {
+     if ($line =~/^session (opened)?(\/)?(closed)? for user [a-zA-Z\d]+/) {
+     } elsif ($line =~ /^account root has password changed in future/) { 
+       #I'm not sure whether this info could not be reported
+     } else {
+         $data{$service}{'Unknown Entries'}{$line}++;
+     }
+   } elsif ($service eq 'system-config-date') {
+     if ($line =~ s/auth could not identify password for \[(.*)\]/$1/) {
+         $data{$service}{'Not Identify Password For'}{$line}++;
+     } else {
+         $data{$service}{'Unknown Entries'}{$line}++;
+     }
    } else {      
       $data{$service}{'Unknown Entries'}{$line}++;
    }


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- logwatch.spec	20 Dec 2006 10:48:31 -0000	1.51
+++ logwatch.spec	20 Dec 2006 14:11:25 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -21,6 +21,10 @@
 Patch19: logwatch-7.3.1-dovecot.patch
 Patch20: logwatch-7.3.1-amavis.patch
 Patch21: logwatch-7.3.1-init.patch
+Patch22: logwatch-7.3.1-cron.patch
+Patch23: logwatch-7.3.1-pam_unix.patch
+Patch24: logwatch-7.3.1-audit.patch
+Patch25: logwatch-7.3.1-init2.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -49,6 +53,10 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %install
 
@@ -153,6 +161,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Wed Dec 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-9
+- add cron, pam_unix, audit, init service patches
+
 * Wed Dec 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-8
 - add dovecot, amavis and init patch 
 - cleanup spec file




More information about the fedora-cvs-commits mailing list