X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/79aba16c69e42498275c56a3d889a78efb22ae6d..ffbd3e61655e48e3485b22dca727ffce3786fdd5:/package/iptables/Makefile diff --git a/package/iptables/Makefile b/package/iptables/Makefile index a14d71a6f..f8f590991 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,65 +1,158 @@ # $Id$ include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.3.3 -PKG_RELEASE:=2.1 -PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4 +PKG_VERSION:=1.3.5 +PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://www.netfilter.org/files \ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5 PKG_CAT:=bzcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -define IPKG_plugin_template +PKG_MENU:=IPv4 / IPv6 firewall administration + +include $(INCLUDE_DIR)/package.mk +ifeq ($(DUMP),) +-include $(LINUX_DIR)/.config +include $(INCLUDE_DIR)/netfilter.mk +endif + +define Package/iptables +SECTION:=net +CATEGORY:=Base system +MENU:=1 +DEFAULT:=y +TITLE:=IPv4 firewall administration tool +URL:=http://netfilter.org/ +endef -$$(IPKG_$(1)): - install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables - for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ - done - $(RSTRIP) $$(IDIR_$(1)) - $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) - -endef - -include $(TOPDIR)/package/rules.mk -include $(LINUX_DIR)/.config -include $(TOPDIR)/target/linux/netfilter.mk - -$(eval $(call PKG_template,IPTABLES,iptables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_EXTRA,iptables-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(eval $(call PKG_template,IPTABLES_MOD_CONNTRACK,iptables-mod-conntrack,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_EXTRA,iptables-mod-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_FILTER,iptables-mod-filter,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_IMQ,iptables-mod-img,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_IPOPT,iptables-mod-ipopt,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_IPSEC,iptables-mod-ipsec,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_NAT,iptables-mod-nat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,IPTABLES_MOD_ULOG,iptables-mod-ulog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_CONNTRACK,$(IPKG_IPTABLES_MOD_CONNTRACK-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_EXTRA,$(IPKG_IPTABLES_MOD_EXTRA-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_FILTER,$(IPKG_IPTABLES_MOD_FILTER-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IMQ,$(IPKG_IPTABLES_MOD_IMQ-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPOPT,$(IPKG_IPTABLES_MOD_IPOPT-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPSEC,$(IPKG_IPTABLES_MOD_IPSEC-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_NAT,$(IPKG_IPTABLES_MOD_NAT-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPKG_IPTABLES_MOD_ULOG-m))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: +define Package/iptables/conffiles +/etc/config/firewall +/etc/firewall.user +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) \ @@ -68,45 +161,81 @@ $(PKG_BUILD_DIR)/.built: KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel - touch $@ +endef + + +define Build/InstallDev + $(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 +endef + +define Build/UninstallDev + rm -rf $(STAGING_DIR)/usr/include/libipq.h + rm -rf $(STAGING_DIR)/usr/lib/libipq.a +endef + -$(IPKG_IPTABLES): - install -d -m0755 $(IDIR_IPTABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ - install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables +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 -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \ ) - $(RSTRIP) $(IDIR_IPTABLES) - $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) - -$(IPKG_IPTABLES_UTILS): - install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/ - $(RSTRIP) $(IDIR_IPTABLES_UTILS) - $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR) - -$(IPKG_IP6TABLES): - install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ - install -d -m0755 $(IDIR_IP6TABLES)/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 -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ + $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ ) - $(RSTRIP) $(IDIR_IP6TABLES) - $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR) - -$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built - mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ + $(RSTRIP) $(1) +endef -install-dev: $(STAGING_DIR)/usr/lib/libipq.a +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 -uninstall-dev: - rm -rf $(STAGING_DIR)/usr/include/libipq.h - rm -rf $(STAGING_DIR)/usr/lib/libipq.a +$$(eval $$(call BuildPackage,$(1))) +endef -compile-targets: install-dev -clean-targets: uninstall-dev +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))