[dovecot] dovecot updated to 2.2.5

[Michal Hlavinka]

commit 5716e092b06dde150d0145838a5b048d7135b19f
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Aug 7 12:01:43 2013 +0200

    dovecot updated to 2.2.5
    
    - added some missing man pages (by Pascal Volk)
    - director: Users near expiration could have been redirected to
      different servers at the same time.
    - pop3: Avoid assert-crash if client disconnects during LIST.
    - mdbox: Corrupted index header still wasn't automatically fixed.
    - dsync: Various fixes to work better with imapc and pop3c storages.
    - ldap: sasl_bind=yes caused crashes, because Dovecot's lib-sasl
      symbols conflicted with Cyrus SASL library.

 .gitignore                       |    1 +
 dovecot-2.2.4-saslconflict.patch |  745 --------------------------------------
 dovecot.spec                     |   17 +-
 sources                          |    2 +-
 4 files changed, 15 insertions(+), 750 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de7a655..9fe6a2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.2.3.tar.gz
 /dovecot-2.2.4.tar.gz
 /dovecot-2.2-pigeonhole-0.4.1.tar.gz
+/dovecot-2.2.5.tar.gz
diff --git a/dovecot.spec b/dovecot.spec
index 07ac990..3c1cc49 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -3,9 +3,9 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.2.4
+Version: 2.2.5
 %global prever %{nil}
-Release: 3%{?dist}
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -35,7 +35,6 @@ Patch5: dovecot-2.1-privatetmp.patch
 
 #wait for network
 Patch6: dovecot-2.1.10-waitonline.patch
-Patch7: dovecot-2.2.4-saslconflict.patch
 Source15: prestartscript
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,7 +131,6 @@ This package provides the development files for dovecot.
 %patch4 -p1 -b .reload
 %patch5 -p1 -b .privatetmp
 %patch6 -p1 -b .waitonline
-%patch7 -p1 -b .saslconflict
 sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
 
 %build
@@ -486,6 +484,17 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Wed Aug 07 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.2.5-1
+- dovecot updated to 2.2.5
+- added some missing man pages (by Pascal Volk)
+- director: Users near expiration could have been redirected to
+  different servers at the same time.
+- pop3: Avoid assert-crash if client disconnects during LIST.
+- mdbox: Corrupted index header still wasn't automatically fixed.
+- dsync: Various fixes to work better with imapc and pop3c storages.
+- ldap: sasl_bind=yes caused crashes, because Dovecot's lib-sasl
+  symbols conflicted with Cyrus SASL library.
+
 * Tue Jul 30 2013 Michal Hlavinka <mhlavink at redhat.com> - 1:2.2.4-3
 - dovecot pigeonhole updated to 0.4.1
 
diff --git a/sources b/sources
index 82204c0..d550ea5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-984cfc921a83c580c52c86e128e9dac2  dovecot-2.2.4.tar.gz
+0096442e2a1739b1b7997a833248a263  dovecot-2.2.5.tar.gz
 a65196ff02c314eaf53373e281426bcd  dovecot-2.2-pigeonhole-0.4.1.tar.gz