--- 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/01 12:18:32	1.14
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.12 2008/08/28 13:14:07 vip-ire Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.13 2008/08/28 15:38:40 snetram Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: Coova-Chilli, a captive portal
 %define name smeserver-coova-chilli
 Name: %{name}
 %define version 0.1
-%define release 7
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -30,6 +30,7 @@ Patch6: smeserver-coova-chilli-0.1-fixOU
 Patch7: smeserver-coova-chilli-0.1-uamallowed.patch 
 Patch8: smeserver-coova-chilli-0.1-dnsparano.patch
 Patch9: smeserver-coova-chilli-0.1-cmdsock.patch
+Patch10: smeserver-coova-chilli-0.1-directOrSquid.patch
 
 %description
 This package allow you to configure a third interface
@@ -41,6 +42,14 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* 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
 
@@ -90,6 +99,7 @@ This contrib will only work in server&ga
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 mv root/opt/chilli.rpmnew/template/images root/opt/chilli/template
 rm -rf root/opt/chilli.rpmnew/