rpms/logwatch/devel logwatch-7.3.6-dovecot_back.patch, NONE, 1.1 logwatch.spec, 1.88, 1.89 logwatch-7.3.6-dovecot.patch, 1.1, NONE

Ivana Varekova (varekova) fedora-extras-commits at redhat.com
Wed Mar 5 10:27:46 UTC 2008


Author: varekova

Update of /cvs/pkgs/rpms/logwatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29435

Modified Files:
	logwatch.spec 
Added Files:
	logwatch-7.3.6-dovecot_back.patch 
Removed Files:
	logwatch-7.3.6-dovecot.patch 
Log Message:
- resolves 436058
  dovecot script for logwatch needs fix for IPv6



logwatch-7.3.6-dovecot_back.patch:

--- NEW FILE logwatch-7.3.6-dovecot_back.patch ---
diff -up logwatch-7.3.6/scripts/services/dovecot.pom logwatch-7.3.6/scripts/services/dovecot
--- logwatch-7.3.6/scripts/services/dovecot.pom	2007-03-17 20:13:13.000000000 +0100
+++ logwatch-7.3.6/scripts/services/dovecot	2008-03-05 11:12:56.000000000 +0100
@@ -1,7 +1,16 @@
 ########################################################
-# $Id: dovecot,v 1.6 2007/03/17 19:13:13 bjorn Exp $
+# $Id: dovecot,v 1.9 2008/02/14 18:19:51 mike Exp $
 ########################################################
 # $Log: dovecot,v $
+# Revision 1.9  2008/02/14 18:19:51  mike
+# Patch from Gilles Detillieux summarize pop3/imap -mgt
+#
+# Revision 1.8  2008/01/16 20:11:04  bjorn
+# Filtering dovecot start-up message, by Gilles Detillieux.
+#
+# Revision 1.7  2007/06/18 03:54:45  bjorn
+# Better printing of IPv6 addresses, by Patrick Vande Walle.
+#
 # Revision 1.6  2007/03/17 19:13:13  bjorn
 # Now handling dovecot starts/kills.
 #
@@ -56,18 +65,20 @@ while (defined($ThisLine = <STDIN>)) {
         # We don't care about these                                                                                                                    
      } elsif ( $ThisLine =~ /Killed with signal /) {
          $End++;
-     } elsif ( $ThisLine =~ /Dovecot starting up$/) {
+     } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up$/) {
          $Restarts++;
          $End = 0;
      } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) {
       if ($Host !~ /$IgnoreHost/) {
          $Login{$User}{$Host}++;
+         $LoginPOP3{$User}++;
          $ConnectionPOP3{$Host}++;
          $Connection{$Host}++; 
       }
    } elsif ( ($User, $Host) = ( $ThisLine =~ /^imap-login: Login: (.*?) \[(.*)\]/ ) ) {
       if ($Host !~ /$IgnoreHost/) {
          $Login{$User}{$Host}++;
+         $LoginIMAP{$User}++;
          $ConnectionIMAP{$Host}++;
          $Connection{$Host}++; 
       }
@@ -76,12 +87,14 @@ while (defined($ThisLine = <STDIN>)) {
     } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: pop3-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/ ) ) {
       if ($Host !~ /$IgnoreHost/) {
          $Login{$User}{$Host}++;
+         $LoginPOP3{$User}++;
          $ConnectionPOP3{$Host}++;
          $Connection{$Host}++;
       }
    } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: imap-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/) ) {
       if ($Host !~ /$IgnoreHost/) {
          $Login{$User}{$Host}++;
+         $LoginIMAP{$User}++;
          $ConnectionIMAP{$Host}++;
          $Connection{$Host}++;
        }
@@ -132,8 +145,8 @@ if ( ( $Detail >=5 ) and $Restarts ) {
 if ( ( $Detail >= 5 ) and (keys %Connection)) {
    print     "\n[Dovecot IMAP and POP3] Connections:".
              "\n====================================".
-             "\n                      Host |     POP3    |   IMAP   |   Total ".
-             "\n-------------------------- | ----------- |--------- | ---------";
+             "\n                                  Host |    POP3   |   IMAP   |   Total ".
+             "\n-------------------------------------- | --------- |--------- | ---------";
   
    $TLSInitFail = 0;
    foreach $Host (sort keys %Connection) {
@@ -151,9 +164,9 @@ if ( ( $Detail >= 5 ) and (keys %Connect
 # Cleanly display IPv4 addresses
       $Host=~ s/::ffff://;
       $HostLength = length($Host);
-      $HostSpaceLength = 26 - $HostLength;
+      $HostSpaceLength = 38 - $HostLength;
       $CountLength = length("$Conns");
-      $CountSpaceLength = 12 - $CountLength;
+      $CountSpaceLength = 10 - $CountLength;
       $IMAPLength = length("$IMAP");
       $IMAPSpaceLength = 9 - $IMAPLength;
       $TotalLenght = length("$Total");
@@ -165,12 +178,12 @@ if ( ( $Detail >= 5 ) and (keys %Connect
       $TotalCount += $Total;
    }
    $POP3Length = length("$POP3Count");
-   $POP3SpaceLength = 40 - $POP3Length;
+   $POP3SpaceLength = 50 - $POP3Length;
    $IMAPLength = length("$IMAPCount");
    $IMAPSpaceLength = 9 - $IMAPLength;
    $TotalLength = length("$TotalCount");
    $totalSpaceLength = 10 - $TotalLength;
-   print "\n" . "-" x 63;
+   print "\n" . "-" x 73;
    print "\n" . " " x $POP3SpaceLength . $POP3Count . " |" . " " x $IMAPSpaceLength . $IMAPCount .
                  " |" . " " x $totalSpaceLength . $TotalCount . "\n";
 }
@@ -180,6 +193,13 @@ if ( ( $Detail >= 10 ) and (keys %Login)
    $LoginCount = 0;
    foreach my $User (keys %Login) {
       print "\n\n  User $User:";
+      if ($LoginPOP3{$User} > 0 || $LoginIMAP{$User} > 0) {
+         print "   (";
+         if ($LoginPOP3{$User} > 0) { print "$LoginPOP3{$User} POP3"; };
+         if ($LoginPOP3{$User} > 0 && $LoginIMAP{$User} > 0) { print "/"; };
+         if ($LoginIMAP{$User} > 0) { print "$LoginIMAP{$User} IMAP"; };
+         print ")";
+      }
       $UserCount = 0;
       $NumHosts = 0;
       foreach $Host (keys %{$Login{$User}}) {


Index: logwatch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logwatch/devel/logwatch.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- logwatch.spec	14 Feb 2008 13:57:29 -0000	1.88
+++ logwatch.spec	5 Mar 2008 10:27:07 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: A log file analysis program
 Name: logwatch
 Version: 7.3.6
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: MIT
 Group: Applications/System
 URL: http://www.logwatch.org/
@@ -28,7 +28,6 @@
 Patch22: logwatch-7.3.6-sshd1.patch
 Patch23: logwatch-7.3.6-clamav-milter.patch
 Patch24: logwatch-7.3.6-conf.patch
-Patch25: logwatch-7.3.6-dovecot.patch
 Patch26: logwatch-7.3.6-amavis.patch
 Patch27: logwatch-7.3.6-oldfiles.patch
 Patch28: logwatch-7.3.6-usage.patch
@@ -37,6 +36,7 @@
 Patch31: logwatch-7.3.6-openvpn.patch
 Patch32: logwatch-7.3.6-postfix.patch
 Patch33: logwatch-7.3.6-cron4.patch
+Patch34: logwatch-7.3.6-dovecot_back.patch
 
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
@@ -73,7 +73,6 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
@@ -82,6 +81,7 @@
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -195,12 +195,16 @@
 %doc License project/CHANGES 
 
 %changelog
+* Wed Mar  5 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-20
+- resolves 436058
+  dovecot script for logwatch needs fix for IPv6
+
 * Thu Feb 14 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-19
 - resolves cron service problem (#432766)
 
 * Mon Jan 28 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-18
--  resolves: #429933 fix postfix script
-   thanks Benjamin Gordon
+- resolves: #429933 fix postfix script
+  thanks Benjamin Gordon
 
 * Mon Jan 21 2008 Ivana Varekova <varekova at redhat.com> 7.3.6-17
 - Resolves: #427734


--- logwatch-7.3.6-dovecot.patch DELETED ---




More information about the fedora-extras-commits mailing list