rpms/logwatch/devel logwatch-7.3.2-amavis.patch, NONE, 1.1 logwatch-7.3.2-automount.patch, NONE, 1.1 logwatch-7.3.2-cron.patch, NONE, 1.1 logwatch-7.3.2-sendmail.patch, NONE, 1.1 logwatch.spec, 1.56, 1.57

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jan 26 14:26:39 UTC 2007


Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.2-amavis.patch logwatch-7.3.2-automount.patch 
	logwatch-7.3.2-cron.patch logwatch-7.3.2-sendmail.patch 
Log Message:
- add sendmail, automount, amvais and cron patch


logwatch-7.3.2-amavis.patch:
 amavis |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE logwatch-7.3.2-amavis.patch ---
--- logwatch-7.3.2/scripts/services/amavis.pom	2006-11-12 19:39:34.000000000 +0100
+++ logwatch-7.3.2/scripts/services/amavis	2007-01-26 13:41:37.000000000 +0100
@@ -124,6 +124,7 @@
         or ($ThisLine =~ /^lookup_ip_acl /)
         or ($ThisLine =~ /^release /)
         or ($ThisLine =~ /^[.]{3}/)    # non-adjacent continuation lines,  captured elsewhere
+        or ($ThisLine =~ /SA TIMED OUT/)
         ) {
 
    } elsif ($ThisLine =~ /^Passed( CLEAN)?, /) {

logwatch-7.3.2-automount.patch:
 automount |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.2-automount.patch ---
--- logwatch-7.3.2/scripts/services/automount.pom	2006-12-15 07:22:14.000000000 +0100
+++ logwatch-7.3.2/scripts/services/automount	2007-01-26 13:20:01.000000000 +0100
@@ -21,7 +21,9 @@
          ($ThisLine =~ /^>>.*mount: .*$/) or
          ($ThisLine =~ /lookup_read_master: lookup\(nisplus\): couldn't locat nis\+ table auto.master/) or
          ($ThisLine =~ /create_(tcp|udp)_client: hostname lookup failed: No such process/) or 
-         ($ThisLine =~ /lookup_mount: exports lookup failed for .*directory/)) {
+         ($ThisLine =~ /lookup_mount: exports lookup failed for .*directory/) or
+         ($ThisLine =~ /create_(tc|ud)p_client: hostname lookup failed: Operation not permitted/) 
+         ) {
       # don't care about these
    }
    elsif ( ($ThisMount) = ($ThisLine =~ /^attempting to mount entry (.*)$/) ) {

logwatch-7.3.2-cron.patch:
 cron |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE logwatch-7.3.2-cron.patch ---
--- logwatch-7.3.2/scripts/services/cron.pom	2006-12-20 16:35:02.000000000 +0100
+++ logwatch-7.3.2/scripts/services/cron	2007-01-26 14:06:04.000000000 +0100
@@ -135,6 +135,8 @@
          $Errors{$Reason}++;
       } elsif ( ($FileName) = ($ThisLine =~ /BAD FILE MODE \((.+)\)/) ) {
          $BFMFile{$FileName}++; 
+      } elsif ( ($FileName) = ($ThisLine = /WRONG FILE OWNER \((.+)\)/) ) {
+         $WFM{$FileName}++;
       } else {
          # Report any unmatched entries...
          push @OtherList, "$ThisLine\n";
@@ -238,6 +240,12 @@
    }
 }
 
+if (keys %WFO) {
+  foreach $i (keys %WFO) {
+     printf "\n Wrong file owner (". $i ."): " . $WFO{$i}. " Time(s)\n";
+  }
+}
+
 if ($Ntpdate) {
    print "\nNtpdate: adjusted $Ntpdate times\n";
    print "\tMinimum offset $ntpdateminoffset\n";

logwatch-7.3.2-sendmail.patch:
 sendmail |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3.2-sendmail.patch ---
--- logwatch-7.3.2/scripts/services/sendmail.pom	2006-12-19 18:13:28.000000000 +0100
+++ logwatch-7.3.2/scripts/services/sendmail	2007-01-26 13:02:26.000000000 +0100
@@ -527,8 +527,10 @@
       # file=queue.c, LogLevel>97, LOG_DEBUG
       ( $ThisLine =~ /$QueueIDFormat: unlink-fail $ENOENT/o ) or
       # generic DEBUG statement
-      ( $ThisLine =~ /^DEBUG: / )
-      
+      ( $ThisLine =~ /^DEBUG: / ) or 
+      ( $ThisLine =~ /[0-9]: fl=0x[0-9], mode=\S+: (FIFO:|SOCK|CHR:) dev=\S+, ino=\S+, nlink=\S+, u.gid=\S+, size=\S+/) or 
+      ( $ThisLine =~ /unable to qualify my own domain name/) or 
+      ( $ThisLine =~ /My unqualified host name (\S+) unknown; sleeping for retry/)
 
    ) {
       # We don't care about these statements above


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- logwatch.spec	17 Jan 2007 13:34:20 -0000	1.56
+++ logwatch.spec	26 Jan 2007 14:26:37 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -10,6 +10,10 @@
 Patch2: logwatch-7.3.1-vsftpd.patch
 Patch3: logwatch-7.3.2-sshd.patch
 Patch4: logwatch-7.3.2-xntpd.patch
+Patch5: logwatch-7.3.2-sendmail.patch
+Patch6: logwatch-7.3.2-automount.patch
+Patch7: logwatch-7.3.2-amavis.patch
+Patch8: logwatch-7.3.2-cron.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -27,6 +31,10 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %install
 
@@ -135,6 +143,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Fri Jan 26 2007 Ivana Varekova <varekova at redhat.com> 7.3.2-5
+- add sendmail, automount, amvais and cron patch
+
 * Wed Jan 17 2007 Ivana Varekova <varekova at redhat.com> 7.3.2-4
 - add xntpd patch
 




More information about the fedora-cvs-commits mailing list