--- rpms/e-smith-base/sme9/e-smith-base.spec	2015/06/11 20:13:30	1.90
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2017/11/15 15:36:55	1.105
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.89 2015/03/31 16:52:29 vip-ire Exp $
+# $Id: e-smith-base.spec,v 1.104 2017/11/15 11:50:46 jpp Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.6.0
-%define release 20
+%define release 33
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,6 +25,17 @@ Patch12: e-smith-base-5.6.0-default_to_n
 Patch13: e-smith-base-5.6.0-only_reset_access_for_private_server.patch
 Patch14: e-smith-base-5.6.0-only_fire_ip_change_on_wan.patch
 Patch15: e-smith-base-5.6.0-dummy_nic.patch
+Patch16: e-smith-base-5.6.0-disable_selinux.patch
+Patch17: e-smith-base-5.6.0_sha256_cert.patch
+Patch18: e-smith-base-5.6.0-update_mime_types.patch
+Patch19: e-smith-base-5.6.0-ssl_update.patch
+Patch20: e-smith-base-5.6.0-reload_ssl_when_renew_cert.patch
+Patch21: e-smith-base-5.6.0-display_http_server_manager.patch
+Patch22: e-smith-base-5.6.0-add_forward_column.patch
+Patch23: e-smith-base-5.6.0-allow_32bits_mask.patch
+Patch24: e-smith-base-5.6.0-ip_route_syntax.patch
+Patch25: e-smith-base-5.8.0-expand_route_bond0.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: pwauth
@@ -72,6 +83,49 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Wed Nov 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-33.sme
+- revert previous change, wrong package
+
+* Wed Nov 15 2017 Jean-Philipe Pialasse <tests@pialasse.com> 5.6.0-32.sme
+- added post transaction rule for ntp [SME: 10454] 
+- backport of SME10 [SME: 10190]
+- thank you to Stefano Zamboni for this work
+
+* Thu May 4 2017 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-31.sme
+- Backport from sme10: Expand route-bond0 when nic bonding is enabled
+  [SME: 10270]
+
+* Thu Feb 9 2017 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-30.sme
+- Use ip route syntax to define routes to local network [SME: 9905]
+
+* Tue Sep 13 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-29.sme
+- Allow /32 masks on the external interface, in which case we don't
+  check if the gateway is on the correct network) [SME: 9765]
+
+* Sun Jan 31 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-28.sme
+- Add a column to display forwarding address [SME: 9174]
+
+* Sun Jan 31 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-27.sme
+- Correctly display http URL to the server-manager in the console [SME: 9163]
+
+* Sun Jan 17 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-26.sme
+- Fire ssl-update event when default cert is renewed [SME: 2257]
+
+* Sun Jan 17 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-25.sme
+- Expand /home/e-smith/ssl.pem/pem during ssl-update [SME: 9152]
+
+* Tue Sep 30 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-24.sme
+- Update /etc/mime.types templates [SME: 9078]
+
+* Mon Aug 24 2015 Charlie Brady <charlie_brady@mitel.com> 5.6.0-23.sme
+- Use sha256 algorithm for signature of SSL cert. [SME: 8615]
+
+* Thu Jun 25 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-22.sme
+- Fix including /etc/selinux directory [SME: 8954]
+
+* Thu Jun 25 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-21.sme
+- Add templates for /etc/selinux/config [SME: 8954]
+
 * Thu Jun 11 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-20.sme
 - Add dummy NIC support as InternalInterface [SME: 7200]
 
@@ -1773,6 +1827,16 @@ e-smith server and gateway software - ba
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
@@ -1799,6 +1863,7 @@ perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/selinux
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /etc/cron.daily/conf-mod_ssl 'attr(0544,root,root)' \
@@ -1851,6 +1916,7 @@ rm -rf $RPM_BUILD_ROOT
     --dir /etc/e-smith/skel/user/.ssh 'attr(0700,root,root)' \
     --file /var/service/local/run 'attr(0750,root,root)' \
     --file /etc/sysconfig/modules/dummy.modules 'attr(0755,root,root)' \
+    --dir /etc/selinux 'attr(0755,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 
 mkdir -p $RPM_BUILD_ROOT/home/e-smith/db