--- rpms/e-smith-base/sme9/e-smith-base.spec	2015/01/16 14:00:07	1.85
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2016/01/17 21:04:03	1.97
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.84 2015/01/11 21:36:52 stephdl Exp $
+# $Id: e-smith-base.spec,v 1.96 2015/09/30 09:12:05 vip-ire Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.6.0
-%define release 17
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,13 @@ Patch9: e-smith-base-5.6.0-service_runle
 Patch10: e-smith-base-5.6.0-ensure_apache_alias_www.patch
 Patch11: e-smith-base-5.6.0-specify_dhcpd_configuration_file.patch
 Patch12: e-smith-base-5.6.0-default_to_no_on_quit_console_app.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: pwauth
@@ -69,6 +76,32 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
+* Tue Mar 31 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-19.sme
+- Only fire the ip-change event when IP is assigned to WAN nic
+  (Code by Charlie Brady and John Crisp) [SME: 8896]
+
+* Tue Mar 31 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-18.sme
+- Only reset service access when switching to or from private server mode
+  (Code by Charlie Brady) [SME: 8879]
+
 * Sun Jan 11 2015 Stephane de Labrusse <stephdl@de-labrusse.fr> 5.6.0-17.sme
 - When quiting the console app with unsaved changes set the default selected 
 - answer to NO  Hsing-Foo Wang <hsingfoo@gmail.com> [SME: 8616]
@@ -1756,6 +1789,13 @@ e-smith server and gateway software - ba
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
@@ -1782,6 +1822,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)' \
@@ -1833,6 +1874,8 @@ rm -rf $RPM_BUILD_ROOT
     --dir /var/log/ippp 'attr(2750,smelog,smelog)' \
     --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