/[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.1 by slords, Tue Apr 15 15:04:56 2008 UTC Revision 1.30 by vip-ire, Wed Apr 14 16:38:56 2010 UTC
# Line 1  Line 1 
1  # $Id$  # $Id: smeserver-coova-chilli.spec,v 1.29 2009/06/11 09:16:08 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 1  %define release 16
10  Version: %{version}  Version: %{version}
11  Release: %{release}%{?dist}  Release: %{release}%{?dist}
12  License: GPL  License: GPL
13  Group: Networking/Remote access  Group: Networking/Remote access
14  Source: %{name}-%{version}.tar.gz  Source: %{name}-%{version}.tar.gz
 Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch  
 Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch  
15  URL: http://sme.firewall-services.com  URL: http://sme.firewall-services.com
 Packager: Daniel Berteaud <daniel@firewall-services.com>  
16  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
17  BuildArchitectures: noarch  BuildArchitectures: noarch
18  Requires: e-smith-release >= 7.0 openssl coova-chilli  BuildRequires: e-smith-devtools
19  BuildRequires: e-smith-devtools >= 1.13.1-03  Requires: e-smith-release >= 7.0
20    Requires: openssl
21    Requires: coova-chilli >= 1.0.13
22    Requires: e-smith-radiusd >= 1.0.0-18
23    Requires: perl(NetAddr::IP)
24    Requires: smeserver-remoteuseraccess
25    
26    Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
27    Patch2: smeserver-coova-chilli-0.2-guest_access.patch
28    Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch
29    Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch
30    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    
48  %description  %description
49  This package allow you to configure a third interface  This package allow you to configure a third interface
# Line 27  This package allow you to configure a th Line 51  This package allow you to configure a th
51  a secured captive portal. Users will be redirected  a secured captive portal. Users will be redirected
52  on a logon page and they'll have to enter credentials  on a logon page and they'll have to enter credentials
53  (sme accounts) before the server allows them. By default,  (sme accounts) before the server allows them. By default,
54  they'll only have web access if they are members of the group "chilli"  they'll only have web access if they are members of the group "chilli"
55    This contrib will only work in server&gateway mode
56    
57  %changelog  %changelog
58    * Wed Apr 14 2010 Daniel B. <daniel@firewall-services.com> 0.2-16
59    - Fixe a bug in conup.sh and condown.sh
60    
61    * Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15
62    - Fixe a bug in masq template for uamallowed entries
63    
64    * Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
65    - Remove space in hotspot-config.pl template
66    
67    * Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13
68    - Add noc2c key (allow to disable the option, but default to enabled)
69    
70    * Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12
71    - Create a new user coovachilli
72    - Add support of new options uid and gid to drop privileges
73    - Enabled noc2c (prevent client to client communication)
74    - Use sudo to call conup/condown script (as chilli runs under un
75      unprivileged account now)
76    - Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates)
77    - move templates2expand in creatlinks script
78    
79    * Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11
80    - Automatically allow uamallowed entries in the firewall (no need to
81      explicitly allow it agin in AllowOutgoing)
82    
83    * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
84    - Small typo correction
85    
86    * Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9
87    - Use allready defined localhost NAS to fixe PPTP problem [SME: 4996]
88      (thanks John K Pruder)
89    - fix a typo in squid template
90    
91    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
92    - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
93    
94    * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
95    - Fix tundev template [SME: 5054]
96    
97    * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
98    - Remove warning in httpd.conf file (httpd -t)
99    
100    * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
101    - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
102    
103    * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
104    - Requires perl(NetAddr::IP)
105    
106    * Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3
107    - Chilli IP computed with NetAddr::IP
108    - Radius timeout set to 3 sec
109    - syntax error in radius users template fixed (for guest access)
110    
111    * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
112    - Bug fix for guest access
113    
114    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
115    - uplink and downlink for guest account are configurable via db keys
116    
117    * Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0
118    - Login page is a CGI, with a server-manager login page look
119    - Guest Access can be enabled with guestAccess key (enabled/disabled)
120    - merge patchs in main package
121    
122    * Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8
123    - Fix uamallowed not working (since bypass_auth_with_squid_fix patch)
124    - Add WebRequests key (use of squid or direct connexions, default to direct)
125    - disable radconf in /etc/chilli/config
126    - possible to disable https (enabled by default in AllowedOutgoing)
127    - add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly
128    - add radiustimeout directive so authentication errors display the standard message quickly
129    
130    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7
131    - Reverted moving of default db entries to SPEC file since common practice is to store them in files
132    
133    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6
134    - split uamallowed (one per line)
135    - Add dnsparanoia directive
136    - correct cmdsock directive
137    - initialise default configuration db in the spec file
138    
139    * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
140    - Remove the reset of $OUT from the template
141    
142    * Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-4
143    - Add template to enable auth module unix (replace the template-custom)
144    - Copy images to /opt/chilli/template before removing .rpmnew directory
145    - Correct dependency (e-smith-radiusd not esmith-radiusd)
146    
147    * Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
148    - Split requirements to one per line
149    - Removed .rpmnew directory from package
150    - Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
151    
152    * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
153    - [0.1-2]
154    - Most firewall customizations (for incomming and forwarded traffic from
155      chilli network only) can be set through db commands (Patch3)
156    - Outgoing DNS is allowed only for the two DNS servers configured
157    - Clean spec file, and put php files in /opt/chilli (Patch4)
158    
159  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>  * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
160  - [0.1-1]  - [0.1-1]
161  - security fixe: auth bypass with squid (patch1)  - security fixe: auth bypass with squid (patch1)
# Line 43  they'll only have web access if they are Line 169  they'll only have web access if they are
169  %setup  %setup
170  %patch1 -p1  %patch1 -p1
171  %patch2 -p1  %patch2 -p1
172    %patch3 -p1
173    %patch4 -p1
174    %patch5 -p1
175    %patch6 -p1
176    %patch7 -p1
177    %patch8 -p1
178    %patch9 -p1
179    %patch10 -p1
180    %patch11 -p1
181    %patch12 -p1
182    %patch13 -p1
183    %patch14 -p1
184    %patch15 -p1
185    %patch16 -p1
186    %patch17 -p1
187    %patch18 -p1
188    %patch19 -p1
189    %patch20 -p1
190    %patch21 -p1
191    
192  %build  %build
193  /usr/bin/perl createlinks  /usr/bin/perl createlinks
# Line 52  they'll only have web access if they are Line 197  they'll only have web access if they are
197  (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)
198  /bin/rm -f %{name}-%{version}-filelist  /bin/rm -f %{name}-%{version}-filelist
199  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \  /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
200          --file /etc/chilli/conup.sh 'attr(0750,root,root)' \          --file /etc/chilli/conup.sh 'attr(755,root,root)' \
201          --file /etc/chilli/condown.sh 'attr(0750,root,root)' \          --file /etc/chilli/condown.sh 'attr(750,root,root)' \
202            --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
203            --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
204            --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
205            --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
206            --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
207            --file /opt/chilli/css/sme.css 'config(noreplace)' \
208          > %{name}-%{version}-filelist          > %{name}-%{version}-filelist
209    
210  %files -f %{name}-%{version}-filelist  %files -f %{name}-%{version}-filelist
# Line 62  they'll only have web access if they are Line 213  they'll only have web access if they are
213  %clean  %clean
214  rm -rf $RPM_BUILD_ROOT  rm -rf $RPM_BUILD_ROOT
215    
216  %post  %pre
217  if [ ! -e /opt/chilli ]; then  if ! /usr/bin/id coovachilli &>/dev/null; then
218          /bin/cp -a /opt/chilli.rpmnew /opt/chilli          /usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \
219                    %logmsg "Unexpected error adding user \"coovachilli\". Abort installation."
220  fi  fi
221    
222    
223  %preun  %preun
224    
225  if [ $1 == 0 ]; then  if [ $1 == 0 ]; then
226          /sbin/e-smith/db configuration setprop chilli status disabled          /sbin/e-smith/db configuration setprop chilli status disabled
227          /sbin/e-smith/signal-event chilli-update          /etc/rc.d/init.d/chilli stop >& /dev/null || :
228  fi  fi
229    


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