--- rpms/e-smith-base/sme10/e-smith-base.spec	2016/03/29 16:27:18	1.9
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2016/06/02 15:07:45	1.19
@@ -1,18 +1,26 @@
-# $Id: e-smith-base.spec,v 1.8 2016/03/23 13:28:29 unnilennium Exp $
+# $Id: e-smith-base.spec,v 1.18 2016/05/29 18:26:00 unnilennium Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 7
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: e-smith-base-5.8.0-cpuspeed.patch
+Patch1: e-smith-base-5.8.0-remove_obsolete_services.patch
+Patch2: e-smith-base-5.8.0-remove_ctrlaltdel.patch
+Patch3: e-smith-base-5.8.0-movese_services_to_systemd.patch
+Patch4: e-smith-base-5.8.0-LOCALE.patch
+Patch5: e-smith-base-5.8.0-install_on_every_reboot.patch
+Patch6: e-smith-base-5.8.0-PasswordSet.patch
+Patch7: e-smith-base-5.8.0-console_wrapper.patch
+Patch8: e-smith-base-5.8.0-postinstall.patch
+Patch9: e-smith-base-5.8.0-fix_forward_field_display.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-BuildArch: noarch
 Requires: pwauth
 Requires: e-smith-lib >= 2.2.0-2
 Requires: server-manager-images, server-manager
@@ -56,6 +64,38 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Thu Jun 2 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-17.sme
+- Fix display of email forward fields since smtpd entry has been merged
+  qpsmtpd [SME: 9552]
+
+* Sun May 29 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-16.sme
+- Allow bootstrap to start services after post-install configuration [SME: 9530]
+
+* Thu May 12 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-15.sme
+- Use a C wrapper for the console to replace perl-suid [SME: 9393]
+
+* Wed Apr 13 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-14.sme
+- fix password not asked after signal-event post-install [SME: 9445]
+
+* Wed Apr 13 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-13.sme
+- only start services on regular boot  [SME: 9436]
+
+* Tue Apr 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-12.sme
+- fix getting locale for db configuration  [SME: 9378]
+
+* Mon Apr 11 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-11.sme
+- rearange startup [SME: 9352]
+- let systemd handle following unsupervised services:
+- bootstrap-console, rsyslog, irqbalance, crond, acpid, smartd
+- disable from systemd services whith link in rc7.d
+- let bootstrap-console run at every reboot and handle surpevised services startup
+
+* Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-9.sme
+- Remove ctrlaltdel service entry [SME: 9437]
+
+* Mon Apr 11 2016 Daniel Berteaud <daniel@firewall-services.com> 5.8.0-8.sme
+- Remove obsolete services [SME: 9420]
+
 * Tue Mar 29 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-7.sme
 - added requires dhcp [SME: 9392]
 
@@ -1803,6 +1843,15 @@ e-smith server and gateway software - ba
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 
 %pre
@@ -1823,11 +1872,13 @@ done
 
 /sbin/e-smith/generate-lexicons
 
-xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console
+xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console.pl
 
 perl createlinks
 /sbin/e-smith/buildtests 10e-smith-base
 
+gcc -o root/sbin/e-smith/console console_wrapper.c
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/etc/selinux