--- rpms/e-smith-imap/sme8/e-smith-imap.spec	2007/06/12 18:54:17	1.1
+++ rpms/e-smith-imap/sme8/e-smith-imap.spec	2014/02/10 00:07:23	1.8
@@ -1,19 +1,21 @@
+# $Id: e-smith-imap.spec,v 1.7 2013/12/26 04:55:52 charliebrady Exp $
+
 Summary: Module for configuring the IMAP server
 %define name e-smith-imap
 Name: %{name}
-%define version 1.4.0
-%define release 9
+%define version 2.2.0
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-imap-1.4.0-concurrency_control.patch
-Patch1: e-smith-imap-1.4.0-startstop_imaps.patch
-Patch2: e-smith-imap-1.4.0-concurrency_per_ip_twelve.patch
-Patch3: e-smith-imap-1.4.0-seedperms.patch
-Patch4: e-smith-imap-1.4.0-subscriptionsfile.patch
-Patch5: e-smith-imap-1.4.0-imap_capability.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: daemontools
 Requires: ipsvd
@@ -22,6 +24,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 +38,27 @@ AutoReqProv: no
 Module for configuring the IMAP server
 
 %changelog
+* 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]
+
+* Thu Feb 21 2013 Ian Wells <esmith@wellsi.com> 2.2.0-4.sme
+- Remove imap-relocate-maildirs action as obsolete and slow [SME: 6463]
+
+* Tue Nov 25 2008 Giacomo Sanchietti <giacomo.sanchietti@nethesis.it> 2.2.0-3.sme
+- Move creation of chrooted dev/urandom to spec-file [SME: 1105]
+
+* Mon Nov 24 2008 Shad L. Lords <slords@mail.com> 2.2.0-2.sme
+- Create chroot dev/urandom for stunnel to use [SME: 1105]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
 * Fri May 18 2007 Shad L. Lords <slords@mail.com> 1.4.0-9
 - Strip off last ^M from capabilities string [SME: 2883]
 
@@ -336,12 +360,12 @@ Module for configuring the IMAP server
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -412,3 +436,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
+%attr(0444,root,root) %dev(c,1,9) /var/service/imap/ssl/dev/urandom