[package] firewall: actually copy firewall.user to image

[openwrt.git] / package / firewall / Makefile

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index e073b57..76ae273 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=1
 PKG_NAME:=firewall
 
 PKG_VERSION:=1

-PKG_RELEASE:=1
+PKG_RELEASE:=3

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -18,52 +18,32 @@ define Package/firewall
   CATEGORY:=Base system
   URL:=http://openwrt.org/
   TITLE:=OpenWrt firewall
   CATEGORY:=Base system
   URL:=http://openwrt.org/
   TITLE:=OpenWrt firewall

-  DEPENDS:=+iptables
+  DEPENDS:=+iptables-mod-conntrack +iptables-mod-nat

 endef
 
 define Package/firewall/description
 endef
 
 define Package/firewall/description

- firewall for openwrt, you can select if you want to use the old version or the new uci based script
-endef
-
-define Package/firewall/config
-       source "$(SOURCE)/Config.in"
+ uci based firewall for openwrt

 endef
 
 define Build/Compile
        true
 endef
 
 endef
 
 define Build/Compile
        true
 endef
 

-ifeq ($(CONFIG_FIREWALL_NEW),y)

 define Package/firewall/conffiles
 /etc/config/firewall
 endef
 
 define Package/firewall/install
        $(INSTALL_DIR) $(1)/lib/firewall
 define Package/firewall/conffiles
 /etc/config/firewall
 endef
 
 define Package/firewall/install
        $(INSTALL_DIR) $(1)/lib/firewall

-       $(INSTALL_DATA) ./files/new/uci_firewall.sh $(1)/lib/firewall
+       $(INSTALL_DATA) ./files/uci_firewall.sh $(1)/lib/firewall

        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_DIR) $(1)/etc/config

-       $(INSTALL_DATA) ./files/new/firewall.config $(1)/etc/config/firewall
+       $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall

        $(INSTALL_DIR) $(1)/etc/init.d/
        $(INSTALL_DIR) $(1)/etc/init.d/

-       $(INSTALL_BIN) ./files/new/firewall.init $(1)/etc/init.d/firewall
+       $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall

        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface

-       $(INSTALL_DATA) ./files/new/20-firewall $(1)/etc/hotplug.d/iface
+       $(INSTALL_DATA) ./files/20-firewall $(1)/etc/hotplug.d/iface
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) ./files/firewall.user $(1)/etc

 endef
 
 endef
 

-else
-
-define Package/firewall/conffiles
-/etc/firewall.config
-/etc/firewall.user
-endef
-
-define Package/firewall/install
-       $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/old/firewall.config $(1)/etc/
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/old/firewall.init $(1)/etc/init.d/firewall
-       $(INSTALL_BIN) ./files/old/firewall.user $(1)/etc/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_DATA) ./files/old/firewall.awk $(1)/usr/lib
-endef
-endif

 $(eval $(call BuildPackage,firewall))
 $(eval $(call BuildPackage,firewall))