--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/27 11:59:18	1.5
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/09/01 12:18:32	1.14
@@ -1,23 +1,36 @@
+# $Id: smeserver-coova-chilli.spec,v 1.13 2008/08/28 15:38:40 snetram 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
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Remote access
 Source: %{name}-%{version}.tar.gz
 URL: http://sme.firewall-services.com
-Packager: Daniel Berteaud <daniel@firewall-services.com> 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: e-smith-release >= 7.0 openssl coova-chilli
+BuildRequires: e-smith-devtools
+Requires: e-smith-release >= 7.0 
+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
+Patch10: smeserver-coova-chilli-0.1-directOrSquid.patch
 
 %description
 This package allow you to configure a third interface
@@ -29,6 +42,36 @@ 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
+
+* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 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 <smeserver-contribs@snetram.nl> 0.1-5
+- Remove the reset of $OUT from the template
+
+* Thu Aug 28 2008 Daniel B. <daniel@firewall-services.com> 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 <smeserver-contribs@snetram.nl> 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. <daniel@firewall-services.com>
 - [0.1-2]
 - Most firewall customizations (for incomming and forwarded traffic from
@@ -51,6 +94,16 @@ This contrib will only work in server&ga
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%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/
+rm -rf root/etc/e-smith/templates-custom/
 
 %build
 /usr/bin/perl createlinks
@@ -80,18 +133,10 @@ This contrib will only work in server&ga
 %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
-