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

5 files changed, 343 insertions, 1 deletions

diff --git a/lib/bind/config.h b/lib/bind/config.h
index bf6f8ce..d743db2 100644
--- a/lib/bind/config.h
+++ b/lib/bind/config.h
@@ -283,8 +283,14 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the <net/if6.h> header file. */
 /* #undef HAVE_NET_IF6_H */
 
+/* Define if your OpenSSL version supports ECDSA. */
+#define HAVE_OPENSSL_ECDSA 1
+
 /* Define if your OpenSSL version supports GOST. */
 /* #undef HAVE_OPENSSL_GOST */
+ 
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
 
 /* Define to 1 if you have the `setegid' function. */
 #define HAVE_SETEGID 1
diff --git a/lib/bind/dns/code.h b/lib/bind/dns/code.h
index 99944ad..b8a5ae3 100644
--- a/lib/bind/dns/code.h
+++ b/lib/bind/dns/code.h
@@ -87,8 +87,15 @@
 #include "rdata/generic/hip_55.c"
 #include "rdata/generic/spf_99.c"
 #include "rdata/generic/unspec_103.c"
+#include "rdata/generic/nid_104.c"
+#include "rdata/generic/l32_105.c"
+#include "rdata/generic/l64_106.c"
+#include "rdata/generic/lp_107.c"
+#include "rdata/generic/eui48_108.c"
+#include "rdata/generic/eui64_109.c"
 #include "rdata/generic/tkey_249.c"
 #include "rdata/any_255/tsig_250.c"
+#include "rdata/generic/uri_256.c"
 #include "rdata/generic/dlv_32769.c"
 #include "rdata/generic/keydata_65533.c"
 
@@ -197,12 +204,19 @@
 	case 55: result = fromtext_hip(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 99: result = fromtext_spf(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 103: result = fromtext_unspec(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 104: result = fromtext_nid(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 105: result = fromtext_l32(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 106: result = fromtext_l64(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 107: result = fromtext_lp(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 108: result = fromtext_eui48(rdclass, type, lexer, origin, options, target, callbacks); break; \
+	case 109: result = fromtext_eui64(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 249: result = fromtext_tkey(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = fromtext_any_tsig(rdclass, type, lexer, origin, options, target, callbacks); break; \
 		default: result = DNS_R_UNKNOWN; break; \
 		} \
 		break; \
+	case 256: result = fromtext_uri(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 32769: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	case 65533: result = fromtext_keydata(rdclass, type, lexer, origin, options, target, callbacks); break; \
 	default: result = DNS_R_UNKNOWN; break; \
@@ -311,12 +325,19 @@
 	case 55: result = totext_hip(rdata, tctx, target); break; \
 	case 99: result = totext_spf(rdata, tctx, target); break; \
 	case 103: result = totext_unspec(rdata, tctx, target); break; \
+	case 104: result = totext_nid(rdata, tctx, target); break; \
+	case 105: result = totext_l32(rdata, tctx, target); break; \
+	case 106: result = totext_l64(rdata, tctx, target); break; \
+	case 107: result = totext_lp(rdata, tctx, target); break; \
+	case 108: result = totext_eui48(rdata, tctx, target); break; \
+	case 109: result = totext_eui64(rdata, tctx, target); break; \
 	case 249: result = totext_tkey(rdata, tctx, target); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = totext_any_tsig(rdata, tctx, target); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = totext_uri(rdata, tctx, target); break; \
 	case 32769: result = totext_dlv(rdata, tctx, target); break; \
 	case 65533: result = totext_keydata(rdata, tctx, target); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -425,12 +446,19 @@
 	case 55: result = fromwire_hip(rdclass, type, source, dctx, options, target); break; \
 	case 99: result = fromwire_spf(rdclass, type, source, dctx, options, target); break; \
 	case 103: result = fromwire_unspec(rdclass, type, source, dctx, options, target); break; \
+	case 104: result = fromwire_nid(rdclass, type, source, dctx, options, target); break; \
+	case 105: result = fromwire_l32(rdclass, type, source, dctx, options, target); break; \
+	case 106: result = fromwire_l64(rdclass, type, source, dctx, options, target); break; \
+	case 107: result = fromwire_lp(rdclass, type, source, dctx, options, target); break; \
+	case 108: result = fromwire_eui48(rdclass, type, source, dctx, options, target); break; \
+	case 109: result = fromwire_eui64(rdclass, type, source, dctx, options, target); break; \
 	case 249: result = fromwire_tkey(rdclass, type, source, dctx, options, target); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = fromwire_any_tsig(rdclass, type, source, dctx, options, target); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = fromwire_uri(rdclass, type, source, dctx, options, target); break; \
 	case 32769: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
 	case 65533: result = fromwire_keydata(rdclass, type, source, dctx, options, target); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -539,12 +567,19 @@
 	case 55: result = towire_hip(rdata, cctx, target); break; \
 	case 99: result = towire_spf(rdata, cctx, target); break; \
 	case 103: result = towire_unspec(rdata, cctx, target); break; \
+	case 104: result = towire_nid(rdata, cctx, target); break; \
+	case 105: result = towire_l32(rdata, cctx, target); break; \
+	case 106: result = towire_l64(rdata, cctx, target); break; \
+	case 107: result = towire_lp(rdata, cctx, target); break; \
+	case 108: result = towire_eui48(rdata, cctx, target); break; \
+	case 109: result = towire_eui64(rdata, cctx, target); break; \
 	case 249: result = towire_tkey(rdata, cctx, target); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = towire_any_tsig(rdata, cctx, target); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = towire_uri(rdata, cctx, target); break; \
 	case 32769: result = towire_dlv(rdata, cctx, target); break; \
 	case 65533: result = towire_keydata(rdata, cctx, target); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -653,12 +688,19 @@
 	case 55: result = compare_hip(rdata1, rdata2); break; \
 	case 99: result = compare_spf(rdata1, rdata2); break; \
 	case 103: result = compare_unspec(rdata1, rdata2); break; \
+	case 104: result = compare_nid(rdata1, rdata2); break; \
+	case 105: result = compare_l32(rdata1, rdata2); break; \
+	case 106: result = compare_l64(rdata1, rdata2); break; \
+	case 107: result = compare_lp(rdata1, rdata2); break; \
+	case 108: result = compare_eui48(rdata1, rdata2); break; \
+	case 109: result = compare_eui64(rdata1, rdata2); break; \
 	case 249: result = compare_tkey(rdata1, rdata2); break; \
 	case 250: switch (rdata1->rdclass) { \
 		case 255: result = compare_any_tsig(rdata1, rdata2); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = compare_uri(rdata1, rdata2); break; \
 	case 32769: result = compare_dlv(rdata1, rdata2); break; \
 	case 65533: result = compare_keydata(rdata1, rdata2); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -767,12 +809,19 @@
 	case 55: result = casecompare_hip(rdata1, rdata2); break; \
 	case 99: result = casecompare_spf(rdata1, rdata2); break; \
 	case 103: result = casecompare_unspec(rdata1, rdata2); break; \
+	case 104: result = casecompare_nid(rdata1, rdata2); break; \
+	case 105: result = casecompare_l32(rdata1, rdata2); break; \
+	case 106: result = casecompare_l64(rdata1, rdata2); break; \
+	case 107: result = casecompare_lp(rdata1, rdata2); break; \
+	case 108: result = casecompare_eui48(rdata1, rdata2); break; \
+	case 109: result = casecompare_eui64(rdata1, rdata2); break; \
 	case 249: result = casecompare_tkey(rdata1, rdata2); break; \
 	case 250: switch (rdata1->rdclass) { \
 		case 255: result = casecompare_any_tsig(rdata1, rdata2); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = casecompare_uri(rdata1, rdata2); break; \
 	case 32769: result = casecompare_dlv(rdata1, rdata2); break; \
 	case 65533: result = casecompare_keydata(rdata1, rdata2); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -881,12 +930,19 @@
 	case 55: result = fromstruct_hip(rdclass, type, source, target); break; \
 	case 99: result = fromstruct_spf(rdclass, type, source, target); break; \
 	case 103: result = fromstruct_unspec(rdclass, type, source, target); break; \
+	case 104: result = fromstruct_nid(rdclass, type, source, target); break; \
+	case 105: result = fromstruct_l32(rdclass, type, source, target); break; \
+	case 106: result = fromstruct_l64(rdclass, type, source, target); break; \
+	case 107: result = fromstruct_lp(rdclass, type, source, target); break; \
+	case 108: result = fromstruct_eui48(rdclass, type, source, target); break; \
+	case 109: result = fromstruct_eui64(rdclass, type, source, target); break; \
 	case 249: result = fromstruct_tkey(rdclass, type, source, target); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = fromstruct_any_tsig(rdclass, type, source, target); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = fromstruct_uri(rdclass, type, source, target); break; \
 	case 32769: result = fromstruct_dlv(rdclass, type, source, target); break; \
 	case 65533: result = fromstruct_keydata(rdclass, type, source, target); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -995,12 +1051,19 @@
 	case 55: result = tostruct_hip(rdata, target, mctx); break; \
 	case 99: result = tostruct_spf(rdata, target, mctx); break; \
 	case 103: result = tostruct_unspec(rdata, target, mctx); break; \
+	case 104: result = tostruct_nid(rdata, target, mctx); break; \
+	case 105: result = tostruct_l32(rdata, target, mctx); break; \
+	case 106: result = tostruct_l64(rdata, target, mctx); break; \
+	case 107: result = tostruct_lp(rdata, target, mctx); break; \
+	case 108: result = tostruct_eui48(rdata, target, mctx); break; \
+	case 109: result = tostruct_eui64(rdata, target, mctx); break; \
 	case 249: result = tostruct_tkey(rdata, target, mctx); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = tostruct_any_tsig(rdata, target, mctx); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = tostruct_uri(rdata, target, mctx); break; \
 	case 32769: result = tostruct_dlv(rdata, target, mctx); break; \
 	case 65533: result = tostruct_keydata(rdata, target, mctx); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -1109,12 +1172,19 @@
 	case 55: freestruct_hip(source); break; \
 	case 99: freestruct_spf(source); break; \
 	case 103: freestruct_unspec(source); break; \
+	case 104: freestruct_nid(source); break; \
+	case 105: freestruct_l32(source); break; \
+	case 106: freestruct_l64(source); break; \
+	case 107: freestruct_lp(source); break; \
+	case 108: freestruct_eui48(source); break; \
+	case 109: freestruct_eui64(source); break; \
 	case 249: freestruct_tkey(source); break; \
 	case 250: switch (common->rdclass) { \
 		case 255: freestruct_any_tsig(source); break; \
 		default: break; \
 		} \
 		break; \
+	case 256: freestruct_uri(source); break; \
 	case 32769: freestruct_dlv(source); break; \
 	case 65533: freestruct_keydata(source); break; \
 	default: break; \
@@ -1223,12 +1293,19 @@
 	case 55: result = additionaldata_hip(rdata, add, arg); break; \
 	case 99: result = additionaldata_spf(rdata, add, arg); break; \
 	case 103: result = additionaldata_unspec(rdata, add, arg); break; \
+	case 104: result = additionaldata_nid(rdata, add, arg); break; \
+	case 105: result = additionaldata_l32(rdata, add, arg); break; \
+	case 106: result = additionaldata_l64(rdata, add, arg); break; \
+	case 107: result = additionaldata_lp(rdata, add, arg); break; \
+	case 108: result = additionaldata_eui48(rdata, add, arg); break; \
+	case 109: result = additionaldata_eui64(rdata, add, arg); break; \
 	case 249: result = additionaldata_tkey(rdata, add, arg); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = additionaldata_any_tsig(rdata, add, arg); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = additionaldata_uri(rdata, add, arg); break; \
 	case 32769: result = additionaldata_dlv(rdata, add, arg); break; \
 	case 65533: result = additionaldata_keydata(rdata, add, arg); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -1337,12 +1414,19 @@
 	case 55: result = digest_hip(rdata, digest, arg); break; \
 	case 99: result = digest_spf(rdata, digest, arg); break; \
 	case 103: result = digest_unspec(rdata, digest, arg); break; \
+	case 104: result = digest_nid(rdata, digest, arg); break; \
+	case 105: result = digest_l32(rdata, digest, arg); break; \
+	case 106: result = digest_l64(rdata, digest, arg); break; \
+	case 107: result = digest_lp(rdata, digest, arg); break; \
+	case 108: result = digest_eui48(rdata, digest, arg); break; \
+	case 109: result = digest_eui64(rdata, digest, arg); break; \
 	case 249: result = digest_tkey(rdata, digest, arg); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = digest_any_tsig(rdata, digest, arg); break; \
 		default: use_default = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = digest_uri(rdata, digest, arg); break; \
 	case 32769: result = digest_dlv(rdata, digest, arg); break; \
 	case 65533: result = digest_keydata(rdata, digest, arg); break; \
 	default: use_default = ISC_TRUE; break; \
@@ -1451,12 +1535,19 @@
 	case 55: result = checkowner_hip(name, rdclass, type, wildcard); break; \
 	case 99: result = checkowner_spf(name, rdclass, type, wildcard); break; \
 	case 103: result = checkowner_unspec(name, rdclass, type, wildcard); break; \
+	case 104: result = checkowner_nid(name, rdclass, type, wildcard); break; \
+	case 105: result = checkowner_l32(name, rdclass, type, wildcard); break; \
+	case 106: result = checkowner_l64(name, rdclass, type, wildcard); break; \
+	case 107: result = checkowner_lp(name, rdclass, type, wildcard); break; \
+	case 108: result = checkowner_eui48(name, rdclass, type, wildcard); break; \
+	case 109: result = checkowner_eui64(name, rdclass, type, wildcard); break; \
 	case 249: result = checkowner_tkey(name, rdclass, type, wildcard); break; \
 	case 250: switch (rdclass) { \
 		case 255: result = checkowner_any_tsig(name, rdclass, type, wildcard); break; \
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = checkowner_uri(name, rdclass, type, wildcard); break; \
 	case 32769: result = checkowner_dlv(name, rdclass, type, wildcard); break; \
 	case 65533: result = checkowner_keydata(name, rdclass, type, wildcard); break; \
 	default: result = ISC_TRUE; break; \
@@ -1565,12 +1656,19 @@
 	case 55: result = checknames_hip(rdata, owner, bad); break; \
 	case 99: result = checknames_spf(rdata, owner, bad); break; \
 	case 103: result = checknames_unspec(rdata, owner, bad); break; \
+	case 104: result = checknames_nid(rdata, owner, bad); break; \
+	case 105: result = checknames_l32(rdata, owner, bad); break; \
+	case 106: result = checknames_l64(rdata, owner, bad); break; \
+	case 107: result = checknames_lp(rdata, owner, bad); break; \
+	case 108: result = checknames_eui48(rdata, owner, bad); break; \
+	case 109: result = checknames_eui64(rdata, owner, bad); break; \
 	case 249: result = checknames_tkey(rdata, owner, bad); break; \
 	case 250: switch (rdata->rdclass) { \
 		case 255: result = checknames_any_tsig(rdata, owner, bad); break; \
 		default: result = ISC_TRUE; break; \
 		} \
 		break; \
+	case 256: result = checknames_uri(rdata, owner, bad); break; \
 	case 32769: result = checknames_dlv(rdata, owner, bad); break; \
 	case 65533: result = checknames_keydata(rdata, owner, bad); break; \
 	default: result = ISC_TRUE; break; \
@@ -1659,6 +1757,7 @@
 			break; \
 		case 140: \
 			RDATATYPE_COMPARE("nsap-ptr", 23, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("l64", 106, _typename, _length, _typep); \
 			break; \
 		case 122: \
 			RDATATYPE_COMPARE("sig", 24, _typename, _length, _typep); \
@@ -1706,6 +1805,7 @@
 			break; \
 		case 48: \
 			RDATATYPE_COMPARE("apl", 42, _typename, _length, _typep); \
+			RDATATYPE_COMPARE("eui48", 108, _typename, _length, _typep); \
 			break; \
 		case 210: \
 			RDATATYPE_COMPARE("ds", 43, _typename, _length, _typep); \
@@ -1747,6 +1847,18 @@
 		case 145: \
 			RDATATYPE_COMPARE("unspec", 103, _typename, _length, _typep); \
 			break; \
+		case 36: \
+			RDATATYPE_COMPARE("nid", 104, _typename, _length, _typep); \
+			break; \
+		case 174: \
+			RDATATYPE_COMPARE("l32", 105, _typename, _length, _typep); \
+			break; \
+		case 32: \
+			RDATATYPE_COMPARE("lp", 107, _typename, _length, _typep); \
+			break; \
+		case 136: \
+			RDATATYPE_COMPARE("eui64", 109, _typename, _length, _typep); \
+			break; \
 		case 184: \
 			RDATATYPE_COMPARE("tkey", 249, _typename, _length, _typep); \
 			break; \
@@ -1769,6 +1881,9 @@
 		case 68: \
 			RDATATYPE_COMPARE("any", 255, _typename, _length, _typep); \
 			break; \
+		case 56: \
+			RDATATYPE_COMPARE("uri", 256, _typename, _length, _typep); \
+			break; \
 	}
 #define RDATATYPE_ATTRIBUTE_SW \
 	switch (type) { \
@@ -1830,6 +1945,12 @@
 	case 101: return (DNS_RDATATYPEATTR_RESERVED); \
 	case 102: return (DNS_RDATATYPEATTR_RESERVED); \
 	case 103: return (RRTYPE_UNSPEC_ATTRIBUTES); \
+	case 104: return (RRTYPE_NID_ATTRIBUTES); \
+	case 105: return (RRTYPE_L32_ATTRIBUTES); \
+	case 106: return (RRTYPE_L64_ATTRIBUTES); \
+	case 107: return (RRTYPE_LP_ATTRIBUTES); \
+	case 108: return (RRTYPE_EUI48_ATTRIBUTES); \
+	case 109: return (RRTYPE_EUI64_ATTRIBUTES); \
 	case 249: return (RRTYPE_TKEY_ATTRIBUTES); \
 	case 250: return (RRTYPE_TSIG_ATTRIBUTES); \
 	case 251: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
@@ -1837,6 +1958,7 @@
 	case 253: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
 	case 254: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
 	case 255: return (DNS_RDATATYPEATTR_META | DNS_RDATATYPEATTR_QUESTIONONLY); \
+	case 256: return (RRTYPE_URI_ATTRIBUTES); \
 	case 32769: return (RRTYPE_DLV_ATTRIBUTES); \
 	case 65533: return (RRTYPE_KEYDATA_ATTRIBUTES); \
 	}
@@ -1900,6 +2022,12 @@
 	case 101: return (str_totext("UID", target)); \
 	case 102: return (str_totext("GID", target)); \
 	case 103: return (str_totext("UNSPEC", target)); \
+	case 104: return (str_totext("NID", target)); \
+	case 105: return (str_totext("L32", target)); \
+	case 106: return (str_totext("L64", target)); \
+	case 107: return (str_totext("LP", target)); \
+	case 108: return (str_totext("EUI48", target)); \
+	case 109: return (str_totext("EUI64", target)); \
 	case 249: return (str_totext("TKEY", target)); \
 	case 250: return (str_totext("TSIG", target)); \
 	case 251: return (str_totext("IXFR", target)); \
@@ -1907,6 +2035,7 @@
 	case 253: return (str_totext("MAILB", target)); \
 	case 254: return (str_totext("MAILA", target)); \
 	case 255: return (str_totext("ANY", target)); \
+	case 256: return (str_totext("URI", target)); \
 	case 32769: return (str_totext("DLV", target)); \
 	case 65533: return (str_totext("KEYDATA", target)); \
 	}
diff --git a/lib/bind/dns/dns/enumtype.h b/lib/bind/dns/dns/enumtype.h
index 5ab36d1..aa53689 100644
--- a/lib/bind/dns/dns/enumtype.h
+++ b/lib/bind/dns/dns/enumtype.h
@@ -82,8 +82,15 @@ enum {
 	dns_rdatatype_hip = 55,
 	dns_rdatatype_spf = 99,
 	dns_rdatatype_unspec = 103,
+	dns_rdatatype_nid = 104,
+	dns_rdatatype_l32 = 105,
+	dns_rdatatype_l64 = 106,
+	dns_rdatatype_lp = 107,
+	dns_rdatatype_eui48 = 108,
+	dns_rdatatype_eui64 = 109,
 	dns_rdatatype_tkey = 249,
 	dns_rdatatype_tsig = 250,
+	dns_rdatatype_uri = 256,
 	dns_rdatatype_dlv = 32769,
 	dns_rdatatype_keydata = 65533,
 	dns_rdatatype_ixfr = 251,
@@ -145,8 +152,15 @@ enum {
 #define dns_rdatatype_hip	((dns_rdatatype_t)dns_rdatatype_hip)
 #define dns_rdatatype_spf	((dns_rdatatype_t)dns_rdatatype_spf)
 #define dns_rdatatype_unspec	((dns_rdatatype_t)dns_rdatatype_unspec)
+#define dns_rdatatype_nid	((dns_rdatatype_t)dns_rdatatype_nid)
+#define dns_rdatatype_l32	((dns_rdatatype_t)dns_rdatatype_l32)
+#define dns_rdatatype_l64	((dns_rdatatype_t)dns_rdatatype_l64)
+#define dns_rdatatype_lp	((dns_rdatatype_t)dns_rdatatype_lp)
+#define dns_rdatatype_eui48	((dns_rdatatype_t)dns_rdatatype_eui48)
+#define dns_rdatatype_eui64	((dns_rdatatype_t)dns_rdatatype_eui64)
 #define dns_rdatatype_tkey	((dns_rdatatype_t)dns_rdatatype_tkey)
 #define dns_rdatatype_tsig	((dns_rdatatype_t)dns_rdatatype_tsig)
+#define dns_rdatatype_uri	((dns_rdatatype_t)dns_rdatatype_uri)
 #define dns_rdatatype_dlv	((dns_rdatatype_t)dns_rdatatype_dlv)
 #define dns_rdatatype_keydata	((dns_rdatatype_t)dns_rdatatype_keydata)
 #define dns_rdatatype_ixfr	((dns_rdatatype_t)dns_rdatatype_ixfr)
diff --git a/lib/bind/dns/dns/rdatastruct.h b/lib/bind/dns/dns/rdatastruct.h
index 10cba31..a05face 100644
--- a/lib/bind/dns/dns/rdatastruct.h
+++ b/lib/bind/dns/dns/rdatastruct.h
@@ -2004,6 +2004,167 @@ typedef struct dns_rdata_unspec_t {
 
 #endif /* GENERIC_UNSPEC_103_H */
 /*
+ * Copyright (C) 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* */
+#ifndef GENERIC_NID_104_H
+#define GENERIC_NID_104_H 1
+
+typedef struct dns_rdata_nid {
+	dns_rdatacommon_t	common;
+	isc_uint16_t		pref;
+	unsigned char		nid[8];
+} dns_rdata_nid_t;
+
+#endif /* GENERIC_NID_104_H */
+/*
+ * Copyright (C) 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* */
+#ifndef GENERIC_L32_105_H
+#define GENERIC_L32_105_H 1
+
+typedef struct dns_rdata_l32 {
+	dns_rdatacommon_t	common;
+	isc_uint16_t		pref;
+	struct in_addr		l32;
+} dns_rdata_l32_t;
+
+#endif /* GENERIC_L32_105_H */
+/*
+ * Copyright (C) 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* */
+#ifndef GENERIC_L64_106_H
+#define GENERIC_L64_106_H 1
+
+typedef struct dns_rdata_l64 {
+	dns_rdatacommon_t	common;
+	isc_uint16_t		pref;
+	unsigned char		l64[8];
+} dns_rdata_l64_t;
+
+#endif /* GENERIC_L64_106_H */
+/*
+ * Copyright (C) 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* */
+#ifndef GENERIC_LP_107_H
+#define GENERIC_LP_107_H 1
+
+typedef struct dns_rdata_lp {
+	dns_rdatacommon_t	common;
+	isc_mem_t		*mctx;
+	isc_uint16_t		pref;
+	dns_name_t		lp;
+} dns_rdata_lp_t;
+
+#endif /* GENERIC_LP_107_H */
+/*
+ * Copyright (C) 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* */
+#ifndef GENERIC_EUI48_108_H
+#define GENERIC_EUI48_108_H 1
+
+typedef struct dns_rdata_eui48 {
+	dns_rdatacommon_t	common;
+	unsigned char		eui48[6];
+} dns_rdata_eui48_t;
+
+#endif /* GENERIC_EUI48_10k_H */
+/*
+ * Copyright (C) 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* */
+#ifndef GENERIC_EUI64_109_H
+#define GENERIC_EUI64_109_H 1
+
+typedef struct dns_rdata_eui64 {
+	dns_rdatacommon_t	common;
+	unsigned char		eui64[8];
+} dns_rdata_eui64_t;
+
+#endif /* GENERIC_EUI64_10k_H */
+/*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001, 2003  Internet Software Consortium.
  *
@@ -2083,6 +2244,37 @@ typedef struct dns_rdata_any_tsig {
 
 #endif /* ANY_255_TSIG_250_H */
 /*
+ * Copyright (C) 2011-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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef GENERIC_URI_256_H
+#define GENERIC_URI_256_H 1
+
+/* $Id: uri_256.h,v 1.2 2011/03/03 14:10:27 fdupont Exp $ */
+
+typedef struct dns_rdata_uri {
+	dns_rdatacommon_t	common;
+	isc_mem_t *		mctx;
+	isc_uint16_t		priority;
+	isc_uint16_t		weight;
+	unsigned char *		target;
+	isc_uint16_t		tgt_len;
+} dns_rdata_uri_t;
+
+#endif /* GENERIC_URI_256_H */
+/*
  * Copyright (C) 2004, 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile
index f41f604..1852472 100644
--- a/lib/bind/isc/Makefile
+++ b/lib/bind/isc/Makefile
@@ -40,7 +40,7 @@ SRCS+=		inet_pton.c \
 		parseint.c portset.c \
 		print.c \
 		quota.c radix.c random.c \
-		ratelimiter.c refcount.c region.c result.c rwlock.c \
+		ratelimiter.c refcount.c region.c regex.c result.c rwlock.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
 
@@ -107,6 +107,7 @@ INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/ratelimiter.h \
 		${SRCDIR}/include/isc/refcount.h \
 		${SRCDIR}/include/isc/region.h \
+		${SRCDIR}/include/isc/regex.h \
 		${SRCDIR}/include/isc/resource.h \
 		${SRCDIR}/include/isc/result.h \
 		${SRCDIR}/include/isc/resultclass.h \