--- rpms/e-smith-manager/sme10/e-smith-manager.spec 2017/03/26 03:32:54 1.19 +++ rpms/e-smith-manager/sme10/e-smith-manager.spec 2022/02/19 04:20:24 1.39 @@ -1,10 +1,10 @@ -# $Id: e-smith-manager.spec,v 1.18 2017/03/26 03:29:06 unnilennium Exp $ +# $Id: e-smith-manager.spec,v 1.38 2021/03/19 03:26:52 jpp Exp $ Summary: e-smith manager navigation module %define name e-smith-manager Name: %{name} %define version 2.8.0 -%define release 17 +%define release 35 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -19,6 +19,17 @@ Patch5: e-smith-manager-2.8.0-koozali.or 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 +Patch17: e-smith-manager-2.8.0-bz10448-bugreport.patch +Patch18: e-smith-manager-2.8.0-bz11872-log.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildRequires: gettext @@ -31,6 +42,45 @@ Provides: server-manager AutoReqProv: no %changelog +* Fri Feb 18 2022 Jean-Philippe Pialasse 2.8.0-35.sme +- removing reference to old log rotation action [SME: 11872] + +* Thu Mar 18 2021 Jean-Philippe Pialasse 2.8.0-34.sme +- take 2 wrong system mode reported in bugreport [SME: 10448] + +* Tue Mar 16 2021 Jean-Philippe Pialasse 2.8.0-33.sme +- fix wrong system mode reported in bugreport [SME: 10448] + +* 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 @@ -743,6 +793,17 @@ This RPM contributes the navigation bars %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 +%patch17 -p1 +%patch18 -p1 %build perl createlinks @@ -770,19 +831,19 @@ mkdir -p root/etc/e-smith/web/panels/pas mkdir -p root/etc/httpd/admin-conf mkdir -p root/service -mkdir -p root/etc/rc.d/init.d/supervise -for service in httpd-admin -do - ln -s /var/service/$service root/service/$service - mkdir -p root/var/service/$service/supervise - touch root/var/service/$service/down - if [ -d root/var/service/$service/log ] - then - mkdir -p root/var/service/$service/log/supervise - mkdir -p root/var/log/$service - fi - ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service -done +#mkdir -p root/etc/rc.d/init.d/supervise +#for service in httpd-admin +#do +# ln -s /var/service/$service root/service/$service +# mkdir -p root/var/service/$service/supervise +# touch root/var/service/$service/down +# if [ -d root/var/service/$service/log ] +# then +# mkdir -p root/var/service/$service/log/supervise +# mkdir -p root/var/log/$service +# fi +# ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service +#done %install rm -rf $RPM_BUILD_ROOT @@ -792,13 +853,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 @@ -807,6 +861,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 | \ @@ -814,6 +874,10 @@ find /etc/e-smith/web/panels/manager/cgi xargs grep -l Persisten | \ xargs rm -f +if [ -d /var/service/httpd-admin ] ; then + rm -rf /var/service/httpd-admin +fi + %postun %files -f %{name}-%{version}-%{release}-filelist