/[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.30 by michel, Mon Jul 6 15:19:43 2020 UTC Revision 1.53 by brianr, Sun Dec 26 12:35:52 2021 UTC
# Line 1  Line 1 
1  # $Id: smeserver-manager.spec,v 1.29 2020/07/01 15:16:09 michel Exp $  # $Id: smeserver-manager.spec,v 1.52 2021/12/20 15:16:29 brianr Exp $
2    
3  Summary: Sme server  navigation module : manager 2  Summary: Sme server  navigation module : manager 2
4  %define name smeserver-manager  %define name smeserver-manager
5  Name: %{name}  Name: %{name}
6  %define version 0.1.0  %define version 0.1.4
7  %define release 27  %define release 6
8  Version: %{version}  Version: %{version}
9  Release: %{release}%{?dist}  Release: %{release}%{?dist}
10  License: GPL  License: GPL
11  Group: Networking/Daemons  Group: Networking/Daemons
12  Source: %{name}-0.1.0.tar.xz  Source: %{name}-%{version}.tar.xz
13  Patch0: %{name}-0.1.0-bz10506.patch  Patch0: %{name}-%{version}-list_access_csrf.patch
14  Patch1: %{name}-add-basic-files.patch  Patch1: %{name}-%{version}-review_csrf_url.patch
15  Patch2: %{name}-0.1.0-mojo_struct.patch  Patch2: smeserver-manager-0.1.4-Add-dummy-classes-to-ep-files.patch
16  Patch3: %{name}-0.1.0-setuid_groups.patch  Patch3: smeserver-manager-0.1.4-Add-span-to-group-member-checkbox-list.patch
17  Patch4: %{name}-0.1.0-reboot_ibays_theme.patch  Patch4: smeserver-manager-0.1.4-Review-configuration-Virtual-domains-re-format-html.patch
 Patch5: %{name}-0.1.0-add-adminlte.patch  
 Patch6: %{name}-0.1.0-navigation_header_listes.patch  
 Patch7: %{name}-0.1.0-navigation_errors.patch  
 Patch8: %{name}-0.1.0-theme_navig_message.patch  
 Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch  
 Patch10: %{name}-0.1.0-remotax_users_logs.patch  
 Patch11: %{name}-0.1.0-localnetworks-panel-remove-adminlte.patch  
 Patch12: %{name}-0.1.0-localnetworks-remove-db-call-from-del.patch  
 Patch13: %{name}-0.1.0-portforwarding-localnetwork-cleanup.patch  
 Patch14: %{name}-0.1.0-portforwarding-rule-comment-missing.patch  
 Patch15: %{name}-0.1.0-yum_backup_email_cleanup.patch  
 Patch16: %{name}-0.1.0-remove_tests.patch  
 Patch17: %{name}-0.1.0-routes_locales_navig.patch  
 Patch18: %{name}-0.1.0-error_success_routes_locales.patch  
 Patch19: %{name}-0.1.0-translation_themes.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  
18    
19  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools  
 BuildRequires: gettext  
20  BuildArchitectures: noarch  BuildArchitectures: noarch
21  #BuildRequires: gcc  BuildRequires: e-smith-devtools
22    #<Build tests>
23    #BuildRequires:  perl >= 0:5.016
24    #BuildRequires:  perl(Test::More)
25    #BuildRequires:  perl(Test::Mojo)
26    #BuildRequires:  perl(Mojolicious) >= 7.56
27    #BuildRequires:  perl(Mojolicious::Plugin::I18N) >= 1.6
28    #BuildRequires:  perl(Net::Netmask) >= 1.9
29    #</Build tests>
30    
31  Requires: e-smith-lib >= 1.18.0-26  Requires: e-smith-lib >= 1.18.0-26
32  Requires: e-smith-manager >= 2.4.0-22  Requires: e-smith-manager >= 2.4.0-22
33  Requires: perl-Mojolicious >= 6.44  Requires:  perl(Mojolicious) >= 7.56
34  Requires: perl-Mojolicious-Plugin-I18N >= 1.6  Requires:  perl(Mojolicious::Plugin::I18N) >= 1.6
35    Requires:  perl(Mojolicious::Plugin::RenderFile) >= 0.12
36    Requires:  perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8
37    Requires:  perl(Net::Netmask) >= 1.9
38  #Requires: js-jquery > 2.2.4-3 (optional)  #Requires: js-jquery > 2.2.4-3 (optional)
39  Requires: pwauth  
 #Requires: perl(Apache::AuthTkt)  
40  Provides: server-manager  Provides: server-manager
41  AutoReqProv: no  AutoReqProv: no
42    
43  %define dir_mngr /usr/share/smanager  %define dir_mngr /usr/share/smanager
44    
   
45  %description  %description
46  This RPM contributes the navigation bars for the smeserver-manager.  This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version.
47    
48  %prep  %prep
49  %setup  %setup
# Line 64  This RPM contributes the navigation bars Line 52  This RPM contributes the navigation bars
52  %patch2 -p1  %patch2 -p1
53  %patch3 -p1  %patch3 -p1
54  %patch4 -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  
 %patch21 -p1  
 %patch22 -p1  
 %patch23 -p1  
 %patch24 -p1  
55    
56  %build  %build
57  perl createlinks  perl createlinks
58    
59  # Force creation of potentially empty directories  # Force creation of potentially empty directories
 ##mkdir -p root/etc/e-smith/web/functions2  
60  mkdir -p root/etc/e-smith/db/routes  mkdir -p root/etc/e-smith/db/routes
61  mkdir -p root/home/e-smith/db/navigation2  mkdir -p root/home/e-smith/db/navigation2
 #mkdir -p root%{dir_mngr}/html  
62  mkdir -p root%{dir_mngr}/themes/default/public/css  mkdir -p root%{dir_mngr}/themes/default/public/css
63    
 ##ln -s /etc/e-smith/web/common/cgi-bin/logout root/%{dir_mngr}/cgi-bin/logout  
 #ln -s %{dir_mngr}/conf/srvmngr.conf root/%{dir_mngr}/srvmngr.conf  
 #ln -s %{dir_mngr}/script/srvmngr.pl root/%{dir_mngr}/srvmngr.pl  
   
 ##gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c  
   
 #for file in index              #initial  
 #do  
 #    ln -s ../../../functions2/wrapper2 root%{dir_mngr}/html/${file}.cgi  
 #done  
   
   
64  %install  %install
65  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
66  (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)  (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
# Line 115  rm -f %{name}-%{version}-%{release}-file Line 69  rm -f %{name}-%{version}-%{release}-file
69  --dir %{dir_mngr} 'attr(0755,root,root)' \  --dir %{dir_mngr} 'attr(0755,root,root)' \
70  --file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \  --file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \
71  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \  --file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \
72    --file %{dir_mngr}/script/daily.sh 'attr(0770,root,root)' \
73    --file %{dir_mngr}/script/routes.pl 'attr(0770,root,root)' \
74    --file %{dir_mngr}/script/secrets.pl 'attr(0770,root,root)' \
75  > %{name}-%{version}-%{release}-filelist  > %{name}-%{version}-%{release}-filelist
76    
77  #--file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \  echo "%doc COPYING f2b/*" >> %{name}-%{version}-%{release}-filelist
 #--file /etc/e-smith/web/functions2/index.cgi 'attr(0500,root,root)' \  
 #--file %{dir_mngr}/html/index.cgi 'attr(root,admin)' \  
   
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist  
78    
79    %check
80    #cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r
81    
82  %clean  %clean
83  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
# Line 130  rm -rf $RPM_BUILD_ROOT Line 85  rm -rf $RPM_BUILD_ROOT
85  %pre  %pre
86    
87  %preun  %preun
88  # js-jquery from epel  if [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ]
 ##if (rpm -q js-jquery > /dev/null 2>&1)  
 if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]  
89  then  then
90      unlink %{dir_mngr}/themes/default/public/js/jquery.min.js      unlink %{dir_mngr}/themes/default/public/js/jquery.min.js
91  fi  fi
 systemctl disable smanager.service  
92  true  true
93    
94  %post  %post
 # js-jquery from epel  
 ##if (rpm -q js-jquery > /dev/null 2>&1)  
95  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]  if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ]
96  then  then
97      mkdir %{dir_mngr}/themes/default/public/js      [ -d %{dir_mngr}/themes/default/public/js ] ||
98      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
99        [ -h %{dir_mngr}/themes/default/public/js/jquery.min.js ] ||
100            ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js
101  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  
102  true  true
103    
104  %postun  %postun
105    
106  %files -f %{name}-%{version}-%{release}-filelist  %files -f %{name}-%{version}-%{release}-filelist
107  %defattr(-,root,root)  %defattr(-,root,root)
108    
109  %changelog  %changelog
110    * Sun Dec 26 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-6.sme
111    - e-format html for Vistual domains inReview config to be compatible with email format list [SME 11822]
112    
113    * Mon Dec 20 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-5.sme
114    - Add-span-to-group-member-checkbox-list [SME: 11815]
115    
116    * Mon Nov 29 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.4-4.sme
117    - Add-dummy-classes-to-ep-files.patch [SME: 11780]
118    
119    * Mon Nov 15 2021 Michel Begue <mab974@misouk.com> 0.1.4-3.sme
120    - Fix error message when linking, unlinking jquery in spec
121    - Correct the 'review' panel presentation
122    - Modify CSRFDefender plugin to take into account GET method
123    - Add TOKEN param where the GET method is used in templates
124    - Remove smanager from local url address
125    
126    * Mon Oct 11 2021 Michel Begue <mab974@protonmail.com> 0.1.4-2.sme
127    - Fix incorrect list order (users, ibays, ...)
128    - Add external private access (remote management)
129    - Change CSRF error message
130    
131    * Mon Jun 21 2021 Michel Begue <mab974@gmail.com> 0.1.4-1.sme
132    - New version: smeserver-manager-0.1.4-1 (= 0.1.2-13)
133    
134    * Sat Jun 19 2021 Michel Begue <mab974@gmail.com> 0.1.2-13.sme
135    - Remove non english locale files (move to smeserver-manager-locale)
136    - Fix error in 'locale2-conf' action
137    
138    * Tue Jun 15 2021 Michel Begue <mab974@gmail.com> 0.1.2-12.sme
139    - Fix errors in daily script
140    - Fix url and routes for 'hostentries' panel
141    - Change GET to POST method for CSRF plugin (routes and templates)
142    - Fix some translations
143    
144    * Tue Jun 08 2021 Michel Begue <mab974@gmail.com> 0.1.2-11.sme
145    - Add cron job for secrets and routes purge
146    - Add CSRFDefender plugin against CSRF attacks
147    - Add optional fail2ban configuration files in doc
148    - Fix zh-tw locale file name
149    - Fix missing links in 'Bugreport'
150    - Fix copyright in footer
151    - Fix translations
152    
153    * Thu Jun 03 2021 Michel Begue <mab974@gmail.com> 0.1.2-10.sme
154    - Add header for contrib in layout
155    - fix emailsettings error 'webmail is only SSL' [SME: 11443]
156    - fix locale files
157    - clean up template files
158    
159    * Wed Apr 21 2021 Michel Begue <mab974@gmail.com> 0.1.2-9.sme
160    - Add access attribute in configuration base
161    - Verify modes and access compatibility
162    - Display theme_switch button to logged in users only [SME: 11571]
163    
164    * Tue Apr 20 2021 Michel Begue <mab974@gmail.com> 0.1.2-8.sme
165    - Fix 'theme switch' [SME: 11571]
166    
167    * Mon Apr 12 2021 Michel Begue <mab974@gmail.com> 0.1.2-7.sme
168    - Fix server-mode in bugreport [SME: 10448]
169    - Add systemd-default for smanager type (service) [SME: 11544]
170    - Fix smanager type and status in db
171    - Move initial security notification to central place
172    - Render 'Manual' output in template
173    - Add a link to koozali.org on Sme logo
174    
175    * Mon Jan 25 2021 Michel Begue <mab974@gmail.com> 0.1.2-6.sme
176    - Fix missing backup functions
177    - background mode for halt and reboot
178    - Store debug mode in ENV
179    - Add a warning mode notification
180    - Fix some translations needing to be escaped
181    
182    * Wed Jan 13 2021 Michel Begue <mab974@gmail.com> 0.1.2-5.sme
183    - Fix menu items not translated [SME: 11322]
184    - Add other locales files
185    
186    * Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme
187    - Fix 404 error when trailing slash is missing
188    - Fix missing translations for ibay and quota panels
189    - Comment out pptp settings in remoteaccess panel
190    - Fix 'sigusr1' exec for httpd  [SME: 11185]
191    
192    * Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme
193    - Fix download error on 'viewlogfiles' panel [SME: 11217]
194    - Fix duplicate entries in log files to be chosen
195    - Fix duplicate translation terms in 'General' lexicon
196    
197    * Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
198    - Fix smanager-update event name
199    - Move smanager service to /usr/lib/systemd
200    - Fix Bugreport file download
201    - Fix translations missing in 'viewlogfiles'
202    - Remove Admin auth in httpd configuration
203    - Add an optional alias for admin sign in.
204    - Remove systemctl from .spec file
205    
206    * Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme
207    - Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31)
208    
209    * Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme
210    - smanager-refresh event come back
211    - add smanager version in footer
212    - add optional refresh in layout
213    - fix yum logfile displaying
214    
215    * Mon Oct 05 2020 Michel Begue <mab974@gmail.com> 0.1.0-30.sme
216    - fix I18N Namespace change for keeping Language
217    - clean up emailsettings code
218    - remove old global lexicon files
219    - add first simple tests
220    - add smanager-update event
221    
222    * Mon Aug 17 2020 Michel Begue <mab974@gmail.com> 0.1.0-29.sme
223    - validate lexicon file before install
224    - fix route url construction (+)
225    - add authentication messages to locales
226    
227    * Fri Aug 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-28.sme
228    - validate netmask in LocalNetworks [SME: 10976]
229    - validate netmask in RemoteAccess [SME: 10977]
230    - prettier action button
231    - accept undescore in lexicon name
232    - change route urls for LocalNetworks and Portforwarding
233    - add rendering to LocalNetworks notification
234    
235  * Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme  * Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme
236  - Fix typo in %post here  - Fix typo in %post here
237  - Complete 'datetime' panel  - Complete 'datetime' panel


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