1 |
# $Id: smeserver-coova-chilli.spec,v 1.10 2008/08/28 08:08:19 vip-ire Exp $ |
# $Id: smeserver-coova-chilli.spec,v 1.17 2008/09/05 10:36:55 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 5 |
%define release 5 |
10 |
Version: %{version} |
Version: %{version} |
11 |
Release: %{release}%{?dist} |
Release: %{release}%{?dist} |
20 |
Requires: openssl |
Requires: openssl |
21 |
Requires: coova-chilli |
Requires: coova-chilli |
22 |
Requires: e-smith-radiusd >= 1.0.0-18 |
Requires: e-smith-radiusd >= 1.0.0-18 |
23 |
|
Requires: perl(NetAddr::IP) |
24 |
|
|
25 |
Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch |
Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch |
26 |
Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch |
Patch2: smeserver-coova-chilli-0.2-guest_access.patch |
27 |
Patch3: smeserver-coova-chilli-0.1-firewall2db.patch |
Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch |
28 |
Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch |
Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch |
29 |
Patch5: smeserver-coova-chilli-0.1-authTemplate.patch |
Patch5: smeserver-coova-chilli-0.2-guest_access2.patch |
30 |
Patch6: smeserver-coova-chilli-0.1-fixOUTreset.patch |
Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch |
31 |
|
|
32 |
%description |
%description |
33 |
This package allow you to configure a third interface |
This package allow you to configure a third interface |
39 |
This contrib will only work in server&gateway mode |
This contrib will only work in server&gateway mode |
40 |
|
|
41 |
%changelog |
%changelog |
42 |
|
* Mon Sep 15 2008 Daniel B. <daniel@firewall-services.com> 0.2-5 |
43 |
|
- Fix Syntax Error in /etc/chilli.conf template (25listen) |
44 |
|
|
45 |
|
* Mon Sep 08 2008 Daniel B. <daniel@firewall-services.com> 0.2-4 |
46 |
|
- Requires perl(NetAddr::IP) |
47 |
|
|
48 |
|
* Fri Sep 5 2008 Daniel B. <daniel@firewall-services.com> 0.2-3 |
49 |
|
- Chilli IP computed with NetAddr::IP |
50 |
|
- Radius timeout set to 3 sec |
51 |
|
- syntax error in radius users template fixed (for guest access) |
52 |
|
|
53 |
|
* Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2 |
54 |
|
- Bug fix for guest access |
55 |
|
|
56 |
|
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1 |
57 |
|
- uplink and downlink for guest account are configurable via db keys |
58 |
|
|
59 |
|
* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-0 |
60 |
|
- Login page is a CGI, with a server-manager login page look |
61 |
|
- Guest Access can be enabled with guestAccess key (enabled/isabled) |
62 |
|
- merge patchs in main package |
63 |
|
|
64 |
|
* Mon Sep 01 2008 Daniel B. <daniel@firewall-services.com> 0.1-8 |
65 |
|
- Fix uamallowed not working (since bypass_auth_with_squid_fix patch) |
66 |
|
- Add WebRequests key (use of squid or direct connexions, default to direct) |
67 |
|
- disable radconf in /etc/chilli/config |
68 |
|
- possible to disable https (enabled by default in AllowedOutgoing) |
69 |
|
- add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly |
70 |
|
- add radiustimeout directive so authentication errors display the standard message quickly |
71 |
|
|
72 |
|
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-7 |
73 |
|
- Reverted moving of default db entries to SPEC file since common practice is to store them in files |
74 |
|
|
75 |
|
* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 0.1-6 |
76 |
|
- split uamallowed (one per line) |
77 |
|
- Add dnsparanoia directive |
78 |
|
- correct cmdsock directive |
79 |
|
- initialise default configuration db in the spec file |
80 |
|
|
81 |
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5 |
* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-5 |
82 |
- Remove the reset of $OUT from the template |
- Remove the reset of $OUT from the template |
83 |
|
|
115 |
%patch4 -p1 |
%patch4 -p1 |
116 |
%patch5 -p1 |
%patch5 -p1 |
117 |
%patch6 -p1 |
%patch6 -p1 |
|
mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template |
|
|
rm -rf root/opt/chilli.rpmnew/ |
|
|
rm -rf root/etc/e-smith/templates-custom/ |
|
118 |
|
|
119 |
%build |
%build |
120 |
/usr/bin/perl createlinks |
/usr/bin/perl createlinks |
126 |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ |
127 |
--file /etc/chilli/conup.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/conup.sh 'attr(0750,root,root)' \ |
128 |
--file /etc/chilli/condown.sh 'attr(0750,root,root)' \ |
--file /etc/chilli/condown.sh 'attr(0750,root,root)' \ |
129 |
--file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \ |
--file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ |
130 |
--file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ |
131 |
--file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \ |
--file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ |
132 |
--file /opt/chilli/hotspotlogin.php 'config(noreplace)' \ |
--file /opt/chilli/css/sme.css 'config(noreplace)' \ |
|
--file /opt/chilli/lang/en.php 'config(noreplace)' \ |
|
|
--file /opt/chilli/lang/fr.php '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)' \ |
|
133 |
> %{name}-%{version}-filelist |
> %{name}-%{version}-filelist |
134 |
|
|
135 |
%files -f %{name}-%{version}-filelist |
%files -f %{name}-%{version}-filelist |