--- rpms/e-smith-base/sme9/e-smith-base.spec 2015/01/03 19:53:54 1.79 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2015/03/31 16:52:29 1.89 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.78 2014/11/02 21:53:22 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.88 2015/03/31 15:42:54 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 13 +%define release 19 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -20,6 +20,10 @@ Patch7: e-smith-base-5.6.0-symlink_udev- 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 +Patch14: e-smith-base-5.6.0-only_fire_ip_change_on_wan.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -67,7 +71,22 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog -* Sat Jan 3 2014 Stephane de Labrusse 5.6.0-14.sme +* Tue Mar 31 2015 Daniel Berteaud 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 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 5.6.0-17.sme +- When quiting the console app with unsaved changes set the default selected +- answer to NO Hsing-Foo Wang [SME: 8616] + +* Tue Jan 6 2015 Stephane de Labrusse 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 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] @@ -1745,6 +1764,11 @@ e-smith server and gateway software - ba %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 + %pre /sbin/e-smith/create-system-user smelastsys 2999 \ 'sme last system user marker' /tmp /bin/false