From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 4 Nov 2021 20:44:23 +0000 (+0100)
Subject: xtables-addons: update to 3.18
X-Git-Tag: v2.27-core162~76^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d17ae41d7e139569fcb80ceab5e103ffdab60220;p=ipfire-2.x.git

xtables-addons: update to 3.18

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/common/xtables-addons b/config/rootfiles/common/xtables-addons
index 6a4a709844..ace6699736 100644
--- a/config/rootfiles/common/xtables-addons
+++ b/config/rootfiles/common/xtables-addons
@@ -22,8 +22,7 @@ lib/xtables/libxt_lscan.so
 lib/xtables/libxt_pknock.so
 lib/xtables/libxt_psd.so
 lib/xtables/libxt_quota2.so
-#usr/bin/xt_geoip_fetch
-#usr/bin/xt_geoip_fetch_maxmind
++usr/bin/xt_geoip_query
 #usr/lib/libxt_ACCOUNT_cl.la
 #usr/lib/libxt_ACCOUNT_cl.so
 usr/lib/libxt_ACCOUNT_cl.so.0
@@ -36,9 +35,10 @@ usr/lib/libxt_ACCOUNT_cl.so.0.0.0
 usr/sbin/iptaccount
 usr/sbin/pknlusr
 #usr/share/man/man1/xt_geoip_build.1
+#usr/share/man/man1/xt_geoip_build_maxmind.1
 #usr/share/man/man1/xt_geoip_dl.1
-#usr/share/man/man1/xt_geoip_fetch.1
+#usr/share/man/man1/xt_geoip_dl_maxmind.1
+#usr/share/man/man1/xt_geoip_query.1
 #usr/share/man/man8/iptaccount.8
 #usr/share/man/man8/pknlusr.8
 #usr/share/man/man8/xtables-addons.8
-usr/share/xt_geoip
diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index 2066711d9a..fdea1ffcdf 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -27,7 +27,7 @@ include Config
 VERSUFIX = ipfire$(KCFG)
 MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/extra/
 
-VER        = 3.13
+VER        = 3.18
 
 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 = 011f339ee2b3f13297c45b02f3aec2ef
+$(DL_FILE)_MD5 = 755471b1dc6808f274f914fa11552698
 
 install : $(TARGET)
 
@@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
 	# Only build the specified modules.
-	cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
-		$(DIR_APP)/mconfig
+#	cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
+#		$(DIR_APP)/mconfig
 
 # Check if we build the modules for a kernel or the userspace parts.
 ifeq "$(USPACE)" "1"