--- rpms/e-smith-apache/sme8/e-smith-apache.spec	2007/09/17 17:48:55	1.2
+++ rpms/e-smith-apache/sme8/e-smith-apache.spec	2014/12/09 21:55:54	1.21
@@ -1,22 +1,26 @@
+# $Id: e-smith-apache.spec,v 1.20 2014/10/31 11:42:12 vip-ire Exp $
+
 Summary: e-smith server and gateway - apache module
 %define name e-smith-apache
 Name: %{name}
-%define version 1.2.0
+%define version 2.2.0
 %define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-apache-1.2.0-ProxyPassVirtualHosts.patch
-Patch1: e-smith-apache-1.2.0-no_ManagerProxyPass.patch
-Patch2: e-smith-apache-1.2.0-SSLCertificateChainFile.patch
-Patch3: e-smith-apache-1.2.0-logrotate.patch
-Patch4: e-smith-apache-1.2.0-load_module.patch
-Patch5: e-smith-apache-1.2.0-skipdomain.patch
-Patch6: e-smith-apache-1.2.0-lib64.patch
-Patch7: e-smith-apache-1.2.0-rename_apache2httpd.patch
-Patch8: e-smith-apache-1.2.0-create_httpd_logrotate.patch
+Patch0: e-smith-apache-2.2.0-AddOffice2007MIMETypes.patch
+Patch1: e-smith-apache-2.2.0-AddOpenOfficeMIMETypes.patch
+Patch2: e-smith-apache-2.2.0-AddXMLMIMEType.patch
+Patch3: e-smith-apache-2.2.0-AddOpenOffice2MIMETypes.patch
+Patch4: e-smith-apache-2.2.0-optionDisableSSLv2.patch
+Patch5: e-smith-apache-2.2.0-disable-SSLv2.patch
+Patch6: e-smith-apache-2.2.0-server-resources-redirect-fix.patch
+Patch7: e-smith-apache-2.2.0-disableIconsIndex.patch
+Patch8: e-smith-apache-2.2.0-apache_modules.patch
+Patch9: e-smith-apache-2.2.0-35SSL10SSLCipherSuite.patch
+Patch10: e-smith-apache-2.2.0-disable_sslv3.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.15.1
@@ -32,6 +36,55 @@ BuildRequires: e-smith-devtools >= 1.11.
 e-smith server and gateway software - apache module.
 
 %changelog
+* Tue Dec 9 2014 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-15.sme
+- Disable SSLv3 [SME: 8710]
+
+* Fri Oct 31 2014 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-14.sme
+- Revert CRIME mitigation patch, as it's not needed [SME: 8614]
+
+* Fri Oct 24 2014 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-13.sme
+- Mitigate CRIME, CVE-2012-4929 [SME: 8614]
+
+* Mon Jan 13 2014 Ian Wells <esmith@wellsi.com> 2.2.0-12.sme
+- Remove insecure ciphers [SME: 7916]
+
+* Mon Oct 07 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.2.0-11.sme
+- Re-do patch to add missing default httpd.conf modules [SME: 7871]
+
+* Fri Oct 04 2013 John H. Bennett III <bennettj@johnbennettservices.com> 2.2.0-10.sme
+- Patch to add missing default httpd.conf modules [SME: 7871]
+
+* Fri Jun 29 2012 Ian Wells <esmith@wellsi.com> 2.2.0-9.sme
+- Disable index listing of Apache icons folder [SME: 7015]
+
+* Fri Dec 23 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-8.sme
+- Fix server-resources redirect w/o trailing slash [SME: 6758]
+
+* Sat Mar 12 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-7.sme
+- Disable SSLv2 by default [SME: 6482]
+
+* Sun Apr 26 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-6.sme
+- Add option to disable SSLv2 [SME: 5034]
+
+* Sat Mar 28 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Add OpenOffice2 MIME Types [SME: 5112]
+
+* Sat Mar  7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
+- Add OpenOffice MIME Types [SME: 4848]
+- Add XML MIME Type [SME: 5035]
+
+* Thu Dec 11 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-3.sme
+- Fix issues in patch that adds Microsoft Office 2007 MIME types [SME: 4548]
+
+* Tue Dec 2 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
+- Add Microsoft Office 2007 MIME types [SME: 4548]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Tue Oct 23 2007 Filippo Carletti <filippo.carletti@gmail.com> 1.2.0-16
+- Add SSL support to ProxyPass. [SME: 3481]
+
 * Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-15
 - Create/Move httpd logrotate.d directory. [SME: 3380]
 
@@ -528,6 +581,8 @@ e-smith server and gateway software - ap
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %pre