From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 28 Nov 2005 02:48:53 +0000 (+0000)
Subject: fix nocatsplash package dependencies (closes: #90),
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9ab35209eee0f8dfa2a8dfcff41410f8a6d4b30c;p=openwrt%2Fsvn-archive%2Farchive.git

fix nocatsplash package dependencies (closes: #90),
fix netfilter modules loaded in initialize.fw,
bump release number

SVN-Revision: 2559
---

diff --git a/openwrt/package/nocatsplash/Makefile b/openwrt/package/nocatsplash/Makefile
index 8820413e4d..7d05e504ee 100644
--- a/openwrt/package/nocatsplash/Makefile
+++ b/openwrt/package/nocatsplash/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nocatsplash
 PKG_VERSION:=0.92
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MD5SUM:=e0fcc0effe52e63bc31070d16d0b4a81
 
 PKG_SOURCE_URL:=http://wifi.rulez.org/~josephus/
diff --git a/openwrt/package/nocatsplash/ipkg/nocatsplash.control b/openwrt/package/nocatsplash/ipkg/nocatsplash.control
index ec0bfc7e2f..95fb0f8c6e 100644
--- a/openwrt/package/nocatsplash/ipkg/nocatsplash.control
+++ b/openwrt/package/nocatsplash/ipkg/nocatsplash.control
@@ -1,7 +1,7 @@
 Package: nocatsplash
 Priority: optional
 Section: net
-Depends: iptables-extra, glib1
+Depends: glib1, iptables-mod-ipopt, iptables-mod-nat
 Description: NoCatSplash is an Open Public Network Gateway Daemon.
  It performs as a [captive/open/active] portal. When run on a gateway/router
  on a network, all web requests are redirected until the client either logs
diff --git a/openwrt/package/nocatsplash/patches/openwrt-firewall.patch b/openwrt/package/nocatsplash/patches/openwrt-firewall.patch
index 055b57f24d..0486fe6e47 100644
--- a/openwrt/package/nocatsplash/patches/openwrt-firewall.patch
+++ b/openwrt/package/nocatsplash/patches/openwrt-firewall.patch
@@ -12,7 +12,7 @@ diff -urN NoCatSplash-0.92.old/libexec/iptables/initialize.fw NoCatSplash-0.92/l
 -    ip_conntrack ipt_mac ipt_state ipt_mark; do
 -
 -    modprobe $module
-+for module in ipt_TOS ipt_mac; do
++for module in ipt_REDIRECT ipt_TOS ipt_mac; do
 +    insmod $module
  done