--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/10/10 20:51:32 1.49 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2022/07/17 04:42:23 1.62 @@ -1,16 +1,27 @@ -# $Id: smeserver-manager.spec,v 1.48 2021/06/21 15:09:42 michel Exp $ - Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.4 -%define release 2 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Source1: visible.png Patch0: %{name}-%{version}-list_access_csrf.patch +Patch1: %{name}-%{version}-review_csrf_url.patch +Patch2: smeserver-manager-0.1.4-Add-dummy-classes-to-ep-files.patch +Patch3: smeserver-manager-0.1.4-Add-span-to-group-member-checkbox-list.patch +Patch4: smeserver-manager-0.1.4-Review-configuration-Virtual-domains-re-format-html.patch +Patch5: smeserver-manager-0.1.4-Sort-out-responsive-table-in-user-and-host-lists.patch +Patch6: smeserver-manager-0.1.4-fix-translation-strings-with-prefix-for-review-config.patch +Patch7: smeserver-manager-0.1.4-format-for-dhcp-ips-in-review-config.patch +Patch8: smeserver-manager-0.1.4-fix_backup_empty_selection_list.patch +Patch9: smeserver-manager-0.1.4-toggle_password_and_menu-jquery_cond-csrf_get.patch +Patch10: smeserver-manager-0.1.4-Update-format-for-datetime-and-reboot.patch +Patch11: smeserver-manager-0.1.4-bz12110-untainting-printer.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -25,11 +36,11 @@ BuildRequires: e-smith-devtools Requires: e-smith-lib >= 1.18.0-26 Requires: e-smith-manager >= 2.4.0-22 -Requires: perl(Mojolicious) >= 7.56 -Requires: perl(Mojolicious::Plugin::I18N) >= 1.6 -Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12 -Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8 -Requires: perl(Net::Netmask) >= 1.9 +Requires: perl(Mojolicious) >= 7.56 +Requires: perl(Mojolicious::Plugin::I18N) >= 1.6 +Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12 +Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8 +Requires: perl(Net::Netmask) >= 1.9 #Requires: js-jquery > 2.2.4-3 (optional) Provides: server-manager @@ -43,6 +54,17 @@ 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 %build perl createlinks @@ -51,6 +73,8 @@ perl createlinks mkdir -p root/etc/e-smith/db/routes mkdir -p root/home/e-smith/db/navigation2 mkdir -p root%{dir_mngr}/themes/default/public/css +mkdir -p root%{dir_mngr}/data +cp %{SOURCE1} root%{dir_mngr}/themes/default/public/images %install rm -rf $RPM_BUILD_ROOT @@ -73,29 +97,80 @@ echo "%doc COPYING f2b/*" >> %{name}-%{v %clean rm -rf $RPM_BUILD_ROOT -%pre - %preun -if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +# complete remove +if [ $1 == 0 ] then - unlink %{dir_mngr}/themes/default/public/js/jquery.min.js + systemctl stop smanager.service + rm -f /home/e-smith/db/navigation2/* + rm -f /home/e-smith/db/routes + rm -f %{dir_mngr}/themes/default/public/css/* + rm -rf %{dir_mngr}/themes/default/public/js + find %{dir_mngr}/lib/SrvMngr/I18N/Modules -type f -name '*.pm' -exec rm '{}' \; fi true %post if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] then - mkdir %{dir_mngr}/themes/default/public/js - ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js + [ -d %{dir_mngr}/themes/default/public/js ] || + mkdir %{dir_mngr}/themes/default/public/js + [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] || + ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js + [ -h %{dir_mngr}/themes/default/public/js/jquery.min.map ] || + ln -s /usr/share/javascript/jquery/latest/jquery.min.map %{dir_mngr}/themes/default/public/js/jquery.min.map fi true -%postun - %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) %changelog +* Sun Jul 17 2022 Jean-Philippe Pialasse 0.1.4-15.sme +- untainting printer [SME: 12110] + +* Fri Jan 21 2022 Michel Begue 0.1.4-14.sme +- Fix jquery map link missing +- Fix jquery link deleted during update +- Remove generated file during remove + +* Wed Jan 05 2022 Brian Read 0.1.4-13.sme +- Update-format-for-datetime-and-reboot [SME: 11830] + +* Mon Jan 03 2022 Michel Begue 0.1.4-12.sme +- Add show password icon to login panel (requires jquery) +- Extend toggle hide to section menu (requires jquery) +- Set layout according to jquery presence +- Set CSRF less strict for GET method. Only if csrftoken param exists [SME: 11789] + +* Mon Dec 27 2021 Michel Begue 0.1.4-10.sme +- Fix empty selection list in workstation restore of backup panel [SME: 11185] + +* Mon Dec 27 2021 Brian Read 0.1.4-9.sme +- format-for-dhcp-ips-in-review-config [SME: ] + +* Sun Dec 26 2021 Brian Read 0.1.4-8.sme +- fix-translation-strings-with-prefix-for-review-config [SME: 11823] + +* Sun Dec 26 2021 Brian Read 0.1.4-7.sme +- Sort-out-responsive-table-in-user-and-host-lists [SME: 11824] + +* Sun Dec 26 2021 Brian Read 0.1.4-6.sme +- e-format html for Vistual domains inReview config to be compatible with email format list [SME 11822] + +* Mon Dec 20 2021 Brian Read 0.1.4-5.sme +- Add-span-to-group-member-checkbox-list [SME: 11815] + +* Mon Nov 29 2021 Brian Read 0.1.4-4.sme +- Add-dummy-classes-to-ep-files.patch [SME: 11780] + +* Mon Nov 15 2021 Michel Begue 0.1.4-3.sme +- Fix error message when linking, unlinking jquery in spec +- Correct the 'review' panel presentation +- Modify CSRFDefender plugin to take into account GET method +- Add TOKEN param where the GET method is used in templates +- Remove smanager from local url address + * Mon Oct 11 2021 Michel Begue 0.1.4-2.sme - Fix incorrect list order (users, ibays, ...) - Add external private access (remote management)