--- rpms/e-smith-email/sme9/e-smith-email.spec	2013/02/07 21:38:28	1.2
+++ rpms/e-smith-email/sme9/e-smith-email.spec	2013/12/14 20:41:17	1.7
@@ -1,15 +1,20 @@
-# $Id: e-smith-email.spec,v 1.1 2013/02/07 21:33:25 slords Exp $
+# $Id: e-smith-email.spec,v 1.6 2013/12/10 01:40:43 burnat Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.4.0
-%define release 1
+%define release 6
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -22,7 +27,7 @@ Requires: perl(Net::Server::Fork)
 Requires: perl(Net::SMTP)
 Requires: perl(Net::SMTP::SSL)
 Requires: perl(Authen::SASL)
-Requires: perl(Net::Server) >= 0.85
+Requires: perl(Net::Server) >= 0.85 
 Requires: runit
 Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: e-smith-smtp-authentication
@@ -35,11 +40,28 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* 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]
+
 * Wed Feb  6 2013 Shad L. Lords <slords@mail.com> 5.4.0-1.sme
 - Roll new stream for sme9
 
 * 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]
+- 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]
@@ -1378,6 +1400,11 @@ e-smith server and gateway software - em
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks