rpms/logwatch/devel logwatch-7.3.6-postfix3.patch, NONE, 1.1 logwatch.spec, 1.97, 1.98

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9017

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/devel/logwatch.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- logwatch.spec	15 Sep 2008 11:28:12 -0000	1.97
+++ logwatch.spec	17 Oct 2008 07:53:35 -0000	1.98
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 28%{?dist}
+Release: 29%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -45,6 +45,7 @@
 Patch40: logwatch-7.3.6-cron5.patch
 Patch41: logwatch-7.3.6-logrotate.patch
 Patch42: logwatch-7.3.6-postfix2.patch
+Patch43: logwatch-7.3.6-postfix3.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -98,6 +99,7 @@
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -211,6 +213,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Fri Oct 17 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-29
+- fix postfix script again (#462174)
+
 * Mon Sep 15 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-28
 - fix postfix script problem
   (#462174)