projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
libiptc and libxtables should install their libraries as symbolic links (#5313, ...
[openwrt/openwrt.git] / package / iptables / Makefile
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 05ef15b1dd231dc33573dbbdf0830f314ffc103b..818e686d47b56d385920f19b4c6234c0a73de16e 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,38 +1,31 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 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 $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
+PKG_VERSION:=1.4.4
+PKG_RELEASE:=2
 
-ifeq ($(CONFIG_LINUX_2_4),y)
-  PKG_VERSION:=1.3.8
-  PKG_RELEASE:=3
-  PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
-  MAKE_TARGETS:=experimental install-experimental
-endif
-
-ifeq ($(CONFIG_LINUX_2_6),y)
-  PKG_VERSION:=1.4.0
-  PKG_RELEASE:=1
-  PKG_MD5SUM:=90cfa8a554a29b0b859a625e701af2a7
-endif
-
-PKG_VERSION?=<IPTABLES_VERSION>
-
+PKG_MD5SUM:=08cd9196881657ea0615d926334cb7e9
 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/
 
+ifeq ($(CONFIG_EXTERNAL_KERNEL_TREE),)
+PATCH_DIR:=
+else
 PATCH_DIR:=./patches/$(PKG_VERSION)
+endif
+
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
@@ -41,6 +34,7 @@ ifeq ($(DUMP),)
   STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
 endif
 
+
 define Package/iptables/Default
   SECTION:=net
   CATEGORY:=Base system
@@ -56,20 +50,38 @@ define Package/iptables
 $(call Package/iptables/Default)
   TITLE:=IPv4 firewall administration tool
   MENU:=1
+  DEPENDS+= +kmod-ipt-core +libiptc +libxtables
 endef
 
-define Package/iptables/conffiles
-/etc/firewall.config
-/etc/firewall.user
+define Package/iptables/description
+ IPv4 firewall administration tool.
+ Includes support for:
+ - limit
+ - LOG
+ - mac
+ - multiport
+ - REJECT
+ - TCPMSS
 endef
 
 define Package/iptables-mod-conntrack
 $(call Package/iptables/Module, +kmod-ipt-conntrack)
-  TITLE:=connection tracking modules
+  TITLE:=Basic connection tracking extensions
 endef
 
 define Package/iptables-mod-conntrack/description
- iptables extensions for connection tracking.
+ Basic iptables extensions for connection tracking.
+ Includes:
+ - state
+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
@@ -78,13 +90,13 @@ endef
 
 define Package/iptables-mod-filter
 $(call Package/iptables/Module, +kmod-ipt-filter)
-  TITLE:=filter modules
+  TITLE:=Content inspection extensions
 endef
 
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
  Includes:
- - libipt_ipp2p
+ - libipt_string
  - libipt_layer7
 endef
 
@@ -101,11 +113,11 @@ endef
 
 define Package/iptables-mod-ipopt
 $(call Package/iptables/Module, +kmod-ipt-ipopt)
-  TITLE:=IP/Packet option modules
+  TITLE:=IP/Packet option extensions
 endef
 
 define Package/iptables-mod-ipopt/description
- iptables extensions for matching/changing IP packet options.\\\
+ iptables extensions for matching/changing IP packet options.
  Includes:
  - libipt_CLASSIFY
  - libipt_dscp/DSCP
@@ -122,7 +134,7 @@ endef
 
 define Package/iptables-mod-ipsec
 $(call Package/iptables/Module, +kmod-ipt-ipsec)
-  TITLE:=IPSec extensions
+  TITLE:=IPsec extensions
 endef
 
 define Package/iptables-mod-ipsec/description
@@ -135,13 +147,26 @@ endef
 
 define Package/iptables-mod-nat
 $(call Package/iptables/Module, +kmod-ipt-nat)
-  TITLE:=extra NAT targets
+  TITLE:=Basic NAT extensions
 endef
 
 define Package/iptables-mod-nat/description
- iptables extensions for different NAT targets.
+ 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:
- - libipt_REDIRECT
+ - REDIRECT
 endef
 
 define Package/iptables-mod-ulog
@@ -157,7 +182,7 @@ endef
 
 define Package/iptables-mod-iprange
 $(call Package/iptables/Module, +kmod-ipt-iprange)
-  TITLE:=ip range module
+  TITLE:=IP range extension
 endef
 
 define Package/iptables-mod-iprange/description
@@ -168,27 +193,23 @@ endef
 
 define Package/iptables-mod-extra
 $(call Package/iptables/Module, +kmod-ipt-extra)
-  TITLE:=other extra iptables extensions
+  TITLE:=Other extra iptables extensions
 endef
 
 define Package/iptables-mod-extra/description
  other extra iptables extensions.
  Includes:
- - libipt_limit
  - libipt_owner
  - libipt_physdev
  - libipt_pkttype
  - libipt_recent
  - iptable_raw
  - libipt_NOTRACK
- - libipt_TARPIT
- - libipt_DELUDE
- - libipt_CHAOS
 endef
 
 define Package/iptables-mod-ipset
 $(call Package/iptables/Module, +kmod-ipt-ipset)
-  TITLE:=ipset iptables extension
+  TITLE:=IPset extension
 endef
 
 define Package/iptables-utils
@@ -205,26 +226,38 @@ $(call Package/iptables/Default)
 endef
 
 define Package/ip6tables-utils
- $(call Package/iptables/Default)
- DEPENDS:=ip6tables
- CATEGORY:=IPv6
- TITLE:=ip6tables save and restore utilities
+$(call Package/iptables/Default)
+  DEPENDS:=ip6tables
+  CATEGORY:=IPv6
+  TITLE:=ip6tables save and restore utilities
 endef
 
-define Build/Prepare
-       $(call Build/Prepare/Default)
+define Package/libiptc
+$(call Package/iptables/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IPv4/IPv6 firewall - shared libiptc library
 endef
 
-define Build/Configure
-       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
-       rm -f $(PKG_BUILD_DIR)/.configured*
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               clean
+define Package/libxtables
+ $(call Package/iptables/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=IPv4/IPv6 firewall - shared xtables library
 endef
 
-define Build/Compile
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR) \
+
+TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS)
+TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --enable-devel \
+       --enable-ipv6 \
+       --with-kernel="$(LINUX_DIR)" \
+       --with-xtlibdir=/usr/lib/iptables
+
+IPTABLES_MAKEOPTS = \
                $(TARGET_CONFIGURE_OPTS) \
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                LDFLAGS="-rdynamic -static-libgcc" \
@@ -232,28 +265,37 @@ define Build/Compile
                KBUILD_OUTPUT="$(LINUX_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install $(MAKE_TARGETS)
+
+define Build/Compile
+       mkdir -p $(PKG_INSTALL_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS)
+       $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS)
 endef
 
 define Build/InstallDev
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               COPT_FLAGS="$(TARGET_CFLAGS)" \
-               KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
-               KBUILD_OUTPUT="$(LINUX_DIR)" \
-               DESTDIR="$(1)" \
-               install-devel
-       $(CP) $(PKG_BUILD_DIR)/include $(1)/usr
-       $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib
+       mkdir -p $(1)/usr/include
+       mkdir -p $(1)/usr/include/iptables
+       mkdir -p $(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/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.{a,so*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(1)/usr/lib/
+       mkdir -p $(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_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/firewall.config $(1)/etc/
-       $(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
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/usr/lib/iptables
@@ -285,6 +327,16 @@ define Package/ip6tables-utils/install
        $(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/libiptc.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_DIR) $$(1)/usr/lib/iptables
@@ -303,9 +355,11 @@ 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-ipset,$(IPT_IPSET-m)))
 $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL)))
@@ -313,7 +367,10 @@ $(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-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))
 $(eval $(call BuildPackage,ip6tables-utils))
+$(eval $(call BuildPackage,libiptc))
+$(eval $(call BuildPackage,libxtables))
OpenWrt Source Repository