/[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.12 by vip-ire, Thu Aug 28 13:14:07 2008 UTC Revision 1.29 by vip-ire, Thu Jun 11 09:16:08 2009 UTC
# Line 1  Line 1 
1  # $Id: smeserver-coova-chilli.spec,v 1.11 2008/08/28 10:12:16 snetram Exp $  # $Id: smeserver-coova-chilli.spec,v 1.28 2009/05/29 07:25:10 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 6  %define release 15
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.1-fixOUTreset.patch  Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
32  Patch7: smeserver-coova-chilli-0.1-uamallowed.patch  Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
33  Patch8: smeserver-coova-chilli-0.1-dnsparano.patch  Patch8: smeserver-coova-chilli-0.2-tundev.patch
34  Patch9: smeserver-coova-chilli-0.1-cmdsock.patch  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    
47  %description  %description
48  This package allow you to configure a third interface  This package allow you to configure a third interface
# Line 41  they'll only have web access if they are Line 54  they'll only have web access if they are
54  This contrib will only work in server&gateway mode  This contrib will only work in server&gateway mode
55    
56  %changelog  %changelog
57  *Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6  * Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15
58    - Fixe a bug in masq template for uamallowed entries
59    
60    * Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
61    - Remove space in hotspot-config.pl template
62    
63    * Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
64    - Add noc2c key (allow to disable the option, but default to enabled)
65    
66    * Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
67    - Create a new user coovachilli
68    - Add support of new options uid and gid to drop privileges
69    - Enabled noc2c (prevent client to client communication)
70    - Use sudo to call conup/condown script (as chilli runs under un
71      unprivileged account now)
72    - Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
73    - move templates2expand in creatlinks script
74    
75    * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
76    - Automatically allow uamallowed entries in the firewall (no need to
77      explicitly allow it agin in AllowOutgoing)
78    
79    * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
80    - Small typo correction
81    
82    * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
83    - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
84      (thanks John K Pruder)
85    - fix a typo in squid template
86    
87    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
88    - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
89    
90    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
91    - Fix tundev template [SME: 5054]
92    
93    * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
94    - Remove warning in httpd.conf file (httpd -t)
95    
96    * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
97    - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
98    
99    * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
100    - Requires perl(NetAddr::IP)
101    
102    * Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
103    - Chilli IP computed with NetAddr::IP
104    - Radius timeout set to 3 sec
105    - syntax error in radius users template fixed (for guest access)
106    
107    * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
108    - Bug fix for guest access
109    
110    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
111    - uplink and downlink for guest account are configurable via db keys
112    
113    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
114    - Login page is a CGI, with a server-manager login page look
115    - Guest Access can be enabled with guestAccess key (enabled/disabled)
116    - merge patchs in main package
117    
118    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
119    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
120    - Add WebRequests key (use of squid or direct connexions, default to direct)
121    - disable radconf in /etc/chilli/config
122    - possible to disable https (enabled by default in AllowedOutgoing)
123    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
124    - add radiustimeout directive so authentication errors display the standard message quickly
125    
126    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
127    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
128    
129    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
130  - split uamallowed (one per line)  - split uamallowed (one per line)
131  - Add dnsparanoia directive  - Add dnsparanoia directive
132  - correct cmdsock directive  - correct cmdsock directive
# Line 87  This contrib will only work in server&ga Line 172  This contrib will only work in server&ga
172  %patch7 -p1  %patch7 -p1
173  %patch8 -p1  %patch8 -p1
174  %patch9 -p1  %patch9 -p1
175    %patch10 -p1
176  mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template  %patch11 -p1
177  rm -rf root/opt/chilli.rpmnew/  %patch12 -p1
178  rm -rf root/etc/e-smith/templates-custom/  %patch13 -p1
179  rm -rf root/etc/e-smith/db/configuration/defaults  %patch14 -p1
180    %patch15 -p1
181    %patch16 -p1
182    %patch17 -p1
183    %patch18 -p1
184    %patch19 -p1
185    %patch20 -p1
186    
187  %build  %build
188  /usr/bin/perl createlinks  /usr/bin/perl createlinks
189    
 # Initialise db fragment  
 DEFAULT=root/etc/e-smith/db/configuration/defaults/chilli  
 mkdir -p $DEFAULT  
 echo 'service'                          > $DEFAULT/type  
 echo 'disabled'                         > $DEFAULT/status  
 echo 'private'                          > $DEFAULT/access  
 echo '900'                              > $DEFAULT/defidletimeout  
 echo '7200'                             > $DEFAULT/defsessiontimeout  
 echo 'eth2'                             > $DEFAULT/dhcpif  
 echo '212.73.209.226'                   > $DEFAULT/dns1  
 echo '194.206.120.1'                    > $DEFAULT/dns2  
 echo '10.1.0.0/255.255.255.0'           > $DEFAULT/net  
 echo '3990'                             > $DEFAULT/TCPPort  
 echo 'tun0'                             > $DEFAULT/tundev  
 echo 'tcp:www.firewall-services.com:80,\  
         tcp:coova.org:80,\  
         tcp:smeserver.org:80,\  
         tcp:sourceforge.net:80'         > $DEFAULT/uamallowed  
 echo ''                                 > $DEFAULT/RedirectToChilli  
 echo ''                                 > $DEFAULT/AllowedServices  
 echo ''                                 > $DEFAULT/AllowedOutgoing  
   
   
190  %install  %install
191  /bin/rm -rf $RPM_BUILD_ROOT  /bin/rm -rf $RPM_BUILD_ROOT
192  (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)
193  /bin/rm -f %{name}-%{version}-filelist  /bin/rm -f %{name}-%{version}-filelist
194  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
195          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(755,root,root)' \
196          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(750,root,root)' \
197          --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \          --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
198          --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \          --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
199          --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \          --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
200          --file /opt/chilli/hotspotlogin.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
201          --file /opt/chilli/lang/en.php 'config(noreplace)' \          --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
202          --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)' \  
203          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
204    
205  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
# Line 144  echo ''                                        > $DEFAULT/AllowedOutgoing Line 208  echo ''                                        > $DEFAULT/AllowedOutgoing
208  %clean  %clean
209  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
210    
211    %pre
212    if ! /usr/bin/id coovachilli &>/dev/null; then
213            /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
214                    %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
215    fi
216    
217    
218  %preun  %preun
219    
220  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