Update to latest commit.

3 files changed, 11 insertions, 11 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 7c4996598c26..cf971a91ecec 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -48,13 +48,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.17.3a0.2020.07.06
+ISCVERSION=	9.17.3a0.2020.07.31
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	9dcf229634968dc7d808c1d23f4bab5d3ba7f47f
+GL_COMMIT=	0c85c4c42447ee9a0ad1b555417bfdfd80c3171c
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 74dd80e547a5..b176d31d491d 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595247830
-SHA256 (isc-projects-bind9-9dcf229634968dc7d808c1d23f4bab5d3ba7f47f_GL0.tar.gz) = 6346405add0b0e0624f8df1c6b180f24d2a7aeb6d40bcc799ebcb602a6c74c7b
-SIZE (isc-projects-bind9-9dcf229634968dc7d808c1d23f4bab5d3ba7f47f_GL0.tar.gz) = 4249231
+TIMESTAMP = 1596457484
+SHA256 (isc-projects-bind9-0c85c4c42447ee9a0ad1b555417bfdfd80c3171c_GL0.tar.gz) = c730df6d9b8ba000213e0a9b92aed813e40a1f0222b48637c6980c02467a95dc
+SIZE (isc-projects-bind9-0c85c4c42447ee9a0ad1b555417bfdfd80c3171c_GL0.tar.gz) = 4257611
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 6b6e32a82358..4aa8435a7669 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2020-07-06 09:00:26 UTC
+--- bin/named/config.c.orig	2020-07-31 15:55:58 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2020-07-06 09:00:26 UTC
+--- bin/named/server.c.orig	2020-07-31 15:55:58 UTC
 +++ bin/named/server.c
 @@ -4333,6 +4333,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asduration(obj);
---- lib/dns/include/dns/view.h.orig	2020-07-06 09:00:26 UTC
+--- lib/dns/include/dns/view.h.orig	2020-07-31 15:55:58 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2020-07-06 09:00:26 UTC
+--- lib/dns/resolver.c.orig	2020-07-31 15:55:58 UTC
 +++ lib/dns/resolver.c
-@@ -6244,6 +6244,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6247,6 +6247,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
  
  		/*
@@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2020-07-06 09:00:26 UTC
+--- lib/isccfg/namedconf.c.orig	2020-07-31 15:55:58 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */