update copyrights

bin/named/Makefile.in

-# Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

bin/named/geoip.c

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/named/include/named/geoip.h

+/*
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #ifndef _GEOIP_H
 #define _GEOIP_H
 

bin/named/interfacemgr.c

 /*
- * Copyright (C) 2004-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

bin/tests/system/Makefile.in

-# Copyright (C) 2004, 2007, 2008, 2010-2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008, 2010-2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

bin/tests/system/geoip/Makefile.in

-# Copyright (C) 2010-2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/clean.sh

 #!/bin/sh
 #
-# Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/data/README

+Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 The data data files in this directory are sample GeoIP databases,
 generated from the corresponding CSV files.  Thanks to MaxMind, Inc.
 for assitance with producing these files.

bin/tests/system/geoip/geoip.c

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/example.db.in

-; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named1.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named10.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named11.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named2.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named3.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named4.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named5.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named6.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named7.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named8.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/ns2/named9.conf

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/prereq.sh

 #!/bin/sh
 #
-# Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/setup.sh

 #!/bin/sh
 #
-# Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

bin/tests/system/geoip/tests.sh

 #!/bin/sh
 #
-# Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

lib/dns/acache.c

 /*
- * Copyright (C) 2004-2008, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2012, 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

lib/dns/adb.c

 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

lib/dns/geoip.c

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

lib/dns/include/dns/Makefile.in

-# Copyright (C) 2004, 2007-2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any

lib/dns/include/dns/acache.h

 /*
- * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -25,7 +25,7 @@
 
 /*
  * Acache
- * 
+ *
  * The Additional Cache Object
  *
  *	This module manages internal caching entries that correspond to
@@ -131,7 +131,7 @@
  *	- 76 bytes for each additional cache entry
  *	- if the entry has a DNS name and associated RRset,
  *	  * 44 bytes + size of the name (1-255 bytes)
- *	  * 52 bytes x number_of_RRs 
+ *	  * 52 bytes x number_of_RRs
  *	- 28 bytes for each DB related to this module
  *
  *	Using the additional cache also requires extra memory consumption in
@@ -415,7 +415,7 @@ dns_acache_attachentry(dns_acacheentry_t *source, dns_acacheentry_t **targetp);
  *
  *	*targetp is attached to 'source'.
  */
-		       
+
 void
 dns_acache_detachentry(dns_acacheentry_t **entryp);
 /*
@@ -429,7 +429,7 @@ dns_acache_detachentry(dns_acacheentry_t **entryp);
  *
  *	*entryp is NULL.
  *
- *	If '*entryp' is the last reference to the entry, 
+ *	If '*entryp' is the last reference to the entry,
  *	cache does not have an outstanding task, all resources used by the
  *	entry (including the entry object itself) will be freed.
  */

lib/dns/include/dns/acl.h

 /*
- * Copyright (C) 2004-2007, 2009, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

lib/dns/include/dns/adb.h

 /*
- * Copyright (C) 2004-2008, 2011  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2011, 2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

lib/dns/include/dns/cache.h

 /*
- * Copyright (C) 2004-2007, 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

lib/dns/include/dns/geoip.h

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

lib/dns/rpz.c

@@ -1572,7 +1572,7 @@ dns_rpz_ready(dns_rpz_zones_t *rpzs,
 
 	UNLOCK(&rpzs->search_lock);
 	result = ISC_R_SUCCESS;
-	
+
  unlock_and_detach:
 	UNLOCK(&rpzs->maint_lock);
 	UNLOCK(&load_rpzs->search_lock);

lib/dns/tests/Makefile.in

-# Copyright (C) 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2013  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above

lib/dns/tests/geoip_test.c

 /*
- * Copyright (C) 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

lib/irs/getnameinfo.c

 /*
- * Copyright (C) 2009, 2011, 2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2011-2013  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

lib/isccfg/aclconf.c

 /*
- * Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

lib/isccfg/include/isccfg/aclconf.h

 /*
- * Copyright (C) 2004-2007, 2010-2012  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2007, 2010-2013  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any

util/copyrights

@@ -139,7 +139,7 @@
 ./bin/dnssec/win32/signzone.dsw			X	2001
 ./bin/dnssec/win32/signzone.mak			X	2001,2004,2005,2006,2009
 ./bin/named/.gitignore				X	2012
-./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./bin/named/Makefile.in				MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./bin/named/bind.keys.h				X	2009,2010,2011,2012
 ./bin/named/bind9.xsl				SGML	2006,2007,2008,2009,2012,2013
 ./bin/named/bind9.xsl.h				X	2007,2008,2009,2011,2012,2013
@@ -150,12 +150,14 @@
 ./bin/named/control.c				C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012,2013
 ./bin/named/controlconf.c			C	2001,2002,2003,2004,2005,2006,2007,2008,2011,2012
 ./bin/named/convertxsl.pl			PERL	2006,2007,2008,2012
+./bin/named/geoip.c				C	2013
 ./bin/named/include/.gitignore			X	2012
 ./bin/named/include/dlz/dlz_dlopen_driver.h	C	2011
 ./bin/named/include/named/builtin.h		C	2001,2004,2005,2007
 ./bin/named/include/named/client.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012
 ./bin/named/include/named/config.h		C	2001,2002,2004,2005,2006,2007,2009
 ./bin/named/include/named/control.h		C	2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012
+./bin/named/include/named/geoip.h		C	2013
 ./bin/named/include/named/globals.h		C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./bin/named/include/named/interfacemgr.h	C	1999,2000,2001,2002,2004,2005,2007,2011
 ./bin/named/include/named/listenlist.h		C	2000,2001,2004,2005,2007
@@ -178,7 +180,7 @@
 ./bin/named/include/named/update.h		C	1999,2000,2001,2004,2005,2007
 ./bin/named/include/named/xfrout.h		C	1999,2000,2001,2004,2005,2007
 ./bin/named/include/named/zoneconf.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2010,2011
-./bin/named/interfacemgr.c			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012
+./bin/named/interfacemgr.c			C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013
 ./bin/named/listenlist.c			C	2000,2001,2004,2005,2007
 ./bin/named/log.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2013
 ./bin/named/logconf.c				C	1999,2000,2001,2004,2005,2006,2007,2011,2013
@@ -530,7 +532,7 @@
 ./bin/tests/startperf/smallzone.db		ZONE	2011
 ./bin/tests/sym_test.c				C	1998,1999,2000,2001,2004,2005,2007
 ./bin/tests/system/.gitignore			X	2012
-./bin/tests/system/Makefile.in			MAKE	2000,2001,2004,2007,2008,2010,2011,2012
+./bin/tests/system/Makefile.in			MAKE	2000,2001,2004,2007,2008,2010,2011,2012,2013
 ./bin/tests/system/README			TXT.BRIEF	2000,2001,2004,2010,2011,2013
 ./bin/tests/system/acl/clean.sh			SH	2008,2012
 ./bin/tests/system/acl/ns2/named1.conf		CONF-C	2008
@@ -990,6 +992,48 @@
 ./bin/tests/system/forward/ns5/root.db		ZONE	2011
 ./bin/tests/system/forward/tests.sh		SH	2000,2001,2004,2007,2011,2012
 ./bin/tests/system/genzone.sh			SH	2001,2002,2003,2004,2007,2009,2011,2012,2013
+./bin/tests/system/geoip/.gitignore		X	2013
+./bin/tests/system/geoip/Makefile.in		MAKE	2013
+./bin/tests/system/geoip/clean.sh		SH	2013
+./bin/tests/system/geoip/data/GeoIP.csv		X	2013
+./bin/tests/system/geoip/data/GeoIP.dat		X	2013
+./bin/tests/system/geoip/data/GeoIPASNum.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPASNum.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPASNumv6.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPASNumv6.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPCity.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPCity.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPCityv6.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPCityv6.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPDomain.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPDomain.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPISP.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPISP.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPNetSpeed.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPNetSpeed.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPOrg.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPOrg.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPRegion.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPRegion.dat	X	2013
+./bin/tests/system/geoip/data/GeoIPv6.csv	X	2013
+./bin/tests/system/geoip/data/GeoIPv6.dat	X	2013
+./bin/tests/system/geoip/data/README		TXT.BRIEF	2013
+./bin/tests/system/geoip/geoip.c		C	2013
+./bin/tests/system/geoip/ns2/example.db.in	ZONE	2013
+./bin/tests/system/geoip/ns2/named1.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named10.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named11.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named2.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named3.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named4.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named5.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named6.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named7.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named8.conf	CONF-C	2013
+./bin/tests/system/geoip/ns2/named9.conf	CONF-C	2013
+./bin/tests/system/geoip/prereq.sh		SH	2013
+./bin/tests/system/geoip/setup.sh		SH	2013
+./bin/tests/system/geoip/tests.sh		SH	2013
 ./bin/tests/system/glue/clean.sh		SH	2000,2001,2004,2007,2012
 ./bin/tests/system/glue/fi.good			X	2000,2001
 ./bin/tests/system/glue/noglue.good		X	2000,2001
@@ -1671,7 +1715,7 @@
 ./bin/win32/BINDInstall/resource.h		X	2001,2005,2009
 ./bind.keys					X	2009,2010,2011
 ./config.guess					X	1998,1999,2000,2001,2004,2009
-./config.h.in					X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./config.h.in					X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./config.h.win32				C	1999,2000,2001,2004,2006,2007,2008,2009,2011,2012
 ./config.sub					X	1998,1999,2000,2001,2004
 ./config.threads.in				X	2005,2006,2010,2011,2012
@@ -2254,9 +2298,9 @@
 ./lib/dns/.gitignore				X	2012
 ./lib/dns/Atffile				X	2011
 ./lib/dns/Makefile.in				MAKE	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
-./lib/dns/acache.c				C	2004,2005,2006,2007,2008,2012
+./lib/dns/acache.c				C	2004,2005,2006,2007,2008,2012,2013
 ./lib/dns/acl.c					C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2013
-./lib/dns/adb.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./lib/dns/adb.c					C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/dns/api					X	1999,2000,2001,2006,2008,2009,2010,2011,2012,2013
 ./lib/dns/byaddr.c				C	2000,2001,2002,2003,2004,2005,2007,2009,2013
 ./lib/dns/cache.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013
@@ -2285,17 +2329,18 @@
 ./lib/dns/gen-unix.h				C	1999,2000,2001,2004,2005,2007,2009
 ./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009
 ./lib/dns/gen.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013
+./lib/dns/geoip.c				C	2013
 ./lib/dns/gssapi_link.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012
 ./lib/dns/gssapictx.c				C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012
 ./lib/dns/hmac_link.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
 ./lib/dns/include/Makefile.in			MAKE	1998,1999,2000,2001,2004,2007,2012
-./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012
-./lib/dns/include/dns/acache.h			C	2004,2006,2007
-./lib/dns/include/dns/acl.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2011
-./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011
+./lib/dns/include/dns/Makefile.in		MAKE	1998,1999,2000,2001,2002,2003,2004,2007,2008,2009,2011,2012,2013
+./lib/dns/include/dns/acache.h			C	2004,2006,2007,2013
+./lib/dns/include/dns/acl.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2011,2013
+./lib/dns/include/dns/adb.h			C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2011,2013
 ./lib/dns/include/dns/bit.h			C	2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/byaddr.h			C	2000,2001,2002,2003,2004,2005,2006,2007
-./lib/dns/include/dns/cache.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012
+./lib/dns/include/dns/cache.h			C	1999,2000,2001,2004,2005,2006,2007,2009,2011,2012,2013
 ./lib/dns/include/dns/callbacks.h		C	1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013
 ./lib/dns/include/dns/cert.h			C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/client.h			C	2009
@@ -2316,6 +2361,7 @@
 ./lib/dns/include/dns/events.h			C	1999,2000,2001,2002,2004,2005,2006,2007,2009,2010,2011
 ./lib/dns/include/dns/fixedname.h		C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/include/dns/forward.h			C	2000,2001,2004,2005,2006,2007,2009
+./lib/dns/include/dns/geoip.h			C	2013
 ./lib/dns/include/dns/iptable.h			C	2007,2012
 ./lib/dns/include/dns/journal.h			C	1999,2000,2001,2004,2005,2006,2007,2008,2009,2011
 ./lib/dns/include/dns/keydata.h			C	2009
@@ -2567,13 +2613,14 @@
 ./lib/dns/stats.c				C	2000,2001,2004,2005,2007,2008,2009,2012
 ./lib/dns/tcpmsg.c				C	1999,2000,2001,2004,2005,2006,2007
 ./lib/dns/tests/Atffile				X	2011
-./lib/dns/tests/Makefile.in			MAKE	2011,2012
+./lib/dns/tests/Makefile.in			MAKE	2011,2012,2013
 ./lib/dns/tests/dbdiff_test.c			C	2011,2012
 ./lib/dns/tests/dbiterator_test.c		C	2011,2012
 ./lib/dns/tests/dbversion_test.c		C	2011,2012
 ./lib/dns/tests/dispatch_test.c			C	2012
 ./lib/dns/tests/dnstest.c			C	2011,2012,2013
 ./lib/dns/tests/dnstest.h			C	2011,2012
+./lib/dns/tests/geoip_test.c			C	2013
 ./lib/dns/tests/master_test.c			C	2011,2012,2013
 ./lib/dns/tests/mkraw.pl			PERL	2011,2012
 ./lib/dns/tests/nsec3_test.c			C	2012
@@ -2679,7 +2726,7 @@
 ./lib/irs/dnsconf.c				C	2009,2012
 ./lib/irs/gai_strerror.c			C	2009
 ./lib/irs/getaddrinfo.c				C	2009,2012
-./lib/irs/getnameinfo.c				C	2009,2011,2012
+./lib/irs/getnameinfo.c				C	2009,2011,2012,2013
 ./lib/irs/include/Makefile.in			MAKE	2009,2012
 ./lib/irs/include/irs/Makefile.in		MAKE	2009,2012
 ./lib/irs/include/irs/context.h			C	2009
@@ -3037,12 +3084,12 @@
 ./lib/isccc/win32/libisccc.mak			X	2001,2002,2004,2005,2006,2009,2011
 ./lib/isccc/win32/version.c			C	2001,2004,2007
 ./lib/isccfg/Makefile.in			MAKE	2001,2002,2003,2004,2005,2007,2009,2011,2012
-./lib/isccfg/aclconf.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012
+./lib/isccfg/aclconf.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013
 ./lib/isccfg/api				X	2001,2006,2008,2009,2010,2011,2012
 ./lib/isccfg/dnsconf.c				C	2009
 ./lib/isccfg/include/Makefile.in		MAKE	2001,2004,2007,2012
 ./lib/isccfg/include/isccfg/Makefile.in		MAKE	2001,2002,2004,2005,2007,2012
-./lib/isccfg/include/isccfg/aclconf.h		C	1999,2000,2001,2004,2005,2006,2007,2010,2011,2012
+./lib/isccfg/include/isccfg/aclconf.h		C	1999,2000,2001,2004,2005,2006,2007,2010,2011,2012,2013
 ./lib/isccfg/include/isccfg/cfg.h		C	2000,2001,2002,2004,2005,2006,2007,2010,2013
 ./lib/isccfg/include/isccfg/dnsconf.h		C	2009
 ./lib/isccfg/include/isccfg/grammar.h		C	2002,2003,2004,2005,2006,2007,2008,2009,2010,2011