From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] GeoIP: Update to 1.25 / changed database path Date: Wed, 11 Jan 2017 18:38:13 +0100 Message-ID: <20170111173813.16778-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5353578105189067190==" List-Id: --===============5353578105189067190== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Database path changed to '/usr/share/GeoIP' Signed-off-by: Matthias Fischer --- config/rootfiles/common/GeoIP | 4 +- lfs/GeoIP | 15 +-- src/patches/geoip_1_25_change_database_path.patch | 139 ++++++++++++++++++++= ++ 3 files changed, 149 insertions(+), 9 deletions(-) create mode 100644 src/patches/geoip_1_25_change_database_path.patch diff --git a/config/rootfiles/common/GeoIP b/config/rootfiles/common/GeoIP index d9b9d1025..d76ba645e 100644 --- a/config/rootfiles/common/GeoIP +++ b/config/rootfiles/common/GeoIP @@ -6,7 +6,7 @@ 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/IP #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Geo/IP/PureP= erl #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Geo/IP/PureP= erl/.packlist -usr/local/share/GeoIP -usr/local/share/GeoIP/GeoIP.dat +#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 index 882d1a078..3e79da544 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2014 IPFire Team = # +# Copyright (C) 2007-2017 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 = # @@ -24,8 +24,8 @@ =20 include Config =20 -VER =3D 1.17 -DATVER =3D 15022015 +VER =3D 1.25 +DATVER =3D 07012017 =20 THISAPP =3D Geo-IP-PurePerl-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -42,8 +42,8 @@ objects =3D $(DL_FILE) GeoIP.dat-$(DATVER).gz $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) GeoIP.dat-$(DATVER).gz =3D $(DL_FROM)/GeoIP.dat-$(DATVER).gz =20 -$(DL_FILE)_MD5 =3D 42a6b9d4dd2563a20c8998556216e1de -GeoIP.dat-$(DATVER).gz_MD5 =3D 508e3c10da15f2722774cf4014863976 +$(DL_FILE)_MD5 =3D a47a1b71f7cd7c46cca9efcc448e0726 +GeoIP.dat-$(DATVER).gz_MD5 =3D fac676d18785585568312f30b7851657 =20 install : $(TARGET) =20 @@ -73,11 +73,12 @@ $(subst %,%_MD5,$(objects)) : $(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_dat= abase_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/local/share/GeoIP && \ - zcat $(DIR_DL)/GeoIP.dat-$(DATVER).gz > /usr/local/share/GeoIP/GeoIP.dat + 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 new file mode 100644 index 000000000..933e93d28 --- /dev/null +++ b/src/patches/geoip_1_25_change_database_path.patch @@ -0,0 +1,139 @@ +--- 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 @@ +=20 +=20 + # --- unfortunately we do not know the path so we assume the=20 +-# 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) +=20 +- my $def_db_file =3D '/usr/local/share/GeoIP/GeoIP.dat'; ++ my $def_db_file =3D '/usr/share/GeoIP/GeoIP.dat'; + if ($^O eq 'NetWare') { + $def_db_file =3D 'sys:/etc/GeoIP/GeoIP.dat'; + } elsif ($^O eq 'MSWin32') { +@@ -758,7 +758,7 @@ + =3Ditem $gi =3D Geo::IP->new( [$flags] ); +=20 + Constructs a new Geo::IP object with the default database located inside yo= ur system's +-I, typically I. ++I, typically I. +=20 + 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); +=20 + 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 =3D $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); +=20 + 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 =3D $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_M= MAP_CACHE + Add GEOIP_MMAP_CACHE support ( Peter Shipley )=20 + 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. +=20 + 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 @@ +=20 + 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. +=20 + 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 @@ +=20 + my $addr =3D shift; +=20 +-my $gi =3D Geo::IP::PurePerl->new( "/usr/local/share/GeoIP/GeoIPCity.dat", ++my $gi =3D Geo::IP::PurePerl->new( "/usr/share/GeoIP/GeoIPCity.dat", + GEOIP_STANDARD ); +=20 + 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 @@ +=20 + my $addr =3D shift; +=20 +-my $gi =3D Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPISP.dat",GEO= IP_STANDARD); ++my $gi =3D Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPISP.dat",GEOIP_STA= NDARD); +=20 + my $isp =3D $gi->org_by_name($addr); +=20 +--- geoip-lookup-netspeed Tue Mar 30 15:13:36 2010 ++++ geoip-lookup-netspeed Mon Jan 09 18:57:53 2017 +@@ -6,7 +6,7 @@ +=20 + my $addr =3D $ARGV[0]; +=20 +-my $gi =3D Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPNetSpeed.dat= ",GEOIP_STANDARD); ++my $gi =3D Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPNetSpeed.dat",GEOI= P_STANDARD); +=20 + my $netspeed =3D $gi->id_by_addr($addr); +=20 +--- geoip-lookup-org Tue Mar 30 15:13:36 2010 ++++ geoip-lookup-org Mon Jan 09 18:57:59 2017 +@@ -7,7 +7,7 @@ +=20 + my $addr =3D shift; +=20 +-my $gi =3D Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPOrg.dat",GEO= IP_STANDARD); ++my $gi =3D Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPOrg.dat",GEOIP_STA= NDARD); +=20 + my $org =3D $gi->org_by_name($addr); +=20 +--- geoip-lookup-region Tue Mar 30 15:13:36 2010 ++++ geoip-lookup-region Mon Jan 09 18:58:01 2017 +@@ -10,7 +10,7 @@ +=20 + my $addr =3D $ARGV[0]; +=20 +-my $gi =3D Geo::IP::PurePerl->new("/usr/local/share/GeoIP/GeoIPRegion.dat",= GEOIP_STANDARD); ++my $gi =3D Geo::IP::PurePerl->new("/usr/share/GeoIP/GeoIPRegion.dat",GEOIP_= STANDARD); +=20 + my ($country,$region) =3D $gi->region_by_name($addr); +=20 +--- 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/GeoI= P.dat.gz + gunzip GeoIP.dat.gz +-mv GeoIP.dat /usr/local/share/GeoIP/GeoIP.dat ++mv GeoIP.dat /usr/share/GeoIP/GeoIP.dat +=20 + perl Makefile.PL + make --=20 2.11.0 --===============5353578105189067190==--