From f8c40fb976f8b30a1665c2f38093195b81dfa6e1 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Mon, 4 Oct 2010 08:48:32 +0200
Subject: [PATCH] - dovecot updated to 2.0.5 - acl: Fixed the logic of merging
 multiple ACL entries - sdbox: Fixed memory leak when copying messages with
 hard links. - zlib: Fixed several crashes, which mainly showed up with mbox.
 - quota: Don't crash if user has quota disabled, but plugin loaded. - acl:
 Fixed crashing when sometimes listing shared mailboxes via dict proxy.

---
 .gitignore   |  2 ++
 dovecot.spec | 12 ++++++++++--
 sources      |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e50f390..04b60a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ pigeonhole-snap0592366457df.tar.bz2
 /pigeonhole-snapcb4c1ebecff3.tar.bz2
 /dovecot-2.0.4.tar.gz
 /pigeonhole-snap824454514f08.tar.bz2
+/dovecot-2.0.5.tar.gz
+/pigeonhole-snapa50464354f5a.tar.bz2
diff --git a/dovecot.spec b/dovecot.spec
index 6c8ecb8..8dae169 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,7 +1,7 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
@@ -15,7 +15,7 @@ Source1: dovecot.init
 Source2: dovecot.pam
 #Source8: http://hg.rename-it.nl/dovecot-2.0-pigeonhole/archive/tip.tar.bz2
 #we use this ^^^ repository snapshost just renamed to contain last commit in name
-%global phsnap 824454514f08
+%global phsnap a50464354f5a
 Source8: pigeonhole-snap%{phsnap}.tar.bz2
 Source9: dovecot.sysconfig
 
@@ -361,6 +361,14 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Mon Oct 04 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.5-1
+- dovecot updated to 2.0.5
+- acl: Fixed the logic of merging multiple ACL entries
+- sdbox: Fixed memory leak when copying messages with hard links. 
+- zlib: Fixed several crashes, which mainly showed up with mbox.
+- quota: Don't crash if user has quota disabled, but plugin loaded.
+- acl: Fixed crashing when sometimes listing shared mailboxes via dict proxy.
+
 * Tue Sep 28 2010 Michal Hlavinka <mhlavink@redhat.com> - 1:2.0.4-1
 - dovecot updated to 2.0.4
 - multi-dbox: If :INDEX=path is specified, keep storage/dovecot.map.index* 
diff --git a/sources b/sources
index f54f43e..cae34bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ff1cd0dbfca4a26cce782f7d31cb2028  dovecot-2.0.4.tar.gz
-dbc6c3662736a56dc7d5c7e72b34442a  pigeonhole-snap824454514f08.tar.bz2
+7168c5bf40fdd38cceb99114547699b8  dovecot-2.0.5.tar.gz
+be53da13e7346d6791f419214e1acd5a  pigeonhole-snapa50464354f5a.tar.bz2