* contrib/build-openwrt-kamikazeipk/wifidog/Makefile: Add iptables u…

…serspace dependencies * Release 1.1.5
wifidog · Apr 13, 2008 · 6dca530 · 6dca530
1 parent 6e7de29
commit 6dca530
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,8 @@
 # $Id$
+2008-04-13 Benoit Gr�goire  <bock@step.polymtl.ca>
+	* contrib/build-openwrt-kamikazeipk/wifidog/Makefile:  Add iptables userspace dependencies
+	* Release 1.1.5
+
 2008-03-24 Benoit Gr�goire  <bock@step.polymtl.ca>
 	* Integrate with OpenWRT kamikaze build system
 

diff --git a/contrib/build-openwrt-kamikazeipk/wifidog/Makefile b/contrib/build-openwrt-kamikazeipk/wifidog/Makefile
@@ -25,7 +25,7 @@ define Package/wifidog
   SUBMENU:=Captive Portals
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-ipt-extra +kmod-ipt-ipopt +kmod-ipt-nat +libpthread
+  DEPENDS:=+kmod-ipt-extra +iptables-mod-extra +kmod-ipt-ipopt +iptables-mod-ipopt +kmod-ipt-nat +iptables-mod-nat +libpthread
   TITLE:=A wireless captive portal solution
   URL:=http://www.wifidog.org
 endef
@@ -44,7 +44,7 @@ endef
 MAKE_FLAGS += \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
 	all install
-	
+
 define Package/wifidog/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(1)/usr/bin/wifidog-init

diff --git a/contrib/build-openwrt-whiterussianipk/wifidog/Makefile b/contrib/build-openwrt-whiterussianipk/wifidog/Makefile
@@ -6,7 +6,7 @@ endif
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidog
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
 PKG_MD5SUM:=842b21e1b02d0a90677b289d794e0e21
 PKG_SOURCE_URL:= @SF/$(PKG_NAME)

diff --git a/scripts/init.d/wifidog b/scripts/init.d/wifidog
@@ -165,6 +165,7 @@ case "$1" in
     echo "   ipt_mark module is working"
     fi
 
+##TODO:  This will not test if required iptables userspace (iptables-mod-nat on Kamikaze) is installed
     echo "  Testing ipt_REDIRECT"
     TEST_IPT_MAC=$(test_ipt_REDIRECT)
     if [ "$TEST_IPT_MAC" = "0" ]; then