-# $Id$
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables
-PKG_VERSION:=1.3.5
+PKG_VERSION:=1.4.7
PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MD5SUM:=645941dd1f9e0ec1f74c61918d70d52f
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_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
-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
+ STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
endif
+
+define Package/iptables/Default
+ SECTION:=net
+ CATEGORY:=Network
+ URL:=http://netfilter.org/
+endef
+
+define Package/iptables/Module
+$(call Package/iptables/Default)
+ DEPENDS:=iptables $(1)
+endef
+
define Package/iptables
-SECTION:=net
-CATEGORY:=Base system
-MENU:=1
-DEFAULT:=y
-TITLE:=IPv4 firewall administration tool
-URL:=http://netfilter.org/
+$(call Package/iptables/Default)
+ TITLE:=IPv4 firewall administration tool
+ MENU:=1
+ DEPENDS+= +kmod-ipt-core +libiptc +libxtables
+endef
+
+define Package/iptables/description
+IPv4 firewall administration tool.
+Includes support for:
+- comment
+- limit
+- LOG
+- mac
+- multiport
+- REJECT
+- TCPMSS
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
+$(call Package/iptables/Module, +kmod-ipt-conntrack)
+ TITLE:=Basic connection tracking extensions
+endef
+
+define Package/iptables-mod-conntrack/description
+Basic iptables extensions for connection tracking.
+Includes:
+- state
+- raw
+- NOTRACK
+endef
+
+define Package/iptables-mod-conntrack-extra
+$(call Package/iptables/Module, +kmod-ipt-conntrack-extra)
+ TITLE:=Extra connection tracking extensions
+endef
+define Package/iptables-mod-conntrack-extra/description
+Extra 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
-
+$(call Package/iptables/Module, +kmod-ipt-filter)
+ TITLE:=Content inspection extensions
+endef
+
+define Package/iptables-mod-filter/description
+iptables extensions for packet content inspection.
+Includes:
+- libipt_string
+- 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
-
+$(call Package/iptables/Module, +kmod-ipt-imq)
+ TITLE:=IMQ support
+endef
+
+define Package/iptables-mod-imq/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
+$(call Package/iptables/Module, +kmod-ipt-ipopt)
+ TITLE:=IP/Packet option extensions
+endef
+define Package/iptables-mod-ipopt/description
+iptables extensions for matching/changing IP packet options.
+Includes:
+- libipt_CLASSIFY
+- libipt_dscp/DSCP
+- libipt_ecn/ECN
+- libipt_length
+- libipt_mac
+- libipt_mark/MARK
+- libipt_statistic
+- libipt_tcpmms
+- libipt_tos/TOS
+- 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
+$(call Package/iptables/Module, +kmod-ipt-ipsec)
+ TITLE:=IPsec extensions
+endef
+
+define Package/iptables-mod-ipsec/description
+iptables extensions for matching ipsec traffic.
+Includes:
+- libipt_ah
+- libipt_esp
+- libipt_policy
+endef
+
+define Package/iptables-mod-ipset
+$(call Package/iptables/Module, @LINUX_2_6)
+ TITLE:=IPset iptables extensions
+endef
+define Package/iptables-mod-ipset/description
+IPset iptables extensions.
+Includes:
+- libipt_set
+- libipt_SET
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
+$(call Package/iptables/Module, +kmod-ipt-nat)
+ TITLE:=Basic NAT extensions
+endef
+
+define Package/iptables-mod-nat/description
+iptables extensions for basic NAT targets.
+Includes:
+- MASQUERADE
+- SNAT
+- DNAT
+endef
+
+define Package/iptables-mod-nat-extra
+$(call Package/iptables/Module, +kmod-ipt-nat-extra)
+ TITLE:=Extra NAT extensions
+endef
+
+define Package/iptables-mod-nat-extra/description
+iptables extensions for extra NAT targets.
+Includes:
+- 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
+$(call Package/iptables/Module, +kmod-ipt-ulog)
+ TITLE:=user-space packet logging
+endef
+
+define Package/iptables-mod-ulog/description
+iptables extensions for user-space packet logging.
+Includes:
+- libipt_ULOG
+endef
+
+define Package/iptables-mod-iprange
+$(call Package/iptables/Module, +kmod-ipt-iprange)
+ TITLE:=IP range extension
+endef
+
+define Package/iptables-mod-iprange/description
+iptables extensions for matching ip ranges.
+Includes:
+- libipt_iprange
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
+$(call Package/iptables/Module, +kmod-ipt-extra)
+ TITLE:=Other extra iptables extensions
+endef
+define Package/iptables-mod-extra/description
+Other extra iptables extensions.
+Includes:
+- 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
+$(call Package/iptables/Module, )
+ TITLE:=iptables save and restore utilities
endef
define Package/ip6tables
-SECTION:=net
-CATEGORY:=Base system
-TITLE:=IPv6 firewall administration tool
+$(call Package/iptables/Default)
+ DEPENDS:=+kmod-ip6tables
+ CATEGORY:=IPv6
+ TITLE:=IPv6 firewall administration tool
+ MENU:=1
endef
+define Package/ip6tables-utils
+$(call Package/iptables/Default)
+ DEPENDS:=ip6tables
+ CATEGORY:=IPv6
+ TITLE:=ip6tables save and restore utilities
+endef
-define Build/Configure
+define Package/libiptc
+$(call Package/iptables/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=IPv4/IPv6 firewall - shared libiptc library
endef
-define Build/Compile
- chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
- mkdir -p $(PKG_INSTALL_DIR)
- $(MAKE) -C $(PKG_BUILD_DIR) \
+define Package/libxtables
+ $(call Package/iptables/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=IPv4/IPv6 firewall - shared xtables library
+endef
+
+
+TARGET_CPPFLAGS := \
+ -I$(PKG_BUILD_DIR)/include \
+ -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \
+ $(TARGET_CPPFLAGS)
+
+CONFIGURE_ARGS += \
+ --enable-shared \
+ --enable-devel \
+ --enable-ipv6 \
+ --with-kernel="$(LINUX_DIR)" \
+ --with-xtlibdir=/usr/lib/iptables
+
+IPTABLES_MAKEOPTS = \
$(TARGET_CONFIGURE_OPTS) \
- CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
- KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \
+ COPT_FLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="-rdynamic -static-libgcc" \
+ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
+ KBUILD_OUTPUT="$(LINUX_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
- all install install-devel
+ $(MAKE_TARGETS)
+
+define Build/Compile
+ $(INSTALL_DIR) $(PKG_INSTALL_DIR)
+ $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS)
+ $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) install
+ $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS)
+ $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) install
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(INSTALL_DIR) $(1)/usr/include/iptables
+ $(INSTALL_DIR) $(1)/usr/include/net/netfilter
+
+ # XXX: iptables header fixup, some headers are not installed by iptables anymore
+ $(CP) $(PKG_BUILD_DIR)/include/net/netfilter/*.h $(1)/usr/include/net/netfilter/
+ $(CP) $(PKG_BUILD_DIR)/include/iptables/*.h $(1)/usr/include/iptables/
+ $(CP) $(PKG_BUILD_DIR)/include/iptables.h $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/include/libipq/libipq.h $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/include/libipulog $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/include/libiptc $(1)/usr/include/
+
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/
endef
-
+
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
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(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/ \
+ for m in $(patsubst xt_%,ipt_%,$(IPT_BUILTIN)) $(patsubst ipt_%,xt_%,$(IPT_BUILTIN)); do \
+ if [ -f $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so ]; then \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $(1)/usr/lib/iptables/ ;\
+ fi; \
+ done \
)
- $(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)
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
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
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(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/ \
)
- $(RSTRIP) $(1)
+endef
+
+define Package/ip6tables-utils/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/
+endef
+
+define Package/libiptc/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.so* $(1)/usr/lib/
+endef
+
+define Package/libxtables/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so* $(1)/usr/lib/
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/ ; \
+ define Package/$(1)/install
+ $(INSTALL_DIR) $$(1)/usr/lib/iptables
+ for m in $(patsubst xt_%,ipt_%,$(2)) $(patsubst ipt_%,xt_%,$(2)); do \
+ if [ -f $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so ]; then \
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \
+ fi; \
done
$(3)
- $(RSTRIP) $$(1)
-endef
+ endef
-$$(eval $$(call BuildPackage,$(1)))
+ $$(eval $$(call BuildPackage,$(1)))
endef
-L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \
+L7_INSTALL:=\
+ $(INSTALL_DIR) $$(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-conntrack-extra,$(IPT_CONNTRACK_EXTRA-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-ipset,ipt_set ipt_SET))
$(eval $(call BuildPlugin,iptables-mod-nat,$(IPT_NAT-m)))
+$(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
+$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-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) \
- $(TARGET_CONFIGURE_OPTS) \
- CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \
- 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
-
+$(eval $(call BuildPackage,ip6tables-utils))
+$(eval $(call BuildPackage,libiptc))
+$(eval $(call BuildPackage,libxtables))
projects / openwrt.git / blobdiff