diff --git a/logwatch-7.3.6-postfix3.patch b/logwatch-7.3.6-postfix3.patch new file mode 100644 index 0000000..e0dad75 --- /dev/null +++ b/logwatch-7.3.6-postfix3.patch @@ -0,0 +1,23 @@ +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)}++; + diff --git a/logwatch.spec b/logwatch.spec index 8da0798..cefde2f 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -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 @@ Patch39: logwatch-7.3.6-init.patch 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 @@ of the package on many systems. %patch40 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 rm -f scripts/services/*.orig %build @@ -211,6 +213,9 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Fri Oct 17 2008 Ivana Varekova 7.3.6-29 +- fix postfix script again (#462174) + * Mon Sep 15 2008 Ivana Varekova 7.3.6-28 - fix postfix script problem (#462174)