--- rpms/e-smith-base/sme9/e-smith-base.spec	2015/06/25 14:55:52	1.91
+++ 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.90 2015/06/11 20:13:30 vip-ire 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 21
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,6 +26,9 @@ Patch13: e-smith-base-5.6.0-only_reset_a
 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
@@ -73,6 +76,18 @@ 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]
 
@@ -1778,6 +1793,9 @@ e-smith server and gateway software - ba
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
@@ -1787,8 +1805,6 @@ e-smith server and gateway software - ba
 
 %build
 
-mkdir -p $RPM_BUILD_ROOT/etc/selinux
-
 LEXICONS=$(find root/etc/e-smith/web/{functions,panels/password/cgi-bin} \
     -type f | grep -v CVS)
 
@@ -1806,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)' \