add package for iptables-save and -restore

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@452 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/iptables/Config.in b/package/iptables/Config.in
index 1244f10..5e1cd60 100644 (file)
--- a/package/iptables/Config.in
+++ b/package/iptables/Config.in
@@ -6,6 +6,13 @@ config BR2_PACKAGE_IPTABLES
 
          http://www.iptables.org/
 
 
          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
 config BR2_PACKAGE_IPTABLES_EXTRA
        tristate "extra modules"
        default m

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ffaef00..d9c0c58 100644 (file)
--- 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_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
 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)
 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
 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
 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_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)
 
 $(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
 $(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/package/iptables/control/iptables-utils.control b/package/iptables/control/iptables-utils.control
new file mode 100644 (file)
index 0000000..2dbc80e
--- /dev/null
+++ b/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