Update to latest commit.

4 files changed, 15 insertions, 14 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 1dc4acf82056..0a3eefd40b37 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -41,13 +41,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=	compiler:c11 cpe libedit ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.15.0a0.2019.04.23
+ISCVERSION=	9.15.0a0.2019.04.26
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	fd7f2c8f9dbfd0a10690044683398778a2359e83
+GL_COMMIT=	cc32080278b94ad8228b2f6ff3239872d532517a
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 48796bbf2aa7..1ad8c99e9365 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556019631
-SHA256 (isc-projects-bind9-fd7f2c8f9dbfd0a10690044683398778a2359e83_GL0.tar.gz) = faec8f7c1a6f2317f89469a87ce095a7d610ba31bb8b23284caa463a237b63a0
-SIZE (isc-projects-bind9-fd7f2c8f9dbfd0a10690044683398778a2359e83_GL0.tar.gz) = 6342894
+TIMESTAMP = 1556539581
+SHA256 (isc-projects-bind9-cc32080278b94ad8228b2f6ff3239872d532517a_GL0.tar.gz) = be40a03e7fa1682e16b100d80b23a4a487f65ef672777abd83f7ca8d9768e325
+SIZE (isc-projects-bind9-cc32080278b94ad8228b2f6ff3239872d532517a_GL0.tar.gz) = 6347599
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 9c13ed1f9cf9..57dbfd78bb76 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	2019-03-29 15:22:57 UTC
+--- bin/named/config.c.orig	2019-04-26 22:53:11 UTC
 +++ bin/named/config.c
 @@ -176,6 +176,7 @@ options {\n\
  	notify-source *;\n\
@@ -8,7 +8,7 @@
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2019-03-29 15:22:57 UTC
+--- bin/named/server.c.orig	2019-04-26 22:53:11 UTC
 +++ bin/named/server.c
 @@ -4231,6 +4231,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -22,7 +22,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	2019-03-29 15:22:57 UTC
+--- lib/dns/include/dns/view.h.orig	2019-04-26 22:53:11 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool				requestnsid;
@@ -32,9 +32,9 @@
  	dns_ttl_t			maxncachettl;
  	dns_ttl_t			mincachettl;
  	dns_ttl_t			minncachettl;
---- lib/dns/resolver.c.orig	2019-03-29 15:22:57 UTC
+--- lib/dns/resolver.c.orig	2019-04-26 22:53:11 UTC
 +++ lib/dns/resolver.c
-@@ -6011,6 +6011,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6018,6 +6018,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
  
  		/*
@@ -47,7 +47,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2019-03-29 15:22:57 UTC
+--- lib/isccfg/namedconf.c.orig	2019-04-26 22:53:11 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1899,6 +1899,7 @@ view_clauses[] = {
  #endif
diff --git a/dns/bind9-devel/files/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools
index a62fab8ace2f..4ee0be5af5f6 100644
--- a/dns/bind9-devel/files/extrapatch-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-bind-tools
@@ -1,6 +1,6 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.in.orig	2019-03-20 05:57:56 UTC
+--- Makefile.in.orig	2019-04-26 22:53:11 UTC
 +++ Makefile.in
 @@ -14,7 +14,7 @@ top_builddir =  @top_builddir@
  
@@ -27,9 +27,9 @@ Only select the "tools" part of bind for building.
  
  uninstall::
  	rm -f ${DESTDIR}${sysconfdir}/bind.keys
---- bin/Makefile.in.orig	2019-03-20 05:57:56 UTC
+--- bin/Makefile.in.orig	2019-04-26 22:53:11 UTC
 +++ bin/Makefile.in
-@@ -11,7 +11,7 @@ srcdir =	@srcdir@
+@@ -11,8 +11,8 @@ srcdir =	@srcdir@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
  
@@ -39,3 +39,4 @@ Only select the "tools" part of bind for building.
 +		@NZD_TOOLS@ @PYTHON_TOOLS@
  TARGETS =
  
+ @BIND9_MAKE_RULES@