From f77b88d124ea1c900f9cf5e04046939aad48bbe1 Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 6 Mar 2005 03:34:52 +0000 Subject: nbd's makefile/menuconfig rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@307 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 97 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 package/iptables/Makefile (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile new file mode 100644 index 000000000..1a0c385f3 --- /dev/null +++ b/package/iptables/Makefile @@ -0,0 +1,97 @@ +include $(TOPDIR)/rules.mk +include kernelconfig.mk + +PKG_NAME := iptables +PKG_VERSION := 1.2.11 +PKG_RELEASE := 1 + +PKG_SOURCE_SITE := http://www.netfilter.org/files +PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_CAT := bzcat +PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) + +PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPT_EXTRA := $(PACKAGE_DIR)/iptables-extra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IP6T := $(PACKAGE_DIR)/ip6tables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk + +I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables +I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra +I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables + +TARGETS := $(PKG_IPT) +ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),) +TARGETS += $(PKG_IPT_EXTRA) +endif +ifneq ($(BR2_PACKAGE_IP6TABLES),) +TARGETS += $(PKG_IP6T) +endif + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + +$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) + mkdir -p $(PKG_BUILD_DIR)/modules + $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) ./patches + touch $(PKG_BUILD_DIR)/.patched + +$(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ + KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ + CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" + +$(PKG_IPT): $(PKG_BUILD_DIR)/iptables + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_IPT)/usr/sbin + cp -af $(PKG_BUILD_DIR)/iptables $(I_IPT)/usr/sbin/ + $(STRIP) $(I_IPT)/usr/sbin/iptables + mkdir -p $(I_IPT)/usr/lib/iptables + (cd $(PKG_BUILD_DIR)/extensions; \ + cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables) + -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so + mkdir -p $(I_IPT_EXTRA)/$(MODULES_SUBDIR) + cp $(MODULES_DIR)/kernel/net/ipv6/netfilter/*.o $(I_IPT_EXTRA)/$(MODULES_SUBDIR) + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR) + +$(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables + (cd $(PKG_BUILD_DIR)/extensions; \ + cp $(patsubst %,libipt_%.so,$(ext-m)) $(I_IPT_EXTRA)/usr/lib/iptables) + -$(STRIP) $(I_IPT_EXTRA)/usr/lib/iptables/*.so + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR) + +$(PKG_IP6T): $(PKG_BUILD_DIR)/iptables + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_IP6T)/usr/sbin + cp -af $(PKG_BUILD_DIR)/ip6tables $(I_IP6T)/usr/sbin/ + $(STRIP) $(I_IP6T)/usr/sbin/ip6tables + mkdir -p $(I_IP6T)/usr/lib/iptables + (cd $(PKG_BUILD_DIR)/extensions; \ + cp libip6t_*.so $(I_IP6T)/usr/lib/iptables) + -$(STRIP) $(I_IP6T)/usr/lib/iptables/*.so + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR) + + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(TARGETS) +install: compile + $(IPKG) install $(PKG_IPT) +ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) + $(IPKG) install $(PKG_IPT_EXTRA) +endif +ifeq ($(BR2_PACKAGE_IP6TABLES),y) + $(IPKG) install $(PKG_IP6T) +endif + +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_IPT) -- cgit v1.2.3 From 3af82587f3b1a1cfa76bf7990dddf0548ad7f981 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 6 Mar 2005 12:03:54 +0000 Subject: Add package install dependencies (don't install a package if it's already installed) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@315 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 1a0c385f3..67e4a2d73 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -28,6 +28,14 @@ ifneq ($(BR2_PACKAGE_IP6TABLES),) TARGETS += $(PKG_IP6T) endif +INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list +ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list +endif +ifeq ($(BR2_PACKAGE_IP6TABLES),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list +endif + $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) @@ -58,6 +66,9 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT) + $(IPKG) install $(PKG_IPT) + $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables @@ -67,6 +78,9 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT) + $(IPKG) install $(PKG_IPT_EXTRA) + $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_IP6T)/usr/sbin @@ -79,18 +93,14 @@ $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T) + $(IPKG) install $(PKG_IP6T) + source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(TARGETS) -install: compile - $(IPKG) install $(PKG_IPT) -ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) - $(IPKG) install $(PKG_IPT_EXTRA) -endif -ifeq ($(BR2_PACKAGE_IP6TABLES),y) - $(IPKG) install $(PKG_IP6T) -endif +install: $(INSTALL_TARGETS) clean: rm -rf $(PKG_BUILD_DIR) -- cgit v1.2.3 From 3d41e84381b583e8ba11ebb15add5a4b3007e1f8 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 6 Mar 2005 14:35:58 +0000 Subject: Remove packages when cleaning git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@319 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 67e4a2d73..b0c1f7786 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -104,4 +104,4 @@ install: $(INSTALL_TARGETS) clean: rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPT) + rm -f $(PKG_IPT) $(PKG_IPT_EXTRA) $(PKG_IP6T) -- cgit v1.2.3 From e2e9de6991ee6191dedf306502f01438b03721ee Mon Sep 17 00:00:00 2001 From: nico Date: Tue, 8 Mar 2005 01:22:14 +0000 Subject: Remove ip6t_* kernel modules from iptables-extra package git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@346 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index b0c1f7786..f8c0723a7 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -61,8 +61,6 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables (cd $(PKG_BUILD_DIR)/extensions; \ cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables) -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so - mkdir -p $(I_IPT_EXTRA)/$(MODULES_SUBDIR) - cp $(MODULES_DIR)/kernel/net/ipv6/netfilter/*.o $(I_IPT_EXTRA)/$(MODULES_SUBDIR) mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR) -- cgit v1.2.3 From 9422e6ad7be3cc57c95efea2ed2e5b719c04382a Mon Sep 17 00:00:00 2001 From: wbx Date: Wed, 16 Mar 2005 14:50:52 +0000 Subject: use another mirror, this mirror is down git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@381 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f8c0723a7..c50c4bdb3 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk include kernelconfig.mk PKG_NAME := iptables -PKG_VERSION := 1.2.11 +PKG_VERSION := 1.3.0 PKG_RELEASE := 1 PKG_SOURCE_SITE := http://www.netfilter.org/files -- cgit v1.2.3 From 0d52ac0f6a06a36bc0f0316b8593f1f8dc3a8a53 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Mar 2005 22:51:51 +0000 Subject: add downloading script (with md5sum checking and sourceforge downloading support) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@391 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index c50c4bdb3..910864583 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -38,7 +38,7 @@ endif $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(PKG_BUILD_DIR)/modules -- cgit v1.2.3 From df1d9706f4e8dc21c18dd210c16cef8620ca7efe Mon Sep 17 00:00:00 2001 From: wbx Date: Mon, 21 Mar 2005 08:12:49 +0000 Subject: add md5sums git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@405 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 910864583..ffaef0058 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,9 +1,12 @@ +# $Id$ + include $(TOPDIR)/rules.mk include kernelconfig.mk PKG_NAME := iptables PKG_VERSION := 1.3.0 PKG_RELEASE := 1 +PKG_MD5SUM := a072c0f09f1b289cb7af56f76407d033 PKG_SOURCE_SITE := http://www.netfilter.org/files PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -38,7 +41,7 @@ endif $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(PKG_BUILD_DIR)/modules -- cgit v1.2.3 From e86b34ebb9045210b2b9db63997c065221692b42 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 25 Mar 2005 00:00:29 +0000 Subject: add package for iptables-save and -restore git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@452 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ffaef0058..d9c0c585d 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -16,14 +16,19 @@ PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPT_UTILS := $(PACKAGE_DIR)/iptables-utils_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPT_EXTRA := $(PACKAGE_DIR)/iptables-extra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IP6T := $(PACKAGE_DIR)/ip6tables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables +I_IPT_UTILS := $(PKG_BUILD_DIR)/ipkg/iptables-utils I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables TARGETS := $(PKG_IPT) +ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),) +TARGETS += $(PKG_IPT_UTILS) +endif ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),) TARGETS += $(PKG_IPT_EXTRA) endif @@ -32,6 +37,9 @@ TARGETS += $(PKG_IP6T) endif INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list +ifeq ($(BR2_PACKAGE_IPTABLES_UTILS),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-utils.list +endif ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list endif @@ -82,6 +90,18 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables $(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT) $(IPKG) install $(PKG_IPT_EXTRA) +$(PKG_IPT_UTILS): $(PKG_BUILD_DIR)/iptables + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_UTILS) control/iptables-utils.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_IPT_UTILS)/usr/sbin + cp $(PKG_BUILD_DIR)/iptables-save $(I_IPT_UTILS)/usr/sbin + cp $(PKG_BUILD_DIR)/iptables-restore $(I_IPT_UTILS)/usr/sbin + -$(STRIP) $(I_IPT_UTILS)/usr/sbin/* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(I_IPT_UTILS) $(PACKAGE_DIR) + +$(IPKG_STATE_DIR)/info/iptables-utils.list: $(PKG_IPT) + $(IPKG) install $(PKG_IPT_UTILS) + $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_IP6T)/usr/sbin -- cgit v1.2.3 From 43a119e79dafcb2eba0d2df6c51d562514576316 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 1 Apr 2005 20:43:11 +0000 Subject: update iptables to 1.3.1 and build/copy libipq.a+includes git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@510 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index d9c0c585d..401835379 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk include kernelconfig.mk PKG_NAME := iptables -PKG_VERSION := 1.3.0 +PKG_VERSION := 1.3.1 PKG_RELEASE := 1 -PKG_MD5SUM := a072c0f09f1b289cb7af56f76407d033 +PKG_MD5SUM := c3358a3bd0d7755df0b64a5063db296b PKG_SOURCE_SITE := http://www.netfilter.org/files PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -25,7 +25,7 @@ I_IPT_UTILS := $(PKG_BUILD_DIR)/ipkg/iptables-utils I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables -TARGETS := $(PKG_IPT) +TARGETS := $(STAGING_DIR)/libipq/libipq.a $(PKG_IPT) ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),) TARGETS += $(PKG_IPT_UTILS) endif @@ -62,6 +62,15 @@ $(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched $(MAKE) -C $(PKG_BUILD_DIR) \ KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" + +$(STAGING_DIR)/libipq/libipq.a: $(PKG_BUILD_DIR)/iptables + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ + KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ + CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \ + libipq/libipq.a + cp -a $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/include/ + cp $(PKG_BUILD_DIR)/libipq/libipq.a $(STAGING_DIR)/lib/ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) -- cgit v1.2.3 From 13857111c1abe14e71dff1c6fc7f54801f085d87 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 21 Apr 2005 18:30:58 +0000 Subject: copy libiptc.a to staging dir git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@700 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 401835379..2f12dbd1f 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -71,6 +71,7 @@ $(STAGING_DIR)/libipq/libipq.a: $(PKG_BUILD_DIR)/iptables libipq/libipq.a cp -a $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/include/ cp $(PKG_BUILD_DIR)/libipq/libipq.a $(STAGING_DIR)/lib/ + cp $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/lib/ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) -- cgit v1.2.3 From 514499f319982ecc7b6c9c0d2302f54404ea2a6b Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 18 May 2005 10:40:10 +0000 Subject: Convert iptables to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@922 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 193 ++++++++++++++++------------------------------ 1 file changed, 68 insertions(+), 125 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 2f12dbd1f..29dcf6cdf 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -3,136 +3,79 @@ include $(TOPDIR)/rules.mk include kernelconfig.mk -PKG_NAME := iptables -PKG_VERSION := 1.3.1 -PKG_RELEASE := 1 -PKG_MD5SUM := c3358a3bd0d7755df0b64a5063db296b +PKG_NAME:=iptables +PKG_VERSION:=1.3.1 +PKG_RELEASE:=1 +PKG_MD5SUM:=c3358a3bd0d7755df0b64a5063db296b -PKG_SOURCE_SITE := http://www.netfilter.org/files -PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_CAT := bzcat -PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://www.netfilter.org/files +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_CAT:=bzcat -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_IPT := $(PACKAGE_DIR)/iptables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPT_UTILS := $(PACKAGE_DIR)/iptables-utils_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPT_EXTRA := $(PACKAGE_DIR)/iptables-extra_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IP6T := $(PACKAGE_DIR)/ip6tables_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +include $(TOPDIR)/package/rules.mk -I_IPT := $(PKG_BUILD_DIR)/ipkg/iptables -I_IPT_UTILS := $(PKG_BUILD_DIR)/ipkg/iptables-utils -I_IPT_EXTRA := $(PKG_BUILD_DIR)/ipkg/iptables-extra -I_IP6T := $(PKG_BUILD_DIR)/ipkg/ip6tables +$(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))) -TARGETS := $(STAGING_DIR)/libipq/libipq.a $(PKG_IPT) -ifneq ($(BR2_PACKAGE_IPTABLES_UTILS),) -TARGETS += $(PKG_IPT_UTILS) -endif -ifneq ($(BR2_PACKAGE_IPTABLES_EXTRA),) -TARGETS += $(PKG_IPT_EXTRA) -endif -ifneq ($(BR2_PACKAGE_IP6TABLES),) -TARGETS += $(PKG_IP6T) -endif - -INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list -ifeq ($(BR2_PACKAGE_IPTABLES_UTILS),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-utils.list -endif -ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list -endif -ifeq ($(BR2_PACKAGE_IP6TABLES),y) -INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list -endif - -$(DL_DIR)/$(PKG_SOURCE_FILE): - mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) - -$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) - mkdir -p $(PKG_BUILD_DIR)/modules - $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.patched - -$(PKG_BUILD_DIR)/iptables: $(PKG_BUILD_DIR)/.patched - $(TARGET_CONFIGURE_OPTS) \ +$(PKG_BUILD_DIR)/.built: + chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ - CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install install-devel + touch $(PKG_BUILD_DIR)/.built -$(STAGING_DIR)/libipq/libipq.a: $(PKG_BUILD_DIR)/iptables - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(PKG_BUILD_DIR) \ - KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ - CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \ - libipq/libipq.a - cp -a $(PKG_BUILD_DIR)/include/* $(STAGING_DIR)/include/ - cp $(PKG_BUILD_DIR)/libipq/libipq.a $(STAGING_DIR)/lib/ - cp $(PKG_BUILD_DIR)/libiptc/libiptc.a $(STAGING_DIR)/lib/ - -$(PKG_IPT): $(PKG_BUILD_DIR)/iptables - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT) control/iptables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_IPT)/usr/sbin - cp -af $(PKG_BUILD_DIR)/iptables $(I_IPT)/usr/sbin/ - $(STRIP) $(I_IPT)/usr/sbin/iptables - mkdir -p $(I_IPT)/usr/lib/iptables - (cd $(PKG_BUILD_DIR)/extensions; \ - cp $(patsubst %,libipt_%.so,$(ext-y)) $(I_IPT)/usr/lib/iptables) - -$(STRIP) $(I_IPT)/usr/lib/iptables/*.so - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT) - $(IPKG) install $(PKG_IPT) - -$(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables - (cd $(PKG_BUILD_DIR)/extensions; \ - cp $(patsubst %,libipt_%.so,$(ext-m)) $(I_IPT_EXTRA)/usr/lib/iptables) - -$(STRIP) $(I_IPT_EXTRA)/usr/lib/iptables/*.so - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT) - $(IPKG) install $(PKG_IPT_EXTRA) - -$(PKG_IPT_UTILS): $(PKG_BUILD_DIR)/iptables - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_UTILS) control/iptables-utils.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_IPT_UTILS)/usr/sbin - cp $(PKG_BUILD_DIR)/iptables-save $(I_IPT_UTILS)/usr/sbin - cp $(PKG_BUILD_DIR)/iptables-restore $(I_IPT_UTILS)/usr/sbin - -$(STRIP) $(I_IPT_UTILS)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(I_IPT_UTILS) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/iptables-utils.list: $(PKG_IPT) - $(IPKG) install $(PKG_IPT_UTILS) - -$(PKG_IP6T): $(PKG_BUILD_DIR)/iptables - $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(I_IP6T)/usr/sbin - cp -af $(PKG_BUILD_DIR)/ip6tables $(I_IP6T)/usr/sbin/ - $(STRIP) $(I_IP6T)/usr/sbin/ip6tables - mkdir -p $(I_IP6T)/usr/lib/iptables - (cd $(PKG_BUILD_DIR)/extensions; \ - cp libip6t_*.so $(I_IP6T)/usr/lib/iptables) - -$(STRIP) $(I_IP6T)/usr/lib/iptables/*.so - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T) - $(IPKG) install $(PKG_IP6T) - - -source: $(DL_DIR)/$(PKG_SOURCE_FILE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(TARGETS) -install: $(INSTALL_TARGETS) - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPT) $(PKG_IPT_EXTRA) $(PKG_IP6T) +$(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 + (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ + cp -fpR $(patsubst %,libipt_%.so,$(ext-y)) $(IDIR_IPTABLES)/usr/lib/iptables \ + ) + $(RSTRIP) $(IDIR_IPTABLES) + $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) + +$(IPKG_IPTABLES_EXTRA): + install -d -m0755 $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables + (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ + cp -fpR $(patsubst %,libipt_%.so,$(ext-m)) $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables \ + ) + $(RSTRIP) $(IDIR_IPTABLES_EXTRA) + $(IPKG_BUILD) $(IDIR_IPTABLES_EXTRA) $(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 + (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ + cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables \ + ) + $(RSTRIP) $(IDIR_IP6TABLES) + $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR) + +$(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built + cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ + +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: install-dev +clean: uninstall-dev -- cgit v1.2.3 From 5b67cab61f22ec25c8ad42836c74b087c9b823a5 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 18 May 2005 14:47:16 +0000 Subject: Add missing .configured target causing superfluous package rebuild git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@934 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 29dcf6cdf..3e84c4ce1 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -22,6 +22,9 @@ $(eval $(call PKG_template,IPTABLES_EXTRA,iptables-extra,$(PKG_VERSION)-$(PKG_RE $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(PKG_BUILD_DIR)/.configured: + touch $(PKG_BUILD_DIR)/.configured + $(PKG_BUILD_DIR)/.built: chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test mkdir -p $(PKG_INSTALL_DIR) -- cgit v1.2.3 From 3d8574e618b181a0d6a9e3b83a4f1d4ec6a015e6 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 19 May 2005 19:38:05 +0000 Subject: fix libipq install if staging dir doesn't contain usr/lib and usr/include yet git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@959 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 3e84c4ce1..c9743fbed 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -71,6 +71,7 @@ $(IPKG_IP6TABLES): $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/usr/include/ $(STAGING_DIR)/usr/lib/ cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ -- cgit v1.2.3 From 08fd6bda6451b3dff2cd82cfde6f5393a1018dd5 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 19 May 2005 21:22:09 +0000 Subject: Cosmetic fix git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@973 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index c9743fbed..c81a345ff 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RE $(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_IPTABLES): install -d -m0755 $(IDIR_IPTABLES)/usr/sbin -- cgit v1.2.3 From 517b88510e4180d8b1f095dab9886f526a2f47f8 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 6 Jun 2005 15:47:13 +0000 Subject: Add some mirrors git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1162 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index c81a345ff..b9f7d552b 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -8,7 +8,10 @@ PKG_VERSION:=1.3.1 PKG_RELEASE:=1 PKG_MD5SUM:=c3358a3bd0d7755df0b64a5063db296b -PKG_SOURCE_URL:=http://www.netfilter.org/files +PKG_SOURCE_URL:=http://www.netfilter.org/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_CAT:=bzcat -- cgit v1.2.3 From 82d17c1f5d609eba2d51a9be0d3d5028cfd124d9 Mon Sep 17 00:00:00 2001 From: kaloz Date: Thu, 20 Oct 2005 16:28:47 +0000 Subject: update iptables to v1.3.3 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2197 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index b9f7d552b..968f597ac 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk include kernelconfig.mk PKG_NAME:=iptables -PKG_VERSION:=1.3.1 +PKG_VERSION:=1.3.3 PKG_RELEASE:=1 -PKG_MD5SUM:=c3358a3bd0d7755df0b64a5063db296b +PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4 PKG_SOURCE_URL:=http://www.netfilter.org/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ -- cgit v1.2.3 From 6b53157103d462f7ea0b81f9fe77412719ea2260 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Oct 2005 12:12:59 +0000 Subject: lots of small package changes and dependency cleanups for the V= stuff git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2230 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 968f597ac..e40fa8e7d 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -84,5 +84,5 @@ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/libipq.h rm -rf $(STAGING_DIR)/usr/lib/libipq.a -compile: install-dev -clean: uninstall-dev +compile-targets: install-dev +clean-targets: uninstall-dev -- cgit v1.2.3 From 79aba16c69e42498275c56a3d889a78efb22ae6d Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 11 Nov 2005 21:15:16 +0000 Subject: backport iptables extension split introduced by changeset:2412 (fix ticket:40), bump trunk release number git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2435 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 54 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 15 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index e40fa8e7d..a14d71a6f 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,11 +1,10 @@ # $Id$ include $(TOPDIR)/rules.mk -include kernelconfig.mk PKG_NAME:=iptables PKG_VERSION:=1.3.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2.1 PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4 PKG_SOURCE_URL:=http://www.netfilter.org/files \ @@ -18,18 +17,50 @@ PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +define IPKG_plugin_template + +$$(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: - chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test + chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ @@ -44,22 +75,14 @@ $(IPKG_IPTABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,libipt_%.so,$(ext-y)) $(IDIR_IPTABLES)/usr/lib/iptables \ + cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) -$(IPKG_IPTABLES_EXTRA): - install -d -m0755 $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables - (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,libipt_%.so,$(ext-m)) $(IDIR_IPTABLES_EXTRA)/usr/lib/iptables \ - ) - $(RSTRIP) $(IDIR_IPTABLES_EXTRA) - $(IPKG_BUILD) $(IDIR_IPTABLES_EXTRA) $(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 + 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) @@ -68,14 +91,15 @@ $(IPKG_IP6TABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables \ + cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/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/ $(STAGING_DIR)/usr/lib/ + 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/ install-dev: $(STAGING_DIR)/usr/lib/libipq.a -- cgit v1.2.3 From b3deee783fa94af0242324cf2e9d2c7161311051 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 11 Nov 2005 23:54:30 +0000 Subject: fix iptables package git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2442 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index a14d71a6f..f54481c05 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptables PKG_VERSION:=1.3.3 -PKG_RELEASE:=2.1 +PKG_RELEASE:=2 PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4 PKG_SOURCE_URL:=http://www.netfilter.org/files \ @@ -75,7 +75,7 @@ $(IPKG_IPTABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y) ipt_standard) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) -- cgit v1.2.3 From 80accc63e96d4e269cabc6089b102b3d88482e9d Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 12 Nov 2005 11:53:55 +0000 Subject: port iptables fix introduced by changeset:2447 to trunk git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2448 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f54481c05..cdbb866a0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -75,7 +75,7 @@ $(IPKG_IPTABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y) ipt_standard) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) -- cgit v1.2.3 From def1f28f94261a2b04fa824241cb97e05982d5d1 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 18 Nov 2005 16:17:27 +0000 Subject: add layer7 patterns to iptables-mod-filter git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2519 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index cdbb866a0..2430a967e 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -24,6 +24,7 @@ $$(IPKG_$(1)): for m in $(2); do \ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ done + @[ -z "$(3)" ] || $(MAKE) $(3) $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) @@ -49,7 +50,7 @@ $(eval $(call PKG_template,IPTABLES_MOD_ULOG,iptables-mod-ulog,$(PKG_VERSION)-$( $(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_FILTER,$(IPKG_IPTABLES_MOD_FILTER-m),layer7-install)) $(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))) @@ -102,6 +103,10 @@ $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/lib cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ +layer7-install: + mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols + cp files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ + install-dev: $(STAGING_DIR)/usr/lib/libipq.a uninstall-dev: -- cgit v1.2.3 From 50b1e1e13ce20e93e0cd762f055afc3d400f1923 Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 7 Dec 2005 04:50:51 +0000 Subject: merge netfilter modules and iptables extensions variables git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2585 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 2430a967e..aa76136f2 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -48,14 +48,14 @@ $(eval $(call PKG_template,IPTABLES_MOD_IPSEC,iptables-mod-ipsec,$(PKG_VERSION)- $(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),layer7-install)) -$(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))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_CONNTRACK,$(IPT_CONNTRACK-m))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_EXTRA,$(IPT_EXTRA-m))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_FILTER,$(IPT_FILTER-m),layer7-install)) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IMQ,$(IPT_IMQ-m))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPOPT,$(IPT_IPOPT-m))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPSEC,$(IPT_IPSEC-m))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_NAT,$(IPT_NAT-m))) +$(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPT_ULOG-m))) $(PKG_BUILD_DIR)/.configured: touch $@ @@ -76,7 +76,7 @@ $(IPKG_IPTABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + cp -fpR $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) -- cgit v1.2.3 From 2732c8d75c9680b7f89ebf6f5bed6dcc4dfef868 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 9 Dec 2005 11:35:06 +0000 Subject: build the transitional iptables-extra meta-package too (port of changeset:2558) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2609 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index aa76136f2..2715c3144 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -81,6 +81,9 @@ $(IPKG_IPTABLES): $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) +$(IPKG_IPTABLES_EXTRA): + $(IPKG_BUILD) $(IDIR_IPTABLES_EXTRA) $(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/ -- cgit v1.2.3 From 0416a581092e60644617c772dad382830bb2a486 Mon Sep 17 00:00:00 2001 From: kaloz Date: Thu, 15 Dec 2005 09:05:57 +0000 Subject: add my 2.6.15-rc5 port (yay) with devfs. The PCI subsystem is broken on Broadcom boards, we are working on it. Also upgrade iptables to 1.3.4 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2683 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 2715c3144..777d46472 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -3,11 +3,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptables -PKG_VERSION:=1.3.3 -PKG_RELEASE:=2 -PKG_MD5SUM:=86d88455520cfdc56fd7ae27897a80a4 +PKG_VERSION:=1.3.4 +PKG_RELEASE:=1 +PKG_MD5SUM:=fdff8abe890807968226b0c374335305 -PKG_SOURCE_URL:=http://www.netfilter.org/files \ +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/ -- cgit v1.2.3 From 1d172228181f3add9c5e9f08019f97e2b8c93bda Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 31 Jan 2006 14:16:05 +0000 Subject: fix typo (#268) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3088 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 777d46472..ed46df259 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -42,7 +42,7 @@ $(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(A $(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_IMQ,iptables-mod-imq,$(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))) -- cgit v1.2.3 From 82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 1 Feb 2006 23:53:19 +0000 Subject: change cp to $(CP) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ed46df259..1792fe37c 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -22,7 +22,7 @@ define IPKG_plugin_template $$(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/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ done @[ -z "$(3)" ] || $(MAKE) $(3) $(RSTRIP) $$(IDIR_$(1)) @@ -73,10 +73,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPTABLES): install -d -m0755 $(IDIR_IPTABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) @@ -86,29 +86,29 @@ $(IPKG_IPTABLES_EXTRA): $(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/ + $(CP) $(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/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ + $(CP) libip6t_*.so $(IDIR_IP6TABLES)/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/ + $(CP) $(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/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ layer7-install: mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols - cp files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ + $(CP) files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ install-dev: $(STAGING_DIR)/usr/lib/libipq.a -- cgit v1.2.3 From 9df6aa8200ebc589fe010b66c5ff22a01ff9481b Mon Sep 17 00:00:00 2001 From: kaloz Date: Wed, 22 Mar 2006 11:43:35 +0000 Subject: upgrade to iptables 1.3.5 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3448 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 1792fe37c..38eb90718 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptables -PKG_VERSION:=1.3.4 +PKG_VERSION:=1.3.5 PKG_RELEASE:=1 -PKG_MD5SUM:=fdff8abe890807968226b0c374335305 +PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ -- cgit v1.2.3 From fc7fc2443ee427cdefe8a4b18a4514b36a3cc8f7 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 2 Apr 2006 21:59:18 +0000 Subject: map xt_ to ipt_ for iptables modules git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3586 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 38eb90718..298a9a9e0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -21,7 +21,7 @@ define IPKG_plugin_template $$(IPKG_$(1)): install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables - for m in $(2); do \ + for m in $$(patsubst xt_%,ipt_%,$(2)); do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ done @[ -z "$(3)" ] || $(MAKE) $(3) @@ -76,7 +76,7 @@ $(IPKG_IPTABLES): $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) -- cgit v1.2.3 From 676c017ecfced2e37aeec176f8aa6b9df90024f3 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 5 Apr 2006 02:09:22 +0000 Subject: large init script cleanup and merge of whiterussian changes, new dnsmasq config handling git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3588 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 298a9a9e0..f16ac8be4 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -72,6 +72,13 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_IPTABLES): + install -d -m0755 $(IDIR_IPTABLES)/etc/config + install -m0644 ./files/firewall.config $(IDIR_IPTABLES)/etc/config/firewall + install -d -m0755 $(IDIR_IPTABLES)/etc/init.d + install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall + install -m0755 ./files/firewall.user $(IDIR_IPTABLES)/etc/ + install -d -m0755 $(IDIR_IPTABLES)/usr/lib + install -m0644 ./files/firewall.awk $(IDIR_IPTABLES)/usr/lib install -d -m0755 $(IDIR_IPTABLES)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables -- cgit v1.2.3 From f60359fc31b33cbd555479093d1c737c025514a2 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 14 Apr 2006 04:27:05 +0000 Subject: port iptables to new config format, change handling of TITLE and DESCRIPTION git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3647 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 254 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 178 insertions(+), 76 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f16ac8be4..ded4816b2 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -17,50 +17,129 @@ PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -define IPKG_plugin_template - -$$(IPKG_$(1)): - install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables - for m in $$(patsubst xt_%,ipt_%,$(2)); do \ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ - done - @[ -z "$(3)" ] || $(MAKE) $(3) - $(RSTRIP) $$(IDIR_$(1)) - $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) - -endef +PKG_MENU:=IPv4 / IPv6 firewall administration 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-imq,$(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,$(IPT_CONNTRACK-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_EXTRA,$(IPT_EXTRA-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_FILTER,$(IPT_FILTER-m),layer7-install)) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IMQ,$(IPT_IMQ-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPOPT,$(IPT_IPOPT-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_IPSEC,$(IPT_IPSEC-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_NAT,$(IPT_NAT-m))) -$(eval $(call IPKG_plugin_template,IPTABLES_MOD_ULOG,$(IPT_ULOG-m))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: +define Package/iptables +SECTION:=net +CATEGORY:=Base system +TITLE:=IPv4 firewall administration tool +endef + +define Package/iptables-mod-conntrack +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=iptables extensions for connection tracking +DESCRIPTION:=Includes: \\\ + * libipt_conntrack \\\ + * libipt_helper \\\ + * libipt_connmark/CONNMARK + +endef + +define Package/iptables-mod-filter +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=iptables extensions for packet content inspection +DESCRIPTION:=Includes: \\\ + * libipt_ipp2p \\\ + * libipt_layer7 + +endef + +define Package/iptables-mod-imq +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=iptables extension for IMQ support +DESCRIPTION:=Includes: \\\ + * libipt_IMQ + +endef + +define Package/iptables-mod-ipopt +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=iptables extensions for matching/changing IP packet options +DESCRIPTION:=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:=iptables extensions for matching ipsec traffic +DESCRIPTION:=Includes: \\\ + * libipt_ah \\\ + * libipt_esp + +endef + +define Package/iptables-mod-nat +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=iptables extensions for different NAT targets +DESCRIPTION:=Includes: \\\ + * libipt_REDIRECT +endef + +define Package/iptables-mod-ulog +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=iptables extensions for user-space packet logging +DESCRIPTION:=Includes: \\\ + * libipt_ULOG +endef + +define Package/iptables-mod-extra +SECTION:=net +CATEGORY:=Base system +DEPENDS:=iptables +TITLE:=other extra iptables extensions +DESCRIPTION:=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) \ @@ -69,43 +148,70 @@ $(PKG_BUILD_DIR)/.built: KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel - touch $@ +endef -$(IPKG_IPTABLES): - install -d -m0755 $(IDIR_IPTABLES)/etc/config - install -m0644 ./files/firewall.config $(IDIR_IPTABLES)/etc/config/firewall - install -d -m0755 $(IDIR_IPTABLES)/etc/init.d - install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall - install -m0755 ./files/firewall.user $(IDIR_IPTABLES)/etc/ - install -d -m0755 $(IDIR_IPTABLES)/usr/lib - install -m0644 ./files/firewall.awk $(IDIR_IPTABLES)/usr/lib - install -d -m0755 $(IDIR_IPTABLES)/usr/sbin - $(CP) $(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) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(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_EXTRA): - $(IPKG_BUILD) $(IDIR_IPTABLES_EXTRA) $(PACKAGE_DIR) - -$(IPKG_IPTABLES_UTILS): - install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin - $(CP) $(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) $(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) libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ + $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ ) - $(RSTRIP) $(IDIR_IP6TABLES) - $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR) + $(RSTRIP) $(1) +endef + +$(eval $(call BuildPackage,iptables)) +$(eval $(call BuildPackage,iptables-utils)) +$(eval $(call BuildPackage,ip6tables)) + +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 + +$$(eval $$(call BuildPackage,$(1))) +endef + +L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \ + $(CP) files/l7/*.pat $$(1)/etc/l7-protocols/ + +$(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))) + $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include @@ -113,15 +219,11 @@ $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ -layer7-install: - mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols - $(CP) files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ - 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 + -- cgit v1.2.3 From 902fd8c8a3efe49f53b10224c33b431789bf64d3 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 19 Apr 2006 23:14:13 +0000 Subject: bugfix in package/rules.mk, add support for dumping package information with make DUMP=1 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3674 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ded4816b2..56ab59417 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -20,13 +20,16 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_MENU:=IPv4 / IPv6 firewall administration include $(TOPDIR)/package/rules.mk +ifeq ($(DUMP),) include $(LINUX_DIR)/.config include $(TOPDIR)/target/linux/netfilter.mk +endif define Package/iptables SECTION:=net CATEGORY:=Base system TITLE:=IPv4 firewall administration tool +URL:=http://netfilter.org/ endef define Package/iptables-mod-conntrack -- cgit v1.2.3 From 096afa4e695916a8068c82af6807f9b6de587c38 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Apr 2006 00:12:18 +0000 Subject: more cleanups and a new menuconfig generator git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3685 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 56ab59417..cc7c84a0d 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -28,6 +28,8 @@ endif define Package/iptables SECTION:=net CATEGORY:=Base system +MENU:=1 +DEFAULT:=y TITLE:=IPv4 firewall administration tool URL:=http://netfilter.org/ endef @@ -186,10 +188,6 @@ define Package/ip6tables/install $(RSTRIP) $(1) endef -$(eval $(call BuildPackage,iptables)) -$(eval $(call BuildPackage,iptables-utils)) -$(eval $(call BuildPackage,ip6tables)) - define BuildPlugin define Package/$(1)/install install -m0755 -d $$(1)/usr/lib/iptables @@ -206,6 +204,8 @@ endef 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))) @@ -214,6 +214,7 @@ $(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)) $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built -- cgit v1.2.3 From b762affd8ed7a8baf8c62b7fee2c3e1358187eaf Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Apr 2006 00:37:58 +0000 Subject: clean up package titles/descriptions git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3686 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index cc7c84a0d..bca061061 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -38,8 +38,9 @@ define Package/iptables-mod-conntrack SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extensions for connection tracking -DESCRIPTION:=Includes: \\\ +TITLE:=connection tracking modules +DESCRIPTION:=iptables extensions for connection tracking \\\ +Includes: \\\ * libipt_conntrack \\\ * libipt_helper \\\ * libipt_connmark/CONNMARK @@ -50,8 +51,9 @@ define Package/iptables-mod-filter SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extensions for packet content inspection -DESCRIPTION:=Includes: \\\ +TITLE:=filter modules +DESCRIPTION:=iptables extensions for packet content inspection\\\ +Includes: \\\ * libipt_ipp2p \\\ * libipt_layer7 @@ -61,8 +63,9 @@ define Package/iptables-mod-imq SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extension for IMQ support -DESCRIPTION:=Includes: \\\ +TITLE:=IMQ support +DESCRIPTION:=iptables extension for IMQ support\\\ +Includes: \\\ * libipt_IMQ endef @@ -71,8 +74,9 @@ define Package/iptables-mod-ipopt SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extensions for matching/changing IP packet options -DESCRIPTION:=Includes: \\\ +TITLE:=IP/Packet option modules +DESCRIPTION:=iptables extensions for matching/changing IP packet options\\\ +Includes: \\\ * libipt_dscp/DSCP \\\ * libipt_ecn/ECN \\\ * libipt_length \\\ @@ -88,8 +92,9 @@ define Package/iptables-mod-ipsec SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extensions for matching ipsec traffic -DESCRIPTION:=Includes: \\\ +TITLE:=IPSec extensions +DESCRIPTION:=iptables extensions for matching ipsec traffic\\\ +Includes: \\\ * libipt_ah \\\ * libipt_esp @@ -99,8 +104,9 @@ define Package/iptables-mod-nat SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extensions for different NAT targets -DESCRIPTION:=Includes: \\\ +TITLE:=extra NAT targets +DESCRIPTION:=iptables extensions for different NAT targets\\\ +Includes: \\\ * libipt_REDIRECT endef @@ -108,8 +114,9 @@ define Package/iptables-mod-ulog SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=iptables extensions for user-space packet logging -DESCRIPTION:=Includes: \\\ +TITLE:=user-space packet logging +DESCRIPTION:=iptables extensions for user-space packet logging\\\ +Includes: \\\ * libipt_ULOG endef @@ -118,7 +125,8 @@ SECTION:=net CATEGORY:=Base system DEPENDS:=iptables TITLE:=other extra iptables extensions -DESCRIPTION:=Includes: \\\ +DESCRIPTION:=other extra iptables extensions\\\ +Includes: \\\ * libipt_limit \\\ * libipt_owner \\\ * libipt_physdev \\\ -- cgit v1.2.3 From 84d7130264baa58902745ae7424045af440ccb11 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 29 Apr 2006 21:43:26 +0000 Subject: install more iptables development stuff into the staging dir git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3713 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index bca061061..fc57f9c70 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -226,10 +226,12 @@ $(eval $(call BuildPackage,ip6tables)) $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ + $(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: -- cgit v1.2.3 From 8b58b43391b17c924d98b21775ecd0d67922b001 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 29 May 2006 01:41:59 +0000 Subject: cosmetic change to standardize layout. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3836 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index fc57f9c70..ae2adcfa0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,16 +5,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iptables PKG_VERSION:=1.3.5 PKG_RELEASE:=1 -PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5 +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 PKG_MENU:=IPv4 / IPv6 firewall administration -- cgit v1.2.3 From c1bae219c1beaf44b2c71bcc3572707c8afa0069 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 31 May 2006 13:00:11 +0000 Subject: add missing BuildPackage lines, convert install-dev: to Build/InstallDev git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3857 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ae2adcfa0..4c547be99 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -162,6 +162,22 @@ define Build/Compile DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel 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 + define Package/iptables/install install -d -m0755 $(1)/etc/config @@ -223,21 +239,3 @@ $(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)) - - -$(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 - -- cgit v1.2.3 From d0dbee9899edf0ba58bd75b8cd1727b09e1142fd Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 31 May 2006 16:41:31 +0000 Subject: fix iptables build git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3867 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 4c547be99..34e681743 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,6 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk +include $(TOPDIR)/package/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.3.5 -- cgit v1.2.3 From e37fde9a68ecd3c38af14f0ef4ecf4341d593bbe Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 18 Jun 2006 13:10:29 +0000 Subject: add conffiles to iptables git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3984 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 34e681743..f47b936f0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -35,6 +35,11 @@ TITLE:=IPv4 firewall administration tool URL:=http://netfilter.org/ endef +define Package/iptables/conffiles +/etc/config/firewall +/etc/firewall.user +endef + define Package/iptables-mod-conntrack SECTION:=net CATEGORY:=Base system -- cgit v1.2.3 From 4e00d98efdec5bb2e6e19eccf85fcf9a0eecb646 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 18:30:40 +0000 Subject: normalize Makefiles. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3998 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f47b936f0..623a64ed8 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -50,7 +50,6 @@ Includes: \\\ * libipt_conntrack \\\ * libipt_helper \\\ * libipt_connmark/CONNMARK - endef define Package/iptables-mod-filter @@ -62,7 +61,6 @@ DESCRIPTION:=iptables extensions for packet content inspection\\\ Includes: \\\ * libipt_ipp2p \\\ * libipt_layer7 - endef define Package/iptables-mod-imq @@ -73,7 +71,6 @@ TITLE:=IMQ support DESCRIPTION:=iptables extension for IMQ support\\\ Includes: \\\ * libipt_IMQ - endef define Package/iptables-mod-ipopt @@ -91,7 +88,6 @@ Includes: \\\ * libipt_tcpmms \\\ * libipt_ttl/TTL \\\ * libipt_unclean - endef define Package/iptables-mod-ipsec @@ -103,7 +99,6 @@ DESCRIPTION:=iptables extensions for matching ipsec traffic\\\ Includes: \\\ * libipt_ah \\\ * libipt_esp - endef define Package/iptables-mod-nat @@ -138,7 +133,6 @@ Includes: \\\ * libipt_physdev \\\ * libipt_pkttype \\\ * libipt_recent - endef define Package/iptables-utils -- cgit v1.2.3 From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 623a64ed8..749027744 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.3.5 @@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_MENU:=IPv4 / IPv6 firewall administration -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk ifeq ($(DUMP),) include $(LINUX_DIR)/.config -include $(TOPDIR)/target/linux/netfilter.mk +include $(TOPDIR)/include/netfilter.mk endif define Package/iptables -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 749027744..f1a7de1f4 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.3.5 @@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_MENU:=IPv4 / IPv6 firewall administration -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) include $(LINUX_DIR)/.config -include $(TOPDIR)/include/netfilter.mk +include $(INCLUDE_DIR)/netfilter.mk endif define Package/iptables -- cgit v1.2.3 From d02aa539911ebcda5b7f97dc2b7177f8c24b4d9e Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 21 Jun 2006 23:27:47 +0000 Subject: avoid includes that aren't required for current target (make download) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4045 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f1a7de1f4..35bba6dac 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -21,10 +21,6 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 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 @@ -213,6 +209,9 @@ define Package/ip6tables/install endef define BuildPlugin +include $(LINUX_DIR)/.config +include $(INCLUDE_DIR)/netfilter.mk + define Package/$(1)/install install -m0755 -d $$(1)/usr/lib/iptables for m in $$(patsubst xt_%,ipt_%,$(2)); do \ -- cgit v1.2.3 From 0ddce1d55ca6d811c70b96d8813382639f47aa09 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 23:45:47 +0000 Subject: revert last change and add a different fix git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4046 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 35bba6dac..f8f590991 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -21,6 +21,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 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 @@ -209,9 +213,6 @@ define Package/ip6tables/install endef define BuildPlugin -include $(LINUX_DIR)/.config -include $(INCLUDE_DIR)/netfilter.mk - define Package/$(1)/install install -m0755 -d $$(1)/usr/lib/iptables for m in $$(patsubst xt_%,ipt_%,$(2)); do \ -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f8f590991..7fdc28422 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk -- cgit v1.2.3 From 12eda14851a3df71d65347d7a8ff7b1b13ba805c Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 3 Jul 2006 06:38:27 +0000 Subject: remove unneeded RSTRIP calls. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4115 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 7fdc28422..54a94f2c9 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -199,13 +199,11 @@ define Package/iptables/install (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/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 @@ -215,7 +213,6 @@ define Package/ip6tables/install (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \ ) - $(RSTRIP) $(1) endef define BuildPlugin @@ -225,7 +222,6 @@ define Package/$(1)/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \ done $(3) - $(RSTRIP) $$(1) endef $$(eval $$(call BuildPackage,$(1))) -- cgit v1.2.3 From 95a463ce0f08f0fec00a044c725f525b801d4443 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Jul 2006 12:33:28 +0000 Subject: port over the netfilter module packaging to the new system and fix iptables dependencies git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4206 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 54a94f2c9..99ef3347c 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -49,7 +49,7 @@ endef define Package/iptables-mod-conntrack SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-conntrack TITLE:=connection tracking modules DESCRIPTION:=iptables extensions for connection tracking \\\ Includes: \\\ @@ -61,7 +61,7 @@ endef define Package/iptables-mod-filter SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-filter TITLE:=filter modules DESCRIPTION:=iptables extensions for packet content inspection\\\ Includes: \\\ @@ -73,7 +73,7 @@ define Package/iptables-mod-imq SECTION:=net CATEGORY:=Base system DEPENDS:=iptables -TITLE:=IMQ support +TITLE:=IMQ support +kmod-imq DESCRIPTION:=iptables extension for IMQ support\\\ Includes: \\\ * libipt_IMQ @@ -82,7 +82,7 @@ endef define Package/iptables-mod-ipopt SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-ipopt TITLE:=IP/Packet option modules DESCRIPTION:=iptables extensions for matching/changing IP packet options\\\ Includes: \\\ @@ -99,7 +99,7 @@ endef define Package/iptables-mod-ipsec SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-ipsec TITLE:=IPSec extensions DESCRIPTION:=iptables extensions for matching ipsec traffic\\\ Includes: \\\ @@ -110,7 +110,7 @@ endef define Package/iptables-mod-nat SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-nat TITLE:=extra NAT targets DESCRIPTION:=iptables extensions for different NAT targets\\\ Includes: \\\ @@ -120,7 +120,7 @@ endef define Package/iptables-mod-ulog SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-ulog TITLE:=user-space packet logging DESCRIPTION:=iptables extensions for user-space packet logging\\\ Includes: \\\ @@ -130,7 +130,7 @@ endef define Package/iptables-mod-extra SECTION:=net CATEGORY:=Base system -DEPENDS:=iptables +DEPENDS:=iptables +kmod-ipt-extra TITLE:=other extra iptables extensions DESCRIPTION:=other extra iptables extensions\\\ Includes: \\\ -- cgit v1.2.3 From 8b379ad6296f23d04b8a73b70d6a88cb78634244 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 03:26:32 +0000 Subject: add quotes to TARGET_CC and TARGET_CROSS to help with distcc and ccache git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4429 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 99ef3347c..a28b8fd8e 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -163,8 +163,8 @@ define Build/Compile mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC=$(TARGET_CC) COPT_FLAGS="$(TARGET_CFLAGS)" \ - KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ + CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ + KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel endef @@ -173,8 +173,8 @@ 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 \ + CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ + KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ DESTDIR="$(STAGING_DIR)" \ install install-devel endef -- cgit v1.2.3 From 5d099491cf5469749a3961291b621429aeee0070 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 09:14:20 +0000 Subject: fix everything I broke with the previous patches git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index a28b8fd8e..bf8124084 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -161,7 +161,7 @@ endef define Build/Compile chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ + PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ @@ -171,7 +171,7 @@ endef define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) \ + PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ -- cgit v1.2.3 From ef998d64e381ed0a92fc73edf4206f7be7335caf Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 11:59:52 +0000 Subject: set PATH in rules.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index bf8124084..8d77fb43f 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -161,9 +161,9 @@ endef define Build/Compile chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* mkdir -p $(PKG_INSTALL_DIR) - PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel @@ -171,9 +171,9 @@ endef define Build/InstallDev - PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ DESTDIR="$(STAGING_DIR)" \ install install-devel -- cgit v1.2.3 From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 20:49:31 +0000 Subject: new (last?) attempt at standardizing Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/iptables/Makefile | 196 ++++++++++++++++++++++++---------------------- 1 file changed, 101 insertions(+), 95 deletions(-) (limited to 'package/iptables/Makefile') diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 8d77fb43f..d198a9271 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -13,7 +13,6 @@ PKG_NAME:=iptables PKG_VERSION:=1.3.5 PKG_RELEASE:=1 -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/ \ @@ -22,23 +21,26 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_MENU:=IPv4 / IPv6 firewall administration - include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) --include $(LINUX_DIR)/.config -include $(INCLUDE_DIR)/netfilter.mk + -include $(LINUX_DIR)/.config + include $(INCLUDE_DIR)/netfilter.mk endif +define Package/iptables/Default + SECTION:=net + CATEGORY:=Base system + URL:=http://netfilter.org/ +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) + DEFAULT:=y + TITLE:=IPv4 firewall administration tool + MENU:=1 endef define Package/iptables/conffiles @@ -47,114 +49,120 @@ define Package/iptables/conffiles endef define Package/iptables-mod-conntrack -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-conntrack -TITLE:=connection tracking modules -DESCRIPTION:=iptables extensions for connection tracking \\\ -Includes: \\\ - * libipt_conntrack \\\ - * libipt_helper \\\ - * libipt_connmark/CONNMARK + $(call Package/iptables/Default) + DEPENDS:=iptables +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-filter -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-filter -TITLE:=filter modules -DESCRIPTION:=iptables extensions for packet content inspection\\\ -Includes: \\\ - * libipt_ipp2p \\\ - * libipt_layer7 + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-filter + 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 +kmod-imq -DESCRIPTION:=iptables extension for IMQ support\\\ -Includes: \\\ - * libipt_IMQ + $(call Package/iptables/Default) + 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 +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 + $(call Package/iptables/Default) + DEPENDS:=iptables +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-ipsec -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-ipsec -TITLE:=IPSec extensions -DESCRIPTION:=iptables extensions for matching ipsec traffic\\\ -Includes: \\\ - * libipt_ah \\\ - * libipt_esp + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-ipsec + 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 +kmod-ipt-nat -TITLE:=extra NAT targets -DESCRIPTION:=iptables extensions for different NAT targets\\\ -Includes: \\\ - * libipt_REDIRECT + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-nat + 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 +kmod-ipt-ulog -TITLE:=user-space packet logging -DESCRIPTION:=iptables extensions for user-space packet logging\\\ -Includes: \\\ - * libipt_ULOG + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-ulog + 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 +kmod-ipt-extra -TITLE:=other extra iptables extensions -DESCRIPTION:=other extra iptables extensions\\\ -Includes: \\\ - * libipt_limit \\\ - * libipt_owner \\\ - * libipt_physdev \\\ - * libipt_pkttype \\\ - * libipt_recent + $(call Package/iptables/Default) + DEPENDS:=iptables +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-utils -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables -TITLE:=iptables save and restore utilities + $(call Package/iptables/Default) + DEPENDS:=iptables + TITLE:=iptables save and restore utilities endef define Package/ip6tables -SECTION:=net -CATEGORY:=Base system -TITLE:=IPv6 firewall administration tool + $(call Package/iptables/Default) + CATEGORY:=Network + TITLE:=IPv6 firewall administration tool endef - define Build/Configure endef @@ -169,7 +177,6 @@ define Build/Compile all install install-devel endef - define Build/InstallDev $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ @@ -184,7 +191,6 @@ define Build/UninstallDev rm -rf $(STAGING_DIR)/usr/lib/libipq.a endef - define Package/iptables/install install -d -m0755 $(1)/etc/config install -m0644 ./files/firewall.config $(1)/etc/config/firewall @@ -216,15 +222,15 @@ define Package/ip6tables/install endef define BuildPlugin -define Package/$(1)/install + 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) -endef + endef -$$(eval $$(call BuildPackage,$(1))) + $$(eval $$(call BuildPackage,$(1))) endef L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \ -- cgit v1.2.3