Update bind910 to 9.10.1.

Security Fixes

   A query specially crafted to exploit a defect in EDNS option
   processing could cause named to terminate with an assertion
   failure, due to a missing isc_buffer_availablelength() check
   when formatting packet contents for logging. For more information,
   see the security advisory at https://kb.isc.org/article/AA-01166/.
   [CVE-2014-3859] [RT #36078]

   A programming error in the prefetch feature could cause named
   to crash with a "REQUIRE" assertion failure in name.c. For more
   information, see the security advisory at
   https://kb.isc.org/article/AA-01161/. [CVE-2014-3214] [RT #35899]

New Features

   Support for CAA record types, as described in RFC 6844 "DNS
   Certification Authority Authorization (CAA) Resource Record",
   was added. [RT#36625] [RT #36737]

   Disallow "request-ixfr" from being specified in zone statements
   where it is not valid (it is only valid for slave and redirect
   zones) [RT #36608]

   Support for CDS and CDNSKEY resource record types was added. For
   details see the proposed Informational Internet-Draft "Automating
   DNSSEC Delegation Trust Maintenance" at
   http://tools.ietf.org/html/draft-ietf-dnsop-delegation-trust-maintainance-14.
   [RT #36333]

   Added version printing options to various BIND utilities. [RT #26057]
   [RT #10686]

   Optionally allows libseccomp-based (secure computing mode)
   system-call filtering on Linux. This sandboxing mechanism may
   be used to isolate "named" from various system resources. Use
   "configure --enable-seccomp" at build time to enable it.  Thank you
   to Loganaden Velvindron of AFRINIC for the contribution. [RT #35347]

Feature Changes

   "geoip asnum" ACL elements would not match unless the full
   organization name was specified.  They can now match against the
   AS number alone (e.g., AS1234). [RT #36945]

   Adds RPZ SOA to the additional section of responses to clearly
   indicate the use of RPZ in a manner that is intended to avoid
   causing issues for downstream resolvers and forwarders [RT #36507]

   rndc now gives distinct error messages when an unqualified zone
   name matches multiple views vs. matching no views [RT #36691]

   Improves the accuracy of dig's reported round trip times.  [RT #36611]

   When an SPF record exists in a zone but no equivalent TXT record
   does, a warning will be issued.  The warning for the reverse
   condition is no longer issued. See the check-spf option in the
   documentation for details. [RT #36210]

   Aging of smoothed round-trip time measurements is now limited
   to no more than once per second, to improve accuracy in selecting
   the best name server. [RT #32909]

   DNSSEC keys that have been marked active but have no publication
   date are no longer presumed to be publishable. [RT #35063]

Bug Fixes

   The Makefile in bin/python was changed to work around a bmake
   bug in FreeBSD 10 and NetBSD 6. [RT #36993] (**)

   Corrected bugs in the handling of wildcard records by the DNSSEC
   validator: invalid wildcard expansions could be treated as valid
   if signed, and valid wildcard expansions in NSEC3 opt-out ranges
   had the AD bit set incorrectly in responses. [RT #37093] [RT #37072]

   An assertion failure could occur if a route event arrived while
   shutting down. [RT #36887]

   When resigning, dnssec-signzone was removing all signatures from
   delegation nodes. It now retains DS and (if applicable) NSEC
   signatures.  [RT #36946]

   The AD flag was being set inappopriately on RPZ responses. [RT #36833]

   Updates the URI record type to current draft standard,
   draft-faltstrom-uri-08, and allows the value field to be zero
   length [RT #36642] [RT #36737]

   On some platforms, overhead from DSCP tagging caused a performance
   regression between BIND 9.9 and BIND 9.10.  [RT #36534]

   RRSIG sets that were not loaded in a single transaction at start
   up were not being correctly added to re-signing heaps.  [RT #36302]

   Setting '-t aaaa' in .digrc had unintended side-effects. [RT #36452]

   Fixed a bug where some updated policy zone contents could be
   ignored due to stale RPZ summary information [RT #35885]

   A race condition could cause a crash in isc_event_free during
   shutdown.  [RT #36720]

   Addresses some problems with unrecoverable lookup failures. [RT #36330]

   Addresses a race condition issue in dispatch. [RT #36731]

   acl elements could be miscounted, causing a crash while loading
   a config [RT #36675]

   Corrects a deadlock between view.c and adb.c. [RT #36341]

   liblwres wasn't properly handling link-local addresses in
   nameserver clauses in resolv.conf. [RT #36039]

   Disable the GCC 4.9 "delete null pointer check" optimizer option,
   and refactor dns_rdataslab_fromrdataset() to separate out the
   handling of an rdataset with no records. This fixes problems
   when using GNU GCC 4.9.0 where its compiler code optimizations
   may cause crashes in BIND. For more information, see the operational
   advisory at https://kb.isc.org/article/AA-01167/. [RT #35968]

   Fixed a bug that could cause repeated resigning of records in
   dynamically signed zones. [RT #35273]

   Fixed a bug that could cause an assertion failure after forwarding
   was disabled. [RT #35979]

   Fixed a bug that caused GeoIP ACLs not to work when referenced
   indirectly via named or nested ACLs. [RT #35879]

   FIxed a bug that could cause problems with cache cleaning when
   SIT was enabled. [RT #35858]

   Fixed a bug that caused SERVFAILs when using RPZ on a system
   configured as a forwarder. [RT #36060]

   Worked around a limitation in Solaris's /dev/poll implementation
   that could cause named to fail to start when configured to use
   more sockets than the system could accomodate. [RT #35878]

   Fixed a bug that could cause an assertion failure when inserting
   and deleting parent and child nodes in a response-policy zone.
   [RT #36272]

13 files changed, 46 insertions, 132 deletions

diff --git a/net/bind910/Makefile b/net/bind910/Makefile
index 5f68fd08aad..a9f3bb1afeb 100644
--- a/net/bind910/Makefile
+++ b/net/bind910/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/07/02 02:42:57 jnemeth Exp $
+# $NetBSD: Makefile,v 1.2 2014/10/14 16:23:19 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.10.0-P2
+BIND_VERSION=	9.10.1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind910/PLIST b/net/bind910/PLIST
index f9652e89b18..fa2334d19d0 100644
--- a/net/bind910/PLIST
+++ b/net/bind910/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/10/14 16:23:19 taca Exp $
 bin/bind9-config
 bin/delv
 bin/dig
@@ -240,6 +240,7 @@ include/lwres/netdb.h
 include/lwres/platform.h
 include/lwres/result.h
 include/lwres/stdlib.h
+include/lwres/string.h
 include/lwres/version.h
 include/pk11/constants.h
 include/pk11/internal.h
diff --git a/net/bind910/distinfo b/net/bind910/distinfo
index 0dff8f83eab..16ac51c82f1 100644
--- a/net/bind910/distinfo
+++ b/net/bind910/distinfo
@@ -1,19 +1,13 @@
-$NetBSD: distinfo,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
+$NetBSD: distinfo,v 1.2 2014/10/14 16:23:19 taca Exp $
 
-SHA1 (bind-9.10.0-P2.tar.gz) = c57b5825e36933119e9fd6f43e3f52262e7ff4ed
-RMD160 (bind-9.10.0-P2.tar.gz) = e1292a28f6b2cd03ba498a0412fd7b0911f172bd
-Size (bind-9.10.0-P2.tar.gz) = 8335644 bytes
+SHA1 (bind-9.10.1.tar.gz) = 96aa28c6112c6a8c33a19efeac98c715f03b35ca
+RMD160 (bind-9.10.1.tar.gz) = 5bc833a729a4d94c3d85af17d1452d15ea605c3c
+Size (bind-9.10.1.tar.gz) = 8353313 bytes
 SHA1 (patch-bin_dig_dighost.c) = 72cb7676cdf9cd4b44bc62c72bcf29127d9fbffe
-SHA1 (patch-bin_tests_system_Makefile.in) = e3a41cbc3b603a4318f3909488a6fb3b0d1a4b12
+SHA1 (patch-bin_tests_system_Makefile.in) = 8bb6130981a6ff2ac736cf53a061115782bb65a2
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
-SHA1 (patch-configure) = c94a5c1c9dd55ff245c1adbb7c4ddb4a8e16a171
+SHA1 (patch-configure) = 1de3bfa72fd9887a8fbb20ddd12bfe0469083ba0
 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) = baa1745799d7fd0951717fa1581e893f1653dfc5
-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
-SHA1 (patch-lib_lwres_getaddrinfo.c) = ccc00e446867785e401eb92e63e05505dfd01087
+SHA1 (patch-lib_dns_rbt.c) = 510dfc72bc7764e548a46e9c48b58b2543490d7a
+SHA1 (patch-lib_lwres_getaddrinfo.c) = 69e9c8049fedcb93bd219c6053163f21ce3b2535
 SHA1 (patch-lib_lwres_getnameinfo.c) = 418ad349cf52925c9e8051b5c71d9d51ea8d2fb1
diff --git a/net/bind910/patches/patch-bin_tests_system_Makefile.in b/net/bind910/patches/patch-bin_tests_system_Makefile.in
index 9d625e4f1c3..6d012e308db 100644
--- a/net/bind910/patches/patch-bin_tests_system_Makefile.in
+++ b/net/bind910/patches/patch-bin_tests_system_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-bin_tests_system_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
+$NetBSD: patch-bin_tests_system_Makefile.in,v 1.2 2014/10/14 16:23:19 taca Exp $
 
 Build fix for DragonFly while linking of driver.so.
 
---- bin/tests/system/Makefile.in.orig	2014-05-27 04:45:53.000000000 +0000
+--- bin/tests/system/Makefile.in.orig	2014-09-16 19:27:15.000000000 +0000
 +++ bin/tests/system/Makefile.in
 @@ -21,7 +21,7 @@ top_srcdir =	@top_srcdir@
  
  @BIND9_MAKE_INCLUDES@
  
--SUBDIRS =	dlzexternal filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss
-+SUBDIRS =	filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss
+-SUBDIRS =	builtin dlzexternal filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss
++SUBDIRS =	builtin filter-aaaa geoip lwresd rpz rsabigexponent tkey tsiggss
  TARGETS =
  
  @BIND9_MAKE_RULES@
diff --git a/net/bind910/patches/patch-configure b/net/bind910/patches/patch-configure
index 5fecf01e05e..68bde16b666 100644
--- a/net/bind910/patches/patch-configure
+++ b/net/bind910/patches/patch-configure
@@ -1,21 +1,30 @@
-$NetBSD: patch-configure,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
+$NetBSD: patch-configure,v 1.2 2014/10/14 16:23:19 taca Exp $
 
 * Add DragonFly support.
 * Link proper postgresql library.
 * Avoid using "==" for argument of test(1).
 
---- configure.orig	2014-01-27 18:58:24.000000000 +0000
+--- configure.orig	2014-09-16 19:27:15.000000000 +0000
 +++ configure
-@@ -11685,7 +11685,7 @@ done
+@@ -11827,7 +11827,7 @@ fi
+   test -n "$PYTHON" && break
+ done
  
- 			;;
- 		esac
--		if test "X$PYTHON" == "X"
-+		if test "X$PYTHON" = "X"
- 		then
- 			case "$use_python" in
- 			unspec)
-@@ -14410,6 +14410,8 @@ case $host in
+-				if test "X$PYTHON" == "X"; then
++				if test "X$PYTHON" = "X"; then
+ 					continue;
+ 				fi
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python module 'argparse'" >&5
+@@ -11842,7 +11842,7 @@ $as_echo "not found" >&6; }
+ 				unset ac_cv_path_PYTHON
+ 				unset PYTHON
+ 			done
+-			if test "X$PYTHON" == "X"
++			if test "X$PYTHON" = "X"
+ 			then
+ 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python support" >&5
+ $as_echo_n "checking for python support... " >&6; }
+@@ -14352,6 +14352,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=true ;;
@@ -24,7 +33,7 @@ $NetBSD: patch-configure,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
  *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -19538,7 +19540,7 @@ $as_echo "no" >&6; }
+@@ -20865,7 +20867,7 @@ $as_echo "no" >&6; }
  	fi
  	if test -n "-L$use_dlz_postgres_lib -lpq"
  	then
diff --git a/net/bind910/patches/patch-lib_bind9_Makefile.in b/net/bind910/patches/patch-lib_bind9_Makefile.in
deleted file mode 100644
index 8cf647908c6..00000000000
--- a/net/bind910/patches/patch-lib_bind9_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_bind9_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
-
-* XXX: Install with proper permission.
-
---- lib/bind9/Makefile.in.orig	2013-09-05 05:09:08.000000000 +0000
-+++ lib/bind9/Makefile.in
-@@ -79,7 +79,7 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libbind9.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f libbind9.@A@ timestamp
diff --git a/net/bind910/patches/patch-lib_dns_Makefile.in b/net/bind910/patches/patch-lib_dns_Makefile.in
deleted file mode 100644
index 7f98fa83338..00000000000
--- a/net/bind910/patches/patch-lib_dns_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_dns_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
-
-* XXX: Install with proper permission.
-
---- lib/dns/Makefile.in.orig	2013-09-05 05:09:08.000000000 +0000
-+++ lib/dns/Makefile.in
-@@ -142,7 +142,7 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libdns.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f libdns.@A@ timestamp
diff --git a/net/bind910/patches/patch-lib_dns_rbt.c b/net/bind910/patches/patch-lib_dns_rbt.c
index af59ad22a72..89e16f4d996 100644
--- a/net/bind910/patches/patch-lib_dns_rbt.c
+++ b/net/bind910/patches/patch-lib_dns_rbt.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-lib_dns_rbt.c,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
+$NetBSD: patch-lib_dns_rbt.c,v 1.2 2014/10/14 16:23:19 taca Exp $
 
 * Disable inline on powerpc.
 
---- lib/dns/rbt.c.orig	2014-05-27 04:45:53.000000000 +0000
+--- lib/dns/rbt.c.orig	2014-09-16 19:27:15.000000000 +0000
 +++ lib/dns/rbt.c
-@@ -328,6 +328,10 @@ hexdump(const char *desc, unsigned char 
+@@ -345,6 +345,10 @@ hexdump(const char *desc, unsigned char 
  }
- #endif
+ #endif /* DEBUG */
  
 +#if !defined(inline) && defined(__powerpc__)
 +#define        inline  /**/
 +#endif
 +
+ /* The passed node must not be NULL. */
  static inline dns_rbtnode_t *
- find_up(dns_rbtnode_t *node) {
- 	dns_rbtnode_t *root;
+ get_subtree_root(dns_rbtnode_t *node) {
diff --git a/net/bind910/patches/patch-lib_isc_Makefile.in b/net/bind910/patches/patch-lib_isc_Makefile.in
deleted file mode 100644
index ea47a99fe60..00000000000
--- a/net/bind910/patches/patch-lib_isc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_isc_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
-
-* XXX: Install with proper permission.
-
---- lib/isc/Makefile.in.orig	2014-01-27 18:58:24.000000000 +0000
-+++ lib/isc/Makefile.in
-@@ -134,7 +134,7 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libisc.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
diff --git a/net/bind910/patches/patch-lib_isccc_Makefile.in b/net/bind910/patches/patch-lib_isccc_Makefile.in
deleted file mode 100644
index 4c3a342b827..00000000000
--- a/net/bind910/patches/patch-lib_isccc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_isccc_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
-
-* XXX: Install with proper permission.
-
---- lib/isccc/Makefile.in.orig	2011-02-19 23:47:38.000000000 +0000
-+++ lib/isccc/Makefile.in
-@@ -80,7 +80,7 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libisccc.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f libisccc.@A@ timestamp
diff --git a/net/bind910/patches/patch-lib_isccfg_Makefile.in b/net/bind910/patches/patch-lib_isccfg_Makefile.in
deleted file mode 100644
index 250233c2317..00000000000
--- a/net/bind910/patches/patch-lib_isccfg_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_isccfg_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
-
-* XXX: Install with proper permission.
-
---- lib/isccfg/Makefile.in.orig	2013-09-05 05:09:08.000000000 +0000
-+++ lib/isccfg/Makefile.in
-@@ -78,7 +78,7 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} libisccfg.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f libisccfg.@A@ timestamp
diff --git a/net/bind910/patches/patch-lib_lwres_Makefile.in b/net/bind910/patches/patch-lib_lwres_Makefile.in
deleted file mode 100644
index 9a2a5ff012e..00000000000
--- a/net/bind910/patches/patch-lib_lwres_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_lwres_Makefile.in,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
-
-* XXX: Install with proper permission.
-
---- lib/lwres/Makefile.in.orig	2007-06-19 23:47:22.000000000 +0000
-+++ lib/lwres/Makefile.in
-@@ -78,7 +78,7 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
- 
- install:: timestamp installdirs
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir}
-+	${LIBTOOL_MODE_INSTALL} ${INSTALL_SCRIPT} liblwres.@A@ ${DESTDIR}${libdir}
- 
- clean distclean::
- 	rm -f liblwres.@A@ liblwres.la timestamp
diff --git a/net/bind910/patches/patch-lib_lwres_getaddrinfo.c b/net/bind910/patches/patch-lib_lwres_getaddrinfo.c
index 4c1e458a0db..7d467098168 100644
--- a/net/bind910/patches/patch-lib_lwres_getaddrinfo.c
+++ b/net/bind910/patches/patch-lib_lwres_getaddrinfo.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_lwres_getaddrinfo.c,v 1.1.1.1 2014/07/02 02:42:58 jnemeth Exp $
+$NetBSD: patch-lib_lwres_getaddrinfo.c,v 1.2 2014/10/14 16:23:19 taca Exp $
 
 * Add fix for KAME based implementation.
 
---- lib/lwres/getaddrinfo.c.orig	2008-11-25 23:47:23.000000000 +0000
+--- lib/lwres/getaddrinfo.c.orig	2014-09-16 19:27:15.000000000 +0000
 +++ lib/lwres/getaddrinfo.c
 @@ -142,6 +142,10 @@
- #include <lwres/netdb.h>
  #include <lwres/stdlib.h>
+ #include <lwres/string.h>
  
 +#ifdef __KAME__
 +#include <net/if.h>