--- rpms/e-smith-apache/sme9/e-smith-apache.spec	2013/02/14 16:14:18	1.1
+++ rpms/e-smith-apache/sme9/e-smith-apache.spec	2014/10/31 12:31:18	1.12
@@ -1,20 +1,29 @@
-# $Id: e-smith-apache.spec,v 1.14 2012/06/30 03:32:05 wellsi Exp $
+# $Id: e-smith-apache.spec,v 1.11 2014/10/24 10:40:50 vip-ire Exp $
 
 Summary: e-smith server and gateway - apache module
 %define name e-smith-apache
 Name: %{name}
 %define version 2.4.0
-%define release 1
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch1: e-smith-apache-2.4.0-pwauth.patch
+Patch2: e-smith-apache-2.4.0-ibay_auth.patch
+Patch3: e-smith-apache-2.4.0-apache_modules.patch
+Patch4: e-smith-apache-2.4.0-35SSL10SSLCipherSuite.patch
+Patch5: e-smith-apache-2.4.0-ssl_engine_on.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.15.1
 Requires: e-smith-lib >= 1.15.1-19
 Requires: e-smith-daemontools >= 1.7.1-01
+Requires: mod_ssl
+Requires: mod_authnz_external
+Obsoletes: distcache <= 1.4.5
+Obsoletes: mod_auth_external
 Obsoletes: e-smith-proxypass
 Obsoletes: e-smith-apache-proxy
 Conflicts: e-smith-ibays < 1.0.2
@@ -25,6 +34,38 @@ BuildRequires: e-smith-devtools >= 1.11.
 e-smith server and gateway software - apache module.
 
 %changelog
+* Fri Oct 31 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-11.sme
+- Revert CRIME mitigation patch, as it's not needed [SME: 8613]
+
+* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-10.sme
+- Mitigate CVE-2012-4929 [SME: 8613]
+
+* Tue Jul 29 2014 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-9.sme
+- Turn SSLEngine on in the SSL vhost (ProxyPassVirtualHosts) [SME: 8501]
+
+* Tue Jan 28 2014 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Remove insecure ciphers [SME: 8138]
+
+* Mon Oct 07 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.4.0-7.sme
+- Re-do patch to add missing default httpd.conf modules [SME: 7874]
+- Add authz_groupfile as a loadable Module [SME: 7875]
+
+* Fri Oct 04 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.4.0-6.sme
+- Patch to add missing default httpd.conf modules [SME: 7874]
+
+* Mon Sep 30 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.4.0-5.sme
+- Patch to correct issue with not being able to access a password protected ibay [SME: 7794]
+
+* Mon Mar 11 2013 Shad L. Lords <slords@mail.com> 2.4.0-4.sme
+- Obsolete el5 version of distcache [SME: 7273]
+
+* Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-3.sme
+- Obsolete mod_auth_external and require mod_authnz_external [SME: 7319]
+- Change the way module is loaded and initialized
+
+* Mon Feb 18 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-2.sme
+- Add missing dependency on mod_ssl [SME: 7234]
+
 * Wed Feb 13 2013 Shad L. Lords <slords@mail.com> 2.4.0-1.sme
 - Roll new stream for sme9
 
@@ -546,6 +587,11 @@ e-smith server and gateway software - ap
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks