/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager.spec

Diff of /rpms/smeserver-manager/sme10/smeserver-manager.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.38 by michel,
Thu Jan  7 18:55:41 2021 UTC
+Revision 1.74 by brianr,
Wed Feb  7 10:29:35 2024 UTC
 Line 1
- # $Id: smeserver-manager.spec,v 1.37 2020/12/01 17:53:43 michel Exp $
  Summary: Sme server  navigation module : manager 2
  %define name smeserver-manager
  Name: %{name}
- %define version 0.1.2
+ %define version 0.1.4
- %define release 4
+ %define release 24
  Version: %{version}
  Release: %{release}%{?dist}
  License: GPL
  Group: Networking/Daemons
  Source: %{name}-%{version}.tar.xz
- Patch0: %{name}-%{version}-bz11185_initial.patch
+ Source1: visible.png
- Patch1: %{name}-%{version}-update_systemd.patch
+ Patch0: %{name}-%{version}-list_access_csrf.patch
- Patch2: %{name}-%{version}-viewlogfiles_download.patch
+ Patch1: %{name}-%{version}-review_csrf_url.patch
- Patch3: %{name}-%{version}-translation_pptp_trailing-slash.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
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArchitectures: noarch
  BuildRequires: e-smith-devtools
- BuildRequires: gettext
  #<Build tests>
  #BuildRequires:  perl >= 0:5.016
  #BuildRequires:  perl(Test::More)
-Line 29 
 BuildRequires: gettext
+Line 45 
 BuildRequires: gettext
  Requires: e-smith-lib >= 1.18.0-26
  Requires: e-smith-manager >= 2.4.0-22
- Requires:  perl(Mojolicious) >= 7.56
+ Requires: e-smith-apache >= 2.6.0-19
- Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6
+ Requires: smeserver-php >= 3.0.0-43
- Requires:  perl(Mojolicious::Plugin::RenderFile) >= 0.12
+ Requires: perl(Mojolicious) >= 7.56
- Requires:  perl(Net::Netmask) >= 1.9
+ 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
-Line 51 
 This RPM contributes the navigation bars
+Line 72 
 This RPM contributes the navigation bars
  %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
  %build
  perl createlinks
-Line 59 
 perl createlinks
+Line 97 
 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
-Line 68 
 rm -f %{name}-%{version}-%{release}-file
+Line 108 
 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
-Line 78 
 echo "%doc COPYING" >> %{name}-%{version
+Line 121 
 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
  true
  %post
  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
  then
-     mkdir %{dir_mngr}/themes/default/public/js
+     [ -d %{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
+         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
+ * Wed Feb 07 2024 Brian Read <brianr@koozali.org> 0.1.4-24.sme
+ - Add in export buttons to dataTables[SME: 12466]
+ * Tue Jan 30 2024 Brian Read <brianr@koozali.org> 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 <brianr@koozali.org> 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 <brianr@koozali.org> 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 <mab974@misouk.com> 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 <brianr@bjsystems.co.uk> 0.1.4-19.sme
+ - Fix requires in systemd smanager.server file  [SME:12294]
+ * Fri Dec 09 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-18.sme
+ - Fix up typo in datetime processing [SME: 11827]
+ * Mon Jul 18 2022 Michel Begue <mab974@misouk.com> 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 <tests@pialasse.com> 0.1.4-16.sme
+ - untainting datetime [SME: 12111]
+ * Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.4-15.sme
+ - untainting printer [SME: 12110]
+ * Fri Jan 21 2022 Michel Begue <mab974@misouk.com> 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 <brianr@bjsystems.co.uk> 0.1.4-13.sme
+ - Update-format-for-datetime-and-reboot [SME: 11830]
+ * Mon Jan 03 2022 Michel Begue <mab974@misouk.com> 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 <mab974@misouk.com> 0.1.4-10.sme
+ - Fix empty selection list in workstation restore of backup panel [SME: 11185]
+ * Mon Dec 27 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-9.sme
+ - format-for-dhcp-ips-in-review-config [SME: ]
+ * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-8.sme
+ - fix-translation-strings-with-prefix-for-review-config [SME: 11823]
+ * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-7.sme
+ - Sort-out-responsive-table-in-user-and-host-lists [SME: 11824]
+ * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 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 <brianr@bjsystems.co.uk> 0.1.4-5.sme
+ - Add-span-to-group-member-checkbox-list [SME: 11815]
+ * Mon Nov 29 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-4.sme
+ - Add-dummy-classes-to-ep-files.patch [SME: 11780]
+ * Mon Nov 15 2021 Michel Begue <mab974@misouk.com> 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 <mab974@protonmail.com> 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 <mab974@gmail.com> 0.1.4-1.sme
+ - New version: smeserver-manager-0.1.4-1 (= 0.1.2-13)
+ * Sat Jun 19 2021 Michel Begue <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 0.1.2-8.sme
+ - Fix 'theme switch' [SME: 11571]
+ * Mon Apr 12 2021 Michel Begue <mab974@gmail.com> 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 <mab974@gmail.com> 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 <mab974@gmail.com> 0.1.2-5.sme
+ - Fix menu items not translated [SME: 11322]
+ - Add other locales files
  * Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
  - Fix 404 error when trailing slash is missing
  - Fix missing translations for ibay and quota panels

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1