X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Ffirewall%2FMakefile;h=05f42a62eab7e2139f631d3b163906f569bbc548;hb=6443da06c2d35432d3908fc917491e25c687bfb9;hp=23f23e6dc1fa74b59399f476bee0fa9a167541ed;hpb=aa954c1c5dd50c89f91ac2574482ab7c927a3c54;p=openwrt.git

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 23f23e6dc1..05f42a62ea 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewall
 
-PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_VERSION:=2
+PKG_RELEASE:=53
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -18,11 +18,13 @@ define Package/firewall
   CATEGORY:=Base system
   URL:=http://openwrt.org/
   TITLE:=OpenWrt firewall
-  DEPENDS:=+iptables +iptables-mod-ipopt +iptables-mod-extra
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
+  DEPENDS:=+iptables +kmod-ipt-conntrack +kmod-ipt-nat
+  PKGARCH:=all
 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
+ UCI based firewall for OpenWrt
 endef
 
 define Build/Compile
@@ -31,17 +33,26 @@ endef
 
 define Package/firewall/conffiles
 /etc/config/firewall
+/etc/firewall.user
 endef
 
 define Package/firewall/install
 	$(INSTALL_DIR) $(1)/lib/firewall
-	$(INSTALL_DATA) ./files/uci_firewall.sh $(1)/lib/firewall
+	$(INSTALL_DATA) ./files/lib/*.sh $(1)/lib/firewall
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) ./files/bin/fw $(1)/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
 	$(INSTALL_DIR) $(1)/etc/init.d/
 	$(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_DATA) ./files/20-firewall $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/firewall.hotplug $(1)/etc/hotplug.d/iface/20-firewall
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/firewall
+	$(INSTALL_DATA) ./files/reflection.hotplug $(1)/etc/hotplug.d/firewall/10-nat-reflection
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DATA) ./files/firewall.user $(1)/etc
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DATA) ./files/firewall.upgrade $(1)/lib/upgrade/keep.d/firewall
 endef
 
 $(eval $(call BuildPackage,firewall))