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

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

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


Revision 1.34 - (hide annotations) (download)
Mon Mar 28 06:57:35 2011 UTC (13 years, 1 month ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_2-20_el4_sme, HEAD
Changes since 1.33: +7 -2 lines
* Mon Mar 28 2011 Daniel B. <daniel@firewall-services.com> 0.2-20
- Fix uamhomepage setting

1 vip-ire 1.34 # $Id: smeserver-coova-chilli.spec,v 1.33 2010/10/20 17:32:50 vip-ire Exp $
2 slords 1.7 # Authority: vip-ire
3     # Name: Daniel Berteaud
4    
5 slords 1.1 Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server
6     %define name smeserver-coova-chilli
7     Name: %{name}
8 slords 1.15 %define version 0.2
9 vip-ire 1.34 %define release 20
10 slords 1.1 Version: %{version}
11 vip-ire 1.5 Release: %{release}%{?dist}
12 vip-ire 1.4 License: GPL
13 slords 1.1 Group: Networking/Remote access
14     Source: %{name}-%{version}.tar.gz
15     URL: http://sme.firewall-services.com
16     BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
17     BuildArchitectures: noarch
18 vip-ire 1.6 BuildRequires: e-smith-devtools
19 snetram 1.8 Requires: e-smith-release >= 7.0
20     Requires: openssl
21 vip-ire 1.26 Requires: coova-chilli >= 1.0.13
22 vip-ire 1.10 Requires: e-smith-radiusd >= 1.0.0-18
23 vip-ire 1.18 Requires: perl(NetAddr::IP)
24 vip-ire 1.26 Requires: smeserver-remoteuseraccess
25 vip-ire 1.3
26 slords 1.15 Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
27     Patch2: smeserver-coova-chilli-0.2-guest_access.patch
28 vip-ire 1.17 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 vip-ire 1.18 Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch
32 vip-ire 1.19 Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch
33 vip-ire 1.22 Patch8: smeserver-coova-chilli-0.2-tundev.patch
34 vip-ire 1.23 Patch9: smeserver-coova-chilli-0.2-dhcp_range.patch
35 vip-ire 1.24 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 vip-ire 1.25 Patch13: smeserver-coova-chilli-0.2-typo.patch
39 vip-ire 1.26 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 vip-ire 1.27 Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
44 vip-ire 1.28 Patch19: smeserver-coova-chilli-0.2-remove_space.patch
45 vip-ire 1.29 Patch20: smeserver-coova-chilli-0.2-fixe_allow_uamallowed.patch
46 vip-ire 1.30 Patch21: smeserver-coova-chilli-0.2-fixe_squid_disabled.patch
47 vip-ire 1.31 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 vip-ire 1.32 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 vip-ire 1.33 Patch30: smeserver-coova-chilli-0.2-drop_forward_not_to_ext_if.patch
56 vip-ire 1.34 Patch31: smeserver-coova-chilli-0.2-fix_uamhomepage.patch
57 slords 1.1
58     %description
59     This package allow you to configure a third interface
60     (eth2). Just plug a WiFi AP on it, and you'll have
61     a secured captive portal. Users will be redirected
62     on a logon page and they'll have to enter credentials
63     (sme accounts) before the server allows them. By default,
64 vip-ire 1.5 they'll only have web access if they are members of the group "chilli"
65     This contrib will only work in server&gateway mode
66 slords 1.1
67     %changelog
68 vip-ire 1.34 * Mon Mar 28 2011 Daniel B. <daniel@firewall-services.com> 0.2-20
69     - Fix uamhomepage setting
70    
71 vip-ire 1.33 * 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 vip-ire 1.32 * 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 vip-ire 1.31 * 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 vip-ire 1.30 * 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 vip-ire 1.29 * 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 vip-ire 1.28 * Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14
94     - Remove space in hotspot-config.pl template
95    
96 vip-ire 1.27 * 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 vip-ire 1.26 * 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 vip-ire 1.25 * Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10
113     - Small typo correction
114    
115 vip-ire 1.24 * 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 vip-ire 1.23 * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8
121 vip-ire 1.24 - Add dhcpstart and dhcpstop db parameters (thanks John K Pruder)
122 vip-ire 1.23
123 vip-ire 1.22 * Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7
124     - Fix tundev template [SME: 5054]
125    
126 vip-ire 1.19 * Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6
127     - Remove warning in httpd.conf file (httpd -t)
128    
129 vip-ire 1.18 * Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5
130 vip-ire 1.22 - Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559]
131 vip-ire 1.18
132     * Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4
133     - Requires perl(NetAddr::IP)
134    
135 vip-ire 1.17 * 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 slords 1.15 * Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
141 vip-ire 1.17 - Bug fix for guest access
142 slords 1.15
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 vip-ire 1.22 - Guest Access can be enabled with guestAccess key (enabled/disabled)
149 slords 1.15 - merge patchs in main package
150    
151 vip-ire 1.14 * 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 snetram 1.13 * 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 vip-ire 1.12 - split uamallowed (one per line)
164     - Add dnsparanoia directive
165     - correct cmdsock directive
166     - initialise default configuration db in the spec file
167    
168 snetram 1.11 * Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5
169     - Remove the reset of $OUT from the template
170    
171 vip-ire 1.9 * 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)
173     - Copy images to /opt/chilli/template before removing .rpmnew directory
174 vip-ire 1.10 - Correct dependency (e-smith-radiusd not esmith-radiusd)
175 vip-ire 1.9
176 snetram 1.8 * Wed Aug 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-3
177     - Split requirements to one per line
178     - Removed .rpmnew directory from package
179 vip-ire 1.9 - Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18
180 snetram 1.8
181 vip-ire 1.3 * Tue Aug 26 2008 Daniel B. <daniel@firewall-services.com>
182     - [0.1-2]
183 vip-ire 1.5 - Most firewall customizations (for incomming and forwarded traffic from
184 vip-ire 1.3 chilli network only) can be set through db commands (Patch3)
185     - Outgoing DNS is allowed only for the two DNS servers configured
186 vip-ire 1.5 - Clean spec file, and put php files in /opt/chilli (Patch4)
187 vip-ire 1.3
188 slords 1.1 * Tue Apr 15 2008 Daniel Berteaud <daniel@firewall-services.com>
189     - [0.1-1]
190     - security fixe: auth bypass with squid (patch1)
191     - masq template not expanded (patch2)
192    
193     * Fri Apr 04 2008 Daniel Berteaud <daniel@firewall-services.com>
194     - [0.1]
195     - initiale release
196    
197     %prep
198     %setup
199     %patch1 -p1
200     %patch2 -p1
201 vip-ire 1.17 %patch3 -p1
202     %patch4 -p1
203     %patch5 -p1
204 vip-ire 1.18 %patch6 -p1
205 vip-ire 1.19 %patch7 -p1
206 vip-ire 1.22 %patch8 -p1
207 vip-ire 1.23 %patch9 -p1
208 vip-ire 1.24 %patch10 -p1
209     %patch11 -p1
210     %patch12 -p1
211 vip-ire 1.25 %patch13 -p1
212 vip-ire 1.26 %patch14 -p1
213     %patch15 -p1
214     %patch16 -p1
215     %patch17 -p1
216 vip-ire 1.27 %patch18 -p1
217 vip-ire 1.28 %patch19 -p1
218 vip-ire 1.29 %patch20 -p1
219 vip-ire 1.30 %patch21 -p1
220 vip-ire 1.31 %patch22 -p1
221     %patch23 -p1
222     %patch24 -p1
223     %patch25 -p1
224 vip-ire 1.32 %patch26 -p1
225     %patch27 -p1
226     %patch28 -p1
227     %patch29 -p1
228 vip-ire 1.33 %patch30 -p1
229 vip-ire 1.34 %patch31 -p1
230 slords 1.15
231 slords 1.1 %build
232     /usr/bin/perl createlinks
233    
234     %install
235     /bin/rm -rf $RPM_BUILD_ROOT
236     (cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
237     /bin/rm -f %{name}-%{version}-filelist
238     /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
239 vip-ire 1.26 --file /etc/chilli/conup.sh 'attr(755,root,root)' \
240     --file /etc/chilli/condown.sh 'attr(750,root,root)' \
241     --file /etc/chilli/call_conup.sh 'attr(755,root,root)' \
242     --file /etc/chilli/call_condown.sh 'attr(755,root,root)' \
243 slords 1.15 --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \
244     --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \
245     --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \
246     --file /opt/chilli/css/sme.css 'config(noreplace)' \
247 slords 1.1 > %{name}-%{version}-filelist
248    
249     %files -f %{name}-%{version}-filelist
250     %defattr(-,root,root)
251    
252     %clean
253     rm -rf $RPM_BUILD_ROOT
254    
255 vip-ire 1.26 %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 slords 1.1 %preun
263 vip-ire 1.3
264 slords 1.1 if [ $1 == 0 ]; then
265     /sbin/e-smith/db configuration setprop chilli status disabled
266 slords 1.7 /etc/rc.d/init.d/chilli stop >& /dev/null || :
267 slords 1.1 fi
268    

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