webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 19:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

xtables-addons: Remove xt_geoip_build script

Browse Source 
This script is not longer required.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2019-12-09 14:35:15 +01:00
parent eaba273a5f
commit 03c8f290d9
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lfs/xtables-addons
View File

@@ -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

18
src/patches/xtables-addons-3.2-fix-database-generation.patch
View File

@@ -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;
}