From b4d560e1be61fdd4377eae84bfd0dbe2482187e1 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 2 Jun 2007 10:54:52 +0000
Subject: [PATCH 01/31] Add nodogsplash (#1765)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@7447 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..23ecbb5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nodogsplash
+PKG_VERSION:=0.8_beta1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/
+PKG_MD5SUM:=f81c69ea46d61455b394f237bcdb3fe4
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nodogsplash
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpthread
+  TITLE:=Open public network gateway daemon
+  DESCRIPTION:=\
+  	Nodogsplash offers a simple way to open a free hotspot providing restricted access to an\\\
+	internet connection. It is intended for use on wireless access points running OpenWRT\\\
+	(but may also work on other Linux-based devices).
+  URL:=http://kokoro.ucsd.edu/nodogsplash/
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default,\
+		--enable-static \
+		--enable-shared \
+	)
+endef
+
+define Build/Compile	
+	mkdir -p $(PKG_INSTALL_DIR)/usr/{share{,/doc/$(PKG_NAME)-$(PKG_VERSION)},lib,include{,/nodogsplash},bin,sbin}/
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		mkinstalldirs="$(SHELL) $(PKG_BUILD_DIR)/config/mkinstalldirs" \
+		install
+endef
+
+define Package/nodogsplash/install	
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,nodogsplash))

From e52bcb7826750b03e5f5d1f4e72c4b27cd0c622f Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 1 Jul 2007 23:09:45 +0000
Subject: [PATCH 02/31] Massive propset of svn:keywords for packages newly
 addded, next time, we should not forget it ;)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@7845 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 23ecbb5..f8a6fab 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 

From 3a14f30f9f75571481674fc22e2705900e1a765e Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 21 Aug 2007 08:11:29 +0000
Subject: [PATCH 03/31] Upgrade nodogplash (#2256)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@8446 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f8a6fab..4f9ff50 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.8_beta1
+PKG_VERSION:=0.9_beta8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/
-PKG_MD5SUM:=f81c69ea46d61455b394f237bcdb3fe4
+PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
+	http://kokoro.ucsd.edu/nodogsplash/old/
+PKG_MD5SUM:=74269856452b9ef6d8719a6b46bae56d
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

From 2e16c326324fbdfd105515f137f55149489e02fb Mon Sep 17 00:00:00 2001
From: olli <olli@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 25 Sep 2007 18:16:27 +0000
Subject: [PATCH 04/31] Category reorganization

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@9019 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 4f9ff50..5cb4fe9 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nodogsplash
+  SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libpthread

From f1b12b28f8c5351073132b851be69ea28b74eb50 Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Oct 2007 04:32:56 +0000
Subject: [PATCH 05/31] DESCRIPTION:= is obselete

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@9304 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5cb4fe9..2d18021 100644
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,15 @@ define Package/nodogsplash
   CATEGORY:=Network
   DEPENDS:=+libpthread
   TITLE:=Open public network gateway daemon
-  DESCRIPTION:=\
-  	Nodogsplash offers a simple way to open a free hotspot providing restricted access to an\\\
-	internet connection. It is intended for use on wireless access points running OpenWRT\\\
-	(but may also work on other Linux-based devices).
   URL:=http://kokoro.ucsd.edu/nodogsplash/
 endef
 
+define Package/nodogsplash/description
+	Nodogsplash offers a simple way to open a free hotspot providing restricted access to an
+	internet connection. It is intended for use on wireless access points running OpenWRT
+	(but may also work on other Linux-based devices).
+endef
+
 define Build/Configure
 	$(call Build/Configure/Default,\
 		--enable-static \

From 48caa6c909f79fcb980d2f62cc4aee216096f44d Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 18 Oct 2007 18:46:37 +0000
Subject: [PATCH 06/31] remove PKG_CAT from packages

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@9349 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2d18021..5d6f7c6 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
 PKG_MD5SUM:=74269856452b9ef6d8719a6b46bae56d
-PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

From 73878398ce3b6326496d5fef7456c6e122d16cbd Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 9 Dec 2007 18:59:01 +0000
Subject: [PATCH 07/31] packages: Use $(CP) instead of $(INSTALL_BIN) for
 binaries.

Signed-off-by: Andy Boyett <agb-openwrt@padded-cell.net>


git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@9695 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5d6f7c6..e3c364a 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endef
 
 define Package/nodogsplash/install	
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef

From c8d93a6a7e24dcb331ff9d410c00be8fbeed8685 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 6 Jul 2008 12:00:20 +0000
Subject: [PATCH 08/31] Update nodogsplash to 0.9 beta9.9 (#3638)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@11695 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e3c364a..b0ef877 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.9_beta8
+PKG_VERSION:=0.9_beta9.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
-PKG_MD5SUM:=74269856452b9ef6d8719a6b46bae56d
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=96e597977717610186ed09ebd7fa54cf
 
 include $(INCLUDE_DIR)/package.mk
 

From 1ede86e3e76260615c0894c1de67a045c0e41dda Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 24 Nov 2008 09:42:08 +0000
Subject: [PATCH 09/31] Install missing configuration file, htdocs and forward
 port the original initscript to the kamikaze rc.d scripts layout, bum release
 number (#4232)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@13335 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile               |   7 +-
 files/nodogsplash.init | 174 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 files/nodogsplash.init

diff --git a/Makefile b/Makefile
index b0ef877..2169f16 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_VERSION:=0.9_beta9.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
@@ -54,6 +54,11 @@ define Package/nodogsplash/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME)/
+	$(CP) $(PKG_BUILD_DIR)/htdocs $(1)/etc/$(PKG_NAME)/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/
 endef
 
 $(eval $(call BuildPackage,nodogsplash))
diff --git a/files/nodogsplash.init b/files/nodogsplash.init
new file mode 100644
index 0000000..5676280
--- /dev/null
+++ b/files/nodogsplash.init
@@ -0,0 +1,174 @@
+#!/bin/sh /etc/rc.common
+#
+# description: Startup/shutdown script for nodogsplash captive portal
+#
+# P. Kube 2007
+#
+# (Based on wifidog startup script
+# Date    : 2004-08-25
+# Version : 1.0
+# Comment by that author: Could be better, but it's working as expected)
+#
+
+
+IPT=/usr/sbin/iptables
+WD_DIR=/usr/bin
+OPTIONS=""
+START=65
+STOP=65
+# -s -d 5 runs in background, with level 5 (not so verbose) messages to syslog
+# -f -d 7 runs in foreground, with level 7 (verbose) debug messages to terminal
+# N.B.: -f will fail if starting at boot from rcS
+#OPTIONS="-s -d 5"
+
+start() {
+   	echo "Starting nodogsplash ... "
+	if $WD_DIR/ndsctl status 2> /dev/null; then
+		echo "FAILED:  nodogsplash already running"
+    	else
+		if $0 test_module && $WD_DIR/nodogsplash $OPTIONS; then
+			echo "OK: nodogsplash started"
+		else
+			echo "FAILED:  nodogsplash exited with non 0 status"
+		fi
+    	fi
+}
+
+stop() {
+	echo "Stopping nodogsplash ... "
+	if $WD_DIR/ndsctl status 2> /dev/null; then
+		if $WD_DIR/ndsctl stop; then
+			echo "OK: nodogsplash stopped"
+		else
+			echo "FAILED:  ndsctl stop exited with non 0 status"
+		fi
+	else
+		echo "FAILED:  nodogsplash was not running"
+    	fi
+status() {
+	$WD_DIR/ndsctl status
+}
+
+test_module() {
+
+    ### Test ipt_mark with iptables
+    test_ipt_mark () {
+	($IPT -A FORWARD -m mark --mark 2 -j ACCEPT 2>&1) > /dev/null
+	IPTABLES_OK=$?
+	if [ "$IPTABLES_OK" -eq 0 ]; then
+	    ($IPT -D FORWARD -m mark --mark 2 -j ACCEPT 2>&1) > /dev/null
+	    return 0
+	else
+	    return 1
+	fi
+    }
+    ### Test ipt_mac with iptables
+    test_ipt_mac () {
+	($IPT -A INPUT -m mac --mac-source 00:00:00:00:00:00 -j ACCEPT 2>&1) > /dev/null
+	IPTABLES_OK=$?
+	if [ "$IPTABLES_OK" -eq 0 ]; then
+	    ($IPT -D INPUT -m mac --mac-source 00:00:00:00:00:00 -j ACCEPT 2>&1) > /dev/null
+	    return 0
+	else
+	    return 1
+	fi
+    }
+
+    ### Test ipt_IMQ with iptables
+    test_ipt_IMQ () {
+	($IPT -t mangle -A PREROUTING -j IMQ --todev 0 2>&1) > /dev/null
+	IPTABLES_OK=$?
+	if [ "$IPTABLES_OK" -eq 0 ]; then
+	    ($IPT -t mangle -D PREROUTING -j IMQ --todev 0 2>&1) > /dev/null
+	    return 0
+	else
+	    return 1
+	fi
+    }
+
+    ### Test imq with ip
+    test_imq () {
+	(ip link set imq0 up 2>&1) > /dev/null
+	IMQ0_OK=$?
+	(ip link set imq1 up 2>&1) > /dev/null
+	IMQ1_OK=$?
+	if [ "$IMQ0_OK" -eq 0 -a "$IMQ1_OK" -eq 0 ]; then
+	    (ip link set imq0 down 2>&1) > /dev/null
+	    (ip link set imq1 down 2>&1) > /dev/null
+	    return 0
+	else
+	    return 1
+	fi
+    }
+
+    ### Test sch_htb with tc; requires imq0
+    test_sch_htb () {
+	(tc qdisc del dev imq0 root 2>&1) > /dev/null
+	(tc qdisc add dev imq0 root htb 2>&1) > /dev/null
+	TC_OK=$?
+	if [ "$TC_OK" -eq 0 ]; then
+	    (tc qdisc del dev imq0 root 2>&1) > /dev/null
+	    return 0
+	else
+	    return 1
+	fi
+    }
+
+    
+    ### Find a module on disk
+    module_exists () {
+      EXIST=$(find /lib/modules/`uname -r` -name $1.*o 2> /dev/null)
+      if [ -n "$EXIST" ]; then
+        return 0
+      else
+        return 1
+      fi
+    }
+
+    ### Test if a module is in memory
+    module_in_memory () {
+      MODULE=$(lsmod | grep $1 | awk '{print $1}')
+      if [ "$MODULE" = "$1" ]; then
+        return 0
+      else
+        return 1
+      fi
+    }
+
+    ### Test functionality of a module; load if necessary
+    do_module_tests () {
+	echo "  Testing module $1 $2"
+	"test_$1"
+	if [ $? -ne 0 ]; then
+	    echo "   Module $1 $2 needed"
+	    echo "   Scanning disk for $1 module"
+	    module_exists $1
+	    if [ $? -ne 0 ]; then 
+		echo "   $1 module missing: please install it"
+		exit 1
+	    else
+		echo "   $1 exists, trying to load"
+		insmod $1 $2 > /dev/null
+		if [ $? -ne 0 ]; then
+		    echo "   Error: insmod $1 $2 failed"
+		    exit 1
+		else
+		    echo "   $1 $2 loaded successfully"
+		fi
+	    fi
+	else
+	    echo "   $1 is working"
+	fi 
+		
+    }
+
+    echo " Testing required modules"
+
+    do_module_tests "ipt_mac"
+    do_module_tests "ipt_mark"
+    # if not using traffic control,
+    # you can comment out the following 3 lines:
+    do_module_tests "imq" "numdevs=2"
+    do_module_tests "ipt_IMQ"
+    do_module_tests "sch_htb"
+}

From 276e7e86129657a202381cff3e9b6a18cadbbea0 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 17 Apr 2009 14:22:30 +0000
Subject: [PATCH 10/31] nuke $Id$ in /packages as well

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@15244 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2169f16..d21a299 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 

From 7e4a500e766e2ba7a96715f3db6f6bae77db9d66 Mon Sep 17 00:00:00 2001
From: marek <marek@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 13 Jul 2009 15:20:50 +0000
Subject: [PATCH 12/31] [nodogsplash] fixing syntax errors in the init script

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@16832 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 files/nodogsplash.init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/files/nodogsplash.init b/files/nodogsplash.init
index 5676280..7eba60b 100644
--- a/files/nodogsplash.init
+++ b/files/nodogsplash.init
@@ -26,7 +26,7 @@ start() {
 	if $WD_DIR/ndsctl status 2> /dev/null; then
 		echo "FAILED:  nodogsplash already running"
     	else
-		if $0 test_module && $WD_DIR/nodogsplash $OPTIONS; then
+		if test_module && $WD_DIR/nodogsplash $OPTIONS; then
 			echo "OK: nodogsplash started"
 		else
 			echo "FAILED:  nodogsplash exited with non 0 status"
@@ -45,6 +45,8 @@ stop() {
 	else
 		echo "FAILED:  nodogsplash was not running"
     	fi
+}
+
 status() {
 	$WD_DIR/ndsctl status
 }

From d714d1b2de0df04d0e733d2e02ed7a561f7c9168 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 20 Sep 2009 12:52:15 +0000
Subject: [PATCH 13/31] [package] update nodogsplash to 0.9-beta9.9.5, fix
 interface names in config files, add missing iptables-mod-ipopt dependency
 (#5796)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@17640 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index d21a299..516d1ce 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.9_beta9.9
-PKG_RELEASE:=2
+PKG_VERSION:=0.9_beta9.9.5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
-PKG_MD5SUM:=96e597977717610186ed09ebd7fa54cf
+#PKG_MD5SUM:=96e597977717610186ed09ebd7fa54cf
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,7 +22,7 @@ define Package/nodogsplash
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread
+  DEPENDS:=+libpthread +iptables-mod-ipopt
   TITLE:=Open public network gateway daemon
   URL:=http://kokoro.ucsd.edu/nodogsplash/
 endef
@@ -40,7 +40,7 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile	
+define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)/usr/{share{,/doc/$(PKG_NAME)-$(PKG_VERSION)},lib,include{,/nodogsplash},bin,sbin}/
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -48,16 +48,20 @@ define Build/Compile
 		install
 endef
 
-define Package/nodogsplash/install	
+define Package/nodogsplash/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME)/
+	$(SED) 's,br0,br-lan,' $(1)/etc/$(PKG_NAME)/$(PKG_NAME).conf
 	$(CP) $(PKG_BUILD_DIR)/htdocs $(1)/etc/$(PKG_NAME)/
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/
+	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
+	$(SED) 's,\(do_module_tests "imq"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
+	$(SED) 's,\(do_module_tests "ipt_IMQ"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
+	$(SED) 's,\(do_module_tests "sch_htb"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,nodogsplash))

From b01b1a022f3e42b595157f9b72ee40bb8be6df01 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 20 Sep 2009 12:55:32 +0000
Subject: [PATCH 14/31] [package] add mising md5sum check

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@17641 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 516d1ce..9b74364 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
-#PKG_MD5SUM:=96e597977717610186ed09ebd7fa54cf
+PKG_MD5SUM:=142f6b761a0ef93bb3e8557e1f53bc56
 
 include $(INCLUDE_DIR)/package.mk
 

From 719cafcc9aee492ae20fe454766829ebf29d51eb Mon Sep 17 00:00:00 2001
From: lars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 19 Feb 2010 00:14:01 +0000
Subject: [PATCH 15/31] [packages] Add missing libtool fixups

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@19714 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9b74364..0d9cb81 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,13 +9,15 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_VERSION:=0.9_beta9.9.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
 PKG_MD5SUM:=142f6b761a0ef93bb3e8557e1f53bc56
 
+PKG_FIXUP:=libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nodogsplash

From 4659a098abb3e93bfd1aea8a17abb30287270713 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 11 Apr 2010 18:38:20 +0000
Subject: [PATCH 16/31] [package] update nodogsplash to 0.9 beta9.9.6 (#7053)

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@20806 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0d9cb81..27f236d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.9_beta9.9.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.9_beta9.9.6
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
-PKG_MD5SUM:=142f6b761a0ef93bb3e8557e1f53bc56
+PKG_MD5SUM:=3ba0d862b4d63ecf97f16176a486faed
 
 PKG_FIXUP:=libtool
 

From ee3252a280d3f43114caf92dab4635fc6bd113aa Mon Sep 17 00:00:00 2001
From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 8 Oct 2010 22:54:41 +0000
Subject: [PATCH 17/31] nodogsplash: mkinstalldirs script does not exist. Just
 use $(INSTALL_DIR).

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@23343 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 27f236d..486cdf8 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ define Build/Compile
 	mkdir -p $(PKG_INSTALL_DIR)/usr/{share{,/doc/$(PKG_NAME)-$(PKG_VERSION)},lib,include{,/nodogsplash},bin,sbin}/
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		mkinstalldirs="$(SHELL) $(PKG_BUILD_DIR)/config/mkinstalldirs" \
+		mkinstalldirs="$(INSTALL_DIR)" \
 		install
 endef
 

From 49a2a82ed7657e02f3c0d468d1f2cc1bd1dfd8dd Mon Sep 17 00:00:00 2001
From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 8 Oct 2010 23:13:03 +0000
Subject: [PATCH 18/31] nodogsplash: Parallel build fixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@23344 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 486cdf8..f83b515 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@ PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 PKG_MD5SUM:=3ba0d862b4d63ecf97f16176a486faed
 
 PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,11 +45,15 @@ define Build/Configure
 endef
 
 define Build/Compile
+	$(call Build/Compile/Default, \
+		mkinstalldirs="$(INSTALL_DIR)")
+endef
+
+define Build/Install
 	mkdir -p $(PKG_INSTALL_DIR)/usr/{share{,/doc/$(PKG_NAME)-$(PKG_VERSION)},lib,include{,/nodogsplash},bin,sbin}/
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
+	$(call Build/Install/Default, \
 		mkinstalldirs="$(INSTALL_DIR)" \
-		install
+		install)
 endef
 
 define Package/nodogsplash/install

From ae4d5baaeced9e5179ae0444a446a3b4fe82048f Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 16 Nov 2011 20:02:41 +0000
Subject: [PATCH 19/31] packages: add missing conffiles define

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@29199 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f83b515..fd41dda 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 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:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
@@ -72,4 +72,8 @@ define Package/nodogsplash/install
 	$(SED) 's,\(do_module_tests "sch_htb"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
 endef
 
+define Package/nodogsplash/conffiles
+/etc/nodogsplash/nodogsplash.conf
+endef
+
 $(eval $(call BuildPackage,nodogsplash))

From 5f0d419140c496d26e1b8337f856fb78392c9792 Mon Sep 17 00:00:00 2001
From: mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 31 May 2012 19:23:13 +0000
Subject: [PATCH 20/31] [packages/nodogsplash] prevent nodogsplash from
 crashing when token/redir is not set - thanks to Moritz Warning

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@32017 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 patches/001-crash_on_missing_rdir_param.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 patches/001-crash_on_missing_rdir_param.patch

diff --git a/patches/001-crash_on_missing_rdir_param.patch b/patches/001-crash_on_missing_rdir_param.patch
new file mode 100644
index 0000000..6bcf2e9
--- /dev/null
+++ b/patches/001-crash_on_missing_rdir_param.patch
@@ -0,0 +1,18 @@
+--- a/src/http.c
++++ b/src/http.c
+@@ -455,10 +455,15 @@ http_nodogsplash_decode_authtarget(reque
+   var = httpdGetVariableByName(r,"tok");
+   if(var && var->value) {
+     token = var->value;
++  } else {
++    token = "";
+   }
++
+   var = httpdGetVariableByName(r,"redir");
+   if(var && var->value) {
+     redir = var->value;
++  } else {
++    redir = "";
+   }
+ 
+   authtarget = http_nodogsplash_make_authtarget(token,redir);

From 72a727423c2db6b06027a69af02bfe2ed5874ffc Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 11 Jun 2012 21:18:33 +0000
Subject: [PATCH 21/31] [packages] normalize PKG_FIXUP - the "libtool" fixup is
 merely an alias for "autoreconf", so change all occurences to that

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@32206 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fd41dda..1e2b514 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
 	http://kokoro.ucsd.edu/nodogsplash/old/
 PKG_MD5SUM:=3ba0d862b4d63ecf97f16176a486faed
 
-PKG_FIXUP:=libtool
+PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 

From b8e14d8ec6258721fec9f0349b9b126aaa7130f0 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 1 Jul 2012 11:44:23 +0000
Subject: [PATCH 22/31] [packages] nodogsplash: fix use of deprecated iptables
 syntax Based on http://patchwork.openwrt.org/patch/2256/ by Moritz Warning
 <moritzwarning@web.de>

git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/nodogsplash@32571 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 Makefile                                     |  4 ++--
 patches/002-deprecated_iptables_syntax.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 patches/002-deprecated_iptables_syntax.patch

diff --git a/Makefile b/Makefile
index 1e2b514..69ac310 100644
--- a/Makefile
+++ b/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/patches/002-deprecated_iptables_syntax.patch b/patches/002-deprecated_iptables_syntax.patch
new file mode 100644
index 0000000..26a22af
--- /dev/null
+++ b/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);

From d1183c96df3006d7cc31aba14f0ae800f5caf5a9 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Sat, 11 May 2013 14:45:52 +0200
Subject: [PATCH 23/31] Rename to subfolder to import into openwrt-routing
 repository

---
 Makefile => nodogsplash/Makefile                                  | 0
 {files => nodogsplash/files}/nodogsplash.init                     | 0
 .../patches}/001-crash_on_missing_rdir_param.patch                | 0
 .../patches}/002-deprecated_iptables_syntax.patch                 | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename Makefile => nodogsplash/Makefile (100%)
 rename {files => nodogsplash/files}/nodogsplash.init (100%)
 rename {patches => nodogsplash/patches}/001-crash_on_missing_rdir_param.patch (100%)
 rename {patches => nodogsplash/patches}/002-deprecated_iptables_syntax.patch (100%)

diff --git a/Makefile b/nodogsplash/Makefile
similarity index 100%
rename from Makefile
rename to nodogsplash/Makefile
diff --git a/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init
similarity index 100%
rename from files/nodogsplash.init
rename to nodogsplash/files/nodogsplash.init
diff --git a/patches/001-crash_on_missing_rdir_param.patch b/nodogsplash/patches/001-crash_on_missing_rdir_param.patch
similarity index 100%
rename from patches/001-crash_on_missing_rdir_param.patch
rename to nodogsplash/patches/001-crash_on_missing_rdir_param.patch
diff --git a/patches/002-deprecated_iptables_syntax.patch b/nodogsplash/patches/002-deprecated_iptables_syntax.patch
similarity index 100%
rename from patches/002-deprecated_iptables_syntax.patch
rename to nodogsplash/patches/002-deprecated_iptables_syntax.patch

From ed1710fad3ece027439ac14173338253e0e7bd42 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Sat, 11 May 2013 00:37:02 +0200
Subject: [PATCH 24/31] [packages] nodogsplash: new OpenWrt package for new
 nodogsplash build system

---
 nodogsplash/Makefile                          | 81 +++++++------------
 .../001-crash_on_missing_rdir_param.patch     | 18 -----
 .../002-deprecated_iptables_syntax.patch      | 11 ---
 3 files changed, 30 insertions(+), 80 deletions(-)
 delete mode 100644 nodogsplash/patches/001-crash_on_missing_rdir_param.patch
 delete mode 100644 nodogsplash/patches/002-deprecated_iptables_syntax.patch

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 69ac310..ffe35b9 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2012 OpenWrt.org
+# Copyright (C) 2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,72 +8,51 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.9_beta9.9.6
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://kokoro.ucsd.edu/nodogsplash/ \
-	http://kokoro.ucsd.edu/nodogsplash/old/
-PKG_MD5SUM:=3ba0d862b4d63ecf97f16176a486faed
-
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
+PKG_VERSION:=0.9_beta9.9.8
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+
 define Package/nodogsplash
-  SUBMENU:=Captive Portals
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +iptables-mod-ipopt
-  TITLE:=Open public network gateway daemon
-  URL:=http://kokoro.ucsd.edu/nodogsplash/
+	SUBMENU:=Captive Portals
+	SECTION:=net
+	CATEGORY:=Network
+	DEPENDS:=+libpthread +iptables-mod-ipopt
+	TITLE:=Open public network gateway daemon
+	URL:=https://github.com/mwarning/nodogsplash
 endef
 
 define Package/nodogsplash/description
-	Nodogsplash offers a simple way to open a free hotspot providing restricted access to an
-	internet connection. It is intended for use on wireless access points running OpenWRT
-	(but may also work on other Linux-based devices).
+	Nodogsplash offers a simple way to open a free hotspot providing
+	restricted access to an internet connection.
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default,\
-		--enable-static \
-		--enable-shared \
-	)
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	git clone https://github.com/mwarning/nodogsplash.git $(PKG_BUILD_DIR)
 endef
 
-define Build/Compile
-	$(call Build/Compile/Default, \
-		mkinstalldirs="$(INSTALL_DIR)")
-endef
-
-define Build/Install
-	mkdir -p $(PKG_INSTALL_DIR)/usr/{share{,/doc/$(PKG_NAME)-$(PKG_VERSION)},lib,include{,/nodogsplash},bin,sbin}/
-	$(call Build/Install/Default, \
-		mkinstalldirs="$(INSTALL_DIR)" \
-		install)
-endef
+#for sources inside the package
+#define Build/Prepare
+#	mkdir -p $(PKG_BUILD_DIR)
+#	$(CP) ./src/* $(PKG_BUILD_DIR)/
+#endef
 
 define Package/nodogsplash/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME)/
-	$(SED) 's,br0,br-lan,' $(1)/etc/$(PKG_NAME)/$(PKG_NAME).conf
-	$(CP) $(PKG_BUILD_DIR)/htdocs $(1)/etc/$(PKG_NAME)/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nodogsplash $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ndsctl $(1)/usr/bin/
+
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
-	$(SED) 's,\(do_module_tests "imq"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
-	$(SED) 's,\(do_module_tests "ipt_IMQ"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
-	$(SED) 's,\(do_module_tests "sch_htb"\),#\1,' $(1)/etc/init.d/$(PKG_NAME)
+	$(INSTALL_BIN) files/nodogsplash.init $(1)/etc/init.d/$(PKG_NAME)
+
+	$(INSTALL_DIR) $(1)/etc/$(PKG_NAME)/htdocs/images
+	$(CP) $(PKG_BUILD_DIR)/resources/nodogsplash.conf $(1)/etc/$(PKG_NAME)/
+	$(CP) $(PKG_BUILD_DIR)/resources/splash.html $(1)/etc/$(PKG_NAME)/htdocs/
+	$(CP) $(PKG_BUILD_DIR)/resources/infoskel.html $(1)/etc/$(PKG_NAME)/htdocs/
+	$(CP) $(PKG_BUILD_DIR)/resources/splash.jpg $(1)/etc/$(PKG_NAME)/htdocs/images/
 endef
 
-define Package/nodogsplash/conffiles
-/etc/nodogsplash/nodogsplash.conf
-endef
 
 $(eval $(call BuildPackage,nodogsplash))
diff --git a/nodogsplash/patches/001-crash_on_missing_rdir_param.patch b/nodogsplash/patches/001-crash_on_missing_rdir_param.patch
deleted file mode 100644
index 6bcf2e9..0000000
--- a/nodogsplash/patches/001-crash_on_missing_rdir_param.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/http.c
-+++ b/src/http.c
-@@ -455,10 +455,15 @@ http_nodogsplash_decode_authtarget(reque
-   var = httpdGetVariableByName(r,"tok");
-   if(var && var->value) {
-     token = var->value;
-+  } else {
-+    token = "";
-   }
-+
-   var = httpdGetVariableByName(r,"redir");
-   if(var && var->value) {
-     redir = var->value;
-+  } else {
-+    redir = "";
-   }
- 
-   authtarget = http_nodogsplash_make_authtarget(token,redir);
diff --git a/nodogsplash/patches/002-deprecated_iptables_syntax.patch b/nodogsplash/patches/002-deprecated_iptables_syntax.patch
deleted file mode 100644
index 26a22af..0000000
--- a/nodogsplash/patches/002-deprecated_iptables_syntax.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);

From b12986c09d501f8c1639f7c10db8ca57b3161498 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Fri, 10 May 2013 23:34:35 +0200
Subject: [PATCH 25/31] [packages] nodogsplash: download git sources with
 proper OpenWrt Makefile tools

---
 nodogsplash/Makefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index ffe35b9..d1a615f 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -8,9 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
-PKG_VERSION:=0.9_beta9.9.8
+PKG_FIXUP:=autoreconf
+PKG_VERSION:=0.9_beta9.9.9-pre
 PKG_RELEASE:=1
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://github.com/mwarning/nodogsplash.git
+PKG_SOURCE_VERSION:=master
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 
@@ -28,17 +36,6 @@ define Package/nodogsplash/description
 	restricted access to an internet connection.
 endef
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	git clone https://github.com/mwarning/nodogsplash.git $(PKG_BUILD_DIR)
-endef
-
-#for sources inside the package
-#define Build/Prepare
-#	mkdir -p $(PKG_BUILD_DIR)
-#	$(CP) ./src/* $(PKG_BUILD_DIR)/
-#endef
-
 define Package/nodogsplash/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nodogsplash $(1)/usr/bin/
@@ -56,3 +53,4 @@ endef
 
 
 $(eval $(call BuildPackage,nodogsplash))
+

From b74d2c860fc5d7f8203f8faa887f7ee6fb6ed932 Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Sat, 11 May 2013 14:59:51 +0200
Subject: [PATCH 26/31] [packages] nodogsplash: use official github nodogsplash
 organization feed

---
 nodogsplash/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index d1a615f..3dfd597 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=git://github.com/mwarning/nodogsplash.git
+PKG_SOURCE_URL:=git://github.com/nodogsplash/nodogsplash.git
 PKG_SOURCE_VERSION:=master
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1

From ef4cdd41e8bca1a3e27b8dc07b7a3606877ec4bf Mon Sep 17 00:00:00 2001
From: Saverio Proto <zioproto@gmail.com>
Date: Fri, 17 May 2013 12:50:38 +0200
Subject: [PATCH 27/31] olsrd: version bump to 0.6.5.4

---
 olsrd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/olsrd/Makefile b/olsrd/Makefile
index 04cd44a..c1ca224 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
-PKG_VERSION:=0.6.5.3
+PKG_VERSION:=0.6.5.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6
 
-PKG_MD5SUM:=c99a6800e152dbc08436c0c36c61e9e0
+PKG_MD5SUM:=44689e790359f9363e5ebb924c548730
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk

From 4711c71b256a1c397ee638e5c99f56cb5cc944a6 Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Mon, 20 May 2013 18:42:53 +0200
Subject: [PATCH 28/31] nodogsplash: use official github nodogsplash
 organization homepage

---
 nodogsplash/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 3dfd597..d1d9212 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -28,7 +28,7 @@ define Package/nodogsplash
 	CATEGORY:=Network
 	DEPENDS:=+libpthread +iptables-mod-ipopt
 	TITLE:=Open public network gateway daemon
-	URL:=https://github.com/mwarning/nodogsplash
+	URL:=https://github.com/nodogsplash/nodogsplash
 endef
 
 define Package/nodogsplash/description

From 43e8adbf42881e37dcfc45d7fe60d0abeca75a17 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sat, 8 Jun 2013 16:01:33 +0200
Subject: [PATCH 29/31] bmx6/Makefile: update including json-c fix

---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 689fa6f..0322e05 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 #PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=c0076183ce28fe15285c8faa51920e74633776fe
-PKG_VERSION:=r2013041901
+PKG_REV:=6c57a8062f737ae3d3a761b2f557142e1c969ccf
+PKG_VERSION:=r2013060801
 PKG_RELEASE:=4
 
 PKG_SOURCE_VERSION:=$(PKG_REV)

From 19862ff9a8c5cee8b713beda3b5bf15e2cb15d59 Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sat, 8 Jun 2013 16:57:24 +0200
Subject: [PATCH 30/31] bmx6/Makefile: add kmod-tun dependency for on-demand
 tunnel support

---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index 0322e05..f0fe9fc 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -32,7 +32,7 @@ PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 #PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
 PKG_REV:=6c57a8062f737ae3d3a761b2f557142e1c969ccf
-PKG_VERSION:=r2013060801
+PKG_VERSION:=r2013060802
 PKG_RELEASE:=4
 
 PKG_SOURCE_VERSION:=$(PKG_REV)
@@ -61,7 +61,7 @@ define Package/bmx6/Default
   TITLE:=BMX6 layer 3 routing daemon
   URL:=http://bmx6.net/
   MAINTAINER:=Axel Neumann <neumann@cgws.de>
-  DEPENDS:=+kmod-ip6-tunnel +kmod-iptunnel6
+  DEPENDS:=+kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun
 endef
 
 define Package/bmx6/description

From 9e255f58197e5446b61c4605d67ee6cdd76e22bd Mon Sep 17 00:00:00 2001
From: Axel Neumann <neumann@cgws.de>
Date: Sat, 8 Jun 2013 17:21:36 +0200
Subject: [PATCH 31/31] bmx6/Makefile: update to current (60adcbd4) bmx6 master
 branch

---
 bmx6/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bmx6/Makefile b/bmx6/Makefile
index f0fe9fc..8786a3f 100644
--- a/bmx6/Makefile
+++ b/bmx6/Makefile
@@ -31,8 +31,8 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://bmx6.net/bmx6.git
 #PKG_SOURCE_URL:=git://github.com/axn/bmx6.git
 
-PKG_REV:=6c57a8062f737ae3d3a761b2f557142e1c969ccf
-PKG_VERSION:=r2013060802
+PKG_REV:=60adcbd4655ccf36a407bae58d66914e33f05a41
+PKG_VERSION:=r2013060803
 PKG_RELEASE:=4
 
 PKG_SOURCE_VERSION:=$(PKG_REV)