Update BIND to version 9.6.1rc1. This version has better performance and

lots of new features compared to 9.4.x, including:

	Full NSEC3 support
	Automatic zone re-signing
	New update-policy methods tcp-self and 6to4-self
	DHCID support.
	More detailed statistics counters including those supported in BIND 8.
	Faster ACL processing.
	Efficient LRU cache-cleaning mechanism.
	NSID support.

2 files changed, 89 insertions, 63 deletions

diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index 6e76a87..7648da5 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -27,14 +27,16 @@ SRCS+=		condition.c mutex.c \
 
 .PATH:		${SRCDIR}
 SRCS+=		inet_pton.c \
-		assertions.c base64.c bitstring.c buffer.c \
-		bufferlist.c commandline.c error.c event.c \
-		hash.c heap.c hex.c hmacmd5.c hmacsha.c \
-		lex.c lfsr.c lib.c log.c md5.c \
-		mem.c mutexblock.c netaddr.c netscope.c ondestroy.c \
-		parseint.c portset.c print.c quota.c random.c \
+		assertions.c base32.c base64.c bitstring.c buffer.c \
+		bufferlist.c commandline.c entropy.c error.c event.c \
+		fsaccess.c hash.c heap.c hex.c hmacmd5.c hmacsha.c \
+		httpd.c inet_aton.c inet_ntop.c iterated_hash.c \
+		lex.c lfsr.c lib.c log.c \
+		md5.c mem.c mutexblock.c \
+		netaddr.c netscope.c ondestroy.c \
+		parseint.c portset.c print.c quota.c radix.c random.c \
 		ratelimiter.c refcount.c region.c result.c rwlock.c \
-		serial.c sha1.c sha2.c sockaddr.c string.c strtoul.c \
+		serial.c sha1.c sha2.c sockaddr.c stats.c string.c strtoul.c \
 		symtab.c task.c taskpool.c timer.c version.c
 
 CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include
@@ -47,6 +49,7 @@ LDADD=		${PTHREAD_LDADD}
 .if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/assertions.h \
+		${SRCDIR}/include/isc/base32.h \
 		${SRCDIR}/include/isc/base64.h \
 		${SRCDIR}/include/isc/bitstring.h \
 		${SRCDIR}/include/isc/boolean.h \
@@ -65,6 +68,8 @@ INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/hex.h \
 		${SRCDIR}/include/isc/hmacmd5.h \
 		${SRCDIR}/include/isc/hmacsha.h \
+		${SRCDIR}/include/isc/httpd.h \
+		${SRCDIR}/include/isc/iterated_hash.h \
 		${SRCDIR}/include/isc/interfaceiter.h \
 		${SRCDIR}/include/isc/ipv6.h \
 		${SRCDIR}/include/isc/lang.h \
@@ -87,6 +92,7 @@ INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/portset.h \
 		${SRCDIR}/include/isc/print.h \
 		${SRCDIR}/include/isc/quota.h \
+		${SRCDIR}/include/isc/radix.h \
 		${SRCDIR}/include/isc/random.h \
 		${SRCDIR}/include/isc/ratelimiter.h \
 		${SRCDIR}/include/isc/refcount.h \
@@ -100,6 +106,7 @@ INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/sha2.h \
 		${SRCDIR}/include/isc/sockaddr.h \
 		${SRCDIR}/include/isc/socket.h \
+		${SRCDIR}/include/isc/stats.h \
 		${SRCDIR}/include/isc/stdio.h \
 		${SRCDIR}/include/isc/stdlib.h \
 		${SRCDIR}/include/isc/string.h \
@@ -110,6 +117,7 @@ INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/types.h \
 		${SRCDIR}/include/isc/util.h \
 		${SRCDIR}/include/isc/version.h \
+		${SRCDIR}/include/isc/xml.h \
 		${SRCDIR}/pthreads/include/isc/condition.h \
 		${SRCDIR}/pthreads/include/isc/mutex.h \
 		${SRCDIR}/pthreads/include/isc/once.h \
diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h
index 09e481e..197a2bc 100644
--- a/lib/bind/isc/isc/platform.h
+++ b/lib/bind/isc/isc/platform.h
@@ -1,7 +1,7 @@
 /* $FreeBSD$ */
 
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.34.18.11 2008/06/24 23:45:55 tbox Exp $ */
+/* $Id: platform.h.in,v 1.48.84.2 2009/02/16 23:47:15 tbox Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
@@ -28,11 +28,6 @@
  ***** Platform-dependent defines.
  *****/
 
-/*
- * Define if the platform has <strings.h>.
- */
-#define ISC_PLATFORM_HAVESTRINGSH 1
-
 /***
  *** Network.
  ***/
@@ -101,29 +96,26 @@
 #undef ISC_PLATFORM_NEEDPTON
 
 /*! \brief
- * If this system needs inet_aton(), ISC_PLATFORM_NEEDATON will be defined.
- */
-#undef ISC_PLATFORM_NEEDATON
-
-/*! \brief
  * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
  */
 #undef ISC_PLATFORM_NEEDPORTT
 
 /*! \brief
- * If the system needs strsep(), ISC_PLATFORM_NEEDSTRSEP will be defined.
+ * Define if the system has struct lifconf which is a extended struct ifconf
+ * for IPv6.
  */
-#undef ISC_PLATFORM_NEEDSTRSEP
+#undef ISC_PLATFORM_HAVELIFCONF
 
 /*! \brief
- * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined.
+ * Define if the system has struct if_laddrconf which is a extended struct
+ * ifconf for IPv6.
  */
-#undef ISC_PLATFORM_NEEDSTRLCPY
+#undef ISC_PLATFORM_HAVEIF_LADDRCONF
 
 /*! \brief
- * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined.
+ * Define if the system has struct if_laddrreq.
  */
-#undef ISC_PLATFORM_NEEDSTRLCAT
+#undef ISC_PLATFORM_HAVEIF_LADDRREQ
 
 /*! \brief
  * Define either ISC_PLATFORM_BSD44MSGHDR or ISC_PLATFORM_BSD43MSGHDR.
@@ -131,10 +123,9 @@
 #define ISC_NET_BSD44MSGHDR 1
 
 /*! \brief
- * Define if PTHREAD_ONCE_INIT should be surrounded by braces to
- * prevent compiler warnings (such as with gcc on Solaris 2.8).
+ * Define if the system supports if_nametoindex.
  */
-#undef ISC_PLATFORM_BRACEPTHREADONCEINIT
+#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
 
 /*! \brief
  * Define on some UnixWare systems to fix erroneous definitions of various
@@ -177,62 +168,74 @@
  */
 #define ISC_PLATFORM_QUADFORMAT "ll"
 
-/*! \brief
- * Defined if we are using threads.
+/***
+ *** String functions.
+ ***/
+/*
+ * If the system needs strsep(), ISC_PLATFORM_NEEDSTRSEP will be defined.
  */
-#define ISC_PLATFORM_USETHREADS 1
+#undef ISC_PLATFORM_NEEDSTRSEP
 
-/*! \brief
- * Defined if unistd.h does not cause fd_set to be delared.
+/*
+ * If the system needs strlcpy(), ISC_PLATFORM_NEEDSTRLCPY will be defined.
  */
-#undef ISC_PLATFORM_NEEDSYSSELECTH
+#undef ISC_PLATFORM_NEEDSTRLCPY
 
-/*! \brief
- * Type used for resource limits.
+/*
+ * If the system needs strlcat(), ISC_PLATFORM_NEEDSTRLCAT will be defined.
  */
-#define ISC_PLATFORM_RLIMITTYPE rlim_t
+#undef ISC_PLATFORM_NEEDSTRLCAT
 
-/*! \brief
- * Define if your compiler supports "long long int".
+/*
+ * Define if this system needs strtoul.
  */
-#define ISC_PLATFORM_HAVELONGLONG 1
+#undef ISC_PLATFORM_NEEDSTRTOUL
 
-/*! \brief
- * Define if the system has struct lifconf which is a extended struct ifconf
- * for IPv6.
+/*
+ * Define if this system needs memmove.
  */
-#undef ISC_PLATFORM_HAVELIFCONF
+#undef ISC_PLATFORM_NEEDMEMMOVE
 
-/*! \brief
- * Define if the system has struct if_laddrconf which is a extended struct
- * ifconf for IPv6.
+/***
+ *** Miscellaneous.
+ ***/
+
+/*
+ * Defined if we are using threads.
  */
-#undef ISC_PLATFORM_HAVEIF_LADDRCONF
+#define ISC_PLATFORM_USETHREADS 1
 
-/*! \brief
- * Define if the system has struct if_laddrreq.
+/*
+ * Defined if unistd.h does not cause fd_set to be delared.
  */
-#undef ISC_PLATFORM_HAVEIF_LADDRREQ
+#undef ISC_PLATFORM_NEEDSYSSELECTH
 
-/*! \brief
- * Used to control how extern data is linked; needed for Win32 platforms.
+/*
+ * Defined to <gssapi.h> or <gssapi/gssapi.h> for how to include
+ * the GSSAPI header.
  */
-#undef ISC_PLATFORM_USEDECLSPEC
 
-/*! \brief
- * Define if the system supports if_nametoindex.
+
+/*
+ * Type used for resource limits.
  */
-#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
+#define ISC_PLATFORM_RLIMITTYPE rlim_t
 
-/*! \brief
- * Define if this system needs strtoul.
+/*
+ * Define if your compiler supports "long long int".
  */
-#undef ISC_PLATFORM_NEEDSTRTOUL
+#define ISC_PLATFORM_HAVELONGLONG 1
 
-/*! \brief
- * Define if this system needs memmove.
+/*
+ * Define if PTHREAD_ONCE_INIT should be surrounded by braces to
+ * prevent compiler warnings (such as with gcc on Solaris 2.8).
  */
-#undef ISC_PLATFORM_NEEDMEMMOVE
+#undef ISC_PLATFORM_BRACEPTHREADONCEINIT
+
+/*
+ * Used to control how extern data is linked; needed for Win32 platforms.
+ */
+#undef ISC_PLATFORM_USEDECLSPEC
 
 /*
  * Define if the platform has <sys/un.h>.
@@ -246,6 +249,12 @@
 #define ISC_PLATFORM_HAVEXADD 1
 
 /*
+ * If the "xaddq" operation (64bit xadd) is available on this architecture,
+ * ISC_PLATFORM_HAVEXADDQ will be defined.
+ */
+#undef ISC_PLATFORM_HAVEXADDQ
+
+/*
  * If the "atomic swap" operation is available on this architecture,
  * ISC_PLATFORM_HAVEATOMICSTORE" will be defined.
  */
@@ -273,6 +282,15 @@
 
 
 /*
+ * Define if the platform has <strings.h>.
+ */
+#define ISC_PLATFORM_HAVESTRINGSH 1
+
+/***
+ ***	Windows dll support.
+ ***/
+
+/*
  * Define if MacOS style of PPC assembly must be used.
  * e.g. "r6", not "6", for register six.
  */