Hello community,
here is the log from the commit of package GeoIP for openSUSE:Factory checked
in at 2016-02-08 09:47:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/GeoIP (Old)
and /work/SRC/openSUSE:Factory/.GeoIP.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "GeoIP"
Changes:
--------
--- /work/SRC/openSUSE:Factory/GeoIP/GeoIP.changes 2015-11-23
07:30:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.GeoIP.new/GeoIP.changes 2016-02-08
09:47:49.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Feb 4 20:08:42 UTC 2016 - mplus...@suse.com
+
+- Update to 1.6.9
+ * Fix a regression introduced in version 1.6.8, which caused
+ GeoIP_database_info to erroneously return NULL.
+- Changes for 1.6.8
+ * Allow compilation on older systems by relaxing the autoconf
+ and automake minimum versions. Thank you, Jose Rubio!
+ * Avoid potential problems in multi-threaded environments by
+ consistently using pread() rather than read().
+ * Fix various small issues reported by clang's static analyser.
+
+-------------------------------------------------------------------
Old:
----
GeoIP-1.6.7.tar.gz
New:
----
GeoIP-1.6.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ GeoIP.spec ++++++
--- /var/tmp/diff_new_pack.XlItkK/_old 2016-02-08 09:47:49.000000000 +0100
+++ /var/tmp/diff_new_pack.XlItkK/_new 2016-02-08 09:47:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package GeoIP
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: GeoIP
-Version: 1.6.7
+Version: 1.6.9
Release: 0
Summary: Library to find the country that any IP address originates from
License: LGPL-2.1+
@@ -31,8 +31,8 @@
Source5: geoip-csv-to-dat.cpp
Source6: geoip-asn-csv-to-dat.cpp
Source7: v4-to-v6-layout.pl
-BuildRequires: pkg-config
BuildRequires: gcc-c++
+BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
Recommends: curl
@@ -108,7 +108,8 @@
cp %{SOURCE2} .
%build
-%configure --disable-static \
+%configure \
+ --disable-static \
--with-pic
sed -i -e '/-DGEOIPDATADIR/s,\$(pkgdatadir),%{_localstatedir}/lib/GeoIP,'
libGeoIP/Makefile{.am,.in,}
@@ -153,8 +154,8 @@
%doc AUTHORS ChangeLog COPYING README.md LICENSE README.SUSE
%{_bindir}/geoiplookup
%{_bindir}/geoiplookup6
-%{_mandir}/man1/geoiplookup6.1*
-%{_mandir}/man1/geoiplookup.1*
+%{_mandir}/man1/geoiplookup6.1%{ext_man}
+%{_mandir}/man1/geoiplookup.1%{ext_man}
%{_sbindir}/geoip-fetch
%{_prefix}/lib/geoip/
++++++ GeoIP-1.6.7.tar.gz -> GeoIP-1.6.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/ChangeLog new/GeoIP-1.6.9/ChangeLog
--- old/GeoIP-1.6.7/ChangeLog 2015-10-30 16:56:10.000000000 +0100
+++ new/GeoIP-1.6.9/ChangeLog 2016-01-11 22:26:48.000000000 +0100
@@ -1,3 +1,16 @@
+1.6.9 2016-01-11
+
+* Fix a regression introduced in version 1.6.8, which caused
+ GeoIP_database_info to erroneously return NULL.
+
+1.6.8 2016-01-11
+
+* Allow compilation on older systems by relaxing the autoconf and automake
+ minimum versions. Thank you, Jose Rubio!
+* Avoid potential problems in multi-threaded environments by consistently using
+ pread() rather than read().
+* Fix various small issues reported by clang's static analyser.
+
1.6.7 2015-10-30
* Fixed a MSVC parser stack overflow when parsing `regionName.c` and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/GeoIP.spec new/GeoIP-1.6.9/GeoIP.spec
--- old/GeoIP-1.6.7/GeoIP.spec 2015-10-30 17:04:31.000000000 +0100
+++ new/GeoIP-1.6.9/GeoIP.spec 2016-01-11 22:27:59.000000000 +0100
@@ -1,5 +1,5 @@
Name: GeoIP
-Version: 1.6.7
+Version: 1.6.9
Summary: GeoIP is a C library finds the location of an IP address.
Release: 1
Group: System Environment/Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/Makefile.in new/GeoIP-1.6.9/Makefile.in
--- old/GeoIP-1.6.7/Makefile.in 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/Makefile.in 2016-01-11 22:27:45.000000000 +0100
@@ -190,8 +190,7 @@
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/GeoIP.spec.in $(srcdir)/Makefile.in \
$(srcdir)/geoip.pc.in AUTHORS COPYING ChangeLog INSTALL \
- compile config.guess config.sub depcomp install-sh ltmain.sh \
- missing
+ compile config.guess config.sub install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -342,6 +341,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/apps/Makefile.in
new/GeoIP-1.6.9/apps/Makefile.in
--- old/GeoIP-1.6.7/apps/Makefile.in 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/apps/Makefile.in 2016-01-11 22:27:45.000000000 +0100
@@ -287,6 +287,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/apps/geoiplookup.c
new/GeoIP-1.6.9/apps/geoiplookup.c
--- old/GeoIP-1.6.7/apps/geoiplookup.c 2015-07-28 22:11:02.000000000 +0200
+++ new/GeoIP-1.6.9/apps/geoiplookup.c 2016-01-11 21:43:25.000000000 +0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* geoiplookup.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/apps/geoiplookup6.c
new/GeoIP-1.6.9/apps/geoiplookup6.c
--- old/GeoIP-1.6.7/apps/geoiplookup6.c 2015-10-30 16:53:33.000000000 +0100
+++ new/GeoIP-1.6.9/apps/geoiplookup6.c 2016-01-11 21:43:25.000000000 +0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* geoiplookup.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/config.guess new/GeoIP-1.6.9/config.guess
--- old/GeoIP-1.6.7/config.guess 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/config.guess 2016-01-11 22:27:45.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-03-23'
+timestamp='2015-08-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
#
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
-# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
+# Please send patches to <config-patc...@gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,20 +168,27 @@
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+ /sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || \
+ echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
+ earmv*)
+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e
's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne
's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
+ ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
@@ -197,6 +204,13 @@
os=netbsd
;;
esac
+ # Determine ABI tags.
+ case "${UNAME_MACHINE_ARCH}" in
+ earm*)
+ expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ ;;
+ esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
@@ -207,13 +221,13 @@
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d.
-f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
+ echo "${machine}-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -235,6 +249,9 @@
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -579,8 +596,9 @@
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
@@ -932,6 +950,9 @@
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
+ e2k:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1020,7 +1041,7 @@
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/config.sub new/GeoIP-1.6.9/config.sub
--- old/GeoIP-1.6.7/config.sub 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/config.sub 2016-01-11 22:27:45.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-09-11'
+timestamp='2015-08-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patc...@gnu.org.
+# Please send patches to <config-patc...@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* |
kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
@@ -255,12 +255,13 @@
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
+ | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
- | epiphany \
- | fido | fr30 | frv \
+ | e2k | epiphany \
+ | fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
@@ -305,7 +306,7 @@
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -313,6 +314,7 @@
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -327,6 +329,9 @@
c6x)
basic_machine=tic6x-unknown
;;
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
@@ -372,12 +377,13 @@
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
- | elxsi-* \
+ | e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -424,12 +430,13 @@
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-*
| sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* |
sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -437,6 +444,7 @@
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -513,6 +521,9 @@
basic_machine=i386-pc
os=-aros
;;
+ asmjs)
+ basic_machine=asmjs-unknown
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -774,6 +785,9 @@
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -1365,7 +1379,7 @@
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* |
-solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/configure new/GeoIP-1.6.9/configure
--- old/GeoIP-1.6.7/configure 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/configure 2016-01-11 22:27:44.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GeoIP 1.6.7.
+# Generated by GNU Autoconf 2.69 for GeoIP 1.6.9.
#
# Report bugs to <supp...@maxmind.com>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='GeoIP'
PACKAGE_TARNAME='GeoIP'
-PACKAGE_VERSION='1.6.7'
-PACKAGE_STRING='GeoIP 1.6.7'
+PACKAGE_VERSION='1.6.9'
+PACKAGE_STRING='GeoIP 1.6.9'
PACKAGE_BUGREPORT='supp...@maxmind.com'
PACKAGE_URL=''
@@ -732,6 +732,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -812,6 +813,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1064,6 +1066,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1201,7 +1212,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1314,7 +1325,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GeoIP 1.6.7 to adapt to many kinds of systems.
+\`configure' configures GeoIP 1.6.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1354,6 +1365,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1384,7 +1396,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GeoIP 1.6.7:";;
+ short | recursive ) echo "Configuration of GeoIP 1.6.9:";;
esac
cat <<\_ACEOF
@@ -1490,7 +1502,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GeoIP configure 1.6.7
+GeoIP configure 1.6.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1967,7 +1979,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GeoIP $as_me 1.6.7, which was
+It was created by GeoIP $as_me 1.6.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2835,7 +2847,7 @@
# Define the identity of the package.
PACKAGE='GeoIP'
- VERSION='1.6.7'
+ VERSION='1.6.9'
cat >>confdefs.h <<_ACEOF
@@ -13727,7 +13739,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GeoIP $as_me 1.6.7, which was
+This file was extended by GeoIP $as_me 1.6.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13784,7 +13796,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GeoIP config.status 1.6.7
+GeoIP config.status 1.6.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/configure.ac new/GeoIP-1.6.9/configure.ac
--- old/GeoIP-1.6.7/configure.ac 2015-10-30 16:57:15.000000000 +0100
+++ new/GeoIP-1.6.9/configure.ac 2016-01-11 22:27:05.000000000 +0100
@@ -1,11 +1,11 @@
dnl AM_CONFIG_HEADER(config.h)
-AC_PREREQ([2.65])
-AC_INIT([GeoIP], [1.6.7],[supp...@maxmind.com],[GeoIP])
+AC_PREREQ([2.63])
+AC_INIT([GeoIP], [1.6.9],[supp...@maxmind.com],[GeoIP])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_SRCDIR([libGeoIP/GeoIP.c])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(1.11.0)
+AM_INIT_AUTOMAKE(1.10.0)
AC_GNU_SOURCE
GEOIP_VERSION_INFO=`echo $VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3,
$2 }'`
AC_SUBST(GEOIP_VERSION_INFO)
Files old/GeoIP-1.6.7/data/GeoIP.dat and new/GeoIP-1.6.9/data/GeoIP.dat differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/install-sh new/GeoIP-1.6.9/install-sh
--- old/GeoIP-1.6.7/install-sh 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/install-sh 2016-01-11 22:27:45.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2014-09-12.12; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,34 +324,41 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # $RANDOM is not portable (e.g. dash); use it when possible to
+ # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
2>/dev/null; exit $ret' 0
+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
+ # create the $tmpdir first (and fail if unsuccessful) to make sure
+ # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null
2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/libGeoIP/GeoIP.c
new/GeoIP-1.6.9/libGeoIP/GeoIP.c
--- old/GeoIP-1.6.7/libGeoIP/GeoIP.c 2015-10-30 16:53:33.000000000 +0100
+++ new/GeoIP-1.6.9/libGeoIP/GeoIP.c 2016-01-11 22:22:58.000000000 +0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* GeoIP.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -872,7 +872,7 @@
if (p) {
while ( ( c = *iso++ ) ) {
if (c < 0) {
- k = (char) 0xc2;
+ k = (char)0xc2;
if (c >= -64) {
k++;
}
@@ -959,7 +959,7 @@
int i, j, segment_record_length;
unsigned char delim[3];
unsigned char buf[LARGE_SEGMENT_RECORD_LENGTH];
-
+ off_t offset = gi->size - 3;
int fno = fileno(gi->GeoIPDatabase);
gi->databaseSegments = NULL;
@@ -967,17 +967,17 @@
/* default to GeoIP Country Edition */
gi->databaseType = GEOIP_COUNTRY_EDITION;
gi->record_length = STANDARD_RECORD_LENGTH;
- if (-1 == lseek(fno, -3l, SEEK_END)) {
- return;
- }
+
for (i = 0; i < STRUCTURE_INFO_MAX_SIZE; i++) {
- if (read(fno, delim, 3) != 3) {
+ if (pread(fno, delim, 3, offset) != 3) {
return;
}
+ offset += 3;
if (delim[0] == 255 && delim[1] == 255 && delim[2] == 255) {
- if (read(fno, &gi->databaseType, 1) != 1) {
+ if (pread(fno, &gi->databaseType, 1, offset) != 1) {
return;
}
+ offset++;
if (gi->databaseType >= 106) {
/* backwards compatibility with databases from April 2003 and
earlier */
gi->databaseType -= 105;
@@ -985,14 +985,14 @@
if (gi->databaseType == GEOIP_REGION_EDITION_REV0) {
/* Region Edition, pre June 2003 */
- gi->databaseSegments = malloc(sizeof(int));
+ gi->databaseSegments = malloc(sizeof(unsigned int));
if (gi->databaseSegments == NULL) {
return;
}
gi->databaseSegments[0] = STATE_BEGIN_REV0;
} else if (gi->databaseType == GEOIP_REGION_EDITION_REV1) {
/* Region Edition, post June 2003 */
- gi->databaseSegments = malloc(sizeof(int));
+ gi->databaseSegments = malloc(sizeof(unsigned int));
if (gi->databaseSegments == NULL) {
return;
}
@@ -1024,19 +1024,20 @@
gi->databaseType == GEOIP_POSTALCONF_EDITION
) {
/* City/Org Editions have two segments, read offset of second
segment */
- gi->databaseSegments = malloc(sizeof(int));
+ gi->databaseSegments = malloc(sizeof(unsigned int));
if (gi->databaseSegments == NULL) {
return;
}
gi->databaseSegments[0] = 0;
segment_record_length = SEGMENT_RECORD_LENGTH;
- if (read(fno, buf,
- segment_record_length) != segment_record_length) {
+ if (pread(fno, buf, segment_record_length, offset)
+ != segment_record_length) {
free(gi->databaseSegments);
gi->databaseSegments = NULL;
return;
}
+
for (j = 0; j < segment_record_length; j++) {
gi->databaseSegments[0] += (buf[j] << (j * 8));
}
@@ -1053,7 +1054,8 @@
}
break;
} else {
- if (-1 == lseek(fno, -4l, SEEK_CUR)) {
+ offset -= 4;
+ if (offset < 0) {
gi->databaseSegments = NULL;
return;
}
@@ -1063,20 +1065,19 @@
gi->databaseType == GEOIP_PROXY_EDITION ||
gi->databaseType == GEOIP_NETSPEED_EDITION ||
gi->databaseType == GEOIP_COUNTRY_EDITION_V6) {
- gi->databaseSegments = malloc(sizeof(int));
+ gi->databaseSegments = malloc(sizeof(unsigned int));
if (gi->databaseSegments == NULL) {
return;
}
gi->databaseSegments[0] = COUNTRY_BEGIN;
}else if (gi->databaseType == GEOIP_LARGE_COUNTRY_EDITION ||
gi->databaseType == GEOIP_LARGE_COUNTRY_EDITION_V6) {
- gi->databaseSegments = malloc(sizeof(int));
+ gi->databaseSegments = malloc(sizeof(unsigned int));
if (gi->databaseSegments == NULL) {
return;
}
gi->databaseSegments[0] = LARGE_COUNTRY_BEGIN;
}
-
}
static
@@ -2027,7 +2028,7 @@
unsigned char buf[3];
char *retval;
int hasStructureInfo = 0;
-
+ off_t offset = gi->size - 3;
int fno;
if (gi == NULL) {
@@ -2037,50 +2038,52 @@
fno = fileno(gi->GeoIPDatabase);
_check_mtime(gi);
- if (-1 == lseek(fno, -3l, SEEK_END)) {
- return NULL;
- }
/* first get past the database structure information */
for (i = 0; i < STRUCTURE_INFO_MAX_SIZE; i++) {
- if (read(fno, buf, 3 ) != 3) {
+ if (pread(fno, buf, 3, offset) != 3) {
return NULL;
}
if (buf[0] == 255 && buf[1] == 255 && buf[2] == 255) {
hasStructureInfo = 1;
break;
}
- if (-1 == lseek(fno, -4l, SEEK_CUR)) {
+ offset -= 1;
+ if (offset < 0) {
return NULL;
}
}
if (hasStructureInfo == 1) {
- if (-1 == lseek(fno, -6l, SEEK_CUR)) {
+ offset -= 6;
+ if (offset < 0) {
return NULL;
}
} else {
/* no structure info, must be pre Sep 2002 database, go back to end */
- if (-1 == lseek(fno, -3l, SEEK_END)) {
+ offset -= 3;
+ if (offset < 0) {
return NULL;
}
}
for (i = 0; i < DATABASE_INFO_MAX_SIZE; i++) {
- if (read(fno, buf, 3 ) != 3) {
+ if (pread(fno, buf, 3, offset) != 3) {
return NULL;
}
+ offset += 3;
if (buf[0] == 0 && buf[1] == 0 && buf[2] == 0) {
retval = malloc(sizeof(char) * (i + 1));
if (retval == NULL) {
return NULL;
}
- if (read(fno, retval, i) != i) {
+ if (pread(fno, retval, i, offset) != i) {
return NULL;
}
retval[i] = '\0';
return retval;
}
- if (-1 == lseek(fno, -4l, SEEK_CUR)) {
+ offset -= 4;
+ if (offset < 0) {
return NULL;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/libGeoIP/GeoIP.h
new/GeoIP-1.6.9/libGeoIP/GeoIP.h
--- old/GeoIP-1.6.7/libGeoIP/GeoIP.h 2015-10-30 14:59:12.000000000 +0100
+++ new/GeoIP-1.6.9/libGeoIP/GeoIP.h 2016-01-11 21:43:25.000000000 +0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* GeoIP.h
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/libGeoIP/GeoIPCity.c
new/GeoIP-1.6.9/libGeoIP/GeoIPCity.c
--- old/GeoIP-1.6.7/libGeoIP/GeoIPCity.c 2015-10-30 16:53:33.000000000
+0100
+++ new/GeoIP-1.6.9/libGeoIP/GeoIPCity.c 2016-01-11 21:43:25.000000000
+0100
@@ -2,7 +2,7 @@
/*
* GeoIPCity.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or modify it
under
* the terms of the GNU Lesser General Public License as published by the
@@ -85,7 +85,7 @@
if (gi->cache == NULL) {
begin_record_buf = record_buf = malloc(
- sizeof(char) * FULL_RECORD_LENGTH);
+ sizeof(unsigned char) * FULL_RECORD_LENGTH);
bytes_read = pread(fileno(
gi->GeoIPDatabase), record_buf,
FULL_RECORD_LENGTH, record_pointer);
@@ -98,6 +98,7 @@
}else {
if (gi->size <= record_pointer) {
/* such record does not exists in the cache */
+ free(record);
return NULL;
}
record_buf = gi->cache + (long)record_pointer;
@@ -174,7 +175,7 @@
}
}
- if (gi->cache == NULL) {
+ if (begin_record_buf != NULL) {
free(begin_record_buf);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/libGeoIP/GeoIPCity.h
new/GeoIP-1.6.9/libGeoIP/GeoIPCity.h
--- old/GeoIP-1.6.7/libGeoIP/GeoIPCity.h 2015-01-27 19:42:09.000000000
+0100
+++ new/GeoIP-1.6.9/libGeoIP/GeoIPCity.h 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* GeoIPCity.h
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/libGeoIP/Makefile.in
new/GeoIP-1.6.9/libGeoIP/Makefile.in
--- old/GeoIP-1.6.7/libGeoIP/Makefile.in 2015-10-30 17:04:17.000000000
+0100
+++ new/GeoIP-1.6.9/libGeoIP/Makefile.in 2016-01-11 22:27:45.000000000
+0100
@@ -313,6 +313,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/man/Makefile.in
new/GeoIP-1.6.9/man/Makefile.in
--- old/GeoIP-1.6.7/man/Makefile.in 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/man/Makefile.in 2016-01-11 22:27:45.000000000 +0100
@@ -260,6 +260,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/man/geoiplookup.1.in
new/GeoIP-1.6.9/man/geoiplookup.1.in
--- old/GeoIP-1.6.7/man/geoiplookup.1.in 2015-01-27 19:42:09.000000000
+0100
+++ new/GeoIP-1.6.9/man/geoiplookup.1.in 2016-01-11 21:43:25.000000000
+0100
@@ -28,7 +28,7 @@
.SH "REPORTING BUGS"
Report bugs to <supp...@maxmind.com>
.SH COPYRIGHT
-Copyright (C) 2006 MaxMind LLC
+Copyright (C) 2016 MaxMind, Inc.
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/Makefile.in
new/GeoIP-1.6.9/test/Makefile.in
--- old/GeoIP-1.6.7/test/Makefile.in 2015-10-30 17:04:17.000000000 +0100
+++ new/GeoIP-1.6.9/test/Makefile.in 2016-01-11 22:27:45.000000000 +0100
@@ -544,6 +544,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-asnum.c
new/GeoIP-1.6.9/test/test-geoip-asnum.c
--- old/GeoIP-1.6.7/test/test-geoip-asnum.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-asnum.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-asnum.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-city.c
new/GeoIP-1.6.9/test/test-geoip-city.c
--- old/GeoIP-1.6.7/test/test-geoip-city.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-city.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-city.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-domain.c
new/GeoIP-1.6.9/test/test-geoip-domain.c
--- old/GeoIP-1.6.7/test/test-geoip-domain.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-domain.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-org.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-isp.c
new/GeoIP-1.6.9/test/test-geoip-isp.c
--- old/GeoIP-1.6.7/test/test-geoip-isp.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-isp.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-isp.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-netspeed.c
new/GeoIP-1.6.9/test/test-geoip-netspeed.c
--- old/GeoIP-1.6.7/test/test-geoip-netspeed.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-netspeed.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-netspeed.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-org.c
new/GeoIP-1.6.9/test/test-geoip-org.c
--- old/GeoIP-1.6.7/test/test-geoip-org.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-org.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-org.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip-region.c
new/GeoIP-1.6.9/test/test-geoip-region.c
--- old/GeoIP-1.6.7/test/test-geoip-region.c 2015-07-28 21:49:23.000000000
+0200
+++ new/GeoIP-1.6.9/test/test-geoip-region.c 2016-01-11 21:43:25.000000000
+0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip-region.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/GeoIP-1.6.7/test/test-geoip.c
new/GeoIP-1.6.9/test/test-geoip.c
--- old/GeoIP-1.6.7/test/test-geoip.c 2015-10-30 15:27:46.000000000 +0100
+++ new/GeoIP-1.6.9/test/test-geoip.c 2016-01-11 22:22:58.000000000 +0100
@@ -1,7 +1,7 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* test-geoip.c
*
- * Copyright (C) 2006 MaxMind LLC
+ * Copyright (C) 2016 MaxMind, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,7 @@
int main()
{
FILE *f;
+ char *db_info;
char ipAddress[30];
char expectedCountry[3];
char expectedCountry3[4];
@@ -47,6 +48,13 @@
exit(1);
}
+ db_info = GeoIP_database_info(gi);
+ if (!db_info || !strstr(db_info, " Copyright")) {
+ fprintf(stderr, "Error reading database info (got %s).\n",
db_info);
+ free(db_info);
+ failed = 1;
+ }
+
/* make sure GeoIP deals with invalid query gracefully */
returnedCountry = GeoIP_country_code_by_addr(gi, NULL);
if (returnedCountry != NULL) {
