projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'openssl'
[openwrt.git] / package / iptables / Makefile
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 80646cd..9d6d8f8 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,15 +10,28 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
-PKG_VERSION:=1.3.8
-PKG_RELEASE:=2
+
+ifeq ($(CONFIG_LINUX_2_4),y)
+  PKG_VERSION:=1.3.8
+  PKG_RELEASE:=3
+  PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
+endif
+
+ifeq ($(CONFIG_LINUX_2_6),y)
+  PKG_VERSION:=1.4.0
+  PKG_RELEASE:=1
+  PKG_MD5SUM:=90cfa8a554a29b0b859a625e701af2a7
+endif
+
+PKG_VERSION?=<IPTABLES_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_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
+
+PATCH_DIR:=./patches/$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
@@ -33,6 +46,11 @@ define Package/iptables/Default
   URL:=http://netfilter.org/
 endef
 
+define Package/iptables/Module
+$(call Package/iptables/Default)
+  DEPENDS:=iptables $(1)
+endef
+
 define Package/iptables
 $(call Package/iptables/Default)
   TITLE:=IPv4 firewall administration tool
@@ -40,13 +58,12 @@ $(call Package/iptables/Default)
 endef
 
 define Package/iptables/conffiles
-/etc/config/firewall
+/etc/firewall.config
 /etc/firewall.user
 endef
 
 define Package/iptables-mod-conntrack
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-conntrack
+$(call Package/iptables/Module, +kmod-ipt-conntrack)
   TITLE:=connection tracking modules
 endef
 
@@ -59,39 +76,36 @@ define Package/iptables-mod-conntrack/description
 endef
 
 define Package/iptables-mod-filter
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-filter
+$(call Package/iptables/Module, +kmod-ipt-filter)
   TITLE:=filter modules
 endef
 
 define Package/iptables-mod-filter/description
  iptables extensions for packet content inspection.
- Includes: 
+ Includes:
  - libipt_ipp2p
- - libipt_layer7 
+ - libipt_layer7
 endef
 
 define Package/iptables-mod-imq
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-imq
+$(call Package/iptables/Module, +kmod-ipt-imq @!LINUX_2_6_25)
   TITLE:=IMQ support
 endef
 
 define Package/iptables-mod-imq/description
  iptables extension for IMQ support.
- Includes: 
+ Includes:
  - libipt_IMQ
 endef
 
 define Package/iptables-mod-ipopt
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-ipopt
+$(call Package/iptables/Module, +kmod-ipt-ipopt)
   TITLE:=IP/Packet option modules
 endef
 
 define Package/iptables-mod-ipopt/description
  iptables extensions for matching/changing IP packet options.\\\
- Includes: 
+ Includes:
  - libipt_CLASSIFY
  - libipt_dscp/DSCP
  - libipt_ecn/ECN
@@ -102,68 +116,63 @@ define Package/iptables-mod-ipopt/description
  - libipt_tcpmms
  - libipt_tos/TOS
  - libipt_ttl/TTL
- - libipt_unclean 
+ - libipt_unclean
 endef
 
 define Package/iptables-mod-ipsec
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-ipsec
+$(call Package/iptables/Module, +kmod-ipt-ipsec)
   TITLE:=IPSec extensions
 endef
 
 define Package/iptables-mod-ipsec/description
  iptables extensions for matching ipsec traffic.
- Includes: 
+ Includes:
  - libipt_ah
  - libipt_esp
  - libipt_policy
 endef
 
 define Package/iptables-mod-nat
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-nat
+$(call Package/iptables/Module, +kmod-ipt-nat)
   TITLE:=extra NAT targets
 endef
 
 define Package/iptables-mod-nat/description
  iptables extensions for different NAT targets.
- Includes: 
+ Includes:
  - libipt_REDIRECT
 endef
 
 define Package/iptables-mod-ulog
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-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: 
+ Includes:
  - libipt_ULOG
 endef
 
 define Package/iptables-mod-iprange
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-iprange
+$(call Package/iptables/Module, +kmod-ipt-iprange)
   TITLE:=ip range module
 endef
 
 define Package/iptables-mod-iprange/description
  iptables extensions for matching ip ranges.
- Includes: 
+ Includes:
  - libipt_iprange
 endef
 
 define Package/iptables-mod-extra
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-extra
+$(call Package/iptables/Module, +kmod-ipt-extra)
   TITLE:=other extra iptables extensions
 endef
 
 define Package/iptables-mod-extra/description
  other extra iptables extensions.
- Includes: 
+ Includes:
  - libipt_limit
  - libipt_owner
  - libipt_physdev
@@ -177,37 +186,36 @@ define Package/iptables-mod-extra/description
 endef
 
 define Package/iptables-mod-ipset
-$(call Package/iptables/Default)
-  DEPENDS:=iptables +kmod-ipt-ipset
+$(call Package/iptables/Module, +kmod-ipt-ipset)
   TITLE:=ipset iptables extension
 endef
 
 define Package/iptables-utils
-$(call Package/iptables/Default)
-  DEPENDS:=iptables
+$(call Package/iptables/Module, )
   TITLE:=iptables save and restore utilities
 endef
 
 define Package/ip6tables
 $(call Package/iptables/Default)
-  DEPENDS:=+kmod-ipv6
-  CATEGORY:=Network
+  DEPENDS:=+kmod-ip6tables
+  CATEGORY:=IPv6
   TITLE:=IPv6 firewall administration tool
+  MENU:=1
 endef
 
 define Package/ip6tables-utils
  $(call Package/iptables/Default)
  DEPENDS:=ip6tables
- CATEGORY:=Network
+ CATEGORY:=IPv6
  TITLE:=ip6tables save and restore utilities
 endef
 
 define Build/Prepare
        $(call Build/Prepare/Default)
-       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
 endef
 
 define Build/Configure
+       chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
        rm -f $(PKG_BUILD_DIR)/.configured*
        $(MAKE) -C $(PKG_BUILD_DIR) \
                clean
@@ -220,6 +228,7 @@ define Build/Compile
                COPT_FLAGS="$(TARGET_CFLAGS)" \
                LDFLAGS="-rdynamic -static-libgcc" \
                KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
+               KBUILD_OUTPUT="$(LINUX_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all experimental install install-experimental
 endef
@@ -229,27 +238,16 @@ define Build/InstallDev
                $(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
 endef
 
-define Build/UninstallDev
-       rm -rf $(1)/usr/include/libipq.h
-       rm -rf $(1)/usr/include/libipulog
-       rm -rf $(1)/usr/include/libipq
-       rm -rf $(1)/usr/include/libiptc
-       rm -rf $(1)/usr/include/linux/netfilter*
-       rm -rf $(1)/usr/include/iptables*
-       rm -rf $(1)/usr/include/ip6tables*
-       rm -rf $(1)/usr/lib/libipq.a
-       rm -rf $(1)/usr/lib/libiptc.a
-endef
-
 define Package/iptables/install
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
+       $(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/
@@ -259,7 +257,11 @@ define Package/iptables/install
        $(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 \
        )
 endef
 
@@ -285,8 +287,10 @@ 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/ ; \
+       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)
   endef
Personal OpenWRT clone
This page took 0.03732 seconds and 4 git commands to generate.