--- rpms/e-smith-email/sme9/e-smith-email.spec	2013/03/16 23:05:59	1.3
+++ rpms/e-smith-email/sme9/e-smith-email.spec	2014/12/05 17:45:32	1.11
@@ -1,16 +1,22 @@
-# $Id: e-smith-email.spec,v 1.2 2013/02/07 21:38:28 slords Exp $
+# $Id: e-smith-email.spec,v 1.10 2014/02/11 02:52:18 wellsi Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.4.0
-%define release 2
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch1: e-smith-email-5.4.0-smtpMigrate.patch
+Patch2: e-smith-email-5.4.0-always_enable_imap.patch
+Patch3: e-smith-email-5.4.0-MultiDrop.patch
+Patch4: e-smith-email-5.4.0-webmail-only-local-network.patch
+Patch5: e-smith-email-5.4.0-AuthOrder.patch
+Patch6: e-smith-email-5.4.0-AuthException.patch
+Patch7: e-smith-email-5.4.0-ZIPVOSX-ZIPV3_new_signatures.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -36,6 +42,31 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Dec 5 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 5.4.0-9.sme
+- Add new zip file signatures to default mailpatterns database : ZIPVOSX & ZIPV3
+- [SME: 8218]
+
+* Mon Feb 10 2014 Charlie Brady <charlie_brady@mitel.com> 5.4.0-8.sme
+- Handle exceptions during attempted SASL auth. Add more debug tracing.
+  [SME: 8205]
+  
+* Fri Dec 20 2013 Ian Wells <esmith@wellsi.com> 5.4.0-7.sme
+- Update of allow webmail-only-local-network by Stephane de Labrusse [SME: 7351]
+
+* Sat Dec 14 2013 Ian Wells <esmith@wellsi.com> 5.4.0-6.sme
+- Only present one auth method at a time, in order, to NET::SMTP, 
+  by Charlie Brady [SME: 8060]
+  Second hunk in patch converts tabs to spaces, no code change.
+
+* Tue Dec 10 2013 Chris Burnat <devlist@burnat.com> 5.4.0-5.sme
+- Allow webmail-only-local-network by Stephane de Labrusse [SME: 7351]
+
+* Fri Jul 5 2013 Ian Wells <esmith@wellsi.com> 5.4.0-4.sme
+- Fetchmail multidrop mode follows TCPPort setting, by Hans Riethmann [SME: 7749]
+
+* Sun Jun 23 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-3.sme
+- Always enable imap, listen on loopback is disabled [SME: 7697]
+
 * Sat Mar 16 2013 Ian Wells <esmith@wellsi.com> 5.4.0-2.sme
 - Avoid use of unitialised variables in smtp migrate fragments [SME: 7487]
 
@@ -1383,7 +1414,12 @@ e-smith server and gateway software - em
 %prep
 %setup
 %patch1 -p1
-
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 %build
 perl createlinks