rpms/logwatch/F-8 logwatch-7.3.6-postfix2.patch, NONE, 1.1 logwatch.spec, 1.89, 1.90

[Ivana Varekova]

Author: varekova

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

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


logwatch-7.3.6-postfix2.patch:

--- NEW FILE logwatch-7.3.6-postfix2.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 13:18:19.000000000 +0200
+++ logwatch-7.3.6/scripts/services/postfix	2008-10-24 09:29:00.000000000 +0200
@@ -769,8 +769,10 @@ while ( <> ) {
       #TD disconnect from mail.example.com[2001:dead:beef::1]
       $Totals{'Disconnection'}++;
    }
-   elsif (($host,$hostip,$reason) = ($p1 =~ /^connect to ([^[]*)\[($re_IP)\]: (.*)$/o)) {
+   elsif (($host,$hostip,$reason) = ($p1 =~ /^connect to ([^[]*)\[($re_IP)\]:?[0-9]*: (.*)$/o)) {
+   print "host $host hostip $hostip reason $reason\n";
       # all "connect to" messages indicate a problem with the connection
+      #TD connect to mail.bues.ru[82.146.62.193]:25: Connection refused
       #TD connect to example.org[10.0.0.1]: Connection refused (port 25)
       #TD connect to mail.sample.com[10.0.0.1]: No route to host (port 25)
       #TD connect to sample.net[192.168.0.1]: read timeout (port 25)
@@ -1530,8 +1532,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)}++;


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/F-8/logwatch.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- logwatch.spec	17 Oct 2008 11:21:48 -0000	1.89
+++ logwatch.spec	24 Oct 2008 07:36:32 -0000	1.90
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -37,6 +37,7 @@
 Patch31: logwatch-7.3.6-dovecot_back.patch
 Patch32: logwatch-7.3.6-logrotate.patch
 Patch33: logwatch-7.3.6-postfix.patch
+Patch34: logwatch-7.3.6-postfix2.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +82,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -194,6 +196,9 @@
 %doc License project/CHANGES 
 
 %changelog
+* Fri Oct 24 2008 Ivana Varekova <varrkova at redhat.com> 7.3.6-19
+- parse another bunch of postfix logs(#467378)
+
 * Fri Oct 17 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-18
 - fix postfix script bug (#467378)