--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/04/20 20:12:10 1.42 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2022/01/05 10:29:07 1.59 @@ -1,27 +1,30 @@ -# $Id: smeserver-manager.spec,v 1.41 2021/04/12 16:51:27 michel Exp $ +# $Id: smeserver-manager.spec,v 1.58 2022/01/05 10:22:17 michel Exp $ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} -%define version 0.1.2 -%define release 8 +%define version 0.1.4 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz -Patch0: %{name}-%{version}-bz11185_initial.patch -Patch1: %{name}-%{version}-update_systemd.patch -Patch2: %{name}-%{version}-viewlogfiles_download.patch -Patch3: %{name}-%{version}-translation_pptp_trailing-slash.patch -Patch4: %{name}-%{version}-locales_menu.patch -Patch5: %{name}-%{version}-backup_panels.patch -Patch6: %{name}-%{version}-bugreport_service.patch -Patch7: %{name}-%{version}-theme_switch.patch +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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools -BuildRequires: gettext # #BuildRequires: perl >= 0:5.016 #BuildRequires: perl(Test::More) @@ -33,13 +36,12 @@ 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(Mojolicious::Plugin::RenderFile) >= 0.12 -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) -#Requires: pwauth -#Requires: perl(Apache::AuthTkt) Provides: server-manager AutoReqProv: no @@ -59,6 +61,8 @@ This RPM contributes the navigation bars %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build perl createlinks @@ -67,6 +71,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 @@ -76,9 +82,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 @@ -89,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT %pre %preun -if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +if [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] then unlink %{dir_mngr}/themes/default/public/js/jquery.min.js fi @@ -98,16 +107,91 @@ 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 fi true %postun + %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) %changelog +* 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]