--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/11/29 15:55:51 1.51 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2024/02/27 10:29:51 1.81 @@ -1,18 +1,42 @@ -# $Id: smeserver-manager.spec,v 1.50 2021/11/15 18:03:45 michel Exp $ - Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.4 -%define release 4 +%define release 31 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 +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 +Patch15: smeserver-manager-0.1.4-Correct-Requires-slapd-ldap-in-systemd-service-file.patch +Patch16: smeserver-manager-0.1.4-yum_session_awstats.patch +Patch17: smeserver-manager-0.1.4-Add-css-to-hover-and-click-feedback-on-submit.patch +Patch18: smeserver-manager-0.1.4-Update-to-use-jquery-dataTables-in-tables.patch +Patch19: smeserver-manager-0.1.4-Get-jquery-etc-from-smeserver-manager-jsquery-rpm.patch +Patch20: smeserver-manager-0.1.4-Add-Export-Buttons-to-dataTable.patch +Patch21: smeserver-manager-0.1.4-Move-dataTable-js-setup-to-seperate-file.patch +Patch22: smeserver-manager-0.1.4-Save-and-restore-menu-configuration.patch +Patch23: smeserver-manager-0.1.4-Re-organise-menus.patch +Patch24: smeserver-manager-0.1.4-Fix-Domains-bug-12479-and-Hostnames-bug-12483.patch +Patch25: smeserver-manager-0.1.4-Make-release-and-version-depend-on-login-status.patch +Patch26: smeserver-manager-0.1.4-Bring-User-menu-into-line-with-menu-revamp.patch +Patch27: smeserver-manager-0.1.4-Sort-mail-anaysis-options-takeout-qmail-q-ones.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch @@ -28,11 +52,17 @@ 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: smeserver-manager-jsquery >= 1.0 #Requires: js-jquery > 2.2.4-3 (optional) Provides: server-manager @@ -48,6 +78,31 @@ This RPM contributes the navigation bars %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 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 %build perl createlinks @@ -56,6 +111,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 @@ -78,12 +135,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 @@ -94,15 +155,114 @@ 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 +* Tue Feb 27 2024 Brian Read 0.1.4-31.sme +- Sort options in mail log anaysis [SME: 11821] +- Take out qmail-q options as need to run as root or qmail - see bug:12491 + +* Sat Feb 24 2024 Brian Read 0.1.4-30.sme +- Bring user menus into line with new menu structure [SME: 12482] + +* Fri Feb 23 2024 Brian Read 0.1.4-29.sme +- Make release and version only show when logged in [SME: 12480] + +* Wed Feb 21 2024 Brian Read 0.1.4-28.sme +- Fix domains bug [SME: 12479] +- Fix hostnames bug [SME: 12483] + +* Sun Feb 18 2024 Brian Read 0.1.4-27.sme +- Re-arrange Menu [SME: 12476] +- Fix problem with ibays not all showing [SME: 12478] + +* Mon Feb 12 2024 Brian Read 0.1.4-26.sme +- Save and Restore menu configuration [SME: 12464] + +* Thu Feb 08 2024 Brian Read 0.1.4-25.sme +- Move-dataTable-js-setup-to-seperate-file [SME: 12467] + +* Wed Feb 07 2024 Brian Read 0.1.4-24.sme +- Add in export buttons to dataTables[SME: 12466] + +* Tue Jan 30 2024 Brian Read 0.1.4-23.sme +- Arrange that jquery etc is local and from rpm smeserver-manager-jsquery [SME: 12459] +- Correct position of % end in partial .html.ep files with tables in. +- Make smeserver-mananger-jsquery a requirement +- Move jquery overrides to jsquery rpm + +* Sat Jan 27 2024 Brian Read 0.1.4-22.sme +- Update to use jquery plugin dataTables [SME: 12458] +- Update Copyright footer to 2024 +- Edit tables to have TableSort in class +- Fix up tables tbody and thead correctly +- Sort out action column to make compatible with dataTable +- Change action links to icons + +* Sun Dec 03 2023 Brian Read 0.1.4-21.sme +- Update CSS to provide feedback to hover and click on panel submit button [SME: 12442] + +* Tue Apr 25 2023 Michel Begue 0.1.4-20.sme +- general locales for awstats [SME:12324b] +- fix reconfigure asked when not needed [SME: 12171b] +- remove unSafe status from session data + +* Wed Dec 28 2022 Brian Read 0.1.4-19.sme +- Fix requires in systemd smanager.server file [SME:12294] + +* 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] + +* 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]