Update bind99 to 9.9.5 (BIND 9.9.5).

Security fixes were already covered by 9.9.4pl2.

Some bug fixes and clean up, please refer CHANGES file in detail.

6 files changed, 39 insertions, 33 deletions

diff --git a/net/bind99/Makefile b/net/bind99/Makefile
index 57a553a8513..8da5e78c31b 100644
--- a/net/bind99/Makefile
+++ b/net/bind99/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/01/13 17:31:00 taca Exp $
+# $NetBSD: Makefile,v 1.32 2014/02/02 07:58:20 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@@ -14,7 +14,7 @@ CONFLICTS+=	host-[0-9]*
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.9.4-P2
+BIND_VERSION=	9.9.5
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind99/PLIST b/net/bind99/PLIST
index 458ad7fa135..708bb8344f2 100644
--- a/net/bind99/PLIST
+++ b/net/bind99/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2013/09/21 16:00:34 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/02/02 07:58:20 taca Exp $
+bin/bind9-config
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -14,6 +15,7 @@ include/dns/byaddr.h
 include/dns/cache.h
 include/dns/callbacks.h
 include/dns/cert.h
+include/dns/client.h
 include/dns/clientinfo.h
 include/dns/compress.h
 include/dns/db.h
@@ -68,6 +70,7 @@ include/dns/ssu.h
 include/dns/tcpmsg.h
 include/dns/time.h
 include/dns/tkey.h
+include/dns/tsec.h
 include/dns/tsig.h
 include/dns/ttl.h
 include/dns/types.h
@@ -163,6 +166,7 @@ include/isc/taskpool.h
 include/isc/thread.h
 include/isc/time.h
 include/isc/timer.h
+include/isc/tm.h
 include/isc/types.h
 include/isc/util.h
 include/isc/version.h
@@ -206,6 +210,7 @@ lib/libisccc.la
 lib/libisccfg.la
 lib/liblwres.la
 man/man1/arpaname.1
+man/man1/bind9-config.1
 man/man1/dig.1
 man/man1/host.1
 man/man1/isc-config.sh.1
@@ -320,6 +325,7 @@ man/man8/rndc.8
 sbin/arpaname
 sbin/ddns-confgen
 sbin/dnssec-dsfromkey
+sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel
 sbin/dnssec-keygen
 sbin/dnssec-revoke
diff --git a/net/bind99/distinfo b/net/bind99/distinfo
index 9eef25c56d0..68f7d63f4d0 100644
--- a/net/bind99/distinfo
+++ b/net/bind99/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.22 2014/01/13 17:31:00 taca Exp $
+$NetBSD: distinfo,v 1.23 2014/02/02 07:58:20 taca Exp $
 
-SHA1 (bind-9.9.4-P2.tar.gz) = 9471a6df92732da1a879115e0416e23b9369544a
-RMD160 (bind-9.9.4-P2.tar.gz) = 29aca8c971deb626aa119d773263e8508b31f09e
-Size (bind-9.9.4-P2.tar.gz) = 7513077 bytes
-SHA1 (patch-bin_dig_dighost.c) = d53f6ebbc878b21ba1415d974341340f56b69cb0
+SHA1 (bind-9.9.5.tar.gz) = f3fe8000628ec57f332aec1ad9587b767208a38f
+RMD160 (bind-9.9.5.tar.gz) = cc2351d9af779ed1a1dd5909a10cce28ddb41747
+Size (bind-9.9.5.tar.gz) = 7729695 bytes
+SHA1 (patch-bin_dig_dighost.c) = 72cb7676cdf9cd4b44bc62c72bcf29127d9fbffe
 SHA1 (patch-bin_tests_system_Makefile.in) = 5701c49d7177fccae6c08a2176988e30a3cf58a0
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
-SHA1 (patch-configure) = 937b505923539ad655646fa9411f38742255650c
+SHA1 (patch-configure) = c94a5c1c9dd55ff245c1adbb7c4ddb4a8e16a171
 SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
 SHA1 (patch-lib_bind9_Makefile.in) = 4d6c592646015c37a8c47dda8056fa01c9636dcd
 SHA1 (patch-lib_dns_Makefile.in) = eab413fb2708b275ea944c6309bd3448e9ddec26
 SHA1 (patch-lib_dns_rbt.c) = df4b029369d9fa3b250d8505b5f7590e2cd86654
-SHA1 (patch-lib_isc_Makefile.in) = 08fde16141c55ccfbfaf855b39599bde0a99eaaa
+SHA1 (patch-lib_isc_Makefile.in) = bd1d80457fb97d496306b84d4205296fd2577824
 SHA1 (patch-lib_isccc_Makefile.in) = a31831872b7724cb84f663ed70a82335d812f95f
 SHA1 (patch-lib_isccfg_Makefile.in) = 0de690dd4f46c42e4152f1d64d8edaecb69c6844
 SHA1 (patch-lib_lwres_Makefile.in) = 40fd0ed1d699cb2f6258f33888a9495899373767
diff --git a/net/bind99/patches/patch-bin_dig_dighost.c b/net/bind99/patches/patch-bin_dig_dighost.c
index d5bfac0f11a..da82388bf45 100644
--- a/net/bind99/patches/patch-bin_dig_dighost.c
+++ b/net/bind99/patches/patch-bin_dig_dighost.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
+$NetBSD: patch-bin_dig_dighost.c,v 1.3 2014/02/02 07:58:20 taca Exp $
 
 * Avoid to use true as variable name.
 
---- bin/dig/dighost.c.orig	2013-09-05 05:09:08.000000000 +0000
+--- bin/dig/dighost.c.orig	2014-01-27 18:58:24.000000000 +0000
 +++ bin/dig/dighost.c
-@@ -4309,7 +4309,7 @@ prepare_lookup(dns_name_t *name)
+@@ -4397,7 +4397,7 @@ prepare_lookup(dns_name_t *name)
  		isc_result_t result;
  		isc_region_t r;
  		dns_rdataset_t *rdataset = NULL;
@@ -13,7 +13,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  #endif
  
  		memset(namestr, 0, DNS_NAME_FORMATSIZE);
-@@ -4323,7 +4323,7 @@ prepare_lookup(dns_name_t *name)
+@@ -4411,7 +4411,7 @@ prepare_lookup(dns_name_t *name)
  
  		result = advanced_rrsearch(&rdataset, &ns.name,
  					   dns_rdatatype_aaaa,
@@ -22,7 +22,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  		if (result == ISC_R_SUCCESS) {
  			for (result = dns_rdataset_first(rdataset);
  			     result == ISC_R_SUCCESS;
-@@ -4352,7 +4352,7 @@ prepare_lookup(dns_name_t *name)
+@@ -4440,7 +4440,7 @@ prepare_lookup(dns_name_t *name)
  
  		rdataset = NULL;
  		result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_a,
@@ -31,7 +31,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  		if (result == ISC_R_SUCCESS) {
  			for (result = dns_rdataset_first(rdataset);
  			     result == ISC_R_SUCCESS;
-@@ -4471,11 +4471,11 @@ isc_result_t
+@@ -4559,11 +4559,11 @@ isc_result_t
  initialization(dns_name_t *name)
  {
  	isc_result_t   result;
@@ -45,7 +45,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  	if (result != ISC_R_SUCCESS) {
  		printf("\n;; NS RRset is missing to continue validation:"
  		       " FAILED\n\n");
-@@ -4823,7 +4823,7 @@ sigchase_td(dns_message_t *msg)
+@@ -4911,7 +4911,7 @@ sigchase_td(dns_message_t *msg)
  	isc_result_t result;
  	dns_name_t *name = NULL;
  	isc_boolean_t have_answer = ISC_FALSE;
@@ -54,7 +54,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  
  	if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
  	    == ISC_R_SUCCESS) {
-@@ -4832,7 +4832,7 @@ sigchase_td(dns_message_t *msg)
+@@ -4920,7 +4920,7 @@ sigchase_td(dns_message_t *msg)
  			initialization(name);
  			return;
  		}
@@ -63,7 +63,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  	} else {
  		if (!current_lookup->trace_root_sigchase) {
  			result = dns_message_firstname(msg,
-@@ -4950,7 +4950,7 @@ sigchase_td(dns_message_t *msg)
+@@ -5038,7 +5038,7 @@ sigchase_td(dns_message_t *msg)
  						   dns_rdatatype_rrsig,
  						   current_lookup
  						   ->rdtype_sigchase,
@@ -72,7 +72,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  			if (result == ISC_R_FAILURE) {
  				printf("\n;; RRset is missing to continue"
  				       " validation SHOULD NOT APPEND:"
-@@ -4963,7 +4963,7 @@ sigchase_td(dns_message_t *msg)
+@@ -5051,7 +5051,7 @@ sigchase_td(dns_message_t *msg)
  						   &chase_authority_name,
  						   dns_rdatatype_rrsig,
  						   dns_rdatatype_any,
@@ -81,7 +81,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  			if (result == ISC_R_FAILURE) {
  				printf("\n;; RRSIG is missing  to continue"
  				       " validation SHOULD NOT APPEND:"
-@@ -5039,7 +5039,7 @@ sigchase_td(dns_message_t *msg)
+@@ -5127,7 +5127,7 @@ sigchase_td(dns_message_t *msg)
  					   &chase_authority_name,
  					   dns_rdatatype_rrsig,
  					   dns_rdatatype_ds,
@@ -90,7 +90,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  		if (result != ISC_R_SUCCESS) {
  			printf("\n;; DSset is missing to continue validation:"
  			       " FAILED\n\n");
-@@ -5127,7 +5127,7 @@ sigchase_td(dns_message_t *msg)
+@@ -5215,7 +5215,7 @@ sigchase_td(dns_message_t *msg)
  		result = advanced_rrsearch(&chase_rdataset, &chase_name,
  					   current_lookup->rdtype_sigchase,
  					   dns_rdatatype_any ,
@@ -99,7 +99,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  	if (result == ISC_R_FAILURE) {
  		printf("\n;; RRsig of RRset is missing to continue validation"
  		       " SHOULD NOT APPEND: FAILED\n\n");
-@@ -5170,7 +5170,7 @@ getneededrr(dns_message_t *msg)
+@@ -5258,7 +5258,7 @@ getneededrr(dns_message_t *msg)
  	dns_name_t *name = NULL;
  	dns_rdata_t sigrdata = DNS_RDATA_INIT;
  	dns_rdata_sig_t siginfo;
@@ -108,7 +108,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  
  	if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
  	    != ISC_R_SUCCESS) {
-@@ -5186,7 +5186,7 @@ getneededrr(dns_message_t *msg)
+@@ -5274,7 +5274,7 @@ getneededrr(dns_message_t *msg)
  	if (chase_rdataset == NULL) {
  		result = advanced_rrsearch(&chase_rdataset, name,
  					   dns_rdatatype_any,
@@ -117,7 +117,7 @@ $NetBSD: patch-bin_dig_dighost.c,v 1.2 2013/09/21 16:00:34 taca Exp $
  		if (result != ISC_R_SUCCESS) {
  			printf("\n;; No Answers: Validation FAILED\n\n");
  			return (ISC_R_NOTFOUND);
-@@ -5306,7 +5306,7 @@ getneededrr(dns_message_t *msg)
+@@ -5394,7 +5394,7 @@ getneededrr(dns_message_t *msg)
  		result = advanced_rrsearch(&chase_sigdsrdataset,
  					   &chase_signame,
  					   dns_rdatatype_rrsig,
diff --git a/net/bind99/patches/patch-configure b/net/bind99/patches/patch-configure
index bc23c28375a..0ceaa8f9b6e 100644
--- a/net/bind99/patches/patch-configure
+++ b/net/bind99/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.7 2014/01/13 17:31:00 taca Exp $
+$NetBSD: patch-configure,v 1.8 2014/02/02 07:58:20 taca Exp $
 
 * Add DragonFly support.
 * Link proper postgresql library.
 * Avoid using "==" for argument of test(1).
 
---- configure.orig	2013-12-20 00:28:28.000000000 +0000
+--- configure.orig	2014-01-27 18:58:24.000000000 +0000
 +++ configure
-@@ -12187,7 +12187,7 @@ done
+@@ -11685,7 +11685,7 @@ done
  
  			;;
  		esac
@@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.7 2014/01/13 17:31:00 taca Exp $
  		then
  			case "$use_python" in
  			unspec)
-@@ -14911,6 +14911,8 @@ case $host in
+@@ -14410,6 +14410,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=true ;;
@@ -24,7 +24,7 @@ $NetBSD: patch-configure,v 1.7 2014/01/13 17:31:00 taca Exp $
  *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -19955,7 +19957,7 @@ $as_echo "no" >&6; }
+@@ -19538,7 +19540,7 @@ $as_echo "no" >&6; }
  	fi
  	if test -n "-L$use_dlz_postgres_lib -lpq"
  	then
diff --git a/net/bind99/patches/patch-lib_isc_Makefile.in b/net/bind99/patches/patch-lib_isc_Makefile.in
index 6726d56ad07..41da36d4a47 100644
--- a/net/bind99/patches/patch-lib_isc_Makefile.in
+++ b/net/bind99/patches/patch-lib_isc_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_isc_Makefile.in,v 1.2 2013/09/21 16:00:34 taca Exp $
+$NetBSD: patch-lib_isc_Makefile.in,v 1.3 2014/02/02 07:58:20 taca Exp $
 
 * XXX: Install with proper permission.
 
---- lib/isc/Makefile.in.orig	2013-09-05 05:09:08.000000000 +0000
+--- lib/isc/Makefile.in.orig	2014-01-27 18:58:24.000000000 +0000
 +++ lib/isc/Makefile.in
-@@ -133,7 +133,7 @@ installdirs:
+@@ -134,7 +134,7 @@ installdirs:
  	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
  
  install:: timestamp installdirs