From 90aa49e90997c18b32be541e7f4d244ed43f8e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= <kklic@fedoraproject.org>
Date: Wed, 3 Feb 2010 11:56:00 +0000
Subject: [PATCH] logwatch-7.3.6-dovecot3.patch

---
 logwatch-7.3.6-dovecot3.patch | 39 +++++++++++++++++++++++++++++++++++
 logwatch.spec                 |  3 +++
 2 files changed, 42 insertions(+)
 create mode 100644 logwatch-7.3.6-dovecot3.patch

diff --git a/logwatch-7.3.6-dovecot3.patch b/logwatch-7.3.6-dovecot3.patch
new file mode 100644
index 0000000..8d131c5
--- /dev/null
+++ b/logwatch-7.3.6-dovecot3.patch
@@ -0,0 +1,39 @@
+--- logwatch/scripts/services/dovecot	2009-08-11 21:59:52.000000000 +1000
++++ dovecot	2010-01-16 16:08:55.000000000 +1100
+@@ -82,6 +82,8 @@
+          $ConnectionIMAP{$Host}++;
+          $Connection{$Host}++; 
+       }
++    } elsif ( ($User, $Mailbox) = ( $ThisLine =~ /^dovecot: deliver\((.*)\): msgid=.*: saved mail to (\S+)/ ) ) {
++      $Deliver{$User}{$Mailbox}++;
+ 
+ # This is for Dovecot 1.0 series
+     } elsif ( ($User, $Host) = ( $ThisLine =~ /^dovecot: pop3-login: Login: user=\<(.*?)\>.*rip=(.*)\, lip=/ ) ) {
+@@ -198,6 +200,27 @@
+                  " |" . " " x $totalSpaceLength . $TotalCount . "\n";
+ }
+ 
++if ( ( $Detail >= 10 ) and (keys %Deliver)) {
++   print "\n\nDovecot Deliveries:";
++   $DeliverCount = 0;
++   foreach my $User (keys %Deliver) {
++      print "\n\n  User $User:";
++      $UserCount = 0;
++      $NumMailboxes = 0;
++      foreach $Mailbox (keys %{$Deliver{$User}}) {
++         $NumMailboxes++;
++         $MailboxCount = $Deliver{$User}{$Mailbox};
++         print "\n    To $Mailbox: $MailboxCount Time(s)";
++         $UserCount += $MailboxCount;
++      }
++      $DeliverCount += $UserCount;
++      if ($NumMailboxes > 1) {
++      print "\n  Total: $UserCount Time(s)";
++      }
++   }
++   print "\n\nTotal: $DeliverCount successful deliveries";
++}
++
+ if ( ( $Detail >= 10 ) and (keys %Login)) {
+    print "\n\nDovecot IMAP and POP3 Successful Logins:";
+    $LoginCount = 0;
diff --git a/logwatch.spec b/logwatch.spec
index 0227c35..c8bea60 100644
--- a/logwatch.spec
+++ b/logwatch.spec
@@ -67,6 +67,7 @@ Patch66: logwatch-7.3.6-named6.patch
 Patch67: logwatch-7.3.6-sshd3.patch
 Patch68: logwatch-7.3.6-dhcpd2.patch
 Patch69: logwatch-7.3.6-named7.patch
+Patch70: logwatch-7.3.6-dovecot3.patch
 Requires: textutils sh-utils grep mailx
 Requires: perl(Date::Manip)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -139,6 +140,7 @@ of the package on many systems.
 %patch67 -p1
 %patch68 -p1
 %patch69 -p1
+%patch70 -p1
 rm -f scripts/services/*.orig
 
 %build
@@ -268,6 +270,7 @@ rm -rf %{buildroot}
 - Removed logwatch-7.3.6-dhcpd.patch, obsoleted by #555735
 - Added lines from #550873 to the logwatch-7.3.6-named6.patch
 - Added named7 patch from #555980
+- Added dovecot3 patch from #555745
 
 * Wed Dec  2 2009 Karel Klic <kklic@redhat.com> 7.3.6-49
 - Add 802.1q subinterface support to iptables report; iptables.patch (#507743)