--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/06/08 18:37:20 1.45 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/12/26 16:23:40 1.55 @@ -1,30 +1,26 @@ -# $Id: smeserver-manager.spec,v 1.44 2021/06/03 19:47:24 michel Exp $ +# $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.2 -%define release 11 +%define version 0.1.4 +%define release 8 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 -Patch8: %{name}-%{version}-public_access.patch -Patch9: %{name}-%{version}-email_header_locale.patch -Patch10: %{name}-%{version}-CSRFDefender_cronjob_fail2ban.patch +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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools -BuildRequires: gettext # #BuildRequires: perl >= 0:5.016 #BuildRequires: perl(Test::More) @@ -42,8 +38,6 @@ Requires: perl(Mojolicious::Plugin::Ren 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 @@ -62,10 +56,6 @@ This RPM contributes the navigation bars %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %build perl createlinks @@ -99,7 +89,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 @@ -108,16 +98,59 @@ 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 +* 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