--- rpms/e-smith-manager/sme10/e-smith-manager.spec 2016/03/18 11:10:13 1.2 +++ rpms/e-smith-manager/sme10/e-smith-manager.spec 2020/12/11 04:00:40 1.35 @@ -1,19 +1,37 @@ -# $Id: e-smith-manager.spec,v 1.1 2016/02/05 22:38:38 stephdl Exp $ +# $Id: e-smith-manager.spec,v 1.34 2020/06/27 18:28:04 jpp Exp $ Summary: e-smith manager navigation module %define name e-smith-manager Name: %{name} %define version 2.8.0 -%define release 2 +%define release 32 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 +Patch7: e-smith-manager-2.8.0-bz9924-badredirection.patch +Patch8: e-smith-manager-2.8.0-bz9921-timeout.patch +Patch9: e-smith-manager-2.8.0-bz10167-emptyback.patch +Patch10: e-smith-manager-2.8.0-bz10209-unitializedUsername.patch +Patch11: e-smith-manager-2.8.0-bz8783-bugreport.patch +Patch12: e-smith-manager-2.8.0-bz10170-SME10eol.patch +Patch13: e-smith-manager-2.8.0-bz9591-iconspath.patch +Patch14: e-smith-manager-2.8.0-bz9677_password_followsymlinks.patch +Patch15: e-smith-manager-2.8.0-bz10967-remove-hardcoded-ports.patch +Patch16: e-smith-manager-2.8.0-bz11144-bz11110-systemd-update.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 +40,84 @@ Provides: server-manager AutoReqProv: no %changelog +* Thu Dec 10 2020 Jean-Philipe Pialasse 2.8.0-32.sme +- create -update event [SME: 11144] +- migrate httpd-admin to systemd [SME: 11110] + +* Sat Jun 27 2020 Jean-Philipe Pialasse 2.8.0-31.sme +- removing hardcoded ports [SME: 10967] + +* Wed Dec 18 2019 Michel Begue 2.8.0-29.sme +- Add a FollowSymlinks for user-password in password/cgi-bin (perl-suid) [SME: 9677] + +* Tue Dec 10 2019 Jean-Philipe Pialasse 2.8.0-29.sme +- update apache icon path [SME: 9591] + +* Sun Feb 04 2018 Jean-Philipe Pialasse 2.8.0-28.sme +- add message to indicate EOL after Jun 30 2024 fix [SME: 10170] + +* Sun Apr 16 2017 Jean-Philipe Pialasse 2.8.0-26.sme +- add a panel to ease reporting bugs [SME: 8783] +- Original work from Mats Schuh m.schuh@neckargeo.net + +* Wed Apr 05 2017 Jean-Philipe Pialasse 2.8.0-20.sme +- fix warning uninitialized value in lc [SME: 10209] + +* Mon Mar 27 2017 Jean-Philipe Pialasse 2.8.0-19.sme +- fix typo in e-smith-manager-2.8.0-bz10167-emptyback.patch + +* Sat Mar 25 2017 Jean-Philipe Pialasse 2.8.0-18.sme +- avoid internal server error if empty back parameter [SME: 10167] +- return user friendly message + +* Sat Mar 25 2017 Jean-Philipe Pialasse 2.8.0-17.sme +- fix too short timeout in server-manager [SME: 9921] +- now 30 min as default instead of 5 +- possibility to change this and adapt the default 0.66 of timeout remaining to reset it +- by default only a session cookie, can activate persistent cookie +- sha256 as encryption. + +* Mon Jan 16 2017 Jean-Philipe Pialasse 2.8.0-15.sme +- fix bad redirection parameter that might reveal session information to remote site [SME: 9924] + +* Tue Jul 19 2016 Jean-Philipe Pialasse 2.8.0-13.sme +- added missing template-begin for tkt.css [SME: 9676] + +* 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] + +* Fri Mar 18 2016 Jean-Philipe Pialasse 2.8.0-3.sme +- rebuild for Bug [SME: 9347] +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or .... + Wed Apr 04 2002 --> Wed Apr 03 2002 or Thu Apr 04 2002 or Wed Apr 10 2002 or .... + Tue May 15 2008 --> Tue May 13 2008 or Thu May 15 2008 or Tue May 20 2008 or .... + * Fri Mar 18 2016 Daniel Berteaud 2.8.0-2.sme - Don't require perl-suidperl anymore [SME: 9339] @@ -36,7 +132,7 @@ AutoReqProv: no - Don't redirect to http when login in/out of the server-manager from localhost [SME: 9163] -* Wed Jan 6 2015 Daniel Berteaud 2.6.0-2.sme +* Tue Jan 6 2015 Daniel Berteaud 2.6.0-2.sme - Allow access to the server-manager without SSL from the loopback [SME: 9163] @@ -101,7 +197,8 @@ AutoReqProv: no * Tue Jul 1 2008 Shad L. Lords 1.14.0-18 - Fix open of database to create if necessary [SME: 4147] -* Tue May 15 2008 Shad L. Lords 1.14.0-17 +* Thu May 15 2008 Shad L. Lords 1.14.0-17 + Tue May 15 2008 --> Tue May 13 2008 or Thu May 15 2008 or Tue May 20 2008 or .... - No longer remove navigation dbs. [SME: 4147] - Deal a little more gracefully with non UTF-8 lexicons [SME: 4229] @@ -546,7 +643,8 @@ AutoReqProv: no - [1.5.1-01] - navigation is now polymorphic and does noframes as well [gordonr #3155] -* Wed Apr 04 2002 Gordon Rowell +* Thu Apr 04 2002 Gordon Rowell + Wed Apr 04 2002 --> Wed Apr 03 2002 or Thu Apr 04 2002 or Wed Apr 10 2002 or .... - [1.5.0-01] - Rolled to development stream [gordonr] @@ -666,7 +764,8 @@ AutoReqProv: no - [0.1.1-02] - changing CELLPADDING in navigation from 4 to 2. -* Wed Mar 14 2000 Charlie Brady +* Tue Mar 14 2000 Charlie Brady + Wed Mar 14 2000 --> Wed Mar 08 2000 or Tue Mar 14 2000 or Wed Mar 15 2000 or .... - initial release %description @@ -674,9 +773,28 @@ This RPM contributes the navigation bars %prep %setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +rm -rf root/var/service %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 @@ -690,7 +808,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 @@ -721,13 +839,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)' \ - --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)' \ - --dir /var/service/httpd-admin/log 'attr(0755,root,root)' \ - --dir /var/service/httpd-admin/log/supervise 'attr(0700,root,root)' \ - --dir /var/service/httpd-admin/supervise 'attr(0700,root,root)' \ - --file /var/service/httpd-admin/log/run 'attr(0755,root,root)' \ + --file /etc/e-smith/web/functions/wrapper 'attr(4750,root,admin)' \ --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \ > %{name}-%{version}-%{release}-filelist echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist @@ -736,6 +848,12 @@ echo "%doc COPYING" >> %{name}-%{version rm -rf $RPM_BUILD_ROOT %pre +if [ $1 -gt 1 ] ; then + if [ -e /var/service/httpd-admin/run ] ; then + /usr/bin/sv d httpd-admin + /usr/bin/sv d httpd-admin/log + fi +fi %preun %post find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \