Update Bind to 9.8.5-P2

New Features

   Adds a new configuration option, "check-spf"; valid values are
   "warn" (default) and "ignore".  When set to "warn", checks SPF
   and TXT records in spf format, warning if either resource record
   type occurs without a corresponding record of the other resource
   record type.  [RT #33355]

   Adds support for Uniform Resource Identifier (URI) resource
   records. [RT #23386]

   Adds support for the EUI48 and EUI64 RR types. [RT #33082]

   Adds support for the RFC 6742 ILNP record types (NID, LP, L32,
   and L64). [RT #31836]

Feature Changes

   Changes timing of when slave zones send NOTIFY messages after
   loading a new copy of the zone.  They now send the NOTIFY before
   writing the zone data to disk.  This will result in quicker
   propagation of updates in multi-level server structures. [RT #27242]
   "named -V" can now report a source ID string.  (This is will be
   of most interest to developers and troubleshooters).  The source

   ID for ISC's production versions of BIND is defined in the "srcid"
   file in the build tree and is normally set to the most recent
   git hash. [RT #31494]

   Response Policy Zone performance enhancements.  New "response-policy"
   option "min-ns-dots".  "nsip" and "nsdname" now enabled by default
   with RPZ. [RT #32251]

Approved by:	delphij (mentor)
Sponsored by:	DK Hostmaster A/S

6 files changed, 17 insertions, 10 deletions

diff --git a/contrib/bind9/lib/export/isc/Makefile.in b/contrib/bind9/lib/export/isc/Makefile.in
index 86726ab34d22..c04a9073dcc3 100644
--- a/contrib/bind9/lib/export/isc/Makefile.in
+++ b/contrib/bind9/lib/export/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 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
@@ -67,12 +67,11 @@ OBJS =		@ISC_EXTRA_OBJS@ \
 		error.@O@ event.@O@ \
 		hash.@O@ hex.@O@ hmacmd5.@O@ hmacsha.@O@ \
 		inet_aton.@O@ iterated_hash.@O@ lex.@O@ lfsr.@O@ log.@O@ \
-		md5.@O@ mutexblock.@O@ \
-		netaddr.@O@ netscope.@O@ \
-		ondestroy.@O@ \
-		parseint.@O@ portset.@O@ radix.@O@ \
-		random.@O@ refcount.@O@ region.@O@ result.@O@ rwlock.@O@ \
-		serial.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ string.@O@ \
+		md5.@O@ mutexblock.@O@ netaddr.@O@ netscope.@O@ \
+		ondestroy.@O@ parseint.@O@ portset.@O@ radix.@O@ \
+		random.@O@ refcount.@O@ region.@O@ regex.@O@ result.@O@ \
+		rwlock.@O@ serial.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ \
+		stats.@O@ string.@O@ \
 		symtab.@O@ \
 		version.@O@ \
 		${APIOBJS} ${ISCDRIVEROBJS} \
@@ -94,7 +93,7 @@ SRCS =		@ISC_EXTRA_SRCS@ \
 		netaddr.c netscope.c \
 		ondestroy.c \
 		parseint.c portset.c radix.c \
-		random.c refcount.c region.c result.c rwlock.c \
+		random.c refcount.c region.c regex.c result.c rwlock.c \
 		serial.c sha1.c sha2.c sockaddr.c stats.c string.c symtab.c \
 		version.c \
 		${APISRCS} ${ISCDRIVERSRCS}
diff --git a/contrib/bind9/lib/export/isc/include/isc/Makefile.in b/contrib/bind9/lib/export/isc/include/isc/Makefile.in
index 91f538c4c17d..8c7eff8efa24 100644
--- a/contrib/bind9/lib/export/isc/include/isc/Makefile.in
+++ b/contrib/bind9/lib/export/isc/include/isc/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 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
@@ -35,7 +35,7 @@ HEADERS =	app.h assertions.h base64.h bitstring.h boolean.h \
 		magic.h md5.h mem.h msgcat.h msgs.h \
 		mutexblock.h namespace.h netaddr.h ondestroy.h os.h parseint.h \
 		print.h quota.h radix.h random.h ratelimiter.h \
-		refcount.h region.h resource.h \
+		refcount.h regex.h region.h resource.h \
 		result.h resultclass.h rwlock.h serial.h sha1.h sha2.h \
 		sockaddr.h socket.h stdio.h stdlib.h string.h \
 		symtab.h \
diff --git a/contrib/bind9/lib/export/isc/nls/Makefile.in b/contrib/bind9/lib/export/isc/nls/Makefile.in
index 25156854d1e1..16a6a863c634 100644
--- a/contrib/bind9/lib/export/isc/nls/Makefile.in
+++ b/contrib/bind9/lib/export/isc/nls/Makefile.in
@@ -16,10 +16,12 @@
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/isc/nls
+export_srcdir = @top_srcdir@/lib/export
 
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/unix/include \
+		-I${export_srcdir}/isc/include \
 		${ISC_INCLUDES}
 
 CDEFINES =
diff --git a/contrib/bind9/lib/export/isc/nothreads/Makefile.in b/contrib/bind9/lib/export/isc/nothreads/Makefile.in
index 994da6362c6b..464099399c66 100644
--- a/contrib/bind9/lib/export/isc/nothreads/Makefile.in
+++ b/contrib/bind9/lib/export/isc/nothreads/Makefile.in
@@ -16,11 +16,13 @@
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/isc/nothreads
+export_srcdir = @top_srcdir@/lib/export
 
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../unix/include \
+		-I${export_srcdir}/isc/include \
 		-I../include \
 		-I${srcdir}/../include \
 		-I${srcdir}/..
diff --git a/contrib/bind9/lib/export/isc/pthreads/Makefile.in b/contrib/bind9/lib/export/isc/pthreads/Makefile.in
index f08e5c630b39..80c5e3bb2032 100644
--- a/contrib/bind9/lib/export/isc/pthreads/Makefile.in
+++ b/contrib/bind9/lib/export/isc/pthreads/Makefile.in
@@ -16,11 +16,13 @@
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/isc/pthreads
+export_srcdir = @top_srcdir@/lib/export
 
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../unix/include \
+		-I${export_srcdir}/isc/include \
 		-I../include \
 		-I${srcdir}/../include \
 		-I${srcdir}/..
diff --git a/contrib/bind9/lib/export/isc/unix/Makefile.in b/contrib/bind9/lib/export/isc/unix/Makefile.in
index f5cf7e86caf6..18732028ecf1 100644
--- a/contrib/bind9/lib/export/isc/unix/Makefile.in
+++ b/contrib/bind9/lib/export/isc/unix/Makefile.in
@@ -16,11 +16,13 @@
 
 top_srcdir =	@top_srcdir@
 srcdir =	@top_srcdir@/lib/isc/unix
+export_srcdir = @top_srcdir@/lib/export
 
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =	-I${srcdir}/include \
 		-I${srcdir}/../@ISC_THREAD_DIR@/include \
+		-I${export_srcdir}/isc/include \
 		-I../include \
 		-I${srcdir}/../include \
 		-I${srcdir}/..