--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/27 13:44:45	1.7
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2008/08/28 13:14:07	1.12
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.2 2008/04/15 15:18:07 slords Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.11 2008/08/28 10:12:16 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 2
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,12 +16,20 @@ URL: http://sme.firewall-services.com
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
-Requires: e-smith-release >= 7.0 openssl coova-chilli
+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
 
 %description
 This package allow you to configure a third interface
@@ -33,6 +41,25 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+*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
@@ -55,10 +82,43 @@ This contrib will only work in server&ga
 %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/
+rm -rf root/etc/e-smith/db/configuration/defaults
 
 %build
 /usr/bin/perl createlinks
 
+# Initialise db fragment
+DEFAULT=root/etc/e-smith/db/configuration/defaults/chilli
+mkdir -p $DEFAULT
+echo 'service' 				> $DEFAULT/type
+echo 'disabled' 			> $DEFAULT/status
+echo 'private'				> $DEFAULT/access
+echo '900'				> $DEFAULT/defidletimeout
+echo '7200'				> $DEFAULT/defsessiontimeout
+echo 'eth2'				> $DEFAULT/dhcpif
+echo '212.73.209.226'			> $DEFAULT/dns1
+echo '194.206.120.1'			> $DEFAULT/dns2
+echo '10.1.0.0/255.255.255.0'		> $DEFAULT/net
+echo '3990'				> $DEFAULT/TCPPort
+echo 'tun0'				> $DEFAULT/tundev
+echo 'tcp:www.firewall-services.com:80,\
+	tcp:coova.org:80,\
+	tcp:smeserver.org:80,\
+	tcp:sourceforge.net:80' 	> $DEFAULT/uamallowed
+echo ''					> $DEFAULT/RedirectToChilli
+echo ''					> $DEFAULT/AllowedServices
+echo ''					> $DEFAULT/AllowedOutgoing
+
+
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)