--- rpms/e-smith-manager/sme10/e-smith-manager.spec 2016/03/23 13:23:20 1.4 +++ rpms/e-smith-manager/sme10/e-smith-manager.spec 2016/07/19 10:01:28 1.13 @@ -1,20 +1,26 @@ -# $Id: e-smith-manager.spec,v 1.3 2016/03/18 14:14:48 unnilennium Exp $ +# $Id: e-smith-manager.spec,v 1.12 2016/06/15 17:46:24 unnilennium Exp $ Summary: e-smith manager navigation module %define name e-smith-manager Name: %{name} %define version 2.8.0 -%define release 4 +%define release 12 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 +Patch3: e-smith-manager-2.8.0-newTKTsyntax.patch +Patch4: e-smith-manager-2.8.0-no_index_for_manager_common.patch +Patch5: e-smith-manager-2.8.0-koozali.org +Patch6: e-smith-manager-2.8.0-Koozali_manager.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 @@ -23,6 +29,30 @@ Provides: server-manager AutoReqProv: no %changelog +* Tue Jul 19 2016 Jean-Philipe Pialasse 2.8.0-12.sme +- Update server-manager to Koozali branding [SME: 9676] +- We thanks John Crisp for his wonderful work. + +* Wed Jun 15 2016 Jean-Philipe Pialasse 2.8.0-11.sme +- change link for donation to koozali.org [SME: 9599] + +* Wed Jun 15 2016 Daniel Berteaud 2.8.0-10.sme +- Fix syntax for removing Indexes options [SME: 9587] + +* Wed Jun 15 2016 Daniel Berteaud 2.8.0-9.sme +- Remove index option for manager's resources [SME: 9587] + +* Mon Jun 13 2016 Jean-Philipe Pialasse 2.8.0-8.sme +- fix 307 redirection to http when https is used [SME: 8825] [SME: 9583] +- update syntaxe for TKT Auth +- bump 8 for typo + +* Wed Jun 1 2016 Daniel Berteaud 2.8.0-6.sme +- Fix a syntax error in server-manager's logout script [SME: 9527] + +* Wed May 11 2016 Daniel Berteaud 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 2.8.0-4.sme - fix syntax for httpd 2.4 [SME: 9365] @@ -690,10 +720,16 @@ This RPM contributes the navigation bars %prep %setup %patch0 -p1 - +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -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 @@ -707,7 +743,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 @@ -738,6 +774,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)' \