From: Stefan Schantl Date: Mon, 9 Dec 2019 13:50:51 +0000 (+0100) Subject: GeoIP: Drop package X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1ca2d1fd5f52bc31c7b4e8c663aa936363eac07;p=people%2Fstevee%2Fipfire-2.x.git GeoIP: Drop package Signed-off-by: Stefan Schantl --- diff --git a/config/rootfiles/common/GeoIP b/config/rootfiles/common/GeoIP deleted file mode 100644 index f84f828b95..0000000000 --- a/config/rootfiles/common/GeoIP +++ /dev/null @@ -1,12 +0,0 @@ -#usr/bin/geoip-lookup -#usr/lib/perl5/site_perl/5.30.0/Geo -#usr/lib/perl5/site_perl/5.30.0/Geo/IP -usr/lib/perl5/site_perl/5.30.0/Geo/IP/PurePerl.pm -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Geo -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Geo/IP -#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Geo/IP/PurePerl -#usr/lib/perl5/site_perl/5.30.0/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 ce758d8a53..0000000000 --- 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/src/patches/geoip_1_25_change_database_path.patch b/src/patches/geoip_1_25_change_database_path.patch deleted file mode 100644 index 933e93d28e..0000000000 --- a/src/patches/geoip_1_25_change_database_path.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- lib/Geo/IP/PurePerl.pm Tue Mar 30 15:41:34 2010 -+++ lib/Geo/IP/PurePerl.pm Mon Jan 09 18:58:11 2017 -@@ -129,7 +129,7 @@ - - - # --- unfortunately we do not know the path so we assume the --# default path /usr/local/share/GeoIP -+# default path /usr/share/GeoIP - # if thats not true, you can set $Geo::IP::PurePerl::OPEN_TYPE_PATH - # - sub open_type { -@@ -210,7 +210,7 @@ - # this will be less messy once deprecated new( $path, [$flags] ) - # is no longer supported (that's what open() is for) - -- my $def_db_file = '/usr/local/share/GeoIP/GeoIP.dat'; -+ my $def_db_file = '/usr/share/GeoIP/GeoIP.dat'; - if ($^O eq 'NetWare') { - $def_db_file = 'sys:/etc/GeoIP/GeoIP.dat'; - } elsif ($^O eq 'MSWin32') { -@@ -758,7 +758,7 @@ - =item $gi = Geo::IP->new( [$flags] ); - - Constructs a new Geo::IP object with the default database located inside your system's --I, typically I. -+I, typically I. - - Flags can be set to either GEOIP_STANDARD, or for faster performance - (at a cost of using more memory), GEOIP_MEMORY_CACHE. ---- t/1_lookup.t Tue Mar 30 15:13:37 2010 -+++ t/1_lookup.t Mon Jan 09 18:58:13 2017 -@@ -2,7 +2,7 @@ - use vars qw($dat); - - BEGIN { -- foreach my $file ("GeoIP.dat",'/usr/local/share/GeoIP/GeoIP.dat') { -+ foreach my $file ("GeoIP.dat",'/usr/share/GeoIP/GeoIP.dat') { - if (-f $file) { - $dat = $file; - last; ---- t/2_namelookup.t Tue Mar 30 15:21:37 2010 -+++ t/2_namelookup.t Mon Jan 09 18:58:21 2017 -@@ -2,7 +2,7 @@ - use vars qw($dat); - - BEGIN { -- foreach my $file ("GeoIP.dat",'/usr/local/share/GeoIP/GeoIP.dat') { -+ foreach my $file ("GeoIP.dat",'/usr/share/GeoIP/GeoIP.dat') { - if (-f $file) { - $dat = $file; - last; ---- Changes Tue Mar 30 15:26:38 2010 -+++ Changes Mon Jan 09 18:57:37 2017 -@@ -35,7 +35,7 @@ - Country, City and Org requests benefit from GEOIP_MEMORY_CACHE and GEOIP_MMAP_CACHE - Add GEOIP_MMAP_CACHE support ( Peter Shipley ) - Now works with new format of GeoIP ISP -- Corrected path to /usr/local/share/GeoIP/GeoIP.dat in geoip-lookup program. -+ Corrected path to /usr/share/GeoIP/GeoIP.dat in geoip-lookup program. - - 1.18 January 8th 2007 - Replaced CS/Serbia and Montenegro with RS/Serbia, removed ZR/Zaire, added ME/Montenegro ---- geoip-lookup Tue Mar 30 15:13:36 2010 -+++ geoip-lookup Mon Jan 09 18:57:44 2017 -@@ -15,7 +15,7 @@ - - The I program will return the country for the IP address or - hostname given as the first command line argument. --It queries the GeoIP Country database in C. -+It queries the GeoIP Country database in C. - - By default it prints the ISO 3166 country code. Use the C<-l> option - to print the country name. ---- geoip-lookup-city Tue Mar 30 15:13:36 2010 -+++ geoip-lookup-city Mon Jan 09 18:57:48 2017 -@@ -6,7 +6,7 @@ - - my $addr = shift; - --my $gi = Geo::IP::PurePerl->new( "/usr/local/share/GeoIP/GeoIPCity.dat", -+my $gi = Geo::IP::PurePerl->new( "/usr/share/GeoIP/GeoIPCity.dat", - GEOIP_STANDARD ); - - if ($addr) { ---- geoip-lookup-isp Tue Mar 30 15:13:36 2010 -+++ geoip-lookup-isp Mon Jan 09 18:57:50 2017 -@@ -7,7 +7,7 @@ - - my $addr = shift; - --my $gi = Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPISP.dat",GEOIP_STANDARD); -+my $gi = Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPISP.dat",GEOIP_STANDARD); - - my $isp = $gi->org_by_name($addr); - ---- geoip-lookup-netspeed Tue Mar 30 15:13:36 2010 -+++ geoip-lookup-netspeed Mon Jan 09 18:57:53 2017 -@@ -6,7 +6,7 @@ - - my $addr = $ARGV[0]; - --my $gi = Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPNetSpeed.dat",GEOIP_STANDARD); -+my $gi = Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPNetSpeed.dat",GEOIP_STANDARD); - - my $netspeed = $gi->id_by_addr($addr); - ---- geoip-lookup-org Tue Mar 30 15:13:36 2010 -+++ geoip-lookup-org Mon Jan 09 18:57:59 2017 -@@ -7,7 +7,7 @@ - - my $addr = shift; - --my $gi = Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPOrg.dat",GEOIP_STANDARD); -+my $gi = Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPOrg.dat",GEOIP_STANDARD); - - my $org = $gi->org_by_name($addr); - ---- geoip-lookup-region Tue Mar 30 15:13:36 2010 -+++ geoip-lookup-region Mon Jan 09 18:58:01 2017 -@@ -10,7 +10,7 @@ - - my $addr = $ARGV[0]; - --my $gi = Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPRegion.dat",GEOIP_STANDARD); -+my $gi = Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPRegion.dat",GEOIP_STANDARD); - - my ($country,$region) = $gi->region_by_name($addr); - ---- INSTALL Tue Mar 30 15:13:36 2010 -+++ INSTALL Mon Jan 09 18:58:05 2017 -@@ -3,7 +3,7 @@ - # fetch latest GeoIP database, updated monthly - wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz - gunzip GeoIP.dat.gz --mv GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat -+mv GeoIP.dat /usr/share/GeoIP/GeoIP.dat - - perl Makefile.PL - make