rpms/logwatch/F-9 logwatch-7.3.6-postfix3.patch, NONE, 1.1 logwatch.spec, 1.93, 1.94

[Ivana Varekova]

Author: varekova

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

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-postfix3.patch 
Log Message:
- fix postfix script again (#462174)



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-17 09:27:02.000000000 +0200
+++ logwatch-7.3.6/scripts/services/postfix	2008-10-17 09:28:46.000000000 +0200
@@ -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: (.*)$/ )) {
@@ -1637,8 +1637,9 @@ while ( <> ) {
       #TD table hash:/etc/postfix/helo_checks has changed -- restarting
       $Totals{'TableChanged'}++;
 
-   } elsif ( ($cmd,$host,$hostip) = ($p1 =~ /too many errors after ([^ ]*) from ([^[]*)\[($re_IP)\]$/o)) {
+   } elsif ( ($cmd,$size,$host,$hostip) = ($p1 =~ /too many errors after ([^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) {
       #TD too many errors after AUTH from sample.net[10.0.0.1] 
+      #TD too many errors after DATA (0 bytes) from aasq46.neoplus.adsl.tpnet.pl[83.5.228.46]
       $Totals{'TooManyErrors'}++;
       $Counts{'TooManyErrors'}{"After $cmd"}{formathost($hostip,$host)}++;
 


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-9/logwatch.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- logwatch.spec	16 Sep 2008 10:56:16 -0000	1.93
+++ logwatch.spec	17 Oct 2008 07:37:40 -0000	1.94
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -41,6 +41,7 @@
 Patch36: logwatch-7.3.6-openvpn2.patch
 Patch37: logwatch-7.3.6-postfix2.patch
 Patch38: logwatch-7.3.6-logrotate.patch
+Patch39: logwatch-7.3.6-postfix3.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -90,6 +91,7 @@
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -204,6 +206,9 @@
 
 %changelog
 
+* Fri Oct 17 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-25
+- fix postfix script again (#462174)
+
 * Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-24
 - fix logrotate x logwatch compatibility problem
   (#458580)