--- rpms/e-smith-base/sme9/e-smith-base.spec 2015/03/31 15:25:08 1.86 +++ rpms/e-smith-base/sme9/e-smith-base.spec 2015/09/05 21:55:51 1.94 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.85 2015/01/16 14:00:07 stephdl Exp $ +# $Id: e-smith-base.spec,v 1.93 2015/08/24 15:59:39 charliebrady Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.6.0 -%define release 18 +%define release 23 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -23,6 +23,10 @@ Patch10: e-smith-base-5.6.0-ensure_apach 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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Requires: pwauth @@ -70,9 +74,25 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Mon Aug 24 2015 Charlie Brady 5.6.0-23.sme +* Use sha256 algorithm for signature of SSL cert. [SME: 8615] + +* Thu Jun 25 2015 Daniel Berteaud 5.6.0-22.sme +- Fix including /etc/selinux directory [SME: 8954] + +* Thu Jun 25 2015 Daniel Berteaud 5.6.0-21.sme +- Add templates for /etc/selinux/config [SME: 8954] + +* Thu Jun 11 2015 Daniel Berteaud 5.6.0-20.sme +- Add dummy NIC support as InternalInterface [SME: 7200] + +* 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 swicthing to or from private server mode - [SME: 8879] +- 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 @@ -1762,6 +1782,10 @@ e-smith server and gateway software - ba %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ @@ -1788,6 +1812,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)' \ @@ -1839,6 +1864,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