X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8afb23270d23db6a033ba8fb77e1cf1a1d925a7c..a0c3d0fe7c58c4ba580deba4347758bd8ce25cb3:/package/iptables/Makefile?ds=sidebyside diff --git a/package/iptables/Makefile b/package/iptables/Makefile index d198a9271..05ef15b1d 100644 --- 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,24 +10,35 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.3.5 -PKG_RELEASE:=1 + +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?= 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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PATCH_DIR:=./patches/$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) -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 @@ -36,145 +47,191 @@ 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) - DEFAULT:=y +$(call Package/iptables/Default) TITLE:=IPv4 firewall administration tool MENU:=1 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 - DESCRIPTION:=\ - iptables extensions for connection tracking.\\\ - \\\ - Includes: \\\ - - libipt_conntrack \\\ - - libipt_helper \\\ - - libipt_connmark/CONNMARK +endef + +define Package/iptables-mod-conntrack/description + iptables extensions for connection tracking. + Includes: + - libipt_conntrack + - libipt_helper + - libipt_connmark/CONNMARK 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 - DESCRIPTION:=\ - iptables extensions for packet content inspection.\\\ - \\\ - Includes: \\\ - - libipt_ipp2p \\\ - - libipt_layer7 +endef + +define Package/iptables-mod-filter/description + iptables extensions for packet content inspection. + Includes: + - libipt_ipp2p + - libipt_layer7 endef define Package/iptables-mod-imq - $(call Package/iptables/Default) - DEPENDS:=iptables +$(call Package/iptables/Module, +kmod-ipt-imq) TITLE:=IMQ support - DESCRIPTION:=\ - iptables extension for IMQ support.\\\ - \\\ - Includes: \\\ - - libipt_IMQ +endef + +define Package/iptables-mod-imq/description + iptables extension for IMQ support. + 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 - 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-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 - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-ipsec +$(call Package/iptables/Module, +kmod-ipt-ipsec) TITLE:=IPSec extensions - DESCRIPTION:=\ - iptables extensions for matching ipsec traffic.\\\ - \\\ - Includes: \\\ - - libipt_ah \\\ - - libipt_esp +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-nat - $(call Package/iptables/Default) - DEPENDS:=iptables +kmod-ipt-nat +$(call Package/iptables/Module, +kmod-ipt-nat) TITLE:=extra NAT targets - DESCRIPTION:=\ - iptables extensions for different NAT targets.\\\ - \\\ - Includes: \\\ - - libipt_REDIRECT +endef + +define Package/iptables-mod-nat/description + iptables extensions for different NAT targets. + 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 - DESCRIPTION:=\ - iptables extensions for user-space packet logging.\\\ - \\\ - Includes: \\\ - - libipt_ULOG +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 module +endef + +define Package/iptables-mod-iprange/description + iptables extensions for matching ip ranges. + 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 - DESCRIPTION:=\ - other extra iptables extensions.\\\ - \\\ - Includes: \\\ - - libipt_limit \\\ - - libipt_owner \\\ - - libipt_physdev \\\ - - libipt_pkttype \\\ - - libipt_recent +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 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) - CATEGORY:=Network +$(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/Prepare + $(call Build/Prepare/Default) endef define Build/Configure + chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* + rm -f $(PKG_BUILD_DIR)/.configured* + $(MAKE) -C $(PKG_BUILD_DIR) \ + clean endef define Build/Compile - chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ 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 + all install $(MAKE_TARGETS) endef define Build/InstallDev @@ -182,50 +239,59 @@ define Build/InstallDev $(TARGET_CONFIGURE_OPTS) \ 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 + 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 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)/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 (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 define Package/iptables-utils/install - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/ + $(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/ \ ) 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 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/ ; \ + $(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) endef @@ -233,17 +299,21 @@ define BuildPlugin $$(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-extra,$(IPT_EXTRA-m))) +$(eval $(call BuildPlugin,iptables-mod-ipset,$(IPT_IPSET-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-iprange,$(IPT_IPRANGE-m))) $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m))) $(eval $(call BuildPackage,ip6tables)) +$(eval $(call BuildPackage,ip6tables-utils))