--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2018/12/17 12:01:03 1.4 +++ 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.3 2018/02/04 18:11:07 jpp 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 2 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -12,6 +12,8 @@ Group: Networking/Daemons 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 @@ -19,13 +21,23 @@ BuildRequires: gcc Requires: e-smith-lib >= 1.18.0-26 Requires: e-smith-manager >= 2.4.0-22 Requires: perl-Mojolicious >= 6.44 +Requires: perl-Mojolicious-Plugin-I18N >= 1.6 Requires: pwauth Requires: perl(Apache::AuthTkt) -Requires: smeserver-manager-html -Provides: server-manager2 +#Requires: smeserver-manager-html +#Provides: server-manager2 AutoReqProv: no %changelog +* Wed Jan 01 2020 Michel Begue 0.1.0-4.sme +- fix setuid with wrapper (remove sudo) +- panels quota and groups + +* Mon Dec 16 2019 Michel Begue 0.1.0-3.sme +- simple architecture : basic mojolicious app running +- some panels +- requires perl-Mojolicious-Plugin-I18N + * Tue Feb 06 2018 John Crisp 0.1.0-2.sme - Start adding some template files @@ -754,12 +766,18 @@ This RPM contributes the navigation bars %setup %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 @@ -768,19 +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/service #mkdir -p root/etc/rc.d/init.d/supervise #for service in httpd-admin @@ -804,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 @@ -827,13 +842,35 @@ rm -rf $RPM_BUILD_ROOT %pre %preun +#rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/css/sme_core.css +#rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/images/btn_donateCC_LG.gif +#rm -f /etc/e-smith/web/panels/manager2/cgi-bin/logout + %post #find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \ # sed -n '/\/[0-9a-z]\{32\}$/p' | \ # xargs grep -l Persisten | \ # xargs rm -f +ln -s /etc/e-smith/web/common/css/sme_core.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_core.css +ln -s /etc/e-smith/web/common/css/sme_main.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_main.css +ln -s /etc/e-smith/web/common/css/sme_menu.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_menu.css +ln -s /etc/e-smith/web/common/btn_donateCC_LG.gif /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images/btn_donateCC_LG.gif +ln -s /etc/e-smith/web/common/smeserver_logo.jpg /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images/smeserver_logo.jpg +ln -s /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/srvmngr.conf +ln -s /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/srvmngr.pl +ln -s /etc/e-smith/web/common/cgi-bin/logout /etc/e-smith/web/panels/manager2/cgi-bin/logout +/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf +chmod 0755 /etc/e-smith/web/panels/manager2/html/index.cgi +chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log +chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log +chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js +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 +%postun %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root)