rpms/logwatch/devel logwatch-7.3.1-sendmail.patch, NONE, 1.1 logwatch.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.1-sendmail.patch 
Log Message:
- fix #209405 - sendmail service problems


logwatch-7.3.1-sendmail.patch:
 sendmail |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE logwatch-7.3.1-sendmail.patch ---
--- logwatch-7.3.1/scripts/services/sendmail.pom	2006-09-15 17:40:58.000000000 +0200
+++ logwatch-7.3.1/scripts/services/sendmail	2006-10-23 15:33:46.000000000 +0200
@@ -236,6 +236,7 @@
 $LastIndex,              $LastIndex2,
 $Load,                   $Luser,                  $MailerName,             
 $MailerString,           $MailerType,             $NewQueueID,             
+$NoNotification,
 $NumRcpts,               $Owner,                  $QueueID,                
 $Reason,                 $RejCmd,                 $Relay,                  
 $RelayDeniedCount,       $RelayHost,              $RelayName,              
@@ -391,6 +392,8 @@
       ( $ThisLine =~ /^--- 550 5(\.[0-9]){2} Command rejected$/ ) or
       # User unknown detected later by ruleset=check_rcpt
       ( $ThisLine =~ /^--- 550 5(\.[0-9]){2} .*\.\.\. User unknown/ ) or
+      ( $ThisLine =~ /to=([^,]*), relay=([^,]*), delay=([^,]*), delays=([^,]*), dsn=([^,]*), status=undeliverable \(unknown user: "([^.]*)"\)/) or
+      ( $ThisLine =~ /to=([^,]*), orig_to=([^,]*), relay=([^,]*), delay=([^,]*), delays=([^,]*), dsn=([^,]*), status=undeliverable \(Host or domain name not found./) or
       # Relaying denied detected later by ruleset=check_rcpt
       ( $ThisLine =~ /^--- 550 5(\.[0-9]){2} .*\.\.\. Relaying denied/ ) or
       # Access denied detected later by ruleset=check_relay
@@ -1028,6 +1031,8 @@
       chomp($Directory=$1);
       chomp($Cause=$2);
       $WUnsafe{$Directory}{$Cause}++;
+   } elsif ($ThisLine=~/sender non-delivery notification/) {
+      $NoNotification++;
 
    # the following is the catch-all:
    } else {
@@ -1901,6 +1906,9 @@
 }
 $TotalError[++$ErrorIndex] = 0;
 
+if (($NoNotification) && ($Detail >=5)){
+   print "\n\nSender non-delivery notification: ", $NoNotification, " Time(s)";
+}
 
 if (keys %ForwardErrors) {
    eval "$PrintCond" if ($Detail >= 3);


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- logwatch.spec	20 Oct 2006 13:30:12 -0000	1.45
+++ logwatch.spec	23 Oct 2006 13:51:41 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: A log file analysis program.
 Name: logwatch
 Version: 7.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -10,6 +10,7 @@
 Patch8: logwatch-7.3-sshd.patch
 Patch9: logwatch-7.3.1-yum.patch
 Patch10: logwatch-7.3.1-automount.patch
+Patch11: logwatch-7.3.1-sendmail.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -27,6 +28,7 @@
 %patch8 -p1
 %patch9 -p1 
 %patch10 -p1
+%patch11 -p1
 
 %install
 
@@ -131,6 +133,9 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Mon Oct 23 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-3
+- fix #209405 - sendmail service problems
+
 * Fri Oct 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-2
 - fix #204078 - missing /etc/logwatch/scripts/services
 - add yum service patch