Update to latest commit.

Sponsored by:	Absolight

4 files changed, 15 insertions, 15 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index c6f4a83cdf1f..f1eeda6509bc 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -31,8 +31,8 @@ LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.12.0a.2017.10.09
-HASH=		6cdff94
+ISCVERSION=	9.12.0a.2017.10.16
+HASH=		9d47a26
 
 USES=	cpe libedit
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 244d3e490dff..c79ba858a4ff 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507563343
-SHA256 (bind9-6cdff94.tar.gz) = 4eb662e7de05e99cbf166623299b26b5ca7753b77f3369145e920368d57ebf99
-SIZE (bind9-6cdff94.tar.gz) = 11295048
+TIMESTAMP = 1508157156
+SHA256 (bind9-9d47a26.tar.gz) = ba54b3821de2c96a55005a4c2ef8d692c6b773349ea9edab5e360e8df2ab25ff
+SIZE (bind9-9d47a26.tar.gz) = 11338658
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 20ac3e5b221b..adb342d49a4a 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	2017-10-03 08:11:36 UTC
+--- bin/named/config.c.orig	2017-10-16 07:38:34 UTC
 +++ bin/named/config.c
 @@ -178,12 +178,14 @@ options {\n\
  	max-recursion-queries 75;\n\
@@ -15,9 +15,9 @@
  	provide-ixfr true;\n\
  	query-source address *;\n\
  	query-source-v6 address *;\n\
---- bin/named/server.c.orig	2017-10-03 08:11:36 UTC
+--- bin/named/server.c.orig	2017-10-16 07:38:34 UTC
 +++ bin/named/server.c
-@@ -4029,6 +4029,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -4044,6 +4044,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -34,7 +34,7 @@
  	result = named_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	2017-10-03 08:11:36 UTC
+--- lib/dns/include/dns/view.h.orig	2017-10-16 07:38:34 UTC
 +++ lib/dns/include/dns/view.h
 @@ -145,6 +145,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -45,9 +45,9 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2017-10-03 08:11:36 UTC
+--- lib/dns/resolver.c.orig	2017-10-16 07:38:34 UTC
 +++ lib/dns/resolver.c
-@@ -5749,6 +5749,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5747,6 +5747,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -65,8 +65,8 @@
 +		/*
  		 * Enforce the configure maximum cache TTL.
  		 */
- 		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2017-10-03 08:11:36 UTC
+ 		if (rdataset->ttl > res->view->maxcachettl) {
+--- lib/isccfg/namedconf.c.orig	2017-10-16 07:38:34 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1918,6 +1918,8 @@ view_clauses[] = {
  	{ "max-acache-size", &cfg_type_sizenodefault,
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 5dbc184160fa..8c48cdb111ae 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2017-10-09 11:53:02 UTC
+--- configure.orig	2017-10-16 07:38:34 UTC
 +++ configure
 @@ -14420,27 +14420,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
-@@ -23112,7 +23054,7 @@ $as_echo "" >&6; }
+@@ -23113,7 +23055,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).