--- rpms/e-smith-email/sme8/e-smith-email.spec	2009/12/21 16:37:51	1.16
+++ rpms/e-smith-email/sme8/e-smith-email.spec	2012/03/05 04:18:53	1.33
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.15 2009/11/05 18:45:41 snetram Exp $
+# $Id: e-smith-email.spec,v 1.32 2011/09/24 07:31:50 snetram Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.2.0
-%define release 4
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,16 @@ Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-email-5.2.0-localonly.patch
 Patch2: e-smith-email-5.2.0-spamsubject.patch
 Patch3: e-smith-email-5.2.0-HeloHost.patch
+Patch4: e-smith-email-5.2.0-blocksmtp.patch
+Patch5: e-smith-email-5.2.0-HeloHost.patch2
+Patch6: e-smith-email-5.2.0-zero-to-disabled.patch
+Patch7: e-smith-email-5.2.0-transparent.patch
+Patch8: e-smith-email-5.2.0-force_relay.patch
+Patch9: e-smith-email-5.2.0-smtp-auth.patch
+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-DigestMD5.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -38,11 +48,50 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Sun Mar 04 2012 Ian Wells <esmith@wellsi.com> 5.2.0-17.sme
+- MD5 patch originally suggested by Charlie Brady [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]
+
+* Fri Sep 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
+- Fix SMTP auth wording in server-manager [SME: 6320]
+
+* Sat Nov 20 2010 Ian Wells <esmith@wellsi.com> 5.2.0-14.sme
+- SME 8.0 Changelog Cleanup [SME: 6368]
+
+* Sun Oct 31 2010 Shad L. Lords <slords@mail.com> 5.2.0-13.sme
+- Fix property merge when local pseudonym is set [SME: 6370]
+
+* Sun Oct 31 2010 Shad L. Lords <slords@mail.com> 5.2.0-12.sme
+- Add smtp auth into web interface, not just when enabled [SME: 6318]
+
+* Mon Oct 4 2010 Shad L. Lords <slords@mail.com> 5.2.0-11.sme
+- Enable auth for smtp traffic and migrate if necessary [SME: 5575]
+
+* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-10.sme
+- Change enabled to transparent for mail proxy [SME: 5574]
+
+* Tue May 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
+- Fix migrate fragment [SME: 5922]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
+- Fix errors in previous commit [SME: 5922]
+
+* Tue May 4 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-7.sme
+- Set smtp-auth-proxy Debug property to disabled instead of 0 [SME: 5922]
+
+* Sat Apr  3 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-6.sme
+- Fix HeloHost patch. [SME: 5854]
+
+* Thu Mar 25 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-5.sme
+- Block by default the SMTP transparent proxy [SME: 5574]
+
 * Mon Dec 21 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-4.sme
 - Use HeloHost (if present) in smtp-auth-proxy.pl [SME: 5680]
 
 * Wed Nov 4 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-3.sme
-- Allow for changing SPAM subject tag through server-manager
+- Allow for changing SPAM subject tag through server-manager [SME: 5559]
 
 * Wed Oct 29 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
 - Fix 'Allow private' to be correct string [SME: 4731]
@@ -1336,6 +1385,16 @@ e-smith server and gateway software - em
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 perl createlinks