X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8e2cf077d0066a626bf3b90596acd941f430fe9e..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/firewall/Makefile diff --git a/package/firewall/Makefile b/package/firewall/Makefile index e073b5771..b81531bdf 100644 --- a/package/firewall/Makefile +++ b/package/firewall/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2010 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:=6 include $(INCLUDE_DIR)/package.mk @@ -18,52 +18,35 @@ define Package/firewall CATEGORY:=Base system URL:=http://openwrt.org/ TITLE:=OpenWrt firewall - DEPENDS:=+iptables + DEPENDS:=+iptables +iptables-mod-conntrack +iptables-mod-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 -endef - -define Package/firewall/config - source "$(SOURCE)/Config.in" + uci based firewall for openwrt 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 - $(INSTALL_DATA) ./files/new/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/new/firewall.config $(1)/etc/config/firewall + $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall $(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_DATA) ./files/new/20-firewall $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files/firewall.hotplug $(1)/etc/hotplug.d/iface/20-firewall + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/firewall.user $(1)/etc 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))