1 |
# $Id: smeserver-coova-chilli.spec,v 1.24 2009/03/11 08:58:33 vip-ire Exp $ |
# $Id: smeserver-coova-chilli.spec,v 1.27 2009/05/26 13:46:19 vip-ire Exp $ |
2 |
# Authority: vip-ire |
# Authority: vip-ire |
3 |
# Name: Daniel Berteaud |
# Name: Daniel Berteaud |
4 |
|
|
6 |
%define name smeserver-coova-chilli |
%define name smeserver-coova-chilli |
7 |
Name: %{name} |
Name: %{name} |
8 |
%define version 0.2 |
%define version 0.2 |
9 |
%define release 10 |
%define release 14 |
10 |
Version: %{version} |
Version: %{version} |
11 |
Release: %{release}%{?dist} |
Release: %{release}%{?dist} |
12 |
License: GPL |
License: GPL |
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) |
Requires: perl(NetAddr::IP) |
24 |
|
Requires: smeserver-remoteuseraccess |
25 |
|
|
26 |
Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch |
Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch |
27 |
Patch2: smeserver-coova-chilli-0.2-guest_access.patch |
Patch2: smeserver-coova-chilli-0.2-guest_access.patch |
36 |
Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch |
Patch11: smeserver-coova-chilli-0.2-localhost_nas2.patch |
37 |
Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch |
Patch12: smeserver-coova-chilli-0.2-squid_template_typo.patch |
38 |
Patch13: smeserver-coova-chilli-0.2-typo.patch |
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 |
|
|
46 |
%description |
%description |
47 |
This package allow you to configure a third interface |
This package allow you to configure a third interface |
53 |
This contrib will only work in server&gateway mode |
This contrib will only work in server&gateway mode |
54 |
|
|
55 |
%changelog |
%changelog |
56 |
|
* Thu May 28 2009 Daniel B. <daniel@firewall-services.com> 0.2-14 |
57 |
|
- Remove space in hotspot-config.pl template |
58 |
|
|
59 |
|
* Tue May 26 2009 Daniel B. <daniel@firewall-services.com> 0.2-13 |
60 |
|
- Add noc2c key (allow to disable the option, but default to enabled) |
61 |
|
|
62 |
|
* Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12 |
63 |
|
- Create a new user coovachilli |
64 |
|
- Add support of new options uid and gid to drop privileges |
65 |
|
- Enabled noc2c (prevent client to client communication) |
66 |
|
- Use sudo to call conup/condown script (as chilli runs under un |
67 |
|
unprivileged account now) |
68 |
|
- Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates) |
69 |
|
- move templates2expand in creatlinks script |
70 |
|
|
71 |
|
* Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11 |
72 |
|
- Automatically allow uamallowed entries in the firewall (no need to |
73 |
|
explicitly allow it agin in AllowOutgoing) |
74 |
|
|
75 |
* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10 |
* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10 |
76 |
- Small typo correction |
- Small typo correction |
77 |
|
|
172 |
%patch11 -p1 |
%patch11 -p1 |
173 |
%patch12 -p1 |
%patch12 -p1 |
174 |
%patch13 -p1 |
%patch13 -p1 |
175 |
|
%patch14 -p1 |
176 |
|
%patch15 -p1 |
177 |
|
%patch16 -p1 |
178 |
|
%patch17 -p1 |
179 |
|
%patch18 -p1 |
180 |
|
%patch19 -p1 |
181 |
|
|
182 |
%build |
%build |
183 |
/usr/bin/perl createlinks |
/usr/bin/perl createlinks |
187 |
(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) |
188 |
/bin/rm -f %{name}-%{version}-filelist |
/bin/rm -f %{name}-%{version}-filelist |
189 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
190 |
--file /etc/chilli/conup.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/conup.sh 'attr(755,root,root)' \ |
191 |
--file /etc/chilli/condown.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/condown.sh 'attr(750,root,root)' \ |
192 |
|
--file /etc/chilli/call_conup.sh 'attr(755,root,root)' \ |
193 |
|
--file /etc/chilli/call_condown.sh 'attr(755,root,root)' \ |
194 |
--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ |
--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ |
195 |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
196 |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
203 |
%clean |
%clean |
204 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
205 |
|
|
206 |
|
%pre |
207 |
|
if ! /usr/bin/id coovachilli &>/dev/null; then |
208 |
|
/usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \ |
209 |
|
%logmsg "Unexpected error adding user \"coovachilli\". Abort installation." |
210 |
|
fi |
211 |
|
|
212 |
|
|
213 |
%preun |
%preun |
214 |
|
|
215 |
if [ $1 == 0 ]; then |
if [ $1 == 0 ]; then |