[packages] nodogsplash: fix use of deprecated iptables syntax

Based on http://patchwork.openwrt.org/patch/2256/ by Moritz Warning <moritzwarning@web.de>

SVN-Revision: 32571

diff --git a/net/nodogsplash/Makefile b/net/nodogsplash/Makefile
index 1e2b514d789d68e373035190b5bee10aac80b067..69ac310242827a06bff71c15da9e7082809a18a8 100644 (file)
--- a/net/nodogsplash/Makefile
+++ b/net/nodogsplash/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2011 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_VERSION:=0.9_beta9.9.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \

diff --git a/net/nodogsplash/patches/002-deprecated_iptables_syntax.patch b/net/nodogsplash/patches/002-deprecated_iptables_syntax.patch
new file mode 100644 (file)
index 0000000..26a22af
--- /dev/null
+++ b/net/nodogsplash/patches/002-deprecated_iptables_syntax.patch
@@ -0,0 +1,11 @@
+--- a/src/fw_iptables.c
++++ b/src/fw_iptables.c
+@@ -449,7 +449,7 @@ iptables_fw_init(void) {
+   /* CHAIN_TO_ROUTER, related and established packets  ACCEPT */
+   rc |= iptables_do_command("-t filter -A " CHAIN_TO_ROUTER " -m state --state RELATED,ESTABLISHED -j ACCEPT");
+   /* CHAIN_TO_ROUTER, bogus SYN packets  DROP */
+-  rc |= iptables_do_command("-t filter -A " CHAIN_TO_ROUTER " -p tcp --tcp-flags SYN SYN --tcp-option \\! 2 -j  DROP");
++  rc |= iptables_do_command("-t filter -A " CHAIN_TO_ROUTER " -p tcp --tcp-flags SYN SYN \\! --tcp-option 2 -j  DROP");
+ 
+   /* CHAIN_TO_ROUTER, packets to HTTP listening on gw_port on router ACCEPT */
+   rc |= iptables_do_command("-t filter -A " CHAIN_TO_ROUTER " -p tcp --dport %d -j ACCEPT", gw_port);