rpms/logwatch/devel logwatch-7.3.1-amavis.patch, NONE, 1.1 logwatch-7.3.1-dovecot.patch, NONE, 1.1 logwatch-7.3.1-init.patch, NONE, 1.1 logwatch.spec, 1.50, 1.51

Wed Dec 20 10:48:33 UTC 2006

Author: varekova

Update of /cvs/dist/rpms/logwatch/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30659

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.1-amavis.patch logwatch-7.3.1-dovecot.patch 
	logwatch-7.3.1-init.patch 
Log Message:
- add dovecot, amavis and init patch 
- cleanup spec file



logwatch-7.3.1-amavis.patch:
 amavis |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

--- NEW FILE logwatch-7.3.1-amavis.patch ---
--- logwatch-7.3.1/scripts/services/amavis.pom	2006-07-06 02:25:00.000000000 +0200
+++ logwatch-7.3.1/scripts/services/amavis	2006-12-20 10:39:57.000000000 +0100
@@ -137,6 +137,19 @@
          $Spams{$Towards}{$FromIP}{$From}++;
       }
 
+   } elsif (($Action, $FromIP, $From, $Towards) = ( $ThisLine =~ /^(Passed |Blocked )?SPAM(?:MY)?, MYUSERS \[.*\] [<(]([^>)]*)[>)] -\> [(<]([^>)]*)[)>]/o )) {
+      # Blocked SPAM, MYUSERS [81.215.226.254] <i at admiracz.com> -> <ldozbaba at admiracz.com>,
+      
+      if ($Action eq "Passed ") {
+         $Counts{'SpamPassed'}++;
+      } else {
+         $Counts{'SpamBlocked'}++;
+      }
+      if ($Detail >= 5) {
+         $From = '<>' if ($From =~ /^$/);
+      $Spams{$Towards}{$FromIP}{$From}++;
+      }
+   
    } elsif (($Action, $Key, $FromIP, $From) = ( $ThisLine =~ /^(?:Virus found - quarantined|(Passed |Blocked )?INFECTED) \(([^\)]+)\),(?: LOCAL)?(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)]/o )) {
       # Blocked INFECTED (HTML.Phishing.Pay-43), [192.168.0.1] [10.0.0.2] <bogus at example.com> -> <someuser at sample.net>...
       # Blocked INFECTED (HTML.Phishing.Pay-43), LOCAL [192.168.0.1] [10.0.0.2] <bogus at example.com> -> <someuser at sample.net>...
@@ -180,7 +193,16 @@
       }
       $From = '<>' if ($From =~ /^$/);
       $BadHeaders{$Towards}{$FromIP}{$From}++;
-
+   } elsif (($Action, $From, $Towards) = ( $ThisLine =~ /(Blocked |Passed )?BAD-HEADER, MYUSERS [(<]([^>)]*)[)>](?: -\> [(<]([^>)]+)[)>])[^:]*/ )) {
+      # Passed BAD-HEADER, MYUSERS <apache at nomi.cz> -> <michal.kuchta at gmail.com>, Message-ID: <20061218223953.D25D453808E at ackle.nomi.cz>, mail_id: 1LXqsTuWfdgt, Hits:
+      $FromIP="";
+      if ($Action eq "Passed ") {
+         $Counts{'BadHeadersPassed'}++;
+      } else {
+         $Counts{'BadHeadersBlocked'}++;
+      }
+      $From = '<>' if ($From =~ /^$/);
+      $BadHeaders{$Towards}{$FromIP}{$From}++;
    } elsif (($From, $Reason) = ( $ThisLine =~ /^BAD HEADER from (?:[(](?:bulk|list|junk) *[)] )?[(<]([^>)]+)[)>]: ([^:]*):.*/ )) {
        # When log_level > 1, provide additional header or MIME violations
 
@@ -213,7 +235,7 @@
    } elsif ( $ThisLine =~ /zero length members, archive retained/ ) {
       $Counts{'ZipEmptyMembers'}++;
 
-   } elsif ( $ThisLine =~ /^(?:\(\!\) )?SA TIMED OUT,/ ) {
+   } elsif ( $ThisLine =~ /^(?:\(\!\)( )?)?SA TIMED OUT,/ ) {
       $Counts{'SATimeout'}++;
 
    } elsif ( $ThisLine =~ /^missing message body; fatal error/ ) {

logwatch-7.3.1-dovecot.patch:
 dovecot |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE logwatch-7.3.1-dovecot.patch ---
--- logwatch-7.3.1/scripts/services/dovecot.pom	2006-08-14 00:02:31.000000000 +0200
+++ logwatch-7.3.1/scripts/services/dovecot	2006-12-20 10:00:33.000000000 +0100
@@ -43,13 +43,15 @@
      # remove timestamp.  We can't use *RemoveHeaders because we need the
      # service name
      $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d [^ ]* //;
-     if ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) {
+     if ($ThisLine =~ /ssl-build-param: SSL parameters regeneration completed/) {
+        # We don't care about these                                                                                                                    
+     } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) {
       if ($Host !~ /$IgnoreHost/) {
          $Login{$User}{$Host}++;
          $ConnectionPOP3{$Host}++;
          $Connection{$Host}++; 
-      }
-   } elsif ( ($User, $Host) = ( $ThisLine =~ /^imap-login: Login: (.*?) \[(.*)\]/ ) ) {
+     }
+     } elsif ( ($User, $Host) = ( $ThisLine =~ /^imap-login: Login: (.*?) \[(.*)\]/ ) ) {
       if ($Host !~ /$IgnoreHost/) {
          $Login{$User}{$Host}++;
          $ConnectionIMAP{$Host}++;

logwatch-7.3.1-init.patch:
 init |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE logwatch-7.3.1-init.patch ---
--- logwatch-7.3.1/scripts/services/init.pom	2005-02-24 18:08:04.000000000 +0100
+++ logwatch-7.3.1/scripts/services/init	2006-12-20 11:15:10.000000000 +0100
@@ -14,7 +14,10 @@
 $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
 
 while (defined($ThisLine = <STDIN>)) {
-   if ( $ThisLine =~ s/Switching to runlevel: (.)\s*$/$1/ ) {
+   if ( $ThisLine =~ /open\(.*\): No such file or directory/) {
+      # We don't care about these     
+   }
+   elsif ( $ThisLine =~ s/Switching to runlevel: (.)\s*$/$1/ ) {
       # Which runlevel did we change to?
       chomp ($ThisLine);
       $RunLevel{$ThisLine}++;


Index: logwatch.spec
===================================================================
RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- logwatch.spec	29 Nov 2006 12:29:41 -0000	1.50
+++ logwatch.spec	20 Dec 2006 10:48:31 -0000	1.51
@@ -1,7 +1,7 @@
-Summary: A log file analysis program.
+Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -18,6 +18,9 @@
 Patch16: logwatch-7.3.1-automount2.patch
 Patch17: logwatch-7.3.1-postfix2.patch
 Patch18: logwatch-7.3.1-vsftpd.patch
+Patch19: logwatch-7.3.1-dovecot.patch
+Patch20: logwatch-7.3.1-amavis.patch
+Patch21: logwatch-7.3.1-init.patch
 
 Requires: textutils sh-utils grep mailx
 BuildRoot: %{_tmppath}/logwatch-build
@@ -43,6 +46,9 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %install
 
@@ -63,8 +69,8 @@
 
 for i in scripts/logfiles/*; do
     if [ $(ls $i | wc -l) -ne 0 ]; then
-	install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
-	install -m 0755 $i/* %{buildroot}%{_datadir}/logwatch/$i
+        install -m 0755 -d %{buildroot}%{_datadir}/logwatch/$i
+        install -m 0755 $i/* %{buildroot}%{_datadir}/logwatch/$i
     fi
 done
 
@@ -147,6 +153,10 @@
 %doc License project/CHANGES project/TODO
 
 %changelog
+* Wed Dec 20 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-8
+- add dovecot, amavis and init patch 
+- cleanup spec file
+
 * Wed Nov 29 2006 Ivana Varekova <varekova at redhat.com> 7.3.1-7
 - add postfix service patch (#208909)
 - add vsftpd service patch (#217226)


