Update bind96 package to 9.6.3.1.ESV.6 (BIND 9.6-ESV-R6).

Security Fixes

  + BIND 9 nameservers performing recursive queries could cache an
    invalid record and subsequent queries for that record could
    crash the resolvers with an assertion failure. [RT #26590]
    [CVE-2011-4313]

Feature Changes

  + Improves initial start-up and server reload time by increasing
    the default size of the hash table the configuration parser
    uses to keep track of loaded zones and allowing it to grow
    dynamically to better handle systems with large numbers of
    zones.  [RT #26523]

  + --enable-developer, a new composite argument to the configure
    script, enables a set of build options normally disabled but
    frequently selected in test or development builds, specifically:
    enable_fixed_rrset, with_atf, enable_filter_aaaa, enable_rpz_nsip,
    enable_rpz_nsdname, and with_dlz_filesystem (and on Linux and
    Darwin, also enable_exportlib) [RT #27103]

5 files changed, 32 insertions, 177 deletions

diff --git a/net/bind96/Makefile b/net/bind96/Makefile
index a0e40a8d603..5a8a1861d1b 100644
--- a/net/bind96/Makefile
+++ b/net/bind96/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/03/12 15:40:15 taca Exp $
+# $NetBSD: Makefile,v 1.23 2012/04/05 00:41:10 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-ESV/.3.1.ESV/:S/-R/./:S/-P/pl/}
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.6-ESV-R5-P1
+BIND_VERSION=	9.6-ESV-R6
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -60,6 +60,8 @@ FILES_SUBST+=		BIND_GROUP=${BIND_GROUP:Q} \
 			BIND_USER=${BIND_USER:Q} PAX=${PAX:Q}
 MESSAGE_SUBST+=		BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
 DOCDIR=			${DESTDIR}${PREFIX}/share/doc/bind9
+MISCDOC=		dnssec ipv6 migration migration-4to9 options \
+			rfc-compliance roadmap sdb
 
 # include/isc/ipv6.h is installed on non-ipv6 platforms
 PLIST_VARS+=	inet6
@@ -69,15 +71,13 @@ PLIST.inet6=	yes
 
 RCD_SCRIPTS=		lwresd named9
 
-INSTALLATION_DIRS=	${DOCDIR} share/doc/bind9/arm share/doc/bind9/draft \
-			share/doc/bind9/rfc
+INSTALLATION_DIRS=	${DOCDIR} share/doc/bind9/arm share/doc/bind9/misc
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/NSEC3-NOTES ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCDIR}/arm
-	${INSTALL_DATA} ${WRKSRC}/doc/draft/draft-*.txt ${DOCDIR}/draft
-	${INSTALL_DATA} ${WRKSRC}/doc/rfc/rfc*.txt ${DOCDIR}/rfc
+	cd ${WRKSRC}/doc/misc && ${INSTALL_DATA} ${MISCDOC} ${DOCDIR}/misc
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind96/PLIST b/net/bind96/PLIST
index 6e7be9c6796..8a91d735933 100644
--- a/net/bind96/PLIST
+++ b/net/bind96/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2011/08/10 15:24:51 taca Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/04/05 00:41:10 taca Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -101,6 +101,7 @@ include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
+include/isc/hmacsha.h
 include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h
@@ -336,159 +337,13 @@ share/doc/bind9/arm/man.nsupdate.html
 share/doc/bind9/arm/man.rndc-confgen.html
 share/doc/bind9/arm/man.rndc.conf.html
 share/doc/bind9/arm/man.rndc.html
-share/doc/bind9/draft/draft-faltstrom-uri-06.txt
-share/doc/bind9/draft/draft-ietf-6man-text-addr-representation-07.txt
-share/doc/bind9/draft/draft-ietf-behave-address-format-07.txt
-share/doc/bind9/draft/draft-ietf-behave-dns64-11.txt
-share/doc/bind9/draft/draft-ietf-dnsext-axfr-clarify-14.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dns-tcp-requirements-03.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-12.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dnssec-registry-fixes-06.txt
-share/doc/bind9/draft/draft-ietf-dnsext-ecc-key-07.txt
-share/doc/bind9/draft/draft-ietf-dnsext-interop3597-02.txt
-share/doc/bind9/draft/draft-ietf-dnsext-rfc2671bis-edns0-05.txt
-share/doc/bind9/draft/draft-ietf-dnsext-rfc2672bis-dname-19.txt
-share/doc/bind9/draft/draft-ietf-dnsext-rfc3597-bis-02.txt
-share/doc/bind9/draft/draft-ietf-dnsext-tsig-md5-deprecated-03.txt
-share/doc/bind9/draft/draft-ietf-dnsop-bad-dns-res-05.txt
-share/doc/bind9/draft/draft-ietf-dnsop-default-local-zones-10.txt
-share/doc/bind9/draft/draft-ietf-dnsop-dnssec-key-timing-02.txt
-share/doc/bind9/draft/draft-ietf-dnsop-dnssec-trust-history-01.txt
-share/doc/bind9/draft/draft-ietf-dnsop-inaddr-required-07.txt
-share/doc/bind9/draft/draft-ietf-dnsop-name-server-management-reqs-02.txt
-share/doc/bind9/draft/draft-ietf-dnsop-respsize-06.txt
-share/doc/bind9/draft/draft-kato-dnsop-local-zones-00.txt
-share/doc/bind9/draft/draft-kerr-ixfr-only-01.txt
-share/doc/bind9/draft/draft-mekking-dnsop-auto-cpsync-00.txt
-share/doc/bind9/draft/draft-yao-dnsext-bname-04.txt
-share/doc/bind9/rfc/rfc1032.txt
-share/doc/bind9/rfc/rfc1033.txt
-share/doc/bind9/rfc/rfc1034.txt
-share/doc/bind9/rfc/rfc1035.txt
-share/doc/bind9/rfc/rfc1101.txt
-share/doc/bind9/rfc/rfc1122.txt
-share/doc/bind9/rfc/rfc1123.txt
-share/doc/bind9/rfc/rfc1183.txt
-share/doc/bind9/rfc/rfc1348.txt
-share/doc/bind9/rfc/rfc1535.txt
-share/doc/bind9/rfc/rfc1536.txt
-share/doc/bind9/rfc/rfc1537.txt
-share/doc/bind9/rfc/rfc1591.txt
-share/doc/bind9/rfc/rfc1611.txt
-share/doc/bind9/rfc/rfc1612.txt
-share/doc/bind9/rfc/rfc1706.txt
-share/doc/bind9/rfc/rfc1712.txt
-share/doc/bind9/rfc/rfc1750.txt
-share/doc/bind9/rfc/rfc1876.txt
-share/doc/bind9/rfc/rfc1886.txt
-share/doc/bind9/rfc/rfc1912.txt
-share/doc/bind9/rfc/rfc1982.txt
-share/doc/bind9/rfc/rfc1995.txt
-share/doc/bind9/rfc/rfc1996.txt
-share/doc/bind9/rfc/rfc2052.txt
-share/doc/bind9/rfc/rfc2104.txt
-share/doc/bind9/rfc/rfc2119.txt
-share/doc/bind9/rfc/rfc2133.txt
-share/doc/bind9/rfc/rfc2136.txt
-share/doc/bind9/rfc/rfc2137.txt
-share/doc/bind9/rfc/rfc2163.txt
-share/doc/bind9/rfc/rfc2168.txt
-share/doc/bind9/rfc/rfc2181.txt
-share/doc/bind9/rfc/rfc2230.txt
-share/doc/bind9/rfc/rfc2308.txt
-share/doc/bind9/rfc/rfc2317.txt
-share/doc/bind9/rfc/rfc2373.txt
-share/doc/bind9/rfc/rfc2374.txt
-share/doc/bind9/rfc/rfc2375.txt
-share/doc/bind9/rfc/rfc2418.txt
-share/doc/bind9/rfc/rfc2535.txt
-share/doc/bind9/rfc/rfc2536.txt
-share/doc/bind9/rfc/rfc2537.txt
-share/doc/bind9/rfc/rfc2538.txt
-share/doc/bind9/rfc/rfc2539.txt
-share/doc/bind9/rfc/rfc2540.txt
-share/doc/bind9/rfc/rfc2541.txt
-share/doc/bind9/rfc/rfc2553.txt
-share/doc/bind9/rfc/rfc2671.txt
-share/doc/bind9/rfc/rfc2672.txt
-share/doc/bind9/rfc/rfc2673.txt
-share/doc/bind9/rfc/rfc2782.txt
-share/doc/bind9/rfc/rfc2825.txt
-share/doc/bind9/rfc/rfc2826.txt
-share/doc/bind9/rfc/rfc2845.txt
-share/doc/bind9/rfc/rfc2874.txt
-share/doc/bind9/rfc/rfc2915.txt
-share/doc/bind9/rfc/rfc2929.txt
-share/doc/bind9/rfc/rfc2930.txt
-share/doc/bind9/rfc/rfc2931.txt
-share/doc/bind9/rfc/rfc3007.txt
-share/doc/bind9/rfc/rfc3008.txt
-share/doc/bind9/rfc/rfc3071.txt
-share/doc/bind9/rfc/rfc3090.txt
-share/doc/bind9/rfc/rfc3110.txt
-share/doc/bind9/rfc/rfc3123.txt
-share/doc/bind9/rfc/rfc3152.txt
-share/doc/bind9/rfc/rfc3197.txt
-share/doc/bind9/rfc/rfc3225.txt
-share/doc/bind9/rfc/rfc3226.txt
-share/doc/bind9/rfc/rfc3258.txt
-share/doc/bind9/rfc/rfc3363.txt
-share/doc/bind9/rfc/rfc3364.txt
-share/doc/bind9/rfc/rfc3425.txt
-share/doc/bind9/rfc/rfc3445.txt
-share/doc/bind9/rfc/rfc3467.txt
-share/doc/bind9/rfc/rfc3490.txt
-share/doc/bind9/rfc/rfc3491.txt
-share/doc/bind9/rfc/rfc3492.txt
-share/doc/bind9/rfc/rfc3493.txt
-share/doc/bind9/rfc/rfc3513.txt
-share/doc/bind9/rfc/rfc3596.txt
-share/doc/bind9/rfc/rfc3597.txt
-share/doc/bind9/rfc/rfc3645.txt
-share/doc/bind9/rfc/rfc3655.txt
-share/doc/bind9/rfc/rfc3658.txt
-share/doc/bind9/rfc/rfc3755.txt
-share/doc/bind9/rfc/rfc3757.txt
-share/doc/bind9/rfc/rfc3833.txt
-share/doc/bind9/rfc/rfc3845.txt
-share/doc/bind9/rfc/rfc3901.txt
-share/doc/bind9/rfc/rfc4025.txt
-share/doc/bind9/rfc/rfc4033.txt
-share/doc/bind9/rfc/rfc4034.txt
-share/doc/bind9/rfc/rfc4035.txt
-share/doc/bind9/rfc/rfc4074.txt
-share/doc/bind9/rfc/rfc4159.txt
-share/doc/bind9/rfc/rfc4193.txt
-share/doc/bind9/rfc/rfc4255.txt
-share/doc/bind9/rfc/rfc4294.txt
-share/doc/bind9/rfc/rfc4339.txt
-share/doc/bind9/rfc/rfc4343.txt
-share/doc/bind9/rfc/rfc4367.txt
-share/doc/bind9/rfc/rfc4398.txt
-share/doc/bind9/rfc/rfc4408.txt
-share/doc/bind9/rfc/rfc4431.txt
-share/doc/bind9/rfc/rfc4470.txt
-share/doc/bind9/rfc/rfc4471.txt
-share/doc/bind9/rfc/rfc4472.txt
-share/doc/bind9/rfc/rfc4509.txt
-share/doc/bind9/rfc/rfc4634.txt
-share/doc/bind9/rfc/rfc4635.txt
-share/doc/bind9/rfc/rfc4641.txt
-share/doc/bind9/rfc/rfc4648.txt
-share/doc/bind9/rfc/rfc4697.txt
-share/doc/bind9/rfc/rfc4701.txt
-share/doc/bind9/rfc/rfc4892.txt
-share/doc/bind9/rfc/rfc4955.txt
-share/doc/bind9/rfc/rfc4956.txt
-share/doc/bind9/rfc/rfc5001.txt
-share/doc/bind9/rfc/rfc5011.txt
-share/doc/bind9/rfc/rfc5155.txt
-share/doc/bind9/rfc/rfc5205.txt
-share/doc/bind9/rfc/rfc5452.txt
-share/doc/bind9/rfc/rfc5507.txt
-share/doc/bind9/rfc/rfc5625.txt
-share/doc/bind9/rfc/rfc5702.txt
-share/doc/bind9/rfc/rfc5933.txt
-share/doc/bind9/rfc/rfc952.txt
+share/doc/bind9/misc/dnssec
+share/doc/bind9/misc/ipv6
+share/doc/bind9/misc/migration
+share/doc/bind9/misc/migration-4to9
+share/doc/bind9/misc/options
+share/doc/bind9/misc/rfc-compliance
+share/doc/bind9/misc/roadmap
+share/doc/bind9/misc/sdb
 share/examples/rc.d/lwresd
 share/examples/rc.d/named9
diff --git a/net/bind96/distinfo b/net/bind96/distinfo
index 0b6d202ab64..4390c098a96 100644
--- a/net/bind96/distinfo
+++ b/net/bind96/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2011/11/16 22:26:07 spz Exp $
+$NetBSD: distinfo,v 1.15 2012/04/05 00:41:10 taca Exp $
 
-SHA1 (bind-9.6-ESV-R5-P1.tar.gz) = 6d9873a66dda3ef43c1db9a1082ad428722f7d69
-RMD160 (bind-9.6-ESV-R5-P1.tar.gz) = 61be93213765ff08000521677b170a38ec326415
-Size (bind-9.6-ESV-R5-P1.tar.gz) = 7886317 bytes
+SHA1 (bind-9.6-ESV-R6.tar.gz) = 8818ba00a7503e757d9d34053b2f16beac0d0f5e
+RMD160 (bind-9.6-ESV-R6.tar.gz) = 239d70e1bc1d7e16a42d36938de8aa3ffbab0b64
+Size (bind-9.6-ESV-R6.tar.gz) = 6288288 bytes
 SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48
 SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05
-SHA1 (patch-ad) = 7e17cfd77d3eeef203f215bb1d19ad88ad4f082a
+SHA1 (patch-ad) = 3fcfac007f7823d48573459e57810f442c5b7d2f
 SHA1 (patch-ag) = ffc547b444f01f51a12a01cfa884916a9a411a88
-SHA1 (patch-am) = 4c6346b048232ede4611fcd0584487aab8fd1998
+SHA1 (patch-am) = a52d847354cd83b2474d5420925925e4614c966f
diff --git a/net/bind96/patches/patch-ad b/net/bind96/patches/patch-ad
index bdc1d7f1715..7c3a043742c 100644
--- a/net/bind96/patches/patch-ad
+++ b/net/bind96/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.5 2011/02/09 16:24:14 taca Exp $
+$NetBSD: patch-ad,v 1.6 2012/04/05 00:41:10 taca Exp $
 
---- configure.orig	2010-12-21 04:33:58.000000000 +0000
+--- configure.orig	2012-03-26 16:14:28.000000000 +0000
 +++ configure
-@@ -21168,6 +21168,8 @@ case $host in
+@@ -21923,6 +21923,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
 +*-dragonfly*)
 +	use_threads=false ;;
- *-bsdi234*)
+ *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -22484,9 +22486,9 @@ case $use_libtool in
+@@ -23239,9 +23241,9 @@ case $use_libtool in
  		O=lo
  		A=la
  		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
@@ -23,7 +23,7 @@ $NetBSD: patch-ad,v 1.5 2011/02/09 16:24:14 taca Exp $
  		case "$host" in
  		*) LIBTOOL_ALLOW_UNDEFINED= ;;
  		esac
-@@ -25587,7 +25589,7 @@ $as_echo "no" >&6; }
+@@ -26420,7 +26422,7 @@ $as_echo "no" >&6; }
  	fi
  	if test -n "-L$use_dlz_postgres_lib -lpq"
  	then
diff --git a/net/bind96/patches/patch-am b/net/bind96/patches/patch-am
index 909c94d3cb4..873b396d72c 100644
--- a/net/bind96/patches/patch-am
+++ b/net/bind96/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.3 2011/02/09 16:24:14 taca Exp $
+$NetBSD: patch-am,v 1.4 2012/04/05 00:41:10 taca Exp $
 
---- config.threads.in.orig	2010-12-21 04:33:18.000000000 +0000
+--- config.threads.in.orig	2012-03-26 16:14:28.000000000 +0000
 +++ config.threads.in
-@@ -44,6 +44,8 @@ case $host in
+@@ -45,6 +45,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
 +*-dragonfly*)
 +	use_threads=false ;;
- *-bsdi[234]*)
+ [*-bsdi[234]*])
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;