From: Erik Kapfer <erik.kapfer@ipfire.org>
Date: Thu, 5 Nov 2015 05:29:01 +0000 (+0100)
Subject: ipset: New package
X-Git-Tag: v2.17-core95~17^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=63cbd2c1df71e246a51b614a2549869168399b10

ipset: New package

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset
new file mode 100644
index 0000000000..50ebed59b4
--- /dev/null
+++ b/config/rootfiles/common/ipset
@@ -0,0 +1,26 @@
+etc/ipset
+#usr/include/libipset
+#usr/include/libipset/data.h
+#usr/include/libipset/errcode.h
+#usr/include/libipset/linux_ip_set.h
+#usr/include/libipset/linux_ip_set_bitmap.h
+#usr/include/libipset/linux_ip_set_hash.h
+#usr/include/libipset/linux_ip_set_list.h
+#usr/include/libipset/mnl.h
+#usr/include/libipset/nf_inet_addr.h
+#usr/include/libipset/nfproto.h
+#usr/include/libipset/parse.h
+#usr/include/libipset/pfxlen.h
+#usr/include/libipset/print.h
+#usr/include/libipset/session.h
+#usr/include/libipset/transport.h
+#usr/include/libipset/types.h
+#usr/include/libipset/ui.h
+#usr/include/libipset/utils.h
+#usr/lib/libipset.la
+#usr/lib/libipset.so
+usr/lib/libipset.so.3
+usr/lib/libipset.so.3.6.0
+#usr/lib/pkgconfig/libipset.pc
+usr/sbin/ipset
+#usr/share/man/man8/ipset.8
diff --git a/lfs/ipset b/lfs/ipset
new file mode 100644
index 0000000000..0ee8c923c3
--- /dev/null
+++ b/lfs/ipset
@@ -0,0 +1,88 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 6.26
+
+THISAPP    = ipset-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 5ec4e79053a30fb6d72e0549d7d09343
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./autogen.sh
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ipset-6.26_fix_kernel_dir_path.patch
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--disable-static
+
+	# Add configuration directory
+	-mkdir -pv /etc/ipset
+	chmod 750 /etc/ipset
+	chown root:root /etc/ipset
+
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index ed902c9cc5..47e07b2322 100755
--- a/make.sh
+++ b/make.sh
@@ -850,6 +850,7 @@ buildipfire() {
   ipfiremake perl-Text-CSV_XS
   ipfiremake swconfig
   ipfiremake haproxy
+  ipfiremake ipset
 }
 
 buildinstaller() {
diff --git a/src/patches/ipset-6.26_fix_kernel_dir_path.patch b/src/patches/ipset-6.26_fix_kernel_dir_path.patch
new file mode 100644
index 0000000000..7c2044850b
--- /dev/null
+++ b/src/patches/ipset-6.26_fix_kernel_dir_path.patch
@@ -0,0 +1,20 @@
+--- ipset-6.26_orig/configure	2015-10-11 06:57:32.659295626 +0000
++++ ipset-6.26/configure	2015-10-11 06:58:21.935695339 +0000
+@@ -13079,7 +13079,7 @@
+ then
+ 	kbuilddir="$KBUILDDIR"
+ else
+-	kbuilddir="/lib/modules/`uname -r`/build"
++	kbuilddir="/lib/modules/`uname -r`-ipfire/build"
+ fi
+ 
+ if test -n "$KSOURCEDIR"; then
+@@ -13087,7 +13087,7 @@
+ elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then
+ 	ksourcedir="$kbuilddir"
+ else
+-	ksourcedir="/lib/modules/$(uname -r)/source"
++	ksourcedir="/lib/modules/$(uname -r)-ipfire/source"
+ fi
+ if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h"
+ then