--- rpms/e-smith-manager/sme10/e-smith-manager.spec 2017/01/19 23:44:59 1.16 +++ rpms/e-smith-manager/sme10/e-smith-manager.spec 2020/12/11 04:00:40 1.35 @@ -1,10 +1,10 @@ -# $Id: e-smith-manager.spec,v 1.15 2017/01/16 23:56:49 unnilennium 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 15 +%define release 32 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -18,6 +18,16 @@ Patch4: e-smith-manager-2.8.0-no_index_f 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 @@ -30,6 +40,43 @@ 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] @@ -734,6 +781,16 @@ This RPM contributes the navigation bars %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 @@ -783,13 +840,6 @@ rm -f %{name}-%{version}-%{release}-file --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)' \ - --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)' \ --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \ > %{name}-%{version}-%{release}-filelist echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist @@ -798,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 | \