reorder nas command line parameters (required for bridge operation)

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index cc7c84a..f8f5909 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,28 +1,29 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 PKG_VERSION:=1.3.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_MENU:=IPv4 / IPv6 firewall administration
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
-include $(LINUX_DIR)/.config
-include $(TOPDIR)/target/linux/netfilter.mk
+-include $(LINUX_DIR)/.config
+include $(INCLUDE_DIR)/netfilter.mk
 endif
 
 define Package/iptables
@@ -34,45 +35,51 @@ TITLE:=IPv4 firewall administration tool
 URL:=http://netfilter.org/
 endef
 
+define Package/iptables/conffiles
+/etc/config/firewall
+/etc/firewall.user
+endef
+
 define Package/iptables-mod-conntrack
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extensions for connection tracking
-DESCRIPTION:=Includes: \\\
+TITLE:=connection tracking modules
+DESCRIPTION:=iptables extensions for connection tracking \\\
+Includes: \\\
        * libipt_conntrack \\\
        * libipt_helper \\\
        * libipt_connmark/CONNMARK
-
 endef
 
 define Package/iptables-mod-filter
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extensions for packet content inspection
-DESCRIPTION:=Includes: \\\
+TITLE:=filter modules
+DESCRIPTION:=iptables extensions for packet content inspection\\\
+Includes: \\\
        * libipt_ipp2p \\\
        * libipt_layer7 
-                                               
 endef
 
 define Package/iptables-mod-imq
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extension for IMQ support 
-DESCRIPTION:=Includes: \\\
+TITLE:=IMQ support
+DESCRIPTION:=iptables extension for IMQ support\\\
+Includes: \\\
        * libipt_IMQ
-                                               
 endef
 
 define Package/iptables-mod-ipopt
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extensions for matching/changing IP packet options
-DESCRIPTION:=Includes: \\\
+TITLE:=IP/Packet option modules
+DESCRIPTION:=iptables extensions for matching/changing IP packet options\\\
+Includes: \\\
        * libipt_dscp/DSCP \\\
        * libipt_ecn/ECN \\\
        * libipt_length \\\
@@ -81,26 +88,26 @@ DESCRIPTION:=Includes: \\\
        * libipt_tcpmms \\\
        * libipt_ttl/TTL \\\
        * libipt_unclean 
-
 endef
 
 define Package/iptables-mod-ipsec
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extensions for matching ipsec traffic
-DESCRIPTION:=Includes: \\\
+TITLE:=IPSec extensions
+DESCRIPTION:=iptables extensions for matching ipsec traffic\\\
+Includes: \\\
        * libipt_ah \\\
        * libipt_esp
-
 endef
 
 define Package/iptables-mod-nat
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extensions for different NAT targets
-DESCRIPTION:=Includes: \\\
+TITLE:=extra NAT targets
+DESCRIPTION:=iptables extensions for different NAT targets\\\
+Includes: \\\
        * libipt_REDIRECT
 endef
 
@@ -108,8 +115,9 @@ define Package/iptables-mod-ulog
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=iptables extensions for user-space packet logging
-DESCRIPTION:=Includes: \\\
+TITLE:=user-space packet logging
+DESCRIPTION:=iptables extensions for user-space packet logging\\\
+Includes: \\\
        * libipt_ULOG
 endef
 
@@ -118,13 +126,13 @@ SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
 TITLE:=other extra iptables extensions
-DESCRIPTION:=Includes: \\\
+DESCRIPTION:=other extra iptables extensions\\\
+Includes: \\\
        * libipt_limit \\\
        * libipt_owner \\\
        * libipt_physdev \\\
        * libipt_pkttype \\\
        * libipt_recent
-
 endef
 
 define Package/iptables-utils
@@ -154,6 +162,22 @@ define Build/Compile
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install install-devel
 endef
+
+
+define Build/InstallDev
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
+               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+               DESTDIR="$(STAGING_DIR)" \
+               install install-devel
+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 -d -m0755 $(1)/etc/config
@@ -215,19 +239,3 @@ $(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))
-
-
-$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/
-
-install-dev: $(STAGING_DIR)/usr/lib/libipq.a
-uninstall-dev:
-       rm -rf $(STAGING_DIR)/usr/include/libipq.h
-       rm -rf $(STAGING_DIR)/usr/lib/libipq.a
-
-compile-targets: install-dev
-clean-targets: uninstall-dev
-