--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/12/01 17:53:43 1.37 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2021/06/20 21:18:17 1.47 @@ -1,10 +1,10 @@ -# $Id: smeserver-manager.spec,v 1.36 2020/11/21 08:43:54 michel Exp $ +# $Id: smeserver-manager.spec,v 1.46 2021/06/15 08:56:45 michel Exp $ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.2 -%define release 3 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,6 +13,16 @@ 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 +Patch11: %{name}-%{version}-post_csrf.patch +Patch12: %{name}-%{version}-remove_locale.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools @@ -31,6 +41,7 @@ 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: js-jquery > 2.2.4-3 (optional) #Requires: pwauth @@ -49,6 +60,16 @@ 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 %build perl createlinks @@ -66,9 +87,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 @@ -94,10 +118,69 @@ fi true %postun + %files -f %{name}-%{version}-%{release}-filelist %defattr(-,root,root) %changelog +* 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