Update from 1.4.6 to 1.4.7

Remove patch-ad since upstream is not accepting it (originated in 2008)
and it no longer applies.

This revision also adds a lot of experimental ipv6 support.

Full release notes:

        * Upd timezone.c Add SX, BQ and CW remove AN and FX ( Boris Zentner )
        * Add support for the new types in geoiplookup6 ( Boris Zentner )
        * Add new database types GEOIP_CITY_EDITION_REV0_V6,
          GEOIP_CITY_EDITION_REV1_V6, GEOIP_DOMAIN_EDITION_V6,
          GEOIP_ORG_EDITION_V6 and GEOIP_ISP_EDITION_V6 ( Boris Zentner )
        * Remove AN and FX. Add SX, BQ and CW ( Boris Zentner )
        * Fix possible segfault in geoipupdate if the connection disappear
          unexpected. ( Boris Zentner )
        * Add sanity check for geoipupdate-pureperl.pl ( Boris Zentner )
        * Add GEOIP_USERTYPE_EDITION and GEOIP_USERTYPE_EDITION_V6
          datatypes ( Boris Zentner )
        * Add new functions GeoIP_is_private_ipnum_v4 and GeoIP_is_private_v4
          ( Boris Zentner )
        * Add new functions GeoIP_teredo and GeoIP_enable_teredo.
          teredo is enabled by default ( Boris Zentner )
        * Fix output of geoiplookup for unknown or private regions.
            ( Boris Zentner )
        * Fix geoipupdate-pureperl.pl to accept more product codes.
            ( Boris Zentner )
        * Fix minor output issue in geoipupdate -v ( Boris Zentner )
        * Add support for various databases. ( Boris Zentner )
        * Add experimental teredo support ( Boris Zentner )
        * Fix possible buffer overflow in conjunction with
            http_proxies ( Elso Andras )
        * Remove memcpy/bcopy macro for BSD ( Boris Zentner )
        * Add GeoIP_lib_version and GeoIP_cleanup ( Ladar Levison )
        * Upd Makefile.vc ( Thomas Winzig )
        * Fix typo in DK,18,Midtjylland ( Boris Zentner )
        * Update libGeoIP/regionName.c with FIPS codes 20100810 ( Boris Zentner )
        * Fix continent codes ( Boris Zentner )
        * Fix 3letter country codes for ATA, BVT, IOT, CXR, CCK, ATF, HMD,
            MYT, SGS and UMI ( Boris Zentner )
        * Fix typo/segfault in GeoIP_id_by_name_v6 ( Boris Zentner )
        * Update libGeoIP/regionName.c with FIPS codes 20100529 ( Boris Zentner )
        * Remove buffered IO functions, to fix issues with dup'ed file
            descriptors ( Boris Zentner )
        * Fix very minor memleak in geoipupdate ( Boris Zentner )
        * Add GEOIP_CITYCONFIDENCEDIST_EDITION, GEOIP_LARGE_COUNTRY_EDITION
            and GEOIP_LARGE_COUNTRY_EDITION_V6 database types ( Boris Zentner )
        * Update libGeoIP/regionName.c with FIPS codes 20100422 ( Boris Zentner )
        * Update libGeoIP/regionName.c with FIPS codes 20100420 ( Boris Zentner )
        * Update libGeoIP/regionName.c with FIPS codes 20100221 ( Boris Zentner )
        * Add missing timezones ( Boris Zentner )
        * Add missing include for Windows 2000 ( Jaap Keute )
        * 'GeoIP Database up to date' and 'Updated database' prints to stdout
            instead of stderr ( Boris Zentner )
        * Add missing GeoIPRecord_delete to geoiplookup.c ( Piotr Kaczuba )
        * Add some IPv4 helper functions
            unsigned long GeoIP_addr_to_num(const char *addr);
            char *        GeoIP_num_to_addr(unsigned long ipnum); ( Boris Zentner )
        * Fix default name for the accuracy radius database to GeoIPDistance.dat ( Boris Zentner )
        * Add GEOIP_CITYCONFIDENCE_EDITION database type. ( Boris Zentner )
        * geoiplookup use GeoIPDistance.dat files if avail ( Boris Zentner )
        * Fix geoiplookup/geoiplookup6 output, when the databaseinfo string is
            not avail. ( Boris Zentner )
        * Change continent code for RU from AS to EU ( Boris Zentner )
        * Add GEOIP_ACCURACYRADIUS_EDITION database type. ( Boris Zentner )
        * Add GEOIP_LOCATIONA_EDITION the database to map back from binary to
            the csv database ( Boris Zentner )
        * Change Turkey's continent code from Asia to Europe ( Boris Zentner )
        * Rename _iso_8859_1__utf8 to _GeoIP_iso_8859_1__utf8 ( Boris Zentner )
        * GEOIP_ORG_EDITION, GEOIP_ISP_EDITION, GEOIP_DOMAIN_EDITION and
            GEOIP_ASNUM_EDITION databases return UTF8 results, if gi->charset is set
            to GEOIP_CHARSET_UTF8 ( Boris Zentner )
        * Avoid unnecesary call to gettimeofday when GEOIP_CHECK_CACHE is not set ( John Douglass )
        * Delayed loading of changed database files for 60 seconds. To avoid
          reading halve written databases ( Boris Zentner )
        * Update README.OSX for Leopard  and Snow Leopard ( Boris Zentner )
        * Add more IPv6 functions ( Boris Zentner )
            const char *GeoIP_country_code_by_addr_v6 (GeoIP* gi, const char *addr);
            const char *GeoIP_country_code_by_name_v6 (GeoIP* gi, const char *host);
            const char *GeoIP_country_code3_by_addr_v6 (GeoIP* gi, const char *addr);
            const char *GeoIP_country_code3_by_name_v6 (GeoIP* gi, const char *host);
            const char *GeoIP_country_name_by_addr_v6 (GeoIP* gi, const char *addr);
            const char *GeoIP_country_name_by_name_v6 (GeoIP* gi, const char *host);
        * Make sure that GeoIP_*_v6 functions refuse GEOIP_PROXY_EDITION and
            GEOIP_NETSPEED_EDITION databases ( Boris Zentner )
        * Update libGeoIP/regionName.c with FIPS codes from 20090723 ( Boris Zentner )
        * Fix geoipupdate's -v option to not change the license filename ( Thom May )
        * Fix geoipupdate's exit code ( Thom May )
        * Add support for ASNUM_EDITION ( Boris Zentner )
        * Fix -i output for larger values, sign issue ( Boris Zentner )
        * Add -i flag for more information on netmask, range_by_ip and the current network range ( Boris Zentner )
        * Add support for DOMAIN_EDITION database type ( Boris Zentner )
        * Fix apps/geoipupdate-pureperl.pl output layer on W32 ( Boris Zentner )

4 files changed, 12 insertions, 31 deletions

diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index cf8fcea918d..a9ce4652aa1 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2010/11/13 21:09:01 shattered Exp $
+# $NetBSD: Makefile,v 1.26 2011/05/31 14:40:25 mspo Exp $
 
-DISTNAME=	GeoIP-1.4.6
+DISTNAME=	GeoIP-1.4.7
 PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://geolite.maxmind.com/download/geoip/api/c/
diff --git a/net/GeoIP/distinfo b/net/GeoIP/distinfo
index 868dea9e814..84342313d7f 100644
--- a/net/GeoIP/distinfo
+++ b/net/GeoIP/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2009/04/24 10:17:22 adam Exp $
+$NetBSD: distinfo,v 1.12 2011/05/31 14:40:25 mspo Exp $
 
-SHA1 (GeoIP-1.4.6.tar.gz) = e692954f447c13270de7860e586696991776d8a3
-RMD160 (GeoIP-1.4.6.tar.gz) = 67097c3f9c6bbdba1a4f7ee796713720dba19b0f
-Size (GeoIP-1.4.6.tar.gz) = 1045241 bytes
-SHA1 (patch-aa) = 13bf4c1c25d3c09c05cf03b1328ebbffd3b8c8b6
-SHA1 (patch-ad) = 5f23a3299ff093097a9d93527f85079b59091394
+SHA1 (GeoIP-1.4.7.tar.gz) = 2db3a61e19dfaa0e4131217b155a59ba4bd0c5cc
+RMD160 (GeoIP-1.4.7.tar.gz) = 5970eb7d18cc5d1436aa32036805b240dbc46d04
+Size (GeoIP-1.4.7.tar.gz) = 1068781 bytes
+SHA1 (patch-aa) = a53740728808c4eb363092cf2e342dddbaa012dc
diff --git a/net/GeoIP/patches/patch-aa b/net/GeoIP/patches/patch-aa
index f2c2e4b887f..9b77f8523a1 100644
--- a/net/GeoIP/patches/patch-aa
+++ b/net/GeoIP/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2009/04/24 10:17:22 adam Exp $
+$NetBSD: patch-aa,v 1.6 2011/05/31 14:40:25 mspo Exp $
 
   - pkgsrc patch: put configuration file into examples directory so CONF_FILES
     can use it as a reference.
@@ -6,9 +6,9 @@ $NetBSD: patch-aa,v 1.5 2009/04/24 10:17:22 adam Exp $
   - pkgsrc patch: do not install the configuration file (in target
     install-exec-hook), let CONF_FILES handle it.
 
---- conf/Makefile.in.orig	2009-02-24 23:56:08.000000000 +0100
+--- conf/Makefile.in.orig	2011-05-31 11:49:22.000000000 +0000
 +++ conf/Makefile.in
-@@ -160,7 +160,7 @@ psdir = @psdir@
+@@ -177,7 +177,7 @@ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
@@ -17,11 +17,11 @@ $NetBSD: patch-aa,v 1.5 2009/04/24 10:17:22 adam Exp $
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
-@@ -310,7 +310,6 @@ install-dvi: install-dvi-am
+@@ -340,7 +340,6 @@ install-dvi-am:
  
  install-exec-am: install-dist_sysconfDATA
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- 
  install-html: install-html-am
  
+ install-html-am:
diff --git a/net/GeoIP/patches/patch-ad b/net/GeoIP/patches/patch-ad
deleted file mode 100644
index 1e0b5fbcbf8..00000000000
--- a/net/GeoIP/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/04/24 10:17:22 adam Exp $
-
-  - test for success of _GeoIP_seek_record(). 0 is a valid return value.
-    http://sourceforge.net/tracker/index.php?func=detail&aid=1888390&group_id=66844&atid=515957
-
---- libGeoIP/GeoIP.c.orig	2009-02-24 17:03:23.000000000 +0100
-+++ libGeoIP/GeoIP.c
-@@ -934,8 +934,8 @@ int GeoIP_id_by_name (GeoIP* gi, const c
- 	}
- 	if (!(ipnum = _GeoIP_lookupaddress(name)))
- 		return 0;
--	ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
--	return ret;
-+	ret = _GeoIP_seek_record(gi, ipnum);
-+	return (ret != 0) ? ret - COUNTRY_BEGIN : 0 ;
- 
- }
-