--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/28 15:38:40	1.13
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/09/04 13:58:06	1.16
@@ -1,12 +1,12 @@
-# $Id: smeserver-coova-chilli.spec,v 1.12 2008/08/28 13:14:07 vip-ire Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.15 2008/09/04 13:56:36 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 7
+%define version 0.2
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,15 +21,8 @@ Requires: openssl
 Requires: coova-chilli
 Requires: e-smith-radiusd >= 1.0.0-18
 
-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
-Patch6: smeserver-coova-chilli-0.1-fixOUTreset.patch
-Patch7: smeserver-coova-chilli-0.1-uamallowed.patch 
-Patch8: smeserver-coova-chilli-0.1-dnsparano.patch
-Patch9: smeserver-coova-chilli-0.1-cmdsock.patch
+Patch1: smeserver-coova-chilli-0.2-guest_uplink_downlink.patch
+Patch2: smeserver-coova-chilli-0.2-guest_access.patch
 
 %description
 This package allow you to configure a third interface
@@ -41,6 +34,25 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* Thu Sep 3 2008 Daniel B. <daniel@firewall-services.com> 0.2-2
+- Bug with for guest access
+
+* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 0.2-1
+- uplink and downlink for guest account are configurable via db keys
+
+* Tue Sep 2 2008 Daniel B. <daniel@firewall-services.com> 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. <daniel@firewall-services.com> 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 <smeserver-contribs@snetram.nl> 0.1-7
 - Reverted moving of default db entries to SPEC file since common practice is to store them in files
 
@@ -83,17 +95,6 @@ This contrib will only work in server&ga
 %setup
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -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/
 
 %build
 /usr/bin/perl createlinks
@@ -105,16 +106,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