--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/10/05 15:43:13 1.33 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2024/02/02 16:39:20 1.73 @@ -1,49 +1,38 @@ -# $Id: smeserver-manager.spec,v 1.32 2020/08/17 17:17:11 michel Exp $ - Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} -%define version 0.1.0 -%define release 30 +%define version 0.1.4 +%define release 23 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons -Source: %{name}-0.1.0.tar.xz -Patch0: %{name}-0.1.0-bz10506.patch -Patch1: %{name}-add-basic-files.patch -Patch2: %{name}-0.1.0-mojo_struct.patch -Patch3: %{name}-0.1.0-setuid_groups.patch -Patch4: %{name}-0.1.0-reboot_ibays_theme.patch -Patch5: %{name}-0.1.0-add-adminlte.patch -Patch6: %{name}-0.1.0-navigation_header_listes.patch -Patch7: %{name}-0.1.0-navigation_errors.patch -Patch8: %{name}-0.1.0-theme_navig_message.patch -Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch -Patch10: %{name}-0.1.0-remotax_users_logs.patch -Patch11: %{name}-0.1.0-localnetworks-panel-remove-adminlte.patch -Patch12: %{name}-0.1.0-localnetworks-remove-db-call-from-del.patch -Patch13: %{name}-0.1.0-portforwarding-localnetwork-cleanup.patch -Patch14: %{name}-0.1.0-portforwarding-rule-comment-missing.patch -Patch15: %{name}-0.1.0-yum_backup_email_cleanup.patch -Patch16: %{name}-0.1.0-remove_tests.patch -Patch17: %{name}-0.1.0-routes_locales_navig.patch -Patch18: %{name}-0.1.0-error_success_routes_locales.patch -Patch19: %{name}-0.1.0-translation_themes.patch -Patch20: %{name}-0.1.0-mojo-app_password_menus.patch -Patch21: %{name}-0.1.0-missing_translations.patch -Patch22: %{name}-0.1.0-bz9457_bz8903_pseudo_acct_swtheme.patch -Patch23: %{name}-0.1.0-start_service.patch -Patch24: %{name}-0.1.0-datetime_quota.patch -Patch25: %{name}-0.1.0-bz10976_bz10977_others.patch -Patch26: %{name}-0.1.0-route_lexicon_locales.patch -Patch27: %{name}-0.1.0-I18N_cleanup_tests.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch - BuildRequires: e-smith-devtools -BuildRequires: gettext # #BuildRequires: perl >= 0:5.016 #BuildRequires: perl(Test::More) @@ -55,21 +44,26 @@ BuildRequires: gettext 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(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) -Requires: pwauth -#Requires: perl(Apache::AuthTkt) Provides: server-manager AutoReqProv: no %define dir_mngr /usr/share/smanager - %description -This RPM contributes the navigation bars for the smeserver-manager. +This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version. %prep %setup @@ -93,14 +87,6 @@ This RPM contributes the navigation bars %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 @@ -109,6 +95,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 @@ -118,9 +106,12 @@ rm -f %{name}-%{version}-%{release}-file --dir %{dir_mngr} 'attr(0755,root,root)' \ --file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \ --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \ +--file %{dir_mngr}/script/daily.sh 'attr(0770,root,root)' \ +--file %{dir_mngr}/script/routes.pl 'attr(0770,root,root)' \ +--file %{dir_mngr}/script/secrets.pl 'attr(0770,root,root)' \ > %{name}-%{version}-%{release}-filelist -echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist +echo "%doc COPYING f2b/*" >> %{name}-%{version}-%{release}-filelist %check #cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r @@ -128,33 +119,206 @@ echo "%doc COPYING" >> %{name}-%{version %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 -systemctl disable smanager.service 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 -/sbin/e-smith/expand-template /usr/share/smanager/conf/srvmngr.conf -/sbin/e-smith/expand-template /etc/systemd/system/smanager.service -systemctl enable smanager.service -systemctl restart smanager.service true -%postun %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) %changelog +* 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] + +* 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) +- Change CSRF error message + +* Mon Jun 21 2021 Michel Begue 0.1.4-1.sme +- New version: smeserver-manager-0.1.4-1 (= 0.1.2-13) + +* Sat Jun 19 2021 Michel Begue 0.1.2-13.sme +- Remove non english locale files (move to smeserver-manager-locale) +- Fix error in 'locale2-conf' action + +* Tue Jun 15 2021 Michel Begue 0.1.2-12.sme +- Fix errors in daily script +- Fix url and routes for 'hostentries' panel +- Change GET to POST method for CSRF plugin (routes and templates) +- Fix some translations + +* Tue Jun 08 2021 Michel Begue 0.1.2-11.sme +- Add cron job for secrets and routes purge +- Add CSRFDefender plugin against CSRF attacks +- Add optional fail2ban configuration files in doc +- Fix zh-tw locale file name +- Fix missing links in 'Bugreport' +- Fix copyright in footer +- Fix translations + +* Thu Jun 03 2021 Michel Begue 0.1.2-10.sme +- Add header for contrib in layout +- fix emailsettings error 'webmail is only SSL' [SME: 11443] +- fix locale files +- clean up template files + +* Wed Apr 21 2021 Michel Begue 0.1.2-9.sme +- Add access attribute in configuration base +- Verify modes and access compatibility +- Display theme_switch button to logged in users only [SME: 11571] + +* Tue Apr 20 2021 Michel Begue 0.1.2-8.sme +- Fix 'theme switch' [SME: 11571] + +* Mon Apr 12 2021 Michel Begue 0.1.2-7.sme +- Fix server-mode in bugreport [SME: 10448] +- Add systemd-default for smanager type (service) [SME: 11544] +- Fix smanager type and status in db +- Move initial security notification to central place +- Render 'Manual' output in template +- Add a link to koozali.org on Sme logo + +* Mon Jan 25 2021 Michel Begue 0.1.2-6.sme +- Fix missing backup functions +- background mode for halt and reboot +- Store debug mode in ENV +- Add a warning mode notification +- Fix some translations needing to be escaped + +* Wed Jan 13 2021 Michel Begue 0.1.2-5.sme +- Fix menu items not translated [SME: 11322] +- Add other locales files + +* Thu Jan 07 2021 Michel Begue 0.1.2-4.sme +- Fix 404 error when trailing slash is missing +- Fix missing translations for ibay and quota panels +- Comment out pptp settings in remoteaccess panel +- Fix 'sigusr1' exec for httpd [SME: 11185] + +* Tue Dec 01 2020 Michel Begue 0.1.2-3.sme +- Fix download error on 'viewlogfiles' panel [SME: 11217] +- Fix duplicate entries in log files to be chosen +- Fix duplicate translation terms in 'General' lexicon + +* Fri Nov 20 2020 Michel Begue 0.1.2-2.sme +- Fix smanager-update event name +- Move smanager service to /usr/lib/systemd +- Fix Bugreport file download +- Fix translations missing in 'viewlogfiles' +- Remove Admin auth in httpd configuration +- Add an optional alias for admin sign in. +- Remove systemctl from .spec file + +* Thu Nov 19 2020 Michel Begue 0.1.2-1.sme +- Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31) + +* Wed Oct 07 2020 Michel Begue 0.1.0-31.sme +- smanager-refresh event come back +- add smanager version in footer +- add optional refresh in layout +- fix yum logfile displaying + * Mon Oct 05 2020 Michel Begue 0.1.0-30.sme - fix I18N Namespace change for keeping Language - clean up emailsettings code