[GeoIP] Fix for bz#947606

Philip Prindeville philipp at fedoraproject.org
Tue Apr 2 20:30:05 UTC 2013 

commit 8816bfc6769586d0aad1faaaf015aeeae0e4585f
Author: Philip Prindeville <philipp at redfish-solutions.com>
Date:   Tue Apr 2 14:29:55 2013 -0600

    Fix for bz#947606

 GeoIP-1.4.8-UTF8.patch => GeoIP-1.5.0-UTF8.patch |   78 +-
 GeoIP-aarch64.patch                              | 1348 ----------------------
 GeoIP.spec                                       |   23 +-
 3 files changed, 43 insertions(+), 1406 deletions(-)
---
diff --git a/GeoIP-1.4.8-UTF8.patch b/GeoIP-1.5.0-UTF8.patch
similarity index 53%
rename from GeoIP-1.4.8-UTF8.patch
rename to GeoIP-1.5.0-UTF8.patch
index 93e67a7..4403fb3 100644
--- a/GeoIP-1.4.8-UTF8.patch
+++ b/GeoIP-1.5.0-UTF8.patch
@@ -1,6 +1,6 @@
-diff -U0 GeoIP-1.4.8/ChangeLog.orig GeoIP-1.4.8/ChangeLog
---- GeoIP-1.4.8/ChangeLog.orig	2011-06-24 14:44:56.000000000 +0100
-+++ GeoIP-1.4.8/ChangeLog	2011-06-27 09:06:16.190029375 +0100
+diff -U0 GeoIP-1.5.0/ChangeLog.orig GeoIP-1.5.0/ChangeLog
+--- GeoIP-1.5.0/ChangeLog.orig	2011-06-24 14:44:56.000000000 +0100
++++ GeoIP-1.5.0/ChangeLog	2011-06-27 09:06:16.190029375 +0100
 @@ -137,2 +137,2 @@
 -	* Fixed a typo in the geoipupdate(1) manpage and also an non-existent path on Debian (Patrick Matthäi)
 -	* Fixes two little format errors (hyphen used as minus sign) in both manpages (Patrick Matthäi)
@@ -24,54 +24,30 @@ diff -U0 GeoIP-1.4.8/ChangeLog.orig GeoIP-1.4.8/ChangeLog
 +		    (I've already done the above changes see attached function.)
 +		    With gcc -O2 calculating x[0] and x[1] for STANDARD_RECORD_LENGTH now
 +		    only takes 15 (was > 100) i80x86 instructions with 6 byte accesses of RAM.                 4) only calculate x[0], x[1] when needed, may be a bigger win
-diff -up GeoIP-1.4.8/man/geoiplookup.1.in.orig GeoIP-1.4.8/man/geoiplookup.1.in
---- GeoIP-1.4.8/man/geoiplookup.1.in.orig	2011-03-27 22:00:36.000000000 +0100
-+++ GeoIP-1.4.8/man/geoiplookup.1.in	2011-06-27 09:06:16.212029324 +0100
-@@ -28,7 +28,7 @@ Written by T.J. Mather
- .SH "REPORTING BUGS"
- Report bugs to <support at maxmind.com>
- .SH COPYRIGHT
--Copyright © 2006 MaxMind LLC
-+Copyright © 2006 MaxMind LLC
- 
- This is free software; see the source for copying conditions.
- There is NO warranty; not even for MERCHANTABILITY
-diff -up GeoIP-1.4.8/man/geoiplookup6.1.in.orig GeoIP-1.4.8/man/geoiplookup6.1.in
---- GeoIP-1.4.8/man/geoiplookup6.1.in.orig	2011-03-27 22:00:36.000000000 +0100
-+++ GeoIP-1.4.8/man/geoiplookup6.1.in	2011-06-27 09:06:16.212029324 +0100
-@@ -33,7 +33,7 @@ Written by T.J. Mather
- .SH "REPORTING BUGS"
- Report bugs to <support at maxmind.com>
- .SH COPYRIGHT
--Copyright © 2008 MaxMind LLC
-+Copyright © 2008 MaxMind LLC
- 
- This is free software; see the source for copying conditions.
- There is NO warranty; not even for MERCHANTABILITY
-diff -up GeoIP-1.4.8/man/geoipupdate.1.in.orig GeoIP-1.4.8/man/geoipupdate.1.in
---- GeoIP-1.4.8/man/geoipupdate.1.in.orig	2011-06-23 21:31:22.000000000 +0100
-+++ GeoIP-1.4.8/man/geoipupdate.1.in	2011-06-27 09:07:07.312910591 +0100
-@@ -56,7 +56,7 @@ Written by T.J. Mather
- .SH "REPORTING BUGS"
- Report bugs to <support at maxmind.com>
- .SH COPYRIGHT
--Copyright © 2011 MaxMind LLC
-+Copyright © 2011 MaxMind LLC
- 
- This is free software; see the source for copying conditions.
- There is NO warranty; not even for MERCHANTABILITY
-diff -up GeoIP-1.4.8/README.orig GeoIP-1.4.8/README
---- GeoIP-1.4.8/README.orig	2011-06-24 14:45:00.000000000 +0100
-+++ GeoIP-1.4.8/README	2011-06-27 09:06:16.213029322 +0100
-@@ -177,7 +177,7 @@ It seems that some
- versions of gcc have a bug and consume 1 GB of memory when optimizing
- certain source files (the other source file where this was reported is
- from XORG X-Server). It happens at least with gcc 3.3.1 and with gcc
--4.2(.0).  Thanks to Kai Schätzl for the report.
-+4.2(.0).  Thanks to Kai Schätzl for the report.
- 
- If GEOIP_MMAP_CACHE doesn't work on a 64bit machine, try adding
- the flag "MAP_32BIT" to the mmap call.
+diff -U0 GeoIP-1.5.0/man/geoiplookup.1.in.orig GeoIP-1.5.0/man/geoiplookup.1.in
+--- GeoIP-1.5.0/man/geoiplookup.1.in.orig	2013-02-27 14:13:11.000000000 -0700
++++ GeoIP-1.5.0/man/geoiplookup.1.in	2013-04-02 12:01:22.500882994 -0600
+@@ -31,1 +31,1 @@
+-Copyright © 2006 MaxMind, Inc.
++Copyright \[co] 2006 MaxMind, Inc.
+diff -U0 GeoIP-1.5.0/man/geoiplookup6.1.in.orig GeoIP-1.5.0/man/geoiplookup6.1.in
+--- GeoIP-1.5.0/man/geoiplookup6.1.in.orig	2013-02-27 14:13:11.000000000 -0700
++++ GeoIP-1.5.0/man/geoiplookup6.1.in	2013-04-02 12:02:11.595886598 -0600
+@@ -36,1 +36,1 @@
+-Copyright © 2008 MaxMind, Inc.
++Copyright \[co] 2008 MaxMind, Inc.
+diff -U0 GeoIP-1.5.0/man/geoipupdate.1.in.orig GeoIP-1.5.0/man/geoipupdate.1.in
+--- GeoIP-1.5.0/man/geoipupdate.1.in.orig	2013-02-27 14:13:11.000000000 -0700
++++ GeoIP-1.5.0/man/geoipupdate.1.in	2013-04-02 12:02:36.402889004 -0600
+@@ -59,1 +59,1 @@
+-Copyright © 2011 MaxMind, Inc.
++Copyright \[co] 2011 MaxMind, Inc.
+diff -U0 GeoIP-1.5.0/README.orig GeoIP-1.5.0/README
+--- GeoIP-1.5.0/README.orig	2013-02-27 14:27:51.000000000 -0700
++++ GeoIP-1.5.0/README	2013-04-02 12:04:45.400883174 -0600
+@@ -209,1 +209,1 @@
+-4.2(.0). Thanks to Kai Schätzl for the report.
++4.2(.0). Thanks to Kai Schätzl for the report.
 diff -up GeoIP-1.4.8/TODO.orig GeoIP-1.4.8/TODO
 --- GeoIP-1.4.8/TODO.orig	2011-03-27 22:00:37.000000000 +0100
 +++ GeoIP-1.4.8/TODO	2011-06-27 09:06:16.214029320 +0100
diff --git a/GeoIP.spec b/GeoIP.spec
index 442d665..25fe7ac 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -1,6 +1,6 @@
 Name:		GeoIP
-Version:	1.4.8
-Release:	6%{?dist}
+Version:	1.5.0
+Release:	1%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
 License:	LGPLv2+ and GPLv2+
@@ -10,8 +10,7 @@ Source1:	LICENSE.txt
 Source2:	fetch-geoipdata-city.pl
 Source3:	fetch-geoipdata.pl
 Source4:	README.Fedora
-Patch0:		GeoIP-aarch64.patch
-Patch10:	GeoIP-1.4.8-UTF8.patch
+Patch10:	GeoIP-1.5.0-UTF8.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
 Obsoletes:	geoip < %{version}-%{release}
@@ -37,9 +36,6 @@ Development headers and static libraries for building GeoIP-based applications.
 %prep
 %setup -q
 
-# Fix config.guess and config.sub to add aarch64 support (#925403)
-%patch0 -p1
-
 # Recode docs as UTF-8
 %patch10 -p1
 
@@ -72,10 +68,19 @@ make DESTDIR=%{buildroot} install
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}%{_libdir}/*.la
 
+# fix up the config file to use the free products by default
+sed -i \
+	-e 's/YOUR_LICENSE_KEY_HERE$/000000000000/' \
+	-e 's/YOUR_USER_ID_HERE$/999999/' \
+	-e 's/106$/506 533 517/' \
+	%{buildroot}%{_sysconfdir}/GeoIP.conf
+ln -sf GeoLiteCountry.dat %{buildroot}%{_datadir}/GeoIP/GeoIP.dat
+
 %clean
 rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
+geoipupdate 
 
 %postun -p /sbin/ldconfig
 
@@ -105,8 +110,12 @@ rm -rf %{buildroot}
 %{_libdir}/libGeoIP.so
 # GPLv2+
 %{_libdir}/libGeoIPUpdate.so
+%{_libdir}/pkgconfig/geoip.pc
 
 %changelog
+* Mon Apr 02 2013 Philip Prindeville <philipp at fedoraproject.org> - 1.5.0-1
+- Version bump to 1.5.0
+
 * Sun Mar 24 2013 Paul Howarth <paul at city-fan.org> - 1.4.8-6
 - Fix config.guess and config.sub to add aarch64 support (#925403)

More information about the scm-commits mailing list