head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.16 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.14 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.12 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.10 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.8 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.6 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.4 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.2 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.1.0.14 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.12 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.10 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.8 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.6 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.4 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2011.05.31.14.40.25; author mspo; state dead; branches; next 1.2; 1.2 date 2009.04.24.10.17.22; author adam; state Exp; branches; next 1.1; 1.1 date 2008.02.06.23.27.03; author heinz; state Exp; branches; next ; desc @@ 1.3 log @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 ) @ text @$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 ; } @ 1.2 log @Changes 1.4.6: * Fix geoipupdate's my_printf function * Fix typo in apps/geoipupdate-pureperl.pl replace PerlIO::Gzip with PerlIO::gzip * Update region codes in libGeoIP/regionName.c * Fix regioncode/generate_regionName.pl to handle regioncodes with ',' correct * Update fips codes 20090201 * Fix unicode builds on WIN32 and eliminate some warnings * Fix sign error in _iso_8859_1__utf8 for PPC64 * Change WIN32 to _WIN32, since _WIN32 is defined by default * Remove the WSAStartup call from GeoIP_open * Silence various warnings * Add more timezone region's for Australia * Fix possible segfault in apps/geoiplookup with null pointers in non gnu printf implementations for example solaris * Add README.OSX to build fat binaries easy * Silence vasprintf warning via AC_GNU_SOURCE * Add several Makefiles to build a static GeoIP.lib for w32 * Silence signedness warnings * Remove --with-city configure option * Remove configure's --with-dbdir option. Use the similar --datadir instead * Various autotools improvements and cleanups. Including parallel build fix. * Fix libGeoIP/timeZone.c * Fix timezone/generate_timeZone.pl * Sync FIPS codes again Jan 14th, 2009 * Fix CA,NL regioncode * Change logic in generate_regionName.pl and GeoIP_region_name_by_code * Sync regionName.c with http://www.maxmind.com/app/fips10_4 from Dec 17th, 2008 * Fix _GeoIP_lookupaddress for 64bit big endian systems like ppc64 * Add proper WIN32/64 support * Escape - in all manpages * Add manpage for geoiplookup6 * Fix -d command line option * GeoIPUpdate.c use vasprintf if avail, otherwise try vsnprintf and sprintf * avoid pre/postincrement and assignment on the same variable @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2008/02/06 23:27:03 heinz Exp $ @ 1.1 log @Updated to version 1.4.4. Pkgsrc changes: - Added support for installation to DESTDIR. - More fixes for the man page geoiplookup.1 (patch-ab) - Two additional patches patch-ac and patch-ad to make geoiplookup not crash with segmentation fault if the data file either does not exist or has the wrong format. - Patches -ab, -ac, and -ad submitted to the bugtracker at sourceforge.net. - Updated DESCR with date of data file. - Added license information. Changes since version 1.4.0: ============================ 1.4.4 2008-1-21 * Updated original geoipupdate to return "Invalid product ID or subscription expired" * Added BL/Saint Barthelemy, MF/Saint Martin (ISO-3166-1 additions) * Check for illegal IP strings, return 0 if IP is not well formed IPv4 e.g. 1.2.3.4.5 and 1.2.3 * Clarified that while core GeoIP library is LGPL, libGeoIPUpdate depends on md5.c and types.h which are GPL. * speedup the conversion from ipstring to ipnum in _GeoIP_addr_to_num. Doubles the speed of GEOIP_MEMORY_CACHE and GEOIP_MMAP_CACHE * Added new mmap shared memory caching option, GEOIP_MMAP_CACHE (Peter Shipley, LookSmart) - mmaps: our maps are shared, but we need only private readonly pages 1.4.3 2007-8-30 ! CHANGE with geoiplookup facility: -v flag now returns database info for all databases, not just GeoIP Country * Added ability to get netmask of network block from last lookup using GeoIP_last_netmask * Fixed GeoIP_database_info bug with GeoLite City * Replaced 4 with sizeof(char*) to fix issues with geoipupdate on 64 Bit machines * Added GeoIP_set_charset function - enables UTF8 output of city name if GEOIP_CHARSET_UTF8 flag is passed to GeoIP_set_charset * Fixed segfault issue if calling GeoIP_db_avail before opening a database * Added continent_code to GeoIP City's record struct (Frank Mather) 1.4.2 2007-2-8 * Added -d flag to enable custom path for geoipupdate utility program (Frank Mather) * Replaced _WIN32 with WIN32 since WIN32 is already set by compilers * Moved var definitions to top of code, defined size_t (Guenter Knauf) * Added Makefile.win32, Makefile.netware, get_ver.awk, geoip.ico to EXTRA_DIST in Makefile.am (Guenter Knauf) 1.4.1 2007-1-2 * Replaced CS/Serbia and Montenegro with RS/Serbia, removed ZR/Zaire, added ME/Montenegro * Added AX/Aland Islands, GG/Guernsey, IM/Isle of Man, JE/Jersey (ISO-3166-1 changes) * Added GeoIP_time_zone_by_country_and_region, to lookup zoneinfo timezone by country and region (Frank Mather) * Added GeoIP_region_name_by_code, to lookup region name from region code (Frank Mather) * added -f and -d flags to enable custom paths for geoiplookup utility program (Frank Mather) * Added benchmarks for GeoIP Region and City in test/benchmark.c (Frank Mather) * Fixed build issue when using --as-needed flag (Diego 'Flameeyes' Pettenò) * Add sanity checking for filename returned by MaxMind.com server for geoipupdate filename (Dean Gaudet, arctic.org) * Fixed memory leaks under error conditions, buffer overflow using sprintf, and issue where a corrupted cache file could core dump the file (Nick Galbreath, Right Media Inc) @ text @d1 1 a1 1 $NetBSD$ d6 1 a6 1 --- libGeoIP/GeoIP.c.orig 2007-11-25 04:27:25.000000000 +0100 d8 1 a8 1 @@@@ -707,8 +707,8 @@@@ int GeoIP_id_by_name (GeoIP* gi, const c @