--- rpms/e-smith-email/sme8/e-smith-email.spec	2011/09/24 07:31:50	1.32
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2014/12/05 17:39:04	1.42
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.31 2011/09/23 13:45:45 snetram Exp $
+# $Id: e-smith-email.spec,v 1.41 2014/02/10 22:16:44 charliebrady Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.2.0
-%define release 16
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,15 @@ Patch9: e-smith-email-5.2.0-smtp-auth.pa
 Patch10: e-smith-email-5.2.0-prop_merge.patch
 Patch11: e-smith-email-5.2.0-smtp-auth-wording.patch
 Patch12: e-smith-email-5.2.0-add-cdata-tag.patch
+Patch13: e-smith-email-5.2.0-AuthBlacklist.patch
+Patch14: e-smith-email-5.2.0-StartTLS.patch
+Patch15: e-smith-email-5.2.0-smtpMigrate.patch
+Patch16: e-smith-email-5.2.0-always_enable_imap.patch
+Patch17: e-smith-email-5.2.0-MultiDrop.patch
+Patch18: e-smith-email-5.2.0-AuthOrder.patch
+Patch19: e-smith-email-5.2.0-webmail-only-local-network.patch
+Patch20: e-smith-email-5.2.0-AuthException.patch
+Patch21: e-smith-email-5.2.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
@@ -47,6 +56,40 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Fri Dec 5 2014 stephane de Labrusse <stephdl@de-labrusse.fr> 5.2.0-26.sme
+- Add new zip file signatures to default mailpatterns database : ZIPVOSX & ZIPV3
+- [SME: 8217]
+
+* Mon Feb 10 2014 Charlie Brady <charlie_brady@mitel.com> 5.2.0-25.sme
+- Handle exceptions during attempted SASL auth. Add more debug tracing.
+  [SME: 8202]
+
+* Fri Jan 31 2014 chris burnat <devlist@burnat.com> 5.2.0-24.sme
+- Update of allow webmail-only-local-network by Stephane de Labrusse [SME: 8165]
+
+* Mon Jan 13 2014 Ian Wells <esmith@wellsi.com> 5.2.0-23.sme
+- Only present one auth method at a time, in order, to NET::SMTP, 
+  by Charlie Brady [SME: 6993]
+  Second hunk in patch converts tabs to spaces, no code change.
+  
+* Sat Jun 29 2013 Ian Wells <esmith@wellsi.com> 5.2.0-22.sme
+- Fetchmail multidrop mode follows TCPPort setting, by Hans Riethmann [SME: 7045]
+
+* Fri Jun 21 2013 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-21.sme
+- Always enable imap, listen on the loopback if disabled [SME: 7676]
+
+* Sat Mar 16 2013 Ian Wells <esmith@wellsi.com> 5.2.0-20.sme
+- Avoid use of unitialised variables in smtp migrate fragments [SME: 7495]
+
+* Wed Dec 19 2012 Ian Wells <esmith@wellsi.com> 5.2.0-19.sme
+- Allow smtp_auth_proxy to use port 587 with STARTTLS, by Charlie Brady [SME: 6922]
+
+* Mon Jul 02 2012 Ian Wells <esmith@wellsi.com> 5.2.0-18.sme
+- Allow blacklist of SMTP AUTH methods, replaces previous patch [SME: 7017]
+
+* Sun Mar 04 2012 Ian Wells <esmith@wellsi.com> 5.2.0-17.sme
+- MD5 patch to workaround buggy SMTP servers [SME: 6538]
+
 * Fri Sep 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
 - Fix previous commit to show complete text in server-manager  [SME: 6320]
 
@@ -1390,6 +1433,15 @@ e-smith server and gateway software - em
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 perl createlinks