--- rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2010/07/20 13:43:28	1.31
+++ rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli.spec	2010/07/29 15:08:58	1.32
@@ -6,7 +6,7 @@ Summary: Coova-Chilli, a captive portal
 %define name smeserver-coova-chilli
 Name: %{name}
 %define version 0.2
-%define release 17
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -48,6 +48,10 @@ Patch22: smeserver-coova-chilli-0.2-squi
 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
 
 %description
 This package allow you to configure a third interface
@@ -59,6 +63,12 @@ they'll only have web access if they are
 This contrib will only work in server&gateway mode 
 
 %changelog
+* 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
@@ -203,6 +213,10 @@ This contrib will only work in server&ga
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
 
 %build
 /usr/bin/perl createlinks