From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Thu, 8 Sep 2005 07:24:02 +0000 (+0000)
Subject: add ipset userland
X-Git-Tag: kamikaze_7.06~2841
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cfa0bce0368aff3b1bbe338c9fe4417c78b98c58;p=openwrt%2Fsvn-archive%2Fopenwrt.git

add ipset userland

SVN-Revision: 1875
---

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 1a078147d5..3442bc2251 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -58,6 +58,7 @@ source "package/howl/Config.in"
 source "package/hostapd/Config.in"
 source "package/htpdate/Config.in"
 source "package/iproute2/Config.in"
+source "package/ipset/Config.in"
 source "package/kismet/Config.in"
 source "package/l2tpd/Config.in"
 source "package/lighttpd/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 28e5ce25f4..090b819a29 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -52,6 +52,7 @@ package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
 package-$(BR2_PACKAGE_IPKG) += ipkg
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
+package-$(BR2_PACKAGE_IPSET) += ipset
 package-$(BR2_PACKAGE_IPTABLES) += iptables
 package-$(BR2_PACKAGE_IRSSI) += irssi
 package-$(BR2_PACKAGE_KISMET) += kismet
diff --git a/openwrt/package/ipset/Config.in b/openwrt/package/ipset/Config.in
new file mode 100644
index 0000000000..c1d3072064
--- /dev/null
+++ b/openwrt/package/ipset/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_IPSET
+	tristate "ipset - Netfilter ip sets administration utility"
+	default m if CONFIG_DEVEL
+	help
+	  Netfilter ip sets administration utility
+	  
+	  http://ipset.netfilter.org/
+	  
+
diff --git a/openwrt/package/ipset/Makefile b/openwrt/package/ipset/Makefile
new file mode 100644
index 0000000000..7f7900af45
--- /dev/null
+++ b/openwrt/package/ipset/Makefile
@@ -0,0 +1,34 @@
+# $Id$
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ipset
+PKG_VERSION:=2.2.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=e760bc3ba45420118086428af4fd3b61
+
+PKG_SOURCE_URL:=http://ipset.netfilter.org
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050720.tar.bz2
+PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION)
+PKG_CAT:=bzcat
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,IPSET,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
+		CFLAGS="$(TARGET_CFLAGS) -Wall -I$(LINUX_DIR)/include -I." \
+		KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr
+	touch $@
+
+$(IPKG_IPSET):
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR=$(IDIR_IPSET) PREFIX=/usr install
+	rm -rf $(IDIR_IPSET)/usr/man
+	$(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR)
+
diff --git a/openwrt/package/ipset/ipkg/ipset.control b/openwrt/package/ipset/ipkg/ipset.control
new file mode 100644
index 0000000000..0c72dc6e44
--- /dev/null
+++ b/openwrt/package/ipset/ipkg/ipset.control
@@ -0,0 +1,7 @@
+Package: ipset
+Priority: optional
+Section: net
+Maintainer: Vincent Bernat <bernat@crans.org>
+Source: buildroot internal
+Description: Netfilter ip sets administration utility
+Depends: kmod-iptables-extra
diff --git a/openwrt/package/iptables/kernelconfig.mk b/openwrt/package/iptables/kernelconfig.mk
index b4de337035..90d8bb521d 100644
--- a/openwrt/package/iptables/kernelconfig.mk
+++ b/openwrt/package/iptables/kernelconfig.mk
@@ -11,6 +11,7 @@ ext-$(CONFIG_IP_NF_MATCH_TOS) += tos
 ext-$(CONFIG_IP_NF_MATCH_RECENT) += recent
 ext-$(CONFIG_IP_NF_MATCH_ECN) += ecn
 ext-$(CONFIG_IP_NF_MATCH_IPP2P) += ipp2p
+ext-$(CONFIG_IP_NF_MATCH_SET) += set
 ext-$(CONFIG_IP_NF_MATCH_DSCP) += dscp
 ext-$(CONFIG_IP_NF_MATCH_AH_ESP) += ah esp
 ext-$(CONFIG_IP_NF_MATCH_LENGTH) += length