Update to latest commit.

Sponsored by:	Absolight

5 files changed, 43 insertions, 27 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index b84eab4fac3e..142925b205c7 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.09.10
-HASH=		8334115
+ISCVERSION=	9.12.0a.2017.09.18
+HASH=		0bcb8b0
 
 USES=	cpe libedit
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 4b9b033acbf2..a92c326d8970 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505133022
-SHA256 (bind9-8334115.tar.gz) = d59fc6eec14f15644288e1ae9e93caf57ac4b0c8f61bc3e0c87fbb508b8ac147
-SIZE (bind9-8334115.tar.gz) = 11605180
+TIMESTAMP = 1505729393
+SHA256 (bind9-0bcb8b0.tar.gz) = 0f2e2eb97c8b3207e46a0d5e1d0954ede2714b026fd97b0991bcb2c3180ecc14
+SIZE (bind9-0bcb8b0.tar.gz) = 11694132
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index f46b035d42b9..10a99c26ccce 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-09-10 01:10:23 UTC
+--- bin/named/config.c.orig	2017-09-18 04:28:39 UTC
 +++ bin/named/config.c
 @@ -179,12 +179,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-09-10 01:10:23 UTC
+--- bin/named/server.c.orig	2017-09-18 04:28:39 UTC
 +++ bin/named/server.c
-@@ -3741,6 +3741,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -4090,6 +4090,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-09-10 01:10:23 UTC
+--- lib/dns/include/dns/view.h.orig	2017-09-18 04:28:39 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-09-10 01:10:23 UTC
+--- lib/dns/resolver.c.orig	2017-09-18 04:28:39 UTC
 +++ lib/dns/resolver.c
-@@ -5726,6 +5726,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5751,6 +5751,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -66,9 +66,9 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2017-09-10 01:10:23 UTC
+--- lib/isccfg/namedconf.c.orig	2017-09-18 04:28:39 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1894,6 +1894,8 @@ view_clauses[] = {
+@@ -1918,6 +1918,8 @@ view_clauses[] = {
  	{ "max-acache-size", &cfg_type_sizenodefault,
  	  CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index a047c80ce85e..a9503890c0dc 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-09-10 01:10:23 UTC
+--- configure.orig	2017-09-18 04:28:39 UTC
 +++ configure
-@@ -14403,27 +14403,9 @@ done
+@@ -14414,27 +14414,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -30,7 +30,7 @@
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14466,47 +14448,7 @@ $as_echo "no" >&6; } ;;
+@@ -14477,47 +14459,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -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
-@@ -22701,7 +22643,7 @@ $as_echo "" >&6; }
+@@ -22987,7 +22929,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 70bbbafa686e..9952d83fd00a 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -9,6 +9,15 @@ bin/mdig
 bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
+etc/mtree/BIND.chroot.dist
+etc/mtree/BIND.chroot.local.dist
+%%ETCDIR%%/bind.keys
+%%ETCDIR%%/master/empty.db
+%%ETCDIR%%/master/localhost-forward.db
+%%ETCDIR%%/master/localhost-reverse.db
+@sample %%ETCDIR%%/named.conf.sample
+%%ETCDIR%%/named.root
+%%ETCDIR%%/rndc.conf.sample
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -32,6 +41,7 @@ include/dns/dispatch.h
 include/dns/dlz.h
 include/dns/dlz_dlopen.h
 include/dns/dns64.h
+include/dns/dnsrps.h
 include/dns/dnssec.h
 include/dns/dnstap.h
 %%DNSTAP%%include/dns/dnstap.pb-c.h
@@ -55,6 +65,7 @@ include/dns/keyflags.h
 include/dns/keytable.h
 include/dns/keyvalues.h
 include/dns/lib.h
+include/dns/librpz.h
 include/dns/log.h
 include/dns/lookup.h
 include/dns/master.h
@@ -145,6 +156,7 @@ include/isc/eventclass.h
 include/isc/file.h
 include/isc/formatcheck.h
 include/isc/fsaccess.h
+include/isc/fuzz.h
 include/isc/hash.h
 include/isc/heap.h
 include/isc/hex.h
@@ -241,6 +253,20 @@ include/isccfg/grammar.h
 include/isccfg/log.h
 include/isccfg/namedconf.h
 include/isccfg/version.h
+include/ns/client.h
+include/ns/interfacemgr.h
+include/ns/lib.h
+include/ns/listenlist.h
+include/ns/log.h
+include/ns/notify.h
+include/ns/query.h
+include/ns/server.h
+include/ns/sortlist.h
+include/ns/stats.h
+include/ns/types.h
+include/ns/update.h
+include/ns/version.h
+include/ns/xfrout.h
 include/pk11/constants.h
 include/pk11/internal.h
 include/pk11/pk11.h
@@ -327,16 +353,6 @@ sbin/nsec3hash
 sbin/rndc
 sbin/rndc-confgen
 sbin/tsig-keygen
-%%ETCDIR%%/rndc.conf.sample
-%%ETCDIR%%/bind.keys
-etc/mtree/BIND.chroot.dist
-etc/mtree/BIND.chroot.local.dist
-@sample %%ETCDIR%%/named.conf.sample
-%%ETCDIR%%/named.root
-%%ETCDIR%%/master/empty.db
-%%ETCDIR%%/master/localhost-forward.db
-%%ETCDIR%%/master/localhost-reverse.db
 @dir(bind,bind,) %%ETCDIR%%/dynamic
-@dir %%ETCDIR%%/master
 @dir(bind,bind,) %%ETCDIR%%/slave
 @dir(bind,bind,) %%ETCDIR%%/working