From patchwork Thu Jan 10 23:00:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2029 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id A074D85D3E7 for ; Thu, 10 Jan 2019 12:00:48 +0000 (GMT) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 3819D219909C; Thu, 10 Jan 2019 12:00:48 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1547121648; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=u5QXYZ1QBM3v4qnF7x7LIkyJ1HYi27IbjjwvAY5REsc=; b=LM4WaX71iGR0ydcl2Pwx0VugIpnHwlLMa1i3ES1h8rIxS44SD6iHpolvzQH+5MHj24gMiY Yn2QBS4i7bIuyZ906OlfUsKSeVJcDEHIJCNnA+PjQUctEPuqRb/HTRAwEU574D6NJKQJ1C gO5/w+gDRx9C3TSlh6Wi+u0+LgFz+EhSJOmvuA3rmdTaoUwO0P79zIzFZbsBFWbWPJQ3Eq Z7iSHrlnPniZHpgjEh32MAL0LQYI+CUf0zS8NWs0EZ5qSnlX2GyTJPVdi2S2Yq8RMJTitQ 8gJXiajZd7eulo1xRX0Pqw1Batl52El552Vzlkt8b9a7Lr1g+un2INiaK14lJg== Received: from tuxedo.stevee (unknown [46.125.249.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 39D7E221C72B; Thu, 10 Jan 2019 12:00:36 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1547121636; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u5QXYZ1QBM3v4qnF7x7LIkyJ1HYi27IbjjwvAY5REsc=; b=BRPTPhYq3Xb42I0nzGAwUmfzP8eWLhkC8jlgoKN6xyvaXE2Oq5exm2lCGQZl38hNu1+5JX nJRYSwBaQ3nlv6BajxPF09hVnJdFq3mPz6GDstLgpn3to4JiY2nMVpKpoDnv2BmbKrAS0K LQV19QVcv+BxSCxqiUEfS3yODhTw77oTTmy9TbkTgeDMUacZXtXwtGkRkfNVrrSerRGSP9 Jpe1nhtPo2/pbvN6sES45y1Pbi13bDSPUOuqoKmHjW2mmlE3PZ99vERUWuUXTvBk0KGbQS gvtpNptNPySqUI0PoBaSaUw2K62GVA4LNF5GhXfJmqLHeIGDCn6c5451qwkdIQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 5/6] GeoIP: Drop legacy GeoIP perl module. Date: Thu, 10 Jan 2019 13:00:16 +0100 Message-Id: <20190110120017.6595-5-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190110120017.6595-1-stefan.schantl@ipfire.org> References: <20190110120017.6595-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-Spamd-Result: default: False [-3.98 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-2.86)[-0.955,0]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8412, ipnet:46.124.0.0/15, country:AT]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-2.01)[95.13%] X-Spam-Status: No, score=-3.98 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 # -# # -# 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 . # -# # -############################################################################### - -############################################################################### -# 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