--- rpms/e-smith-base/sme9/e-smith-base.spec	2014/09/10 07:43:21	1.75
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2015/03/31 15:35:59	1.87
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.74 2014/07/25 13:32:54 vip-ire Exp $
+# $Id: e-smith-base.spec,v 1.86 2015/03/31 15:25:08 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 10
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,12 @@ Patch4: e-smith-base-5.6.0_remove_10runp
 Patch5: e-smith-base-5.6.0-mdevent.patch
 Patch6: e-smith-base-5.6.0-pppoe_after_post_upgrade.patch
 Patch7: e-smith-base-5.6.0-symlink_udev-post.patch
+Patch8: e-smith-base-5.6.0-detect_conf_change_single_nic.patch
+Patch9: e-smith-base-5.6.0-service_runlevel_4.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: pwauth
@@ -64,10 +70,34 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
-* Wed Sep 10 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-10
+* Tue Mar 31 2015 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-18.sme
+- Only reset service access when swicthing 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]
+
+* Tue Jan 6 2015 Stephane de Labrusse <stephdl@de-labrusse.fr> 5.6.0-16.sme
+- Added a comment to specify the real configuration file of dhcpd [SME: 8386]
+
+* Sat Jan 3 2015 Stephane de Labrusse <stephdl@de-labrusse.fr> 5.6.0-15.sme
+- Modified the patch of daniel e-smith-base-5.6.0-ensure_apache_alias_www.patch
+- Ensure www group exists and that apache is an alias of www [SME: 8549]
+
+* Sun Nov 2 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-13.sme
+- Ensure www group exists and that apache is an alias of www [SME: 8549]
+
+* Sun Nov 2 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-12.sme
+- Check were running runlevel 4, not 7 in service wrapper [SME: 8637]
+
+* Sun Sep 21 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-11.sme
+- Correctly update NIC configuration on single NIC systems [SME: 8561]
+
+* Wed Sep 10 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-10.sme
 - Symlink udev-post service in rc7 [SME: 8542]
 
-* Fri Jul 25 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-9
+* Fri Jul 25 2014 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-9.sme
 - Fix PPPoE after a post-upgrade [SME: 8493]
 
 * Thu Jul 3 2014 Ian Wells <esmith@wellsi.com> 5.6.0-8.sme
@@ -1726,6 +1756,13 @@ e-smith server and gateway software - ba
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
     'sme last system user marker' /tmp /bin/false