X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fxtables-addons;h=08b1e070f8075a7a351223941c18a0b65365e30f;hb=391540d9d82b42042756c67b2f5676d799d92f59;hp=da67aa761e84a6e224289451cc745f4e402fb559;hpb=a77870146fcf1e4575a9a0e59a85a10674599e91;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index da67aa761e..08b1e070f8 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        = 3.2
+VER        = 3.7
 
 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 = 80ea89ba8d5a001a8d71c7f05b2f0141
+$(DL_FILE)_MD5 = d81776d6320ebd741042bf8eb7e13d1d
 
 install : $(TARGET)
 
@@ -94,22 +94,25 @@ ifeq "$(USPACE)" "1"
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-
-	# Install xt_geoip_build.
-	cd $(DIR_APP) && install -m 755 GeoIP/xt_geoip_build \
-		/usr/local/bin/
 else
 	cd $(DIR_APP) && ./configure \
-		--with-kbuild=/usr/src/linux-$(KVER)/
-
+		--with-kbuild=/lib/modules/$$(uname -r)$(KCFG)/build
 	cd $(DIR_APP) && make $(MAKETUNING)
 
 	# Install the built kernel modules.
+	mkdir -p $(MODPATH)
 	cd $(DIR_APP) && for f in $$(ls extensions/*.ko); do \
-		mkdir -p $(MODPATH); \
-		install -m 644 $$f $(MODPATH); \
+		/lib/modules/$$(uname -r)$(KCFG)/build/scripts/sign-file sha512 \
+			/lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.pem \
+			/lib/modules/$$(uname -r)$(KCFG)/build/certs/signing_key.x509 \
+			$$f; \
+		xz $$f; \
+		install -m 644 $$f.xz $(MODPATH); \
 	done
 endif
 
+	# Create directory for the databases.
+	mkdir -pv /usr/share/xt_geoip/
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)