/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec
ViewVC logotype

Diff of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec

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

Revision 1.10 by vip-ire, Thu Aug 28 08:08:19 2008 UTC Revision 1.34 by vip-ire, Mon Mar 28 06:57:35 2011 UTC
# Line 1  Line 1 
1  # $Id: smeserver-coova-chilli.spec,v 1.9 2008/08/28 07:47:34 vip-ire Exp $  # $Id: smeserver-coova-chilli.spec,v 1.33 2010/10/20 17:32:50 vip-ire Exp $
2  # Authority: vip-ire  # Authority: vip-ire
3  # Name: Daniel Berteaud  # Name: Daniel Berteaud
4    
5  Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server  Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server
6  %define name smeserver-coova-chilli  %define name smeserver-coova-chilli
7  Name: %{name}  Name: %{name}
8  %define version 0.1  %define version 0.2
9  %define release 4  %define release 20
10  Version: %{version}  Version: %{version}
11  Release: %{release}%{?dist}  Release: %{release}%{?dist}
12  License: GPL  License: GPL
# Line 18  BuildArchitectures: noarch Line 18  BuildArchitectures: noarch
18  BuildRequires: e-smith-devtools  BuildRequires: e-smith-devtools
19  Requires: e-smith-release >= 7.0  Requires: e-smith-release >= 7.0
20  Requires: openssl  Requires: openssl
21  Requires: coova-chilli  Requires: coova-chilli >= 1.0.13
22  Requires: e-smith-radiusd >= 1.0.0-18  Requires: e-smith-radiusd >= 1.0.0-18
23    Requires: perl(NetAddr::IP)
24    Requires: smeserver-remoteuseraccess
25    
26  Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch  Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
27  Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch  Patch2: smeserver-coova-chilli-0.2-guest_access.patch
28  Patch3: smeserver-coova-chilli-0.1-firewall2db.patch  Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
29  Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch  Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
30  Patch5: smeserver-coova-chilli-0.1-authTemplate.patch  Patch5: smeserver-coova-chilli-0.2-guest_access2.patch
31    Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
32    Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
33    Patch8: smeserver-coova-chilli-0.2-tundev.patch
34    Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
35    Patch10: smeserver-coova-chilli-0.2-localhost_nas.patch
36    Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch
37    Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch
38    Patch13: smeserver-coova-chilli-0.2-typo.patch
39    Patch14: smeserver-coova-chilli-0.2-allow_uamallowed.patch
40    Patch15: smeserver-coova-chilli-0.2-drop_privileges.patch
41    Patch16: smeserver-coova-chilli-0.2-use_sudo.patch
42    Patch17: smeserver-coova-chilli-0.2-templates2expand_in_createlinks.patch
43    Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
44    Patch19: smeserver-coova-chilli-0.2-remove_space.patch
45    Patch20: smeserver-coova-chilli-0.2-fixe_allow_uamallowed.patch
46    Patch21: smeserver-coova-chilli-0.2-fixe_squid_disabled.patch
47    Patch22: smeserver-coova-chilli-0.2-squid_tcpport.patch
48    Patch23: smeserver-coova-chilli-0.2-sudo_env.patch
49    Patch24: smeserver-coova-chilli-0.2-iptables_insert_position.patch
50    Patch25: smeserver-coova-chilli-0.2-transparent_squid.patch
51    Patch26: smeserver-coova-chilli-0.2-clean_cgi.patch
52    Patch27: smeserver-coova-chilli-0.2-remove_obsolete_php_templates.patch
53    Patch28: smeserver-coova-chilli-0.2-add_macallowed_in_db.patch
54    Patch29: smeserver-coova-chilli-0.2-add_uamhomepage_in_db.patch
55    Patch30: smeserver-coova-chilli-0.2-drop_forward_not_to_ext_if.patch
56    Patch31: smeserver-coova-chilli-0.2-fix_uamhomepage.patch
57    
58  %description  %description
59  This package allow you to configure a third interface  This package allow you to configure a third interface
# Line 37  they'll only have web access if they are Line 65  they'll only have web access if they are
65  This contrib will only work in server&gateway mode  This contrib will only work in server&gateway mode
66    
67  %changelog  %changelog
68    * Mon Mar 28 2011 Daniel B. <daniel@firewall-services.com> 0.2-20
69    - Fix uamhomepage setting
70    
71    * Wed Oct 20 2010 Daniel B. <daniel@firewall-services.com> 0.2-19
72    - Drop all the trafic not going through the external interface
73    
74    * Thu Jul 29 2010 Daniel B. <daniel@firewall-services.com> 0.2-18
75    - cleanup CGI login script
76    - remove obsolete php templates
77    - add macallowed DB key to bypass auth for some mac addresses
78    - add uamhomepage DB key
79    
80    * Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.2-17
81    - Fixes sudo env (bug only in SME8)
82    - Uses TCPPort squid key instead of TransparentPort so coova can
83      work with dansguardian
84    - insert NAT rule just before the ACCEPT (PREROUTING_FROM_CHILLI)
85    - add transparent directive to squid (required for squid => 2.6)
86    
87    * Wed Apr 14 2010 Daniel B. <daniel@firewall-services.com> 0.2-16
88    - Fixe a bug in conup.sh and condown.sh
89    
90    * Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15
91    - Fixe a bug in masq template for uamallowed entries
92    
93    * Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
94    - Remove space in hotspot-config.pl template
95    
96    * Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
97    - Add noc2c key (allow to disable the option, but default to enabled)
98    
99    * Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
100    - Create a new user coovachilli
101    - Add support of new options uid and gid to drop privileges
102    - Enabled noc2c (prevent client to client communication)
103    - Use sudo to call conup/condown script (as chilli runs under un
104      unprivileged account now)
105    - Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
106    - move templates2expand in creatlinks script
107    
108    * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
109    - Automatically allow uamallowed entries in the firewall (no need to
110      explicitly allow it agin in AllowOutgoing)
111    
112    * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
113    - Small typo correction
114    
115    * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
116    - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
117      (thanks John K Pruder)
118    - fix a typo in squid template
119    
120    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
121    - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
122    
123    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
124    - Fix tundev template [SME: 5054]
125    
126    * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
127    - Remove warning in httpd.conf file (httpd -t)
128    
129    * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
130    - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
131    
132    * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
133    - Requires perl(NetAddr::IP)
134    
135    * Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
136    - Chilli IP computed with NetAddr::IP
137    - Radius timeout set to 3 sec
138    - syntax error in radius users template fixed (for guest access)
139    
140    * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
141    - Bug fix for guest access
142    
143    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
144    - uplink and downlink for guest account are configurable via db keys
145    
146    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
147    - Login page is a CGI, with a server-manager login page look
148    - Guest Access can be enabled with guestAccess key (enabled/disabled)
149    - merge patchs in main package
150    
151    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
152    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
153    - Add WebRequests key (use of squid or direct connexions, default to direct)
154    - disable radconf in /etc/chilli/config
155    - possible to disable https (enabled by default in AllowedOutgoing)
156    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
157    - add radiustimeout directive so authentication errors display the standard message quickly
158    
159    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
160    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
161    
162    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
163    - split uamallowed (one per line)
164    - Add dnsparanoia directive
165    - correct cmdsock directive
166    - initialise default configuration db in the spec file
167    
168    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
169    - Remove the reset of $OUT from the template
170    
171  * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4  * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
172  - Add template to enable auth module unix (replace the template-custom)  - Add template to enable auth module unix (replace the template-custom)
173  - Copy images to /opt/chilli/template before removing .rpmnew directory  - Copy images to /opt/chilli/template before removing .rpmnew directory
# Line 70  This contrib will only work in server&ga Line 201  This contrib will only work in server&ga
201  %patch3 -p1  %patch3 -p1
202  %patch4 -p1  %patch4 -p1
203  %patch5 -p1  %patch5 -p1
204  mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template  %patch6 -p1
205  rm -rf root/opt/chilli.rpmnew/  %patch7 -p1
206  rm -rf root/etc/e-smith/templates-custom/  %patch8 -p1
207    %patch9 -p1
208    %patch10 -p1
209    %patch11 -p1
210    %patch12 -p1
211    %patch13 -p1
212    %patch14 -p1
213    %patch15 -p1
214    %patch16 -p1
215    %patch17 -p1
216    %patch18 -p1
217    %patch19 -p1
218    %patch20 -p1
219    %patch21 -p1
220    %patch22 -p1
221    %patch23 -p1
222    %patch24 -p1
223    %patch25 -p1
224    %patch26 -p1
225    %patch27 -p1
226    %patch28 -p1
227    %patch29 -p1
228    %patch30 -p1
229    %patch31 -p1
230    
231  %build  %build
232  /usr/bin/perl createlinks  /usr/bin/perl createlinks
# Line 82  rm -rf root/etc/e-smith/templates-custom Line 236  rm -rf root/etc/e-smith/templates-custom
236  (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)  (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
237  /bin/rm -f %{name}-%{version}-filelist  /bin/rm -f %{name}-%{version}-filelist
238  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
239          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(755,root,root)' \
240          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(750,root,root)' \
241          --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \          --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
242          --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \          --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
243          --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
244          --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
245          --file /opt/chilli/lang/en.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
246          --file /opt/chilli/lang/fr.php 'config(noreplace)' \          --file /opt/chilli/css/sme.css 'config(noreplace)' \
         --file /opt/chilli/lang/main.php 'config(noreplace)' \  
         --file /opt/chilli/template/loggingin.php 'config(noreplace)' \  
         --file /opt/chilli/template/loginform-footer.php 'config(noreplace)' \  
         --file /opt/chilli/template/loginform-header.php 'config(noreplace)' \  
247          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
248    
249  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
# Line 102  rm -rf root/etc/e-smith/templates-custom Line 252  rm -rf root/etc/e-smith/templates-custom
252  %clean  %clean
253  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
254    
255    %pre
256    if ! /usr/bin/id coovachilli &>/dev/null; then
257            /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
258                    %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
259    fi
260    
261    
262  %preun  %preun
263    
264  if [ $1 == 0 ]; then  if [ $1 == 0 ]; then


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