--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec 2008/08/27 11:41:16 1.4 +++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec 2008/11/06 10:43:17 1.19 @@ -1,23 +1,34 @@ +# $Id: smeserver-coova-chilli.spec,v 1.18 2008/09/15 16:11:26 vip-ire 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 2.el4.sme +%define version 0.2 +%define release 6 Version: %{version} -Release: %{release} +Release: %{release}%{?dist} License: GPL Group: Networking/Remote access Source: %{name}-%{version}.tar.gz URL: http://sme.firewall-services.com -Packager: Daniel Berteaud BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch -Requires: e-smith-release >= 7.0 openssl coova-chilli - -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 +BuildRequires: e-smith-devtools +Requires: e-smith-release >= 7.0 +Requires: openssl +Requires: coova-chilli +Requires: e-smith-radiusd >= 1.0.0-18 +Requires: perl(NetAddr::IP) + +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 %description This package allow you to configure a third interface @@ -25,16 +36,71 @@ This package allow you to configure a th a secured captive portal. Users will be redirected on a logon page and they'll have to enter credentials (sme accounts) before the server allows them. By default, -they'll only have web access if they are members of the group "chilli" +they'll only have web access if they are members of the group "chilli" +This contrib will only work in server&gateway mode %changelog +* 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) [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/isabled) +- 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 +- Removed .rpmnew directory from package +- Removed the need for templates-custom as package now requires e-smith-radiusd >= 1.0.0-18 + * Tue Aug 26 2008 Daniel B. - [0.1-2] -- Most firewall customizations (for incomming and forwarded traffic from +- Most firewall customizations (for incomming and forwarded traffic from chilli network only) can be set through db commands (Patch3) - Outgoing DNS is allowed only for the two DNS servers configured -- Clean spec file, adn put php files in /opt/chilli (Patch4) - +- Clean spec file, and put php files in /opt/chilli (Patch4) * Tue Apr 15 2008 Daniel Berteaud - [0.1-1] @@ -51,6 +117,9 @@ they'll only have web access if they are %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build /usr/bin/perl createlinks @@ -62,16 +131,10 @@ they'll only have web access if they are /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 @@ -80,18 +143,10 @@ they'll only have web access if they are %clean rm -rf $RPM_BUILD_ROOT -%pre - - -%post - %preun if [ $1 == 0 ]; then /sbin/e-smith/db configuration setprop chilli status disabled - /etc/rc.d/init.d/chilli stop > /dev/null 2>&1 - true + /etc/rc.d/init.d/chilli stop >& /dev/null || : fi -%postun -