From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 5/6] GeoIP: Drop legacy GeoIP perl module.
Date: Thu, 10 Jan 2019 13:00:16 +0100 [thread overview]
Message-ID: <20190110120017.6595-5-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <20190110120017.6595-1-stefan.schantl@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 5484 bytes --]
The legacy GeoIP perl module cannot handle the new GeoLite2 databases
provided from maxmind and therefore needs to be dropped.
Reference #11960
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
config/rootfiles/common/GeoIP | 12 -----
lfs/GeoIP | 84 -----------------------------------
make.sh | 1 -
3 files changed, 97 deletions(-)
delete mode 100644 config/rootfiles/common/GeoIP
delete mode 100644 lfs/GeoIP
diff --git a/config/rootfiles/common/GeoIP b/config/rootfiles/common/GeoIP
deleted file mode 100644
index d76ba645e..000000000
--- a/config/rootfiles/common/GeoIP
+++ /dev/null
@@ -1,12 +0,0 @@
-#usr/bin/geoip-lookup
-#usr/lib/perl5/site_perl/5.12.3/Geo
-#usr/lib/perl5/site_perl/5.12.3/Geo/IP
-usr/lib/perl5/site_perl/5.12.3/Geo/IP/PurePerl.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Geo
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Geo/IP
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Geo/IP/PurePerl
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Geo/IP/PurePerl/.packlist
-#usr/share/GeoIP
-usr/share/GeoIP/GeoIP.dat
-#usr/share/man/man1/geoip-lookup.1
-#usr/share/man/man3/Geo::IP::PurePerl.3
diff --git a/lfs/GeoIP b/lfs/GeoIP
deleted file mode 100644
index ce758d8a5..000000000
--- a/lfs/GeoIP
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-# #
-# 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.25
-DATVER = 30062018
-
-THISAPP = Geo-IP-PurePerl-$(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.dat-$(DATVER).gz
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
-
-$(DL_FILE)_MD5 = a47a1b71f7cd7c46cca9efcc448e0726
-GeoIP.dat-$(DATVER).gz_MD5 = d538e57ad9268fdc7955c6cf9a37c4a9
-
-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 zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/geoip_1_25_change_database_path.patch
- cd $(DIR_APP) && perl Makefile.PL
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- cd $(DIR_APP) && mkdir -p /usr/share/GeoIP && \
- zcat $(DIR_DL)/GeoIP.dat-$(DATVER).gz > /usr/share/GeoIP/GeoIP.dat
- cd $(DIR_APP) && chmod 777 /srv/web/ipfire/html/images/flags
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 601f1675b..1d9163dce 100755
--- a/make.sh
+++ b/make.sh
@@ -1305,7 +1305,6 @@ buildipfire() {
lfsmake2 python-daemon
lfsmake2 python-ipaddress
lfsmake2 glib
- lfsmake2 GeoIP
lfsmake2 ntp
lfsmake2 openssh
lfsmake2 fontconfig
--
2.19.1
next prev parent reply other threads:[~2019-01-10 12:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 12:00 [PATCH 1/6] perl-Net-CIDR-Lite: New package Stefan Schantl
2019-01-10 12:00 ` [PATCH 2/6] xtables-addons: Update to 3.2 Stefan Schantl
2019-01-10 12:00 ` [PATCH 3/6] xtables-addons: Use shipped xt_geoip_build Stefan Schantl
2019-01-10 12:00 ` [PATCH 4/6] xt_geoip_update: Adjust script to download and use the GeoLite2 database Stefan Schantl
2019-01-10 12:00 ` Stefan Schantl [this message]
2019-01-10 12:00 ` [PATCH 6/6] geoip-functions.pl: Re-write code to lookup the iso country code of a given IP-address Stefan Schantl
2019-01-10 15:01 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190110120017.6595-5-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox