+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
# $Id$
include $(TOPDIR)/rules.mk
-include kernelconfig.mk
-
-PKG_NAME := iptables
-PKG_VERSION := 1.3.0
-PKG_RELEASE := 1
-PKG_MD5SUM := a072c0f09f1b289cb7af56f76407d033
-
-PKG_SOURCE_SITE := http://www.netfilter.org/files
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_CAT := bzcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-
-PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPT_EXTRA := $(PACKAGE_DIR)/iptables-extra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IP6T := $(PACKAGE_DIR)/ip6tables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables
-I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra
-I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables
-
-TARGETS := $(PKG_IPT)
-ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),)
-TARGETS += $(PKG_IPT_EXTRA)
-endif
-ifneq ($(BR2_PACKAGE_IP6TABLES),)
-TARGETS += $(PKG_IP6T)
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=iptables
+PKG_VERSION:=1.3.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
+ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
+ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
+ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
+PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
+PKG_CAT:=bzcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+ifeq ($(DUMP),)
+ -include $(LINUX_DIR)/.config
+ include $(INCLUDE_DIR)/netfilter.mk
endif
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
-ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
-endif
-ifeq ($(BR2_PACKAGE_IP6TABLES),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list
-endif
-
-$(DL_DIR)/$(PKG_SOURCE_FILE):
- mkdir -p $(DL_DIR)
- $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
-
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE)
- mkdir -p $(PKG_BUILD_DIR)/modules
- $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(PATCH) $(PKG_BUILD_DIR) ./patches
- touch $(PKG_BUILD_DIR)/.patched
-
-$(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched
- $(TARGET_CONFIGURE_OPTS) \
+define Package/iptables/Default
+ SECTION:=net
+ CATEGORY:=Base system
+ URL:=http://netfilter.org/
+endef
+
+define Package/iptables
+ $(call Package/iptables/Default)
+ TITLE:=IPv4 firewall administration tool
+ MENU:=1
+endef
+
+define Package/iptables/conffiles
+/etc/config/firewall
+/etc/firewall.user
+endef
+
+define Package/iptables-mod-conntrack
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-conntrack
+ TITLE:=connection tracking modules
+ DESCRIPTION:=\
+ iptables extensions for connection tracking.\\\
+ \\\
+ Includes: \\\
+ - libipt_conntrack \\\
+ - libipt_helper \\\
+ - libipt_connmark/CONNMARK
+endef
+
+define Package/iptables-mod-filter
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-filter
+ TITLE:=filter modules
+ DESCRIPTION:=\
+ iptables extensions for packet content inspection.\\\
+ \\\
+ Includes: \\\
+ - libipt_ipp2p \\\
+ - libipt_layer7
+endef
+
+define Package/iptables-mod-imq
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables
+ TITLE:=IMQ support
+ DESCRIPTION:=\
+ iptables extension for IMQ support.\\\
+ \\\
+ Includes: \\\
+ - libipt_IMQ
+endef
+
+define Package/iptables-mod-ipopt
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-ipopt
+ TITLE:=IP/Packet option modules
+ DESCRIPTION:=\
+ iptables extensions for matching/changing IP packet options.\\\
+ \\\
+ Includes: \\\
+ - libipt_dscp/DSCP \\\
+ - libipt_ecn/ECN \\\
+ - libipt_length \\\
+ - libipt_mac \\\
+ - libipt_tos/TOS \\\
+ - libipt_tcpmms \\\
+ - libipt_ttl/TTL \\\
+ - libipt_unclean
+endef
+
+define Package/iptables-mod-ipsec
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-ipsec
+ TITLE:=IPSec extensions
+ DESCRIPTION:=\
+ iptables extensions for matching ipsec traffic.\\\
+ \\\
+ Includes: \\\
+ - libipt_ah \\\
+ - libipt_esp
+endef
+
+define Package/iptables-mod-nat
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-nat
+ TITLE:=extra NAT targets
+ DESCRIPTION:=\
+ iptables extensions for different NAT targets.\\\
+ \\\
+ Includes: \\\
+ - libipt_REDIRECT
+endef
+
+define Package/iptables-mod-ulog
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-ulog
+ TITLE:=user-space packet logging
+ DESCRIPTION:=\
+ iptables extensions for user-space packet logging.\\\
+ \\\
+ Includes: \\\
+ - libipt_ULOG
+endef
+
+define Package/iptables-mod-extra
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables +kmod-ipt-extra
+ TITLE:=other extra iptables extensions
+ DESCRIPTION:=\
+ other extra iptables extensions.\\\
+ \\\
+ Includes: \\\
+ - libipt_limit \\\
+ - libipt_owner \\\
+ - libipt_physdev \\\
+ - libipt_pkttype \\\
+ - libipt_recent
+endef
+
+define Package/iptables-utils
+ $(call Package/iptables/Default)
+ DEPENDS:=iptables
+ TITLE:=iptables save and restore utilities
+endef
+
+define Package/ip6tables
+ $(call Package/iptables/Default)
+ CATEGORY:=Network
+ TITLE:=IPv6 firewall administration tool
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+ chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
+ mkdir -p $(PKG_INSTALL_DIR)
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ $(TARGET_CONFIGURE_OPTS) \
+ COPT_FLAGS="$(TARGET_CFLAGS)" \
+ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all install install-devel
+endef
+
+define Build/InstallDev
$(MAKE) -C $(PKG_BUILD_DIR) \
- KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
- CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)"
-
-$(PKG_IPT): $(PKG_BUILD_DIR)/iptables
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(I_IPT)/usr/sbin
- cp -af $(PKG_BUILD_DIR)/iptables $(I_IPT)/usr/sbin/
- $(STRIP) $(I_IPT)/usr/sbin/iptables
- mkdir -p $(I_IPT)/usr/lib/iptables
- (cd $(PKG_BUILD_DIR)/extensions; \
- cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables)
- -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so
- mkdir -p $(PACKAGE_DIR)
- $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT)
- $(IPKG) install $(PKG_IPT)
-
-$(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables
- (cd $(PKG_BUILD_DIR)/extensions; \
- cp $(patsubst %,libipt_%.so,$(ext-m)) $(I_IPT_EXTRA)/usr/lib/iptables)
- -$(STRIP) $(I_IPT_EXTRA)/usr/lib/iptables/*.so
- mkdir -p $(PACKAGE_DIR)
- $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT)
- $(IPKG) install $(PKG_IPT_EXTRA)
-
-$(PKG_IP6T): $(PKG_BUILD_DIR)/iptables
- $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
- mkdir -p $(I_IP6T)/usr/sbin
- cp -af $(PKG_BUILD_DIR)/ip6tables $(I_IP6T)/usr/sbin/
- $(STRIP) $(I_IP6T)/usr/sbin/ip6tables
- mkdir -p $(I_IP6T)/usr/lib/iptables
- (cd $(PKG_BUILD_DIR)/extensions; \
- cp libip6t_*.so $(I_IP6T)/usr/lib/iptables)
- -$(STRIP) $(I_IP6T)/usr/lib/iptables/*.so
- mkdir -p $(PACKAGE_DIR)
- $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T)
- $(IPKG) install $(PKG_IP6T)
-
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(TARGETS)
-install: $(INSTALL_TARGETS)
-
-clean:
- rm -rf $(PKG_BUILD_DIR)
- rm -f $(PKG_IPT) $(PKG_IPT_EXTRA) $(PKG_IP6T)
+ $(TARGET_CONFIGURE_OPTS) \
+ COPT_FLAGS="$(TARGET_CFLAGS)" \
+ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
+ DESTDIR="$(STAGING_DIR)" \
+ install install-devel
+ $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr
+endef
+
+define Build/UninstallDev
+ rm -rf $(STAGING_DIR)/usr/include/libipq.h
+ rm -rf $(STAGING_DIR)/usr/lib/libipq.a
+endef
+
+define Package/iptables/install
+ $(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_BIN) ./files/firewall.user $(1)/etc/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/lib/iptables
+ (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+ $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \
+ )
+endef
+
+define Package/iptables-utils/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
+endef
+
+define Package/ip6tables/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/lib/iptables
+ (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+ $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
+ )
+endef
+
+define BuildPlugin
+ define Package/$(1)/install
+ $(INSTALL_DIR) $$(1)/usr/lib/iptables
+ for m in $$(patsubst xt_%,ipt_%,$(2)); do \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \
+ done
+ $(3)
+ endef
+
+ $$(eval $$(call BuildPackage,$(1)))
+endef
+
+L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
+ $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
+
+$(eval $(call BuildPackage,iptables))
+$(eval $(call BuildPackage,iptables-utils))
+$(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m)))
+$(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
+$(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL)))
+$(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m)))
+$(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
+$(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
+$(eval $(call BuildPlugin,iptables-mod-nat,$(IPT_NAT-m)))
+$(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
+$(eval $(call BuildPackage,ip6tables))