--- rpms/e-smith-manager/sme10/e-smith-manager.spec	2016/03/18 14:14:48	1.3
+++ rpms/e-smith-manager/sme10/e-smith-manager.spec	2016/06/01 06:49:42	1.6
@@ -1,19 +1,22 @@
-# $Id: e-smith-manager.spec,v 1.2 2016/03/18 11:10:13 vip-ire Exp $
+# $Id: e-smith-manager.spec,v 1.5 2016/05/12 17:09:12 vip-ire Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.8.0
-%define release 3
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: e-smith-manager-2.8.0-fixsyntax.patch
+Patch1: e-smith-manager-2.8.0-manager_suid_wrapper.patch
+Patch2: e-smith-manager-2.8.0-fix_logout.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
-BuildArchitectures: noarch
+BuildRequires: gcc
 Requires: e-smith-lib >= 1.18.0-26
 Requires: mod_auth_tkt
 Requires: pwauth
@@ -22,6 +25,15 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Wed Jun 1 2016 Daniel Berteaud <daniel@firewall-services.com> 2.8.0-6.sme
+- Fix a syntax error in server-manager's logout script [SME: 9527]
+
+* Wed May 11 2016 Daniel Berteaud <daniel@firewall-services.com> 2.8.0-5.sme
+- Add a C wrapper to execute manager's cgi to replace perl-suid [SME: 9393]
+
+* Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-4.sme
+- fix syntax for httpd 2.4 [SME: 9365]
+
 * Fri Mar 18 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-3.sme
 - rebuild for Bug [SME: 9347]
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
@@ -685,9 +697,13 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
+gcc -o root/etc/e-smith/web/functions/wrapper manager.c
 mkdir -p root/home/e-smith/db/navigation
 mkdir -p root/etc/e-smith/web/common/css
 
@@ -701,7 +717,7 @@ ln -s foot.tmpl root/etc/e-smith/web/com
 mkdir -p  root/etc/e-smith/web/panels/manager/html
 for file in index initial
 do
-    ln -s ../../../functions/${file}.cgi root/etc/e-smith/web/panels/manager/html/${file}.cgi
+    ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/manager/html/${file}.cgi
 done
 
 # Force creation of potentially empty directories
@@ -732,6 +748,7 @@ rm -f %{name}-%{version}-%{release}-file
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /etc/e-smith/web/common/cgi-bin/login 'attr(0755,root,root)' \
     --file /etc/e-smith/web/common/cgi-bin/logout 'attr(0755,root,root)' \
+    --file /etc/e-smith/web/functions/wrapper 'attr(4750,root,admin)' \
     --dir /var/service/httpd-admin 'attr(01755,root,root)' \
     --file /var/service/httpd-admin/down 'attr(0644,root,root)' \
     --file /var/service/httpd-admin/run 'attr(0755,root,root)' \