--- rpms/e-smith-proxy/sme8/e-smith-proxy.spec	2010/09/26 17:12:22	1.14
+++ rpms/e-smith-proxy/sme8/e-smith-proxy.spec	2014/02/12 03:05:15	1.18
@@ -1,10 +1,10 @@
-# $Id: e-smith-proxy.spec,v 1.13 2010/09/26 16:28:40 slords Exp $
+# $Id: e-smith-proxy.spec,v 1.17 2014/01/30 20:30:50 burnat Exp $
 
 Summary: e-smith server and gateway - proxy module
 %define name e-smith-proxy
 Name: %{name}
 %define version 5.2.0
-%define release 4
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,8 @@ Source: %{name}-%{version}.tar.gz
 Patch0: e-smith-proxy-5.2.0-blocksmtp.patch
 Patch1: e-smith-proxy-5.2.0-transparent.patch
 Patch2: e-smith-proxy-5.2.0-transparent2.patch
+Patch3: e-smith-proxy-5.2.0-smtp-proxy-wording.patch
+Patch4: e-smith-proxy-5.2.0-squid_additionnal_SSLports.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -29,6 +31,13 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Thu Jan 30 2014 chris burnat <devlist@burnat.com> 5.2.0-6.sme
+- Modify template to allow Squid proxy https access to ports other than 443,563 using db command [SME: 8159] 
+- Code by John Bennett
+
+* Fri Sep 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-5.sme
+- Fix SMTP proxy wording in server-manager [SME: 6178]
+
 * Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-4.sme
 - Fix missed enabled->transparent mapping [SME: 5574]
 
@@ -679,6 +688,8 @@ e-smith server and gateway software - pr
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks