--- rpms/e-smith-base/sme10/e-smith-base.spec	2016/03/23 13:28:29	1.8
+++ rpms/e-smith-base/sme10/e-smith-base.spec	2016/05/12 17:10:46	1.17
@@ -1,18 +1,24 @@
-# $Id: e-smith-base.spec,v 1.7 2016/03/18 14:27:13 unnilennium Exp $
+# $Id: e-smith-base.spec,v 1.16 2016/04/13 16:07:33 unnilennium Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.8.0
-%define release 6
+%define release 15
 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
 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
@@ -22,11 +28,9 @@ Requires: e-smith-daemontools >= 1.7.1-0
 Requires: perl(Locale::gettext)
 Requires: perl(Crypt::Cracklib)
 Requires: perl(Date::Manip)
-#Requires: perl(Data::UUID)
 Requires: perl(Net::IPv4Addr)
 Requires: perl(Digest::SHA1)
 Requires: /usr/sbin/irqbalance
-#Requires: /usr/sbin/cpuspeed
 Requires: /usr/sbin/smartd
 Requires: dbus
 Requires: acpid
@@ -36,7 +40,7 @@ Requires: vconfig
 Requires: e-smith-bootloader
 Requires: mdadm
 Requires: pv
-#Requires: pam_abl
+Requires: dhcp
 Requires: diald
 Requires: /usr/bin/passwd
 Requires: nss-pam-ldapd
@@ -47,7 +51,6 @@ Obsoletes: rlinetd, e-smith-mod_ssl
 Obsoletes: e-smith-serial-console
 Obsoletes: sshell
 Obsoletes: e-smith-rp-pppoe
-#Obsoletes: perl-Data-UUID
 BuildRequires: perl, perl(Test::Inline) >= 0.12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 BuildRequires: gettext
@@ -59,6 +62,34 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
 * Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 5.8.0-6.sme
 - add Requires perl(Digest::SHA1) for console [SME: 9372]
 
@@ -1803,7 +1834,13 @@ 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
 
 %pre
 /sbin/e-smith/create-system-user smelastsys 2999 \
@@ -1823,11 +1860,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