X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fxtables-addons;h=162ef87d8c82eb764d740c4f2323feeaa4fd8c0e;hp=1848dc908846a8c4c6c07f0b2e0864aba30a77b0;hb=0aa82849052c63a01d6b098d7ea968c7af708790;hpb=f09f3fd8819de0565c6ac73048b0dcfcff0c75ec

diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index 1848dc9088..162ef87d8c 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2018  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        #
@@ -27,7 +27,7 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/
 
-VER        = 2.6
+VER        = 3.2
 
 THISAPP    = xtables-addons-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 087835ba7e564481b6fd398692268340
+$(DL_FILE)_MD5 = 80ea89ba8d5a001a8d71c7f05b2f0141
 
 install : $(TARGET)
 
@@ -82,6 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xtables-addons-3.2-fix-database-generation.patch
+
 	# Only build the specified modules.
 	cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
 		$(DIR_APP)/mconfig
@@ -94,14 +96,17 @@ ifeq "$(USPACE)" "1"
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-else
-	cd $(DIR_APP) && ./configure \
-		--with-kbuild=/usr/src/linux-$(KVER)/
 
+	# Install xt_geoip_build.
+	cd $(DIR_APP) && install -m 755 geoip/xt_geoip_build \
+		/usr/local/bin/
+else
+	cd $(DIR_APP) && ./configure
 	cd $(DIR_APP) && make $(MAKETUNING)
 
 	# Install the built kernel modules.
 	cd $(DIR_APP) && for f in $$(ls extensions/*.ko); do \
+		mkdir -p $(MODPATH); \
 		install -m 644 $$f $(MODPATH); \
 	done
 endif