--- rpms/smeserver-manager/sme10/smeserver-manager.spec	2019/12/16 17:32:51	1.5
+++ rpms/smeserver-manager/sme10/smeserver-manager.spec	2020/01/04 10:12:41	1.6
@@ -1,10 +1,10 @@
-# $Id: smeserver-manager.spec,v 1.4 2018/12/17 12:01:03 jcrisp Exp $
+# $Id: smeserver-manager.spec,v 1.5 2019/12/16 17:32:51 michel Exp $
 
 Summary: smeserver manager 2 navigation module
 %define name smeserver-manager
 Name: %{name}
 %define version 0.1.0
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,7 @@ Source: %{name}-%{version}.tar.xz
 Patch0: smeserver-manager-0.1.0-bz10506.patch
 Patch1: smeserver-manager-add-basic-files.patch
 Patch2: smeserver-manager-0.1.0-mojo_struct.patch
+Patch3: smeserver-manager-0.1.0-setuid_groups.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -28,6 +29,10 @@ Requires: perl(Apache::AuthTkt)
 AutoReqProv: no
 
 %changelog
+* Wed Jan 01 2020 Michel Begue <mab974@gmail.com> 0.1.0-4.sme
+- fix setuid with wrapper (remove sudo)
+- panels quota and groups
+
 * Mon Dec 16 2019 Michel Begue <mab974@gmail.com> 0.1.0-3.sme
 - simple architecture : basic mojolicious app running
 - some panels
@@ -762,12 +767,17 @@ This RPM contributes the navigation bars
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -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
+# Force creation of potentially empty directoriesperl createlinks
+mkdir -p root/etc/e-smith/web/functions2
+mkdir -p root/home/e-smith/db/navigation
+mkdir -p root/etc/e-smith/web/common/css
+mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html}
+mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images
+
+gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c
 
 #mkdir -p root/usr/share/locale/en_US/LC_MESSAGES/
 #xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright
@@ -776,20 +786,14 @@ perl createlinks
 #ln -s head.tmpl root/etc/e-smith/web/common/noframes_head.tmpl
 #ln -s foot.tmpl root/etc/e-smith/web/common/noframes_foot.tmpl
 
-#mkdir -p  root/etc/e-smith/web/panels/manager/html
-#for file in index initial
-#do
-#    ln -s ../../../functions/wrapper root/etc/e-smith/web/panels/manager/html/${file}.cgi
-#done
+#mkdir -p  root/etc/e-smith/web/panels/manager2/html
+for file in index 		#initial
+do
+    ln -s ../../../functions2/wrapper2 root/etc/e-smith/web/panels/manager2/html/${file}.cgi
+done
 
 # Force creation of potentially empty directories
-#mkdir -p root/etc/e-smith/web/{common,functions}
-#mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,html}
-#mkdir -p root/etc/e-smith/web/panels/password/{cgi-bin,html}
 #mkdir -p root/etc/httpd/admin-conf
-mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html}
-mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images
-
 #mkdir -p root/service
 #mkdir -p root/etc/rc.d/init.d/supervise
 #for service in httpd-admin
@@ -813,6 +817,8 @@ rm -f %{name}-%{version}-%{release}-file
 --file /etc/e-smith/web/panels/manager2/cgi-bin/wbl 'attr(4750,root,admin)' \
 --file /etc/e-smith/web/panels/manager2/cgi-bin/useraccounts 'attr(4750,root,admin)' \
 --dir /etc/e-smith/web/panels/manager2 'attr(0755,root,root)' \
+--file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \
+--file /etc/e-smith/web/functions2/index.cgi 'attr(0500,root,root)' \
 > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
 
@@ -861,7 +867,8 @@ chown root:admin /etc/e-smith/web/panels
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js
 chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
 chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep
-
+chown root:admin /etc/e-smith/web/functions2/wrapper2
+chmod 4750  /etc/e-smith/web/functions2/wrapper2
 
 
 %postun