--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2009/06/11 09:16:08	1.29
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2011/03/28 06:57:35	1.34
@@ -1,4 +1,4 @@
-# $Id: smeserver-coova-chilli.spec,v 1.28 2009/05/29 07:25:10 vip-ire Exp $
+# $Id: smeserver-coova-chilli.spec,v 1.33 2010/10/20 17:32:50 vip-ire 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.2
-%define release 15
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -43,6 +43,17 @@ Patch17: smeserver-coova-chilli-0.2-temp
 Patch18: smeserver-coova-chilli-0.2-db_noc2c.patch
 Patch19: smeserver-coova-chilli-0.2-remove_space.patch
 Patch20: smeserver-coova-chilli-0.2-fixe_allow_uamallowed.patch
+Patch21: smeserver-coova-chilli-0.2-fixe_squid_disabled.patch
+Patch22: smeserver-coova-chilli-0.2-squid_tcpport.patch
+Patch23: smeserver-coova-chilli-0.2-sudo_env.patch
+Patch24: smeserver-coova-chilli-0.2-iptables_insert_position.patch
+Patch25: smeserver-coova-chilli-0.2-transparent_squid.patch
+Patch26: smeserver-coova-chilli-0.2-clean_cgi.patch
+Patch27: smeserver-coova-chilli-0.2-remove_obsolete_php_templates.patch
+Patch28: smeserver-coova-chilli-0.2-add_macallowed_in_db.patch
+Patch29: smeserver-coova-chilli-0.2-add_uamhomepage_in_db.patch
+Patch30: smeserver-coova-chilli-0.2-drop_forward_not_to_ext_if.patch
+Patch31: smeserver-coova-chilli-0.2-fix_uamhomepage.patch
 
 %description
 This package allow you to configure a third interface
@@ -54,6 +65,28 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* Mon Mar 28 2011 Daniel B. <daniel@firewall-services.com> 0.2-20
+- Fix uamhomepage setting
+
+* Wed Oct 20 2010 Daniel B. <daniel@firewall-services.com> 0.2-19
+- Drop all the trafic not going through the external interface
+
+* Thu Jul 29 2010 Daniel B. <daniel@firewall-services.com> 0.2-18
+- cleanup CGI login script
+- remove obsolete php templates
+- add macallowed DB key to bypass auth for some mac addresses
+- add uamhomepage DB key
+
+* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.2-17
+- Fixes sudo env (bug only in SME8)
+- Uses TCPPort squid key instead of TransparentPort so coova can
+  work with dansguardian
+- insert NAT rule just before the ACCEPT (PREROUTING_FROM_CHILLI)
+- add transparent directive to squid (required for squid => 2.6)
+
+* Wed Apr 14 2010 Daniel B. <daniel@firewall-services.com> 0.2-16
+- Fixe a bug in conup.sh and condown.sh
+
 * Thu Jun 11 2009 Daniel B. <daniel@firewall-services.com> 0.2-15
 - Fixe a bug in masq template for uamallowed entries
 
@@ -183,6 +216,17 @@ This contrib will only work in server&ga
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %build
 /usr/bin/perl createlinks