rpms/logwatch/F-8 logwatch-7.3.6-postfix3.patch, NONE, 1.1 logwatch.spec, 1.91, 1.92

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27013

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-postfix3.patch 
Log Message:
 - parse another bunch of postfix logs(#467378)


logwatch-7.3.6-postfix3.patch:

--- NEW FILE logwatch-7.3.6-postfix3.patch ---
diff -up logwatch-7.3.6/scripts/services/postfix.pom logwatch-7.3.6/scripts/services/postfix
--- logwatch-7.3.6/scripts/services/postfix.pom	2008-10-29 11:32:59.000000000 +0100
+++ logwatch-7.3.6/scripts/services/postfix	2008-10-29 11:41:04.000000000 +0100
@@ -693,7 +693,7 @@ while ( <> ) {
 
    my ($helo, $relay, $from, $origto, $to, $domain, $status,
        $type, $reason, $reason2, $filter, $site, $cmd, $qid, $p2,
-       $rej_action, $host, $hostip);
+       $rej_action, $host, $hostip, $size);
 
    # ^fatal: ...
    if ( ($reason) = ($p1 =~ /^fatal: (.*)$/ )) {
@@ -1523,8 +1523,14 @@ while ( <> ) {
          #$Counts{'RejectMilter'}{$cmd}{formathost($hostip,$host)}{$reason}{$p3}++;
          $Counts{'RejectMilter'}{$cmd}{formathost($hostip,$host)}{$reason}++;
 
+     } elsif ( ($host,$hostip,$reason) = ($p1 =~ /host ([^ ]*)\[([^ ]*)\] refused to talk to me: [0-9]* .*: Connection refused. (.*)/)) {  
+       # TD  host mx10.hanmail.net[211.43.197.142] refused to talk to me: 554 5.7.1 CCRX 80.95.96.6: Connection refused. Your IP address is blocked(anti-spam) 
+        $Totals{'ConnectToFailure'}++;
+        $Counts{'ConnectToFailure'}{$reason}{formathost($hostip,$host)}++;
+
       } else {
          # keep this as the last condition in this else clause
+          
          inc_unmatched('unknownqid', $OrigLine);
       }
    }
@@ -1572,8 +1578,9 @@ while ( <> ) {
    }
 
    # see also TimeoutInbound in $re_QID section
-   elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) from ([^[]*)\[($re_IP)\]$/o)) {
+   elsif ( ($reason,$size,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
       #TD timeout after RSET from example.com[192.168.0.1]
+      #TD timeout after DATA (0 bytes) from unknown[68.161.112.141]
       $Totals{'TimeoutInbound'}++;
       $Counts{'TimeoutInbound'}{"\u$reason"}{formathost($hostip,$host)}++;
    }


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-8/logwatch.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- logwatch.spec	24 Oct 2008 07:53:52 -0000	1.91
+++ logwatch.spec	29 Oct 2008 10:52:57 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -38,6 +38,7 @@
 Patch32: logwatch-7.3.6-logrotate.patch
 Patch33: logwatch-7.3.6-postfix.patch
 Patch34: logwatch-7.3.6-postfix2.patch
+Patch35: logwatch-7.3.6-postfix3.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -83,6 +84,7 @@
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -196,7 +198,10 @@
 %doc License project/CHANGES 
 
 %changelog
-* Fri Oct 24 2008 Ivana Varekova <varrkova at redhat.com> 7.3.6-20
+* Wed Oct 29 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-21
+- parse another bunch of postfix logs(#467378)
+
+* Fri Oct 24 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-20
 - parse another bunch of postfix logs(#467378)
 
 * Fri Oct 17 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-18