From e9467ffb7f84a4cb210846e7726a29ca868a664c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 25 Mar 2005 00:00:29 +0000
Subject: [PATCH] add package for iptables-save and -restore

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@452 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/package/iptables/Config.in            |  7 +++++++
 openwrt/package/iptables/Makefile             | 20 +++++++++++++++++++
 .../iptables/control/iptables-utils.control   |  6 ++++++
 3 files changed, 33 insertions(+)
 create mode 100644 openwrt/package/iptables/control/iptables-utils.control

diff --git a/openwrt/package/iptables/Config.in b/openwrt/package/iptables/Config.in
index 1244f10912..5e1cd60c03 100644
--- a/openwrt/package/iptables/Config.in
+++ b/openwrt/package/iptables/Config.in
@@ -6,6 +6,13 @@ config BR2_PACKAGE_IPTABLES
 
 	  http://www.iptables.org/
 
+config BR2_PACKAGE_IPTABLES_UTILS
+	tristate "save and restore"
+	default m
+	depends BR2_PACKAGE_IPTABLES
+	help
+	  iptables-save and iptables-restore
+
 config BR2_PACKAGE_IPTABLES_EXTRA
 	tristate "extra modules"
 	default m
diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile
index ffaef0058c..d9c0c585d1 100644
--- a/openwrt/package/iptables/Makefile
+++ b/openwrt/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
diff --git a/openwrt/package/iptables/control/iptables-utils.control b/openwrt/package/iptables/control/iptables-utils.control
new file mode 100644
index 0000000000..2dbc80e1e8
--- /dev/null
+++ b/openwrt/package/iptables/control/iptables-utils.control
@@ -0,0 +1,6 @@
+Package: iptables-utils
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: iptables-save and iptables-restore