diff --git a/logwatch-7.3.6-postfix2.patch b/logwatch-7.3.6-postfix2.patch new file mode 100644 index 0000000..4067f0a --- /dev/null +++ b/logwatch-7.3.6-postfix2.patch @@ -0,0 +1,46 @@ +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-09-15 13:13:29.000000000 +0200 ++++ logwatch-7.3.6/scripts/services/postfix 2008-09-15 13:09:26.000000000 +0200 +@@ -1530,8 +1530,9 @@ while ( <> ) { + # end of $re_QID section + + # see also ConnectionLost in $re_QID section +- elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) from ([^[]*)\[($re_IP|unknown)\]$/o )) { ++ elsif ( ($reason,$host,$hostip) = ($p1 =~ /lost connection (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP|unknown)\]$/o )) { + unless ($hostip =~ /unknown/) { ++ #TD lost connection after DATA (0 bytes) from mail.example.com[192.168.0.1] + #TD lost connection after CONNECT from mail.example.com[192.168.0.1] + $Totals{'ConnectionLost'}++; + $Counts{'ConnectionLost'}{"\u$reason"}{formathost($hostip,$host)}++; +@@ -1570,7 +1571,8 @@ while ( <> ) { + } + + # see also TimeoutInbound in $re_QID section +- elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) from ([^[]*)\[($re_IP)\]$/o)) { ++ elsif ( ($reason,$host,$hostip) = ($p1 =~ /^timeout (after [^ ]*) (\(\d+ bytes\) )?from ([^[]*)\[($re_IP)\]$/o)) { ++ #TD timeout after DATA (0 bytes) from unknown[85.102.182.31] + #TD timeout after RSET from example.com[192.168.0.1] + $Totals{'TimeoutInbound'}++; + $Counts{'TimeoutInbound'}{"\u$reason"}{formathost($hostip,$host)}++; +@@ -1593,7 +1595,8 @@ while ( <> ) { + + ### smtpd_tls_loglevel >= 1 + # Server TLS messages +- elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) { ++ elsif ( ($status,$host,$hostip,$type) = ($p1 =~ /^(?:(Trusted|Untrusted|Anonymous) )?TLS connection established from ([^[]+)\[($re_IP)\]: (.*)$/o )) { ++ #DT Anonymous TLS connection established from fractal.kaosol.net[216.150.215.72]: TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits) + #TD TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits) + # Postfix 2.5+: status: Untrusted or Trusted + #TD Untrusted TLS connection established from example.com[192.168.0.1]: TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits) +@@ -1625,6 +1628,11 @@ while ( <> ) { + $Totals{'TlsUnverified'}++; + $Counts{'TlsUnverified'}{$cert}++; + ++ } elsif ( ($cert) = ($p1 =~ /: Untrusted: (subject_CN=.*)/)) { ++ #TD Untrusted: subject_CN=EXAMPLE-MAIL, issuer=EXAMPLE-MAIL, ++ $Totals{'TlsUnverified'}++; ++ $Counts{'TlsUnverified'}{$cert}++; ++ + } elsif ( ($p1 =~ m/(lookup )?table ([^ ]+ )?has changed -- (restarting|exiting)$/)) { + #TD table hash:/etc/postfix/helo_checks has changed -- restarting + $Totals{'TableChanged'}++; diff --git a/logwatch.spec b/logwatch.spec index 94fcc97..8da0798 100644 --- a/logwatch.spec +++ b/logwatch.spec @@ -1,7 +1,7 @@ Summary: A log file analysis program Name: logwatch Version: 7.3.6 -Release: 27%{?dist} +Release: 28%{?dist} License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -44,6 +44,7 @@ Patch38: logwatch-7.3.6-audit3.patch 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 Requires: textutils sh-utils grep mailx Requires: perl(Date::Manip) @@ -96,6 +97,7 @@ of the package on many systems. %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 rm -f scripts/services/*.orig %build @@ -209,6 +211,10 @@ rm -rf %{buildroot} %doc License project/CHANGES %changelog +* Mon Sep 15 2008 Ivana Varekova 7.3.6-28 +- fix postfix script problem + (#462174) + * Tue Aug 26 2008 Ivana Varekova 7.3.6-27 - fix init script problem (#459887)