git: ec77d013f3dc - 2021Q3 - dns/bind916: Fix patch

[Mathieu Arnold]

The branch 2021Q3 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec77d013f3dcaff9d26df54b38d624bc7de62a91

commit ec77d013f3dcaff9d26df54b38d624bc7de62a91
Author:     Mathieu Arnold <mat at FreeBSD.org>
AuthorDate: 2021-07-24 11:39:55 +0000
Commit:     Mathieu Arnold <mat at FreeBSD.org>
CommitDate: 2021-07-24 11:45:37 +0000

    dns/bind916: Fix patch
    
    Pointy hat:     mat
    
    (cherry picked from commit 8d1799264b126343b400fe22a73c90882da7fe9b)
---
 dns/bind916/files/extrapatch-bind-min-override-ttl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 36e82c339d80..1dce8f15d7d6 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/files/extrapatch-bind-min-override-ttl
@@ -1,18 +1,18 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2021-06-08 10:45:10 UTC
+--- bin/named/config.c.orig	2021-07-09 08:02:03 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\n\
 +	override-cache-ttl 0; /* do not override */\n\
+ 	parental-source *;\n\
+ 	parental-source-v6 *;\n\
  	provide-ixfr true;\n\
- 	qname-minimization relaxed;\n\
- 	query-source address *;\n\
---- bin/named/server.c.orig	2021-06-08 10:45:10 UTC
+--- bin/named/server.c.orig	2021-07-09 08:02:03 UTC
 +++ bin/named/server.c
-@@ -4364,6 +4364,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4406,6 +4406,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	2021-06-08 10:45:10 UTC
+--- lib/dns/include/dns/view.h.orig	2021-07-09 08:02:03 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2021-06-08 10:45:10 UTC
+--- lib/dns/resolver.c.orig	2021-07-09 08:02:03 UTC
 +++ lib/dns/resolver.c
 @@ -6476,6 +6476,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	2021-06-08 10:45:10 UTC
+--- lib/isccfg/namedconf.c.orig	2021-07-09 08:02:03 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2047,6 +2047,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2048,6 +2048,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 },