--- rpms/e-smith-proxy/sme8/e-smith-proxy.spec	2008/08/15 23:49:40	1.10
+++ rpms/e-smith-proxy/sme8/e-smith-proxy.spec	2014/02/12 03:05:15	1.18
@@ -1,26 +1,20 @@
+# $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 4.14.0
-%define release 15
+%define version 5.2.0
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-proxy-4.14.0-squidrotate.patch
-Patch2: e-smith-proxy-4.14.0-proxycron.patch
-Patch3: e-smith-proxy-4.14.0-http_port.patch
-Patch4: e-smith-proxy-4.14.0-squid.conf_perms.patch
-Patch5: e-smith-proxy-4.14.0-bind_address.patch
-Patch6: e-smith-proxy-4.14.0-AddWpadFeature.patch
-Patch7: e-smith-proxy-4.14.0-squid26.patch
-Patch8: e-smith-proxy-4.14.0-notenforced.patch
-Patch9: e-smith-proxy-4.14.0-rmFormTitle.patch
-Patch10: e-smith-proxy-4.14.0-tags2general.patch
-Patch11: e-smith-proxy-4.14.0-ChangeWpadURL.patch
-Patch12: e-smith-proxy-4.14.0-no_confref.patch
-Patch13: e-smith-proxy-4.14.0-no_confref-sme8.patch
+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
@@ -28,6 +22,7 @@ Requires: squid
 Requires: e-smith-lib >= 1.15.1-19
 Requires: iptables
 Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-email >= 5.2.0-5
 BuildRequires: e-smith-devtools
 Obsoletes: e-smith-transproxy
 AutoReqProv: no
@@ -36,6 +31,25 @@ 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]
+
+* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 5.2.0-3.sme
+- Change enabled to transparent for mail proxy [SME: 5574]
+
+* Thu Mar 25 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-2.sme
+- New option to block outgoing SMTP connections [SME: 5574]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
 * Fri Aug 15 2008 Shad L. Lords <slords@mail.com> 4.14.0-15
 - Fix obsolete use of esmith::db class in template fragment in sme8. [SME: 4509]
 
@@ -671,24 +685,11 @@ e-smith server and gateway software - pr
 
 %prep
 %setup
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%if "%{?rhel}" == "5"
-%patch7 -p1
-%endif
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%if "%{?rhel}" == "4"
-%patch12 -p1
-%else
-%patch13 -p1
-%endif
 
 %build
 perl createlinks