* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9e20c024b0ea76fd797447b745fb4d6e5afe0012
@ 2019-08-24 13:46 Arne Fitzenreiter
0 siblings, 0 replies; only message in thread
From: Arne Fitzenreiter @ 2019-08-24 13:46 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 10515 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 9e20c024b0ea76fd797447b745fb4d6e5afe0012 (commit)
via 329f4a3fe15226cd4932cdb5452411ae12c00f18 (commit)
via 392994dcfb01b913f5bb9db4ca129fdbdbf39569 (commit)
from fd24c5dcbd06e87641ca58ae399a2c1713a6f630 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9e20c024b0ea76fd797447b745fb4d6e5afe0012
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Aug 24 15:42:27 2019 +0200
xt_geoip_update: fix date and add maxmind copyright to GeoIP.dat
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 329f4a3fe15226cd4932cdb5452411ae12c00f18
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Aug 24 11:33:45 2019 +0200
perl-NetAddr-IP: move to core
I had added this for spamassassin but now the geoip-converter needs it too.
It was not pushed yet so there is no need to remove it from pakfire databases.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 392994dcfb01b913f5bb9db4ca129fdbdbf39569
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Aug 24 11:29:01 2019 +0200
geoip-generator: added to build legacy GeoIP.dat file
program and scripts based on debian geoip packages.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/geoip-generator | 16 ++++++++++++++++
.../rootfiles/{packages => common}/perl-NetAddr-IP | 0
lfs/{freetype => geoip-generator} | 22 +++++++++++++++++-----
lfs/perl-NetAddr-IP | 5 -----
lfs/spamassassin | 2 +-
make.sh | 1 +
src/scripts/xt_geoip_update | 22 ++++++++++++++++++++++
7 files changed, 57 insertions(+), 11 deletions(-)
create mode 100644 config/rootfiles/common/geoip-generator
rename config/rootfiles/{packages => common}/perl-NetAddr-IP (100%)
copy lfs/{freetype => geoip-generator} (76%)
Difference in files:
diff --git a/config/rootfiles/common/geoip-generator b/config/rootfiles/common/geoip-generator
new file mode 100644
index 000000000..6ff83c036
--- /dev/null
+++ b/config/rootfiles/common/geoip-generator
@@ -0,0 +1,16 @@
+#usr/bin/geoiplookup
+#usr/bin/geoiplookup6
+#usr/include/GeoIP.h
+#usr/include/GeoIPCity.h
+#usr/lib/libGeoIP.a
+#usr/lib/libGeoIP.la
+usr/lib/libGeoIP.so
+usr/lib/libGeoIP.so.1
+usr/lib/libGeoIP.so.1.6.12
+#usr/lib/pkgconfig/geoip.pc
+#usr/share/GeoIP/bin
+usr/share/GeoIP/bin/countryInfo.txt
+usr/share/GeoIP/bin/geoip-generator
+usr/share/GeoIP/bin/geolite2-to-legacy-csv.sh
+#usr/share/man/man1/geoiplookup.1
+#usr/share/man/man1/geoiplookup6.1
diff --git a/config/rootfiles/packages/perl-NetAddr-IP b/config/rootfiles/common/perl-NetAddr-IP
similarity index 100%
rename from config/rootfiles/packages/perl-NetAddr-IP
rename to config/rootfiles/common/perl-NetAddr-IP
diff --git a/lfs/geoip-generator b/lfs/geoip-generator
new file mode 100644
index 000000000..3091d32c7
--- /dev/null
+++ b/lfs/geoip-generator
@@ -0,0 +1,89 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.6.12
+DVER = 1.6.12-3
+
+THISAPP = geoip-api-c-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) geoip_$(DVER).debian.tar.xz
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+geoip_$(DVER).debian.tar.xz = $(DL_FROM)/geoip_$(DVER).debian.tar.xz
+
+$(DL_FILE)_MD5 = 727e5d6df9e9fc039dbc3a323cc56d2e
+geoip_$(DVER).debian.tar.xz_MD5 = 64fb561362dc456b45b799da20d47dd4
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./bootstrap
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ cd $(DIR_APP) && tar axf $(DIR_DL)/geoip_$(DVER).debian.tar.xz
+ cd $(DIR_APP) && sed -i "s/use diagnostics;//g" debian/src/geolite2-to-legacy-csv.sh
+ cd $(DIR_APP) && g++ -std=gnu++11 -g debian/src/geoip-csv-to-dat.cpp \
+ -o geoip-generator -lGeoIP
+ -mkdir -p /usr/share/GeoIP/bin
+ cd $(DIR_APP) && install -m 755 geoip-generator /usr/share/GeoIP/bin
+ cd $(DIR_APP) && install -m 755 debian/src/geolite2-to-legacy-csv.sh /usr/share/GeoIP/bin
+ cd $(DIR_APP) && install -m 644 debian/src/countryInfo.txt /usr/share/GeoIP/bin
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/perl-NetAddr-IP b/lfs/perl-NetAddr-IP
index 04e977c58..06763d524 100644
--- a/lfs/perl-NetAddr-IP
+++ b/lfs/perl-NetAddr-IP
@@ -33,8 +33,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = perl-NetAddr-IP
-DEPS = ""
-PAK_VER = 1
###############################################################################
# Top-level Rules
@@ -54,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist:
- @$(PAK)
-
###############################################################################
# Downloading, checking, md5sum
###############################################################################
diff --git a/lfs/spamassassin b/lfs/spamassassin
index 5055b1e41..08f4f0c5e 100644
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = spamassassin
PAK_VER = 3
-DEPS = "perl-NetAddr-IP"
+DEPS = ""
###############################################################################
# Top-level Rules
diff --git a/make.sh b/make.sh
index 316d939f7..909fe2430 100755
--- a/make.sh
+++ b/make.sh
@@ -1626,6 +1626,7 @@ buildipfire() {
lfsmake2 flashrom
lfsmake2 firmware-update
lfsmake2 tshark
+ lfsmake2 geoip-generator
}
buildinstaller() {
diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 93884dcf5..9ea66e006 100644
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -25,6 +25,7 @@ TMP_FILE=$(mktemp -p $TMP_PATH)
SCRIPT_PATH=/usr/local/bin
DEST_PATH=/usr/share/xt_geoip
DB_PATH=/var/lib/GeoIP
+DB1_PATH=/usr/share/GeoIP
DL_URL=https://geolite.maxmind.com/download/geoip/database
DL_FILE=GeoLite2-Country-CSV.zip
@@ -82,6 +83,22 @@ function install() {
return 0
}
+function build_legacy() {
+ # Create temporary directory.
+ mkdir -pv $TMP_PATH
+
+ echo "Convert database to legacy GeoIP.dat ..."
+ cat $DB_PATH/GeoLite2-Country-Blocks-IPv4.csv | \
+ $DB1_PATH/bin/geolite2-to-legacy-csv.sh $DB1_PATH/bin/countryInfo.txt > \
+ $TMP_FILE
+ $DB1_PATH/bin/geoip-generator -v -4 --info="$(date -u +'GEO-106FREE %Y%m%d Build -IPFire-' \
+ -r $DB_PATH/GeoLite2-Country-Blocks-IPv4.csv) $(<$DB_PATH/COPYRIGHT.txt)" -o \
+ $DB1_PATH/GeoIP.dat $TMP_FILE
+
+ return 0
+}
+
+
function build() {
echo "Convert database..."
@@ -121,7 +138,12 @@ function main() {
# Convert the ruleset.
build || exit $?
+ # Convert GeoIP2 to lagacy.
+ build_legacy || exit $?
return 0
+
+ # Remove temporary files.
+ cleanup || exit $?
}
# Run the main function.
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-24 13:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-24 13:46 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9e20c024b0ea76fd797447b745fb4d6e5afe0012 Arne Fitzenreiter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox