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

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

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

Revision 1.34 by michel, Wed Oct 7 16:46:34 2020 UTC Revision 1.69 by brianr, Sat Jan 27 20:02:58 2024 UTC
# Line 1  Line 1 
 # $Id: smeserver-manager.spec,v 1.33 2020/10/05 15:43:13 michel Exp $  
   
1  Summary: Sme server  navigation module : manager 2  Summary: Sme server  navigation module : manager 2
2  %define name smeserver-manager  %define name smeserver-manager
3  Name: %{name}  Name: %{name}
4  %define version 0.1.0  %define version 0.1.4
5  %define release 31  %define release 22
6  Version: %{version}  Version: %{version}
7  Release: %{release}%{?dist}  Release: %{release}%{?dist}
8  License: GPL  License: GPL
9  Group: Networking/Daemons  Group: Networking/Daemons
10  Source: %{name}-0.1.0.tar.xz  Source: %{name}-%{version}.tar.xz
11  Patch0: %{name}-0.1.0-bz10506.patch  Source1: visible.png
12  Patch1: %{name}-add-basic-files.patch  Patch0: %{name}-%{version}-list_access_csrf.patch
13  Patch2: %{name}-0.1.0-mojo_struct.patch  Patch1: %{name}-%{version}-review_csrf_url.patch
14  Patch3: %{name}-0.1.0-setuid_groups.patch  Patch2: smeserver-manager-0.1.4-Add-dummy-classes-to-ep-files.patch
15  Patch4: %{name}-0.1.0-reboot_ibays_theme.patch  Patch3: smeserver-manager-0.1.4-Add-span-to-group-member-checkbox-list.patch
16  Patch5: %{name}-0.1.0-add-adminlte.patch  Patch4: smeserver-manager-0.1.4-Review-configuration-Virtual-domains-re-format-html.patch
17  Patch6: %{name}-0.1.0-navigation_header_listes.patch  Patch5: smeserver-manager-0.1.4-Sort-out-responsive-table-in-user-and-host-lists.patch
18  Patch7: %{name}-0.1.0-navigation_errors.patch  Patch6: smeserver-manager-0.1.4-fix-translation-strings-with-prefix-for-review-config.patch
19  Patch8: %{name}-0.1.0-theme_navig_message.patch  Patch7: smeserver-manager-0.1.4-format-for-dhcp-ips-in-review-config.patch
20  Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch  Patch8: smeserver-manager-0.1.4-fix_backup_empty_selection_list.patch
21  Patch10: %{name}-0.1.0-remotax_users_logs.patch  Patch9: smeserver-manager-0.1.4-toggle_password_and_menu-jquery_cond-csrf_get.patch
22  Patch11: %{name}-0.1.0-localnetworks-panel-remove-adminlte.patch  Patch10: smeserver-manager-0.1.4-Update-format-for-datetime-and-reboot.patch
23  Patch12: %{name}-0.1.0-localnetworks-remove-db-call-from-del.patch  Patch11: smeserver-manager-0.1.4-bz12110-untainting-printer.patch
24  Patch13: %{name}-0.1.0-portforwarding-localnetwork-cleanup.patch  Patch12: smeserver-manager-0.1.4-bz12111-untainting-date.patch
25  Patch14: %{name}-0.1.0-portforwarding-rule-comment-missing.patch  Patch13: smeserver-manager-0.1.4-bz11816_password_reset.patch
26  Patch15: %{name}-0.1.0-yum_backup_email_cleanup.patch  Patch14: smeserver-manager-0.1.4-Fix-typo-in-datetime-processing.patch
27  Patch16: %{name}-0.1.0-remove_tests.patch  Patch15: smeserver-manager-0.1.4-Correct-Requires-slapd-ldap-in-systemd-service-file.patch
28  Patch17: %{name}-0.1.0-routes_locales_navig.patch  Patch16: smeserver-manager-0.1.4-yum_session_awstats.patch
29  Patch18: %{name}-0.1.0-error_success_routes_locales.patch  Patch17: smeserver-manager-0.1.4-Add-css-to-hover-and-click-feedback-on-submit.patch
30  Patch19: %{name}-0.1.0-translation_themes.patch  Patch18: smeserver-manager-0.1.4-Update-to-use-jquery-dataTables-in-tables.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  
 Patch28: %{name}-0.1.0-yum_refresh_version.patch  
31    
32  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
33  BuildArchitectures: noarch  BuildArchitectures: noarch
   
34  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
 BuildRequires: gettext  
35  #<Build tests>  #<Build tests>
36  #BuildRequires:  perl >= 0:5.016  #BuildRequires:  perl >= 0:5.016
37  #BuildRequires:  perl(Test::More)  #BuildRequires:  perl(Test::More)
# Line 56  BuildRequires: gettext Line 43  BuildRequires: gettext
43    
44  Requires: e-smith-lib >= 1.18.0-26  Requires: e-smith-lib >= 1.18.0-26
45  Requires: e-smith-manager >= 2.4.0-22  Requires: e-smith-manager >= 2.4.0-22
46  Requires:  perl(Mojolicious) >= 7.56  Requires: e-smith-apache >= 2.6.0-19
47  Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6  Requires: smeserver-php >= 3.0.0-43
48  Requires:  perl(Net::Netmask) >= 1.9  Requires: perl(Mojolicious) >= 7.56
49    Requires: perl(Mojolicious::Plugin::I18N) >= 1.6
50    Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12
51    Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8
52    Requires: perl(Net::Netmask) >= 1.9
53    Requires: perl(DBM::Deep) >= 2.0011-1
54    Requires: perl(Mojo::JWT) >= 0.08-1
55    Requires: mutt >= 1.5.21
56  #Requires: js-jquery > 2.2.4-3 (optional)  #Requires: js-jquery > 2.2.4-3 (optional)
 Requires: pwauth  
 #Requires: perl(Apache::AuthTkt)  
57    
58  Provides: server-manager  Provides: server-manager
59  AutoReqProv: no  AutoReqProv: no
60    
61  %define dir_mngr /usr/share/smanager  %define dir_mngr /usr/share/smanager
62    
   
63  %description  %description
64  This RPM contributes the navigation bars for the smeserver-manager.  This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
65    
66  %prep  %prep
67  %setup  %setup
# Line 93  This RPM contributes the navigation bars Line 84  This RPM contributes the navigation bars
84  %patch16 -p1  %patch16 -p1
85  %patch17 -p1  %patch17 -p1
86  %patch18 -p1  %patch18 -p1
 %patch19 -p1  
 %patch20 -p1  
 %patch21 -p1  
 %patch22 -p1  
 %patch23 -p1  
 %patch24 -p1  
 %patch25 -p1  
 %patch26 -p1  
 %patch27 -p1  
 %patch28 -p1  
87    
88  %build  %build
89  perl createlinks  perl createlinks
# Line 111  perl createlinks Line 92  perl createlinks
92  mkdir -p root/etc/e-smith/db/routes  mkdir -p root/etc/e-smith/db/routes
93  mkdir -p root/home/e-smith/db/navigation2  mkdir -p root/home/e-smith/db/navigation2
94  mkdir -p root%{dir_mngr}/themes/default/public/css  mkdir -p root%{dir_mngr}/themes/default/public/css
95    mkdir -p root%{dir_mngr}/data
96    cp %{SOURCE1} root%{dir_mngr}/themes/default/public/images
97    
98  %install  %install
99  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 120  rm -f %{name}-%{version}-%{release}-file Line 103  rm -f %{name}-%{version}-%{release}-file
103  --dir %{dir_mngr} 'attr(0755,root,root)' \  --dir %{dir_mngr} 'attr(0755,root,root)' \
104  --file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \  --file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \
105  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \
106    --file %{dir_mngr}/script/daily.sh 'attr(0770,root,root)' \
107    --file %{dir_mngr}/script/routes.pl 'attr(0770,root,root)' \
108    --file %{dir_mngr}/script/secrets.pl 'attr(0770,root,root)' \
109  > %{name}-%{version}-%{release}-filelist  > %{name}-%{version}-%{release}-filelist
110    
111  echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist  echo "%doc COPYING f2b/*" >> %{name}-%{version}-%{release}-filelist
112    
113  %check  %check
114  #cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r  #cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r
# Line 130  echo "%doc COPYING" >> %{name}-%{version Line 116  echo "%doc COPYING" >> %{name}-%{version
116  %clean  %clean
117  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
118    
 %pre  
   
119  %preun  %preun
120  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]  # complete remove
121    if [ $1 == 0 ]
122  then  then
123      unlink %{dir_mngr}/themes/default/public/js/jquery.min.js      systemctl stop smanager.service
124        rm -f /home/e-smith/db/navigation2/*
125        rm -f /home/e-smith/db/routes
126        rm -f %{dir_mngr}/themes/default/public/css/*
127        rm -rf %{dir_mngr}/themes/default/public/js
128        find %{dir_mngr}/lib/SrvMngr/I18N/Modules -type f -name '*.pm' -exec rm '{}' \;
129  fi  fi
 systemctl disable smanager.service  
130  true  true
131    
132  %post  %post
133  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
134  then  then
135      mkdir %{dir_mngr}/themes/default/public/js      [ -d %{dir_mngr}/themes/default/public/js ] ||
136      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
137        [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] ||
138            ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
139        [ -h %{dir_mngr}/themes/default/public/js/jquery.min.map ] ||
140            ln -s /usr/share/javascript/jquery/latest/jquery.min.map %{dir_mngr}/themes/default/public/js/jquery.min.map
141  fi  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  
142  true  true
143    
 %postun  
144  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
145  %defattr(-,root,root)  %defattr(-,root,root)
146    
147  %changelog  %changelog
148    * Sat Jan 27 2024 Brian Read <brianr@koozali.org> 0.1.4-22.sme
149    - Update to use jquery plugin dataTables [SME: 12458]
150    - Update Copyright footer to 2024
151    - Edit tables to have TableSort in class
152    - Fix up tables tbody and thead correctly
153    - Sort out action column to make compatible with dataTable
154    
155    * Sun Dec 03 2023 Brian Read <brianr@koozali.org> 0.1.4-21.sme
156    - Update CSS to provide feedback to hover and click on panel submit button  [SME: 12442]
157    
158    * Tue Apr 25 2023 Michel Begue <mab974@misouk.com> 0.1.4-20.sme
159    - general locales for awstats [SME:12324b]
160    - fix reconfigure asked when not needed [SME: 12171b]
161    - remove unSafe status from session data
162    
163    * Wed Dec 28 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-19.sme
164    - Fix requires in systemd smanager.server file  [SME:12294]
165    
166    * Fri Dec 09 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-18.sme
167    - Fix up typo in datetime processing [SME: 11827]
168    
169    * Mon Jul 18 2022 Michel Begue <mab974@misouk.com> 0.1.4-17.sme
170    - add forgotten password link to login panel [SME: 11816]
171    - update to httpd 2.4 syntax [SME: 12112]
172    - enable backup of /usr/share/smanager/data
173    - fix target in link to 'Previous SM'
174    
175    * Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.4-16.sme
176    - untainting datetime [SME: 12111]
177    
178    * Sun Jul 17 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.4-15.sme
179    - untainting printer [SME: 12110]
180    
181    * Fri Jan 21 2022 Michel Begue <mab974@misouk.com> 0.1.4-14.sme
182    - Fix jquery map link missing
183    - Fix jquery link deleted during update
184    - Remove generated file during remove
185    
186    * Wed Jan 05 2022 Brian Read <brianr@bjsystems.co.uk> 0.1.4-13.sme
187    - Update-format-for-datetime-and-reboot [SME: 11830]
188    
189    * Mon Jan 03 2022 Michel Begue <mab974@misouk.com> 0.1.4-12.sme
190    - Add show password icon to login panel (requires jquery)
191    - Extend toggle hide to section menu (requires jquery)
192    - Set layout according to jquery presence
193    - Set CSRF less strict for GET method. Only if csrftoken param exists [SME: 11789]
194    
195    * Mon Dec 27 2021 Michel Begue <mab974@misouk.com> 0.1.4-10.sme
196    - Fix empty selection list in workstation restore of backup panel [SME: 11185]
197    
198    * Mon Dec 27 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-9.sme
199    - format-for-dhcp-ips-in-review-config [SME: ]
200    
201    * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-8.sme
202    - fix-translation-strings-with-prefix-for-review-config [SME: 11823]
203    
204    * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-7.sme
205    - Sort-out-responsive-table-in-user-and-host-lists [SME: 11824]
206    
207    * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-6.sme
208    - e-format html for Vistual domains inReview config to be compatible with email format list [SME 11822]
209    
210    * Mon Dec 20 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-5.sme
211    - Add-span-to-group-member-checkbox-list [SME: 11815]
212    
213    * Mon Nov 29 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-4.sme
214    - Add-dummy-classes-to-ep-files.patch [SME: 11780]
215    
216    * Mon Nov 15 2021 Michel Begue <mab974@misouk.com> 0.1.4-3.sme
217    - Fix error message when linking, unlinking jquery in spec
218    - Correct the 'review' panel presentation
219    - Modify CSRFDefender plugin to take into account GET method
220    - Add TOKEN param where the GET method is used in templates
221    - Remove smanager from local url address
222    
223    * Mon Oct 11 2021 Michel Begue <mab974@protonmail.com> 0.1.4-2.sme
224    - Fix incorrect list order (users, ibays, ...)
225    - Add external private access (remote management)
226    - Change CSRF error message
227    
228    * Mon Jun 21 2021 Michel Begue <mab974@gmail.com> 0.1.4-1.sme
229    - New version: smeserver-manager-0.1.4-1 (= 0.1.2-13)
230    
231    * Sat Jun 19 2021 Michel Begue <mab974@gmail.com> 0.1.2-13.sme
232    - Remove non english locale files (move to smeserver-manager-locale)
233    - Fix error in 'locale2-conf' action
234    
235    * Tue Jun 15 2021 Michel Begue <mab974@gmail.com> 0.1.2-12.sme
236    - Fix errors in daily script
237    - Fix url and routes for 'hostentries' panel
238    - Change GET to POST method for CSRF plugin (routes and templates)
239    - Fix some translations
240    
241    * Tue Jun 08 2021 Michel Begue <mab974@gmail.com> 0.1.2-11.sme
242    - Add cron job for secrets and routes purge
243    - Add CSRFDefender plugin against CSRF attacks
244    - Add optional fail2ban configuration files in doc
245    - Fix zh-tw locale file name
246    - Fix missing links in 'Bugreport'
247    - Fix copyright in footer
248    - Fix translations
249    
250    * Thu Jun 03 2021 Michel Begue <mab974@gmail.com> 0.1.2-10.sme
251    - Add header for contrib in layout
252    - fix emailsettings error 'webmail is only SSL' [SME: 11443]
253    - fix locale files
254    - clean up template files
255    
256    * Wed Apr 21 2021 Michel Begue <mab974@gmail.com> 0.1.2-9.sme
257    - Add access attribute in configuration base
258    - Verify modes and access compatibility
259    - Display theme_switch button to logged in users only [SME: 11571]
260    
261    * Tue Apr 20 2021 Michel Begue <mab974@gmail.com> 0.1.2-8.sme
262    - Fix 'theme switch' [SME: 11571]
263    
264    * Mon Apr 12 2021 Michel Begue <mab974@gmail.com> 0.1.2-7.sme
265    - Fix server-mode in bugreport [SME: 10448]
266    - Add systemd-default for smanager type (service) [SME: 11544]
267    - Fix smanager type and status in db
268    - Move initial security notification to central place
269    - Render 'Manual' output in template
270    - Add a link to koozali.org on Sme logo
271    
272    * Mon Jan 25 2021 Michel Begue <mab974@gmail.com> 0.1.2-6.sme
273    - Fix missing backup functions
274    - background mode for halt and reboot
275    - Store debug mode in ENV
276    - Add a warning mode notification
277    - Fix some translations needing to be escaped
278    
279    * Wed Jan 13 2021 Michel Begue <mab974@gmail.com> 0.1.2-5.sme
280    - Fix menu items not translated [SME: 11322]
281    - Add other locales files
282    
283    * Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
284    - Fix 404 error when trailing slash is missing
285    - Fix missing translations for ibay and quota panels
286    - Comment out pptp settings in remoteaccess panel
287    - Fix 'sigusr1' exec for httpd  [SME: 11185]
288    
289    * Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme
290    - Fix download error on 'viewlogfiles' panel [SME: 11217]
291    - Fix duplicate entries in log files to be chosen
292    - Fix duplicate translation terms in 'General' lexicon
293    
294    * Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
295    - Fix smanager-update event name
296    - Move smanager service to /usr/lib/systemd
297    - Fix Bugreport file download
298    - Fix translations missing in 'viewlogfiles'
299    - Remove Admin auth in httpd configuration
300    - Add an optional alias for admin sign in.
301    - Remove systemctl from .spec file
302    
303    * Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme
304    - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)
305    
306  * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme  * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme
307  - smanager-refresh event come back  - smanager-refresh event come back
308  - add smanager version in footer  - add smanager version in footer


Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed