--- rpms/e-smith-email/sme9/e-smith-email.spec	2013/02/07 21:33:25	1.1
+++ rpms/e-smith-email/sme9/e-smith-email.spec	2013/06/23 19:53:54	1.4
@@ -1,15 +1,17 @@
-# $Id: e-smith-email.spec,v 1.35 2012/12/20 03:31:45 wellsi Exp $
+# $Id: e-smith-email.spec,v 1.3 2013/03/16 23:05:59 wellsi Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 5.5.0
-%define release 1
+%define version 5.4.0
+%define release 3
 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
 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 +24,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 +37,17 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* 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 +1386,8 @@ e-smith server and gateway software - em
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks