--- rpms/e-smith-imap/sme8/e-smith-imap.spec	2013/06/23 18:21:27	1.6
+++ rpms/e-smith-imap/sme8/e-smith-imap.spec	2014/02/16 01:52:26	1.10
@@ -1,10 +1,10 @@
-# $Id: e-smith-imap.spec,v 1.5 2013/02/22 03:55:06 wellsi Exp $
+# $Id: e-smith-imap.spec,v 1.9 2014/02/15 03:54:36 wellsi Exp $
 
 Summary: Module for configuring the IMAP server
 %define name e-smith-imap
 Name: %{name}
 %define version 2.2.0
-%define release 5
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,9 @@ Patch1: e-smith-imap-2.2.0-urandom.patch
 Patch2: e-smith-imap-2.2.0-urandomToSpecfile.patch
 Patch3: e-smith-imap-2.2.0-imapRelocate.patch
 Patch4: e-smith-imap-2.2.0-always_enable_imap.patch
+Patch5: e-smith-imap-2.2.0-keepalive.patch
+Patch6: e-smith-imap-2.2.0-stunnel.patch
+Patch7: e-smith-imap-2.2.0-stunnel.patch2
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: daemontools
 Requires: ipsvd
@@ -22,6 +25,7 @@ Requires: mailfront
 Requires: dovecot
 Requires: e-smith-cvm-unix-local
 Requires: e-smith-lib >= 1.15.1-33
+Requires: ipsvd >= 0.12.1-6
 Obsoletes: imap
 Obsoletes: e-smith-wu-imap
 Obsoletes: e-smith-ssl-imap
@@ -35,6 +39,18 @@ AutoReqProv: no
 Module for configuring the IMAP server
 
 %changelog
+* Sat Feb 15 2014 Charlie Brady <charlie_brady@mitel.com> 2.2.0-9.sme
+- Use stunnel-tls instead of sslio to wrap imaps service (take II). [SME: 7999]
+
+* Fri Feb 14 2014 Ian Wells <esmith@wellsi.com> 2.2.0-8.sme
+- Remove last patch. [SME: 7999]
+
+* Sun Feb  9 2014 Charlie Brady <charlie_brady@mitel.com> 2.2.0-7.sme
+- Use stunnel-tls instead of sslio to wrap imaps service. [SME: 7999]
+
+* Wed Dec 25 2013 Charlie Brady <charlie_brady@mitel.com> 2.2.0-6.sme
+- Add keepalive option for tcpsvd for imap and imaps services. [SME: 8078]
+
 * Fri Jun 21 2013 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-5.sme
 - Always enable imap, listen on the loopback if disabled [SME: 7676]
 
@@ -355,6 +371,9 @@ Module for configuring the IMAP server
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks