--- rpms/e-smith-email/sme9/e-smith-email.spec	2013/12/10 01:40:43	1.6
+++ rpms/e-smith-email/sme9/e-smith-email.spec	2013/12/14 20:41:17	1.7
@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.5 2013/07/05 23:39:56 wellsi 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 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,6 +14,7 @@ Patch1: e-smith-email-5.4.0-smtpMigrate.
 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
@@ -39,6 +40,11 @@ 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]
 
@@ -1398,6 +1404,7 @@ e-smith server and gateway software - em
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks