Update bind96 package to 9.6.3.

9.6.3

     * BIND now builds with threads disabled in versions of NetBSD earlier
       than 5.0 and with pthreads enabled by default in NetBSD versions
       5.0 and higher. Also removes support for unproven-pthreads,
       mit-pthreads and ptl2. [RT #19203]
     * HPUX now correctly defaults to using /dev/poll, which should
       increase performance. [RT #21919]
     * If named is running as a threaded application, after an "rndc stop"
       command has been issued, other inbound TCP requests can cause named
       to hang and never complete shutdown. [RT #22108]
     * When performing a GSS-TSIG signed dynamic zone update, memory could
       be leaked. This causes an unclean shutdown and may affect
       long-running servers. [RT #22573]
     * A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled
       allows for a TCP DoS attack. Until there is a kernel fix, ISC is
       disabling SO_ACCEPTFILTER support in BIND. [RT #22589]
     * Corrected a defect where a combination of dynamic updates and zone
       transfers incorrectly locked the in-memory zone database, causing
       named to freeze. [RT #22614]
     * Don't run MX checks (check-mx) when the MX record points to ".".
       [RT #22645]
     * DST key reference counts can now be incremented via dst_key_attach.
       [RT #22672]
     * isc_mutex_init_errcheck() in phtreads/mutex.c failed to destroy
       attr. [RT #22766]
     * The Kerberos realm was being truncated when being pulled from the
       the host prinicipal, make krb5-self updates fail. [RT #22770]
     * named failed to preserve the case of domain names in RDATA which is
       not compressible when writing master files. [RT #22863]
     * There was a bug in how the clients-per-query code worked with some
       query patterns. This could result, in rare circumstances, in having
       all the client query slots filled with queries for the same DNS
       label, essentially ignoring the max-clients-per-query setting. [RT
       #22972]

5 files changed, 33 insertions, 104 deletions

diff --git a/net/bind96/Makefile b/net/bind96/Makefile
index 5b174698fff..249475d79f4 100644
--- a/net/bind96/Makefile
+++ b/net/bind96/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/12/02 00:32:34 taca Exp $
+# $NetBSD: Makefile,v 1.18 2011/02/09 16:24:14 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.6.2-P3
+BIND_VERSION=	9.6.3
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind96/PLIST b/net/bind96/PLIST
index 18d55264595..954d9ed531a 100644
--- a/net/bind96/PLIST
+++ b/net/bind96/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/05/26 15:57:37 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/02/09 16:24:14 taca Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -336,24 +336,30 @@ 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-ietf-6man-text-addr-representation-01.txt
-share/doc/bind9/draft/draft-ietf-behave-dns64-06.txt
-share/doc/bind9/draft/draft-ietf-dnsext-axfr-clarify-13.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dns-tcp-requirements-02.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-09.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dnssec-gost-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-02.txt
-share/doc/bind9/draft/draft-ietf-dnsext-rfc2672bis-dname-18.txt
-share/doc/bind9/draft/draft-ietf-dnsext-rfc3597-bis-00.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-09.txt
+share/doc/bind9/draft/draft-ietf-dnsop-default-local-zones-10.txt
+share/doc/bind9/draft/draft-ietf-dnsop-dnssec-key-timing-00.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
@@ -481,6 +487,7 @@ 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/examples/rc.d/lwresd
 share/examples/rc.d/named9
diff --git a/net/bind96/distinfo b/net/bind96/distinfo
index 9aead2d99a6..4a17b00dbb1 100644
--- a/net/bind96/distinfo
+++ b/net/bind96/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2010/12/02 00:32:34 taca Exp $
+$NetBSD: distinfo,v 1.11 2011/02/09 16:24:14 taca Exp $
 
-SHA1 (bind-9.6.2-P3.tar.gz) = b6f0ac1612229529636e4b2ae1c4cb21447d2e8f
-RMD160 (bind-9.6.2-P3.tar.gz) = d95b78c04400b13c04251f1b4a3da4ad446ec364
-Size (bind-9.6.2-P3.tar.gz) = 6725172 bytes
+SHA1 (bind-9.6.3.tar.gz) = 7d6dc79dc7bf32e8d6785c7bb1d913aa676f6424
+RMD160 (bind-9.6.3.tar.gz) = df00af80d58c79190149a0068f4cc2fe84557db2
+Size (bind-9.6.3.tar.gz) = 7203094 bytes
 SHA1 (patch-ab) = 6cec876c8caa7082f97365863f3f88c4f168da48
 SHA1 (patch-ac) = 074649e1514870a3154c623a5f6d1507b72b5b05
-SHA1 (patch-ad) = 65b571e506d41054951315729859d3b189689913
+SHA1 (patch-ad) = 7e17cfd77d3eeef203f215bb1d19ad88ad4f082a
 SHA1 (patch-ag) = ffc547b444f01f51a12a01cfa884916a9a411a88
-SHA1 (patch-am) = 790408852e6b0f3a1b6dfb2725e2a43ad7240935
+SHA1 (patch-am) = 4c6346b048232ede4611fcd0584487aab8fd1998
diff --git a/net/bind96/patches/patch-ad b/net/bind96/patches/patch-ad
index 4c68a5ce22e..bdc1d7f1715 100644
--- a/net/bind96/patches/patch-ad
+++ b/net/bind96/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2010/05/26 15:57:37 taca Exp $
+$NetBSD: patch-ad,v 1.5 2011/02/09 16:24:14 taca Exp $
 
---- configure.orig	2009-10-16 04:30:13.000000000 +0000
+--- configure.orig	2010-12-21 04:33:58.000000000 +0000
 +++ configure
-@@ -23124,6 +23124,8 @@ case $host in
+@@ -21168,6 +21168,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,47 +11,7 @@ $NetBSD: patch-ad,v 1.4 2010/05/26 15:57:37 taca Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -23212,7 +23214,7 @@ echo "$as_me: WARNING: linking with PTL2
- echo "${ECHO_T}native" >&6; }
- 				LIBS="-lpthread $LIBS"
- 			else
--				if test ! -d $LOCALBASE/pthreads
-+				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
- 				then
- 					{ echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6; }
-@@ -23223,14 +23225,23 @@ echo "$as_me: error: \"could not find th
- 
- 				if $use_threads
- 				then
--					{ echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
-+					if test -f /usr/include/pthread.h
-+					then
-+						{ echo "$as_me:$LINENO: result: native pthreads" >&5
-+$as_echo "native pthreads" >&6; }
-+						LIBS="-lpthread $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I/usr/include"
-+						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
-+					else
-+						{ echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
- echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6; }
--					pkg="$LOCALBASE/pthreads"
--					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
--					lib2="-lpthread -lm -lgcc -lpthread"
--					LIBS="$lib1 $lib2 $LIBS"
--					CPPFLAGS="$CPPFLAGS -I$pkg/include"
--					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+						pkg="$LOCALBASE/pthreads"
-+						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
-+						lib2="-lpthread -lm -lgcc -lpthread"
-+						LIBS="$lib1 $lib2 $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I$pkg/include"
-+						STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					fi
- 				fi
- 			fi
- 		fi
-@@ -25648,9 +25659,9 @@ case $use_libtool in
+@@ -22484,9 +22486,9 @@ case $use_libtool in
  		O=lo
  		A=la
  		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
@@ -63,7 +23,7 @@ $NetBSD: patch-ad,v 1.4 2010/05/26 15:57:37 taca Exp $
  		case "$host" in
  		*) LIBTOOL_ALLOW_UNDEFINED= ;;
  		esac
-@@ -32072,7 +32083,7 @@ echo "${ECHO_T}no" >&6; }
+@@ -25587,7 +25589,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 2a3d9594d87..909c94d3cb4 100644
--- a/net/bind96/patches/patch-am
+++ b/net/bind96/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2010/05/26 15:57:37 taca Exp $
+$NetBSD: patch-am,v 1.3 2011/02/09 16:24:14 taca Exp $
 
---- config.threads.in.orig	2006-07-20 05:39:07.000000000 +0000
+--- config.threads.in.orig	2010-12-21 04:33:18.000000000 +0000
 +++ config.threads.in
-@@ -48,6 +48,8 @@ case $host in
+@@ -44,6 +44,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,41 +11,3 @@ $NetBSD: patch-am,v 1.2 2010/05/26 15:57:37 taca Exp $
  *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -121,7 +123,7 @@ then
- 				AC_MSG_RESULT(native)
- 				LIBS="-lpthread $LIBS"
- 			else
--				if test ! -d $LOCALBASE/pthreads
-+				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
- 				then
- 					AC_MSG_RESULT(none)
- 					AC_MSG_ERROR("could not find thread libraries")
-@@ -129,13 +131,21 @@ then
- 
- 				if $use_threads
- 				then
--					AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
--					pkg="$LOCALBASE/pthreads"
--					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
--					lib2="-lpthread -lm -lgcc -lpthread"
--					LIBS="$lib1 $lib2 $LIBS"
--					CPPFLAGS="$CPPFLAGS -I$pkg/include"
--					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					if test -f /usr/include/pthread.h
-+					then
-+						AC_MSG_RESULT(native pthreads)
-+						LIBS="-lpthread $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I/usr/inclue"
-+						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
-+					else
-+						AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
-+						pkg="$LOCALBASE/pthreads"
-+						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
-+						lib2="-lpthread -lm -lgcc -lpthread"
-+						LIBS="$lib1 $lib2 $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I$pkg/include"
-+						STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					fi
- 				fi
- 			fi
- 		fi