--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/12/26 16:23:40 1.55 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2022/12/09 15:14:20 1.65 @@ -1,15 +1,14 @@ -# $Id: smeserver-manager.spec,v 1.54 2021/12/26 15:33:49 brianr Exp $ - Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.4 -%define release 8 +%define release 18 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 @@ -17,6 +16,14 @@ Patch3: smeserver-manager-0.1.4-Add-span 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 +Patch12: smeserver-manager-0.1.4-bz12111-untainting-date.patch +Patch13: smeserver-manager-0.1.4-bz11816_password_reset.patch +Patch14: smeserver-manager-0.1.4-Fix-typo-in-datetime-processing.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -32,11 +39,16 @@ 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: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 +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(DBM::Deep) >= 2.0011-1 +Requires: perl(Mojo::JWT) >= 0.08-1 +Requires: mutt >= 1.5.21 #Requires: js-jquery > 2.2.4-3 (optional) Provides: server-manager @@ -56,6 +68,14 @@ This RPM contributes the navigation bars %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build perl createlinks @@ -64,6 +84,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 @@ -86,12 +108,16 @@ echo "%doc COPYING f2b/*" >> %{name}-%{v %clean rm -rf $RPM_BUILD_ROOT -%pre - %preun -if [ -h %{dir_mngr}/themes/default/public/js/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 @@ -102,15 +128,50 @@ then 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 +* Fri Dec 09 2022 Brian Read 0.1.4-18.sme +- Fix up typo in datetime processing [SME: 11827] + +* Mon Jul 18 2022 Michel Begue 0.1.4-17.sme +- add forgotten password link to login panel [SME: 11816] +- update to httpd 2.4 syntax [SME: 12112] +- enable backup of /usr/share/smanager/data +- fix target in link to 'Previous SM' + +* Sun Jul 17 2022 Jean-Philippe Pialasse 0.1.4-16.sme +- untainting datetime [SME: 12111] + +* 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]