From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 9 Dec 2019 13:35:15 +0000 (+0100)
Subject: xtables-addons: Remove xt_geoip_build script
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03c8f290d99bd9a06d85197e6e5f4d437239e682;p=people%2Fstevee%2Fipfire-2.x.git

xtables-addons: Remove xt_geoip_build script

This script is not longer required.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index 2152fa5fd1..9d55d171e5 100644
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -82,8 +82,6 @@ $(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
@@ -96,10 +94,6 @@ 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=/lib/modules/$$(uname -r)$(KCFG)/build
diff --git a/src/patches/xtables-addons-3.2-fix-database-generation.patch b/src/patches/xtables-addons-3.2-fix-database-generation.patch
deleted file mode 100644
index 5574e200d6..0000000000
--- a/src/patches/xtables-addons-3.2-fix-database-generation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build
-index 3b15875..7bc42f3 100755
---- a/geoip/xt_geoip_build
-+++ b/geoip/xt_geoip_build
-@@ -259,7 +259,12 @@ sub writeCountry
- 		my ($start, $end) = split('-', $range);
- 		$start = inet_pton($family, $start);
- 		$end = inet_pton($family, $end);
--		print $fh $start, $end;
-+
-+		if ($family == AF_INET) {
-+			print $fh substr($start, 0, 4), substr($end, 0, 4);
-+		} else {
-+			print $fh $start, $end;
-+		}
- 	}
- 	close $fh;
- }