avoid running timestamp.pl for dumpinfo -- drastically speeds up the .pkginfo process

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 4018353..fc57f9c 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,137 +1,243 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk

-include kernelconfig.mk

 
 

-PKG_NAME := iptables
-PKG_VERSION := 1.3.1
-PKG_RELEASE := 1
-PKG_MD5SUM := c3358a3bd0d7755df0b64a5063db296b
+PKG_NAME:=iptables
+PKG_VERSION:=1.3.5
+PKG_RELEASE:=1
+PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5

 
 

-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_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_CAT:=bzcat

 
 

-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 

-PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPT_UTILS := $(PACKAGE_DIR)/iptables-utils_$(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
+PKG_MENU:=IPv4 / IPv6 firewall administration

 
 

-I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables
-I_IPT_UTILS := $(PKG_BUILD_DIR)/ipkg/iptables-utils
-I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra
-I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables
-
-TARGETS := $(STAGING_DIR)/libipq/libipq.a $(PKG_IPT)
-ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),)
-TARGETS += $(PKG_IPT_UTILS)
-endif
-ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),)
-TARGETS += $(PKG_IPT_EXTRA)
-endif
-ifneq ($(BR2_PACKAGE_IP6TABLES),)
-TARGETS += $(PKG_IP6T)
-endif
-
-INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list
-ifeq ($(BR2_PACKAGE_IPTABLES_UTILS),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-utils.list
-endif
-ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list
+include $(TOPDIR)/package/rules.mk
+ifeq ($(DUMP),)
+include $(LINUX_DIR)/.config
+include $(TOPDIR)/target/linux/netfilter.mk

 endif
 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
+SECTION:=net
+CATEGORY:=Base system
+MENU:=1
+DEFAULT:=y
+TITLE:=IPv4 firewall administration tool
+URL:=http://netfilter.org/
+endef
+
+define Package/iptables-mod-conntrack
+SECTION:=net
+CATEGORY:=Base system
+DEPENDS:=iptables
+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:=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:=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:=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
+SECTION:=net
+CATEGORY:=Base system
+DEPENDS:=iptables
+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:=extra NAT targets
+DESCRIPTION:=iptables extensions for different NAT targets\\\
+Includes: \\\
+       * libipt_REDIRECT
+endef
+
+define Package/iptables-mod-ulog
+SECTION:=net
+CATEGORY:=Base system
+DEPENDS:=iptables
+TITLE:=user-space packet logging
+DESCRIPTION:=iptables extensions for user-space packet logging\\\
+Includes: \\\
+       * libipt_ULOG
+endef
+
+define Package/iptables-mod-extra
+SECTION:=net
+CATEGORY:=Base system
+DEPENDS:=iptables
+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
+SECTION:=net
+CATEGORY:=Base system
+DEPENDS:=iptables
+TITLE:=iptables save and restore utilities
+endef
+
+define Package/ip6tables
+SECTION:=net
+CATEGORY:=Base system
+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) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

+               $(TARGET_CONFIGURE_OPTS) \
+               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \

                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
                KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \

-               CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)"
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install install-devel
+endef

                
                

-$(STAGING_DIR)/libipq/libipq.a: $(PKG_BUILD_DIR)/iptables
-       $(TARGET_CONFIGURE_OPTS) \
+define Package/iptables/install
+       install -d -m0755 $(1)/etc/config
+       install -m0644 ./files/firewall.config $(1)/etc/config/firewall
+       install -d -m0755 $(1)/etc/init.d
+       install -m0755 ./files/firewall.init $(1)/etc/init.d/S45firewall
+       install -m0755 ./files/firewall.user $(1)/etc/
+       install -d -m0755 $(1)/usr/lib
+       install -m0644 ./files/firewall.awk $(1)/usr/lib
+       install -d -m0755 $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
+       install -d -m0755 $(1)/usr/lib/iptables
+       (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+               $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \
+       )
+       $(RSTRIP) $(1)
+endef
+
+define Package/iptables-utils/install
+       install -d -m0755 $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
+       $(RSTRIP) $(1)
+endef
+
+define Package/ip6tables/install
+       install -d -m0755 $(1)/usr/sbin
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
+       install -d -m0755 $(1)/usr/lib/iptables
+       (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
+               $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
+       )
+       $(RSTRIP) $(1)
+endef
+
+define BuildPlugin
+define Package/$(1)/install
+       install -m0755 -d $$(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)
+       $(RSTRIP) $$(1)
+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))
+
+
+$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+               $(TARGET_CONFIGURE_OPTS) \

                CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
                CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \

-               libipq/libipq.a
-       cp -a $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/include/
-       cp $(PKG_BUILD_DIR)/libipq/libipq.a $(STAGING_DIR)/lib/
-
-$(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_IPT_UTILS): $(PKG_BUILD_DIR)/iptables
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_UTILS) control/iptables-utils.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
-       mkdir -p $(I_IPT_UTILS)/usr/sbin
-       cp $(PKG_BUILD_DIR)/iptables-save $(I_IPT_UTILS)/usr/sbin
-       cp $(PKG_BUILD_DIR)/iptables-restore $(I_IPT_UTILS)/usr/sbin
-       -$(STRIP) $(I_IPT_UTILS)/usr/sbin/*
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(I_IPT_UTILS) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/iptables-utils.list: $(PKG_IPT)
-       $(IPKG) install $(PKG_IPT_UTILS)
-
-$(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)
+               KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+               DESTDIR="$(STAGING_DIR)" \
+               install install-devel
+
+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
+