--- rpms/e-smith-apache/sme10/e-smith-apache.spec	2016/03/23 12:58:14	1.5
+++ rpms/e-smith-apache/sme10/e-smith-apache.spec	2020/12/11 02:44:25	1.15
@@ -1,16 +1,24 @@
-# $Id: e-smith-apache.spec,v 1.4 2016/02/07 10:54:50 vip-ire Exp $
+# $Id: e-smith-apache.spec,v 1.14 2020/06/27 20:46:34 jpp Exp $
 
 Summary: e-smith server and gateway - apache module
 %define name e-smith-apache
 Name: %{name}
 %define version 2.6.0
-%define release 2
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-apache-2.6.0-httpd24.patch
+Patch1: e-smith-apache-2.6.0-bz9591-iconspath.patch
+Patch2: e-smith-apache-2.6.0-bz10916-SSLHonorCipherOrder.patch
+Patch3: e-smith-apache-2.6.0-bz10459-Ciphers-and-TLS.patch
+Patch4: e-smith-apache-2.6.0-bz10867-remove-php3-refs.patch
+Patch5: e-smith-apache-2.6.0-bz10966-remove-hardcoded-ports.patch
+Patch6: e-smith-apache-2.6.0-bz8693-SNI.patch
+Patch7: e-smith-apache-2.6.0-bz11123-bz11111-systemd-update.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.15.1
@@ -32,6 +40,14 @@ e-smith server and gateway software - ap
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+rm -rf  root/var/service/ root/service/ root/etc/rc.d/init.d/httpd-e-smith
 
 %build
 perl createlinks
@@ -41,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --file /sbin/e-smith/systemd/httpd-e-smith-prepare 'attr(0554,root,root)' \
     --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
     --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
     --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
@@ -54,8 +71,45 @@ rm -rf $RPM_BUILD_ROOT
 %files -f e-smith-%{version}-filelist
 %defattr(-,root,root)
 
+%pre
+# ease the transition between runit and systemd
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/httpd-e-smith/run ] ; then
+       /usr/bin/sv d httpd-e-smith
+  fi
+fi
 
 %changelog
+* Wed Dec 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- create-update event [SME: 11123]
+- move httpd-e-smith to systemd [SME: 11111]
+  changed sigusr1 used in events to reload as defined in the unit file
+- give a logger to httpd-e-smith : journald [SME: 1416]
+
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
+- set default SSLStrictSNIVHostCheck to off [SME: 8693]
+
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+- add SNI support for individual certificates per VirtualHosts [SME: 8693]
+
+* Sat Jun 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
+- port 80 and 443 should not be hardcoded [SME: 9192]
+- e-smith-apache removing hardcoded ports [SME: 10966] 
+
+* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- remove php3 and php4 refs [SME: 10867]
+
+* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- disable TLSv1 TLSv1.1 by default [SME: 10459]
+  * put strong ciphers first in default string
+  * cipher order and properties with periods
+
+* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+- add SSLHonorCipherOrder Directive  [SME: 10916]
+
+* Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+- update apache icon path [SME: 9591]
+
 * Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
 - fix syntax preventing httpd to launch [SME: 9364]
 - moved changelog at end of file