--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec 2008/08/28 07:47:34 1.9 +++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec 2009/03/08 18:19:59 1.22 @@ -1,12 +1,12 @@ -# $Id: smeserver-coova-chilli.spec,v 1.8 2008/08/27 20:10:47 snetram Exp $ +# $Id: smeserver-coova-chilli.spec,v 1.21 2008/11/25 16:20:19 slords Exp $ # Authority: vip-ire # Name: Daniel Berteaud Summary: Coova-Chilli, a captive portal based on ChilliSpot configured for SME server %define name smeserver-coova-chilli Name: %{name} -%define version 0.1 -%define release 4 +%define version 0.2 +%define release 7 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -19,13 +19,17 @@ BuildRequires: e-smith-devtools Requires: e-smith-release >= 7.0 Requires: openssl Requires: coova-chilli -Requires: esmith-radiusd >= 1.0.0-18 +Requires: e-smith-radiusd >= 1.0.0-18 +Requires: perl(NetAddr::IP) -Patch1: smeserver-coova-chilli-0.1-bypass_auth_with_squid_fix.patch -Patch2: smeserver-coova-chilli-0.1-expand_masq_fix.patch -Patch3: smeserver-coova-chilli-0.1-firewall2db.patch -Patch4: smeserver-coova-chilli-0.1-loginPageDir.patch -Patch5: smeserver-coova-chilli-0.1-authTemplate.patch +Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch +Patch2: smeserver-coova-chilli-0.2-guest_access.patch +Patch3: smeserver-coova-chilli-0.2-chilli_ip.patch +Patch4: smeserver-coova-chilli-0.2-radius_timeout.patch +Patch5: smeserver-coova-chilli-0.2-guest_access2.patch +Patch6: smeserver-coova-chilli-0.2-template_syntax_error.patch +Patch7: smeserver-coova-chilli-0.2-httpd_warning.patch +Patch8: smeserver-coova-chilli-0.2-tundev.patch %description This package allow you to configure a third interface @@ -37,9 +41,58 @@ they'll only have web access if they are This contrib will only work in server&gateway mode %changelog +* Sun Mar 07 2009 Daniel B. 0.2-7 +- Fix tundev template [SME: 5054] + +* Thu Sep 18 2008 Daniel B. 0.2-6 +- Remove warning in httpd.conf file (httpd -t) + +* Mon Sep 15 2008 Daniel B. 0.2-5 +- Fix Syntax Error in /etc/chilli.conf template (25listen) [SME: 4559] + +* Mon Sep 08 2008 Daniel B. 0.2-4 +- Requires perl(NetAddr::IP) + +* Fri Sep 5 2008 Daniel B. 0.2-3 +- Chilli IP computed with NetAddr::IP +- Radius timeout set to 3 sec +- syntax error in radius users template fixed (for guest access) + +* Thu Sep 3 2008 Daniel B. 0.2-2 +- Bug fix for guest access + +* Tue Sep 2 2008 Daniel B. 0.2-1 +- uplink and downlink for guest account are configurable via db keys + +* Tue Sep 2 2008 Daniel B. 0.2-0 +- Login page is a CGI, with a server-manager login page look +- Guest Access can be enabled with guestAccess key (enabled/disabled) +- merge patchs in main package + +* Mon Sep 01 2008 Daniel B. 0.1-8 +- Fix uamallowed not working (since bypass_auth_with_squid_fix patch) +- Add WebRequests key (use of squid or direct connexions, default to direct) +- disable radconf in /etc/chilli/config +- possible to disable https (enabled by default in AllowedOutgoing) +- add tcp:static.sourceforge.net:80 in uamallowed so daloradius homepage is displayed correctly +- add radiustimeout directive so authentication errors display the standard message quickly + +* Thu Aug 28 2008 Jonathan Martens 0.1-7 +- Reverted moving of default db entries to SPEC file since common practice is to store them in files + +* Thu Aug 28 2008 Daniel B. 0.1-6 +- split uamallowed (one per line) +- Add dnsparanoia directive +- correct cmdsock directive +- initialise default configuration db in the spec file + +* Thu Aug 28 2008 Jonathan Martens 0.1-5 +- Remove the reset of $OUT from the template + * Thu Aug 28 2008 Daniel B. 0.1-4 - Add template to enable auth module unix (replace the template-custom) - Copy images to /opt/chilli/template before removing .rpmnew directory +- Correct dependency (e-smith-radiusd not esmith-radiusd) * Wed Aug 27 2008 Jonathan Martens 0.1-3 - Split requirements to one per line @@ -69,9 +122,9 @@ This contrib will only work in server&ga %patch3 -p1 %patch4 -p1 %patch5 -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/ +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build /usr/bin/perl createlinks @@ -83,16 +136,10 @@ rm -rf root/etc/e-smith/templates-custom /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /etc/chilli/conup.sh 'attr(0750,root,root)' \ --file /etc/chilli/condown.sh 'attr(0750,root,root)' \ - --file /opt/chilli/hotspotlogin-loginform.php 'config(noreplace)' \ - --file /opt/chilli/hotspotlogin-nonchilli.php 'config(noreplace)' \ - --file /opt/chilli/hotspotlogin-nonssl.php 'config(noreplace)' \ - --file /opt/chilli/hotspotlogin.php '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)' \ + --file /opt/chilli/cgi-bin/hotspotlogin.cgi 'attr(0750,root,www) %config(noreplace)' \ + --file /opt/chilli/lang/hotspotlogin.fr.pl 'config(noreplace)' \ + --file /opt/chilli/lang/hotspotlogin.en.pl 'config(noreplace)' \ + --file /opt/chilli/css/sme.css 'config(noreplace)' \ > %{name}-%{version}-filelist %files -f %{name}-%{version}-filelist