Update to latest snapshot.

Sponsored by:	Absolight

5 files changed, 17 insertions, 14 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 5a9a40a7f33b..14f1d356a8f1 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -16,8 +16,8 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.0.a20160530
-HASH=		44fa277
+ISCVERSION=	9.11.0.a20160604
+HASH=		e211ffb
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 9780ea3c57a2..7ff295501da6 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464602336
-SHA256 (bind9-44fa277.tar.gz) = 934ea6575dc1efa4d7092ce277254cb5e6db5b426b87998bc2b26d34de5139fb
-SIZE (bind9-44fa277.tar.gz) = 11810375
+TIMESTAMP = 1465208108
+SHA256 (bind9-e211ffb.tar.gz) = 9b23bb05fbbdbb8fddb3374f2fc7b2156728611cde61fefbbe37b30aeea66179
+SIZE (bind9-e211ffb.tar.gz) = 11811851
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 88d8b2d675a2..a59603ab5fc1 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2016-05-30 03:38:46 UTC
+--- bin/named/config.c.orig	2016-06-04 07:08:48 UTC
 +++ bin/named/config.c
 @@ -160,6 +160,8 @@ options {\n\
  	lame-ttl 600;\n\
@@ -9,9 +9,9 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 90%;\n\
---- bin/named/server.c.orig	2016-05-30 03:38:46 UTC
+--- bin/named/server.c.orig	2016-06-04 07:08:48 UTC
 +++ bin/named/server.c
-@@ -3478,6 +3478,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3491,6 +3491,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,7 +28,7 @@
  	result = ns_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2016-05-30 03:38:46 UTC
+--- lib/dns/include/dns/view.h.orig	2016-06-04 07:08:48 UTC
 +++ lib/dns/include/dns/view.h
 @@ -154,6 +154,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -39,7 +39,7 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2016-05-30 03:38:46 UTC
+--- lib/dns/resolver.c.orig	2016-06-04 07:08:48 UTC
 +++ lib/dns/resolver.c
 @@ -5440,6 +5440,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
@@ -60,9 +60,9 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2016-05-30 03:38:46 UTC
+--- lib/isccfg/namedconf.c.orig	2016-06-04 07:08:48 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1715,6 +1715,8 @@ view_clauses[] = {
+@@ -1716,6 +1716,8 @@ view_clauses[] = {
  	{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 0709c199f356..0da3ddf49431 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2016-05-09 05:42:57 UTC
+--- configure.orig	2016-06-04 07:08:48 UTC
 +++ configure
 @@ -14204,27 +14204,9 @@ done
  		# problems start to show up.
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22141,7 +22083,7 @@ $as_echo "" >&6; }
+@@ -22143,7 +22085,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 04e5414813ae..822367ccb6da 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -17,6 +17,7 @@ include/dns/bit.h
 include/dns/byaddr.h
 include/dns/cache.h
 include/dns/callbacks.h
+include/dns/catz.h
 include/dns/cert.h
 include/dns/client.h
 include/dns/clientinfo.h
@@ -43,6 +44,7 @@ include/dns/events.h
 include/dns/fixedname.h
 include/dns/forward.h
 include/dns/geoip.h
+include/dns/ipkeylist.h
 include/dns/iptable.h
 include/dns/journal.h
 include/dns/keydata.h
@@ -144,6 +146,7 @@ include/isc/heap.h
 include/isc/hex.h
 include/isc/hmacmd5.h
 include/isc/hmacsha.h
+include/isc/ht.h
 include/isc/httpd.h
 include/isc/int.h
 include/isc/interfaceiter.h