1 |
# $Id: smeserver-coova-chilli.spec,v 1.17 2008/09/05 10:36:55 vip-ire Exp $ |
# $Id: smeserver-coova-chilli.spec,v 1.25 2009/03/12 14:54:34 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 5 |
%define release 12 |
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 |
29 |
Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch |
Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch |
30 |
Patch5: smeserver-coova-chilli-0.2-guest_access2.patch |
Patch5: smeserver-coova-chilli-0.2-guest_access2.patch |
31 |
Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch |
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 |
|
|
44 |
%description |
%description |
45 |
This package allow you to configure a third interface |
This package allow you to configure a third interface |
51 |
This contrib will only work in server&gateway mode |
This contrib will only work in server&gateway mode |
52 |
|
|
53 |
%changelog |
%changelog |
54 |
|
* Thu Apr 30 2009 Daniel B. <daniel@firewall-services.com> 0.2-12 |
55 |
|
- Create a new user coovachilli |
56 |
|
- Add support of new options uid and gid to drop privileges |
57 |
|
- Enabled noc2c (prevent client to client communication) |
58 |
|
- Use sudo to call conup/condown script (as chilli runs under un |
59 |
|
unprivileged account now) |
60 |
|
- Add smeserver-remoteuseraccess as a dependency (for sudoers metadata templates) |
61 |
|
- move templates2expand in creatlinks script |
62 |
|
|
63 |
|
* Wed Mar 13 2009 Daniel B. <daniel@firewall-services.com> 0.2-11 |
64 |
|
- Automatically allow uamallowed entries in the firewall (no need to |
65 |
|
explicitly allow it agin in AllowOutgoing) |
66 |
|
|
67 |
|
* Thu Mar 12 2009 Daniel B. <daniel@firewall-services.com> 0.2-10 |
68 |
|
- Small typo correction |
69 |
|
|
70 |
|
* Tue Mar 10 2009 Daniel B. <daniel@firewall-services.com> 0.2-9 |
71 |
|
- Use allready defined localhost NAS to fixe PPTP problem [SME: 4996] |
72 |
|
(thanks John K Pruder) |
73 |
|
- fix a typo in squid template |
74 |
|
|
75 |
|
* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-8 |
76 |
|
- Add dhcpstart and dhcpstop db parameters (thanks John K Pruder) |
77 |
|
|
78 |
|
* Sun Mar 07 2009 Daniel B. <daniel@firewall-services.com> 0.2-7 |
79 |
|
- Fix tundev template [SME: 5054] |
80 |
|
|
81 |
|
* Thu Sep 18 2008 Daniel B. <daniel@firewall-services.com> 0.2-6 |
82 |
|
- Remove warning in httpd.conf file (httpd -t) |
83 |
|
|
84 |
* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5 |
* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5 |
85 |
- Fix Syntax Error in /etc/chilli.conf template (25listen) |
- Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559] |
86 |
|
|
87 |
* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4 |
* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4 |
88 |
- Requires perl(NetAddr::IP) |
- Requires perl(NetAddr::IP) |
100 |
|
|
101 |
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0 |
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0 |
102 |
- Login page is a CGI, with a server-manager login page look |
- Login page is a CGI, with a server-manager login page look |
103 |
- Guest Access can be enabled with guestAccess key (enabled/isabled) |
- Guest Access can be enabled with guestAccess key (enabled/disabled) |
104 |
- merge patchs in main package |
- merge patchs in main package |
105 |
|
|
106 |
* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8 |
* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8 |
157 |
%patch4 -p1 |
%patch4 -p1 |
158 |
%patch5 -p1 |
%patch5 -p1 |
159 |
%patch6 -p1 |
%patch6 -p1 |
160 |
|
%patch7 -p1 |
161 |
|
%patch8 -p1 |
162 |
|
%patch9 -p1 |
163 |
|
%patch10 -p1 |
164 |
|
%patch11 -p1 |
165 |
|
%patch12 -p1 |
166 |
|
%patch13 -p1 |
167 |
|
%patch14 -p1 |
168 |
|
%patch15 -p1 |
169 |
|
%patch16 -p1 |
170 |
|
%patch17 -p1 |
171 |
|
|
172 |
%build |
%build |
173 |
/usr/bin/perl createlinks |
/usr/bin/perl createlinks |
177 |
(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) |
178 |
/bin/rm -f %{name}-%{version}-filelist |
/bin/rm -f %{name}-%{version}-filelist |
179 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
180 |
--file /etc/chilli/conup.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/conup.sh 'attr(755,root,root)' \ |
181 |
--file /etc/chilli/condown.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/condown.sh 'attr(750,root,root)' \ |
182 |
|
--file /etc/chilli/call_conup.sh 'attr(755,root,root)' \ |
183 |
|
--file /etc/chilli/call_condown.sh 'attr(755,root,root)' \ |
184 |
--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)' \ |
185 |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
186 |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
193 |
%clean |
%clean |
194 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
195 |
|
|
196 |
|
%pre |
197 |
|
if ! /usr/bin/id coovachilli &>/dev/null; then |
198 |
|
/usr/sbin/useradd -c 'Coova Chilli User' -s /sbin/nologin -r -d /etc/chilli coovachilli &>/dev/null || \ |
199 |
|
%logmsg "Unexpected error adding user \"coovachilli\". Abort installation." |
200 |
|
fi |
201 |
|
|
202 |
|
|
203 |
%preun |
%preun |
204 |
|
|
205 |
if [ $1 == 0 ]; then |
if [ $1 == 0 ]; then |