From 63e7b6278b43f1c7b8fb298c28276ead3a73301e Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 4 Jan 2021 13:55:44 +0000
Subject: Update to latest commit.

---
 dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 16 ++++++++--------
 dns/bind9-devel/files/extrapatch-no-bind-tools         |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'dns/bind9-devel/files')

diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index ec5c2f195805..906806977a11 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-11-11 21:48:13 UTC
+--- bin/named/config.c.orig	2021-01-04 06:21:13 UTC
 +++ bin/named/config.c
 @@ -181,6 +181,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2020-11-11 21:48:13 UTC
+--- bin/named/server.c.orig	2021-01-04 06:21:13 UTC
 +++ bin/named/server.c
-@@ -4346,6 +4346,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4433,6 +4433,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -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-11-11 21:48:13 UTC
+--- lib/dns/include/dns/view.h.orig	2021-01-04 06:21:13 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-11-11 21:48:13 UTC
+--- lib/dns/resolver.c.orig	2021-01-04 06:21:13 UTC
 +++ lib/dns/resolver.c
-@@ -6185,6 +6185,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6192,6 +6192,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2020-11-11 21:48:13 UTC
+--- lib/isccfg/namedconf.c.orig	2021-01-04 06:21:13 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1998,6 +1998,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2034,6 +2034,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
  	{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools
index 5c29894872dd..0183e6a803ab 100644
--- a/dns/bind9-devel/files/extrapatch-no-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-no-bind-tools
@@ -1,6 +1,6 @@
 Exclude the "tools" from building and installing.
 
---- bin/Makefile.am.orig	2020-07-20 08:13:37 UTC
+--- bin/Makefile.am.orig	2021-01-04 06:21:13 UTC
 +++ bin/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
@@ -8,10 +8,10 @@ Exclude the "tools" from building and installing.
  
  if HAVE_PKCS11
  SUBDIRS += pkcs11
---- bin/tools/Makefile.am.orig	2020-07-20 08:13:37 UTC
+--- bin/tools/Makefile.am.orig	2021-01-04 06:21:13 UTC
 +++ bin/tools/Makefile.am
 @@ -9,11 +9,7 @@ LDADD =				\
- 	$(LIBDNS_LIBS)
+ 	$(LIBISC_LIBS)
  
  bin_PROGRAMS =			\
 -	arpaname		\
-- 
cgit v1.2.3