From 8176def266c918a325ff8c2a8d697fca5aebb37f Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Wed, 30 May 2012 10:18:47 +0200
Subject: [PATCH] updated to 2.1.7

- v2.1.5: Using "~/" as mail_location or elsewhere failed to actually
  expand it to home directory.
- dbox: Fixed potential assert-crash when reading dbox files.
- trash plugin: Fixed behavior when quota is already over limit.
- mail_log plugin: Logging "copy" event didn't work.
- Proxying to backend server with SSL: Verifying server certificate
  name always failed, because it was compared to an IP address.
---
 .gitignore                     |  1 +
 dovecot-2.1.6-systemdfix.patch | 12 ------------
 dovecot.spec                   | 16 ++++++++++++----
 sources                        |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 dovecot-2.1.6-systemdfix.patch

diff --git a/.gitignore b/.gitignore
index 8b13dbe..7067fcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ pigeonhole-snap0592366457df.tar.bz2
 /dovecot-2.1.4.tar.gz
 /dovecot-2.1.5.tar.gz
 /dovecot-2.1.6.tar.gz
+/dovecot-2.1.7.tar.gz
diff --git a/dovecot-2.1.6-systemdfix.patch b/dovecot-2.1.6-systemdfix.patch
deleted file mode 100644
index e65f969..0000000
--- a/dovecot-2.1.6-systemdfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dovecot-2.1.6/src/master/service-listen.c.systemdfix dovecot-2.1.6/src/master/service-listen.c
---- dovecot-2.1.6/src/master/service-listen.c.systemdfix	2012-05-04 23:14:02.000000000 +0200
-+++ dovecot-2.1.6/src/master/service-listen.c	2012-05-09 13:07:39.827730993 +0200
-@@ -339,7 +339,7 @@ int services_listen(struct service_list
- 	}
- 
- #ifdef HAVE_SYSTEMD
--	if (ret == 0)
-+ 	if (ret > 0)
- 		services_verify_systemd(service_list);
- #endif
- 	return ret;
diff --git a/dovecot.spec b/dovecot.spec
index e233f8c..ba7135f 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,9 +1,9 @@
 Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
-Version: 2.1.6
+Version: 2.1.7
 #global prever .rc6
-Release: 2%{?dist}
+Release: 1%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -27,7 +27,6 @@ Patch1: dovecot-2.0-defaultconfig.patch
 Patch2: dovecot-1.0.beta2-mkcert-permissions.patch
 Patch3: dovecot-1.0.rc7-mkcert-paths.patch
 Patch4: dovecot-2.1-privatetmp.patch
-Patch5: dovecot-2.1.6-systemdfix.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel
@@ -112,7 +111,6 @@ This package provides the development files for dovecot.
 %patch2 -p1 -b .mkcert-permissions
 %patch3 -p1 -b .mkcert-paths
 %patch4 -p1 -b .privatetmp
-%patch5 -p1 -b .systemdfix
 sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
 
 %build
@@ -429,6 +427,16 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Wed May 30 2012 Michal Hlavinka <mhlavink@redhat.com> - 1:2.1.7-1
+- updated to 2.1.7
+- v2.1.5: Using "~/" as mail_location or elsewhere failed to actually
+  expand it to home directory.
+- dbox: Fixed potential assert-crash when reading dbox files.
+- trash plugin: Fixed behavior when quota is already over limit.
+- mail_log plugin: Logging "copy" event didn't work.
+- Proxying to backend server with SSL: Verifying server certificate
+  name always failed, because it was compared to an IP address.
+
 * Wed May 09 2012 Michal Hlavinka <mhlavink@redhat.com> - 1:2.1.6-2
 - fix socket activation again, fix in 2.1.6 is incomplete
 
diff --git a/sources b/sources
index 8c66ba9..14da3c3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-56d2a8d5273d39caa41d6a8dd9f4442c  dovecot-2.1.6.tar.gz
+b52d0faf1b9ec21bc5552691fe0ff1d1  dovecot-2.1.7.tar.gz
 a3e19701b775bfe1d8059c1dffd43f80  dovecot-2.1-pigeonhole-0.3.0.tar.gz