contrib: prepare for renaming of firewall3 in OpenWrt

diff --git a/contrib/package/freifunk-firewall/Makefile b/contrib/package/freifunk-firewall/Makefile
index 413ea47..5bcb2c8 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
   CATEGORY:=LuCI
   SUBMENU:=9. Freifunk
   TITLE:=Freifunk Firewall Addon

-  DEPENDS:=+firewall3
+  DEPENDS:=+firewall

 endef
 
 define Package/freifunk-firewall/description
 endef
 
 define Package/freifunk-firewall/description

diff --git a/contrib/package/freifunk-gwcheck/Makefile b/contrib/package/freifunk-gwcheck/Makefile
index af8dda6..c339d13 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
   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
 endef
 
 define Package/freifunk-gwcheck/description

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index 2542544..6be79a9 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-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))
 
 $(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 52f7147..8ec00cf 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
   CATEGORY:=LuCI
   SUBMENU:=9. Freifunk
   TITLE:=Shell script based wizard for Mesh networks

-  DEPENDS:=+firewall3
+  DEPENDS:=+firewall

 endef
 
 define Package/meshwizard/description
 endef
 
 define Package/meshwizard/description