contrib: prepare for renaming of firewall3 in OpenWrt

diff --git a/contrib/package/freifunk-firewall/Makefile b/contrib/package/freifunk-firewall/Makefile
index 413ea47326df351737feea147024381d2aad62cb..5bcb2c8ad5146b79674e906cc8c9d29a0c3eef4f 100644 (file)
--- a/contrib/package/freifunk-firewall/Makefile
+++ b/contrib/package/freifunk-firewall/Makefile
@@ -18,7 +18,7 @@ define Package/freifunk-firewall
   CATEGORY:=LuCI
   SUBMENU:=9. Freifunk
   TITLE:=Freifunk Firewall Addon
-  DEPENDS:=+firewall3
+  DEPENDS:=+firewall
 endef
 
 define Package/freifunk-firewall/description

diff --git a/contrib/package/freifunk-gwcheck/Makefile b/contrib/package/freifunk-gwcheck/Makefile
index af8dda6328b80080f215081b555c679f0fe7897d..c339d13fad04c8a5bc42c523720f83909ecbe084 100644 (file)
--- a/contrib/package/freifunk-gwcheck/Makefile
+++ b/contrib/package/freifunk-gwcheck/Makefile
@@ -15,7 +15,7 @@ define Package/freifunk-gwcheck
   CATEGORY:=LuCI
   SUBMENU:=9. Freifunk
   TITLE:=Freifunk gateway check script
-  DEPENDS:=firewall3 +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain
+  DEPENDS:=firewall +ip +iptables-mod-ipopt +olsrd-mod-dyn-gw-plain
 endef
 
 define Package/freifunk-gwcheck/description

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 25425446b694fcf049232a1c043dbe4c1985aaa7..6be79a96b7c49a86868506f53450c26907d03bd5 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -311,7 +311,7 @@ $(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\
        +PACKAGE_luci-app-siitwizard:kmod-siit))
 
 $(eval $(call application,firewall,Firewall and Portforwarding application,\
-       +PACKAGE_luci-app-firewall:firewall3))
+       +PACKAGE_luci-app-firewall:firewall))
 
 $(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic,\
         +PACKAGE_luci-app-freifunk-policyrouting:freifunk-policyrouting))

diff --git a/contrib/package/meshwizard/Makefile b/contrib/package/meshwizard/Makefile
index 52f71478087044e02d777340ba98bd815c0a175d..8ec00cf78e2b76d8a17427e719b72eb800ed89d6 100644 (file)
--- a/contrib/package/meshwizard/Makefile
+++ b/contrib/package/meshwizard/Makefile
@@ -15,7 +15,7 @@ define Package/meshwizard
   CATEGORY:=LuCI
   SUBMENU:=9. Freifunk
   TITLE:=Shell script based wizard for Mesh networks
-  DEPENDS:=+firewall3
+  DEPENDS:=+firewall
 endef
 
 define Package/meshwizard/description