dns/bind918: update to 9.18.5

Changes:	https://downloads.isc.org/isc/bind9/9.18.5/doc/arm/html/notes.html#notes-for-bind-9-18-5
MFH:		2022Q3
(cherry picked from commit 7f75f9cf428afaa0fec231492a5587608628519e)

5 files changed, 42 insertions, 28 deletions

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 75297521ab26..56c5f4c1a4c3 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -17,19 +17,19 @@ bin/nsec3hash
 bin/nslookup
 bin/nsupdate
 lib/bind-tools/libbind9.so
-lib/bind-tools/libbind9-9.18.4.so
+lib/bind-tools/libbind9-9.18.5.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.18.4.so
+lib/bind-tools/libdns-9.18.5.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.18.4.so
+lib/bind-tools/libirs-9.18.5.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.18.4.so
+lib/bind-tools/libisc-9.18.5.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.18.4.so
+lib/bind-tools/libisccc-9.18.5.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.18.4.so
+lib/bind-tools/libisccfg-9.18.5.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.18.4.so
+lib/bind-tools/libns-9.18.5.so
 %%MANPAGES%%man/man1/arpaname.1.gz
 %%MANPAGES%%man/man1/delv.1.gz
 %%MANPAGES%%man/man1/dig.1.gz
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 09aa5a70febc..7352c92776b8 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -7,7 +7,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind918 here
-PORTREVISION=	1
+PORTREVISION=	0
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -43,7 +43,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.18.4
+ISCVERSION=	9.18.5
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index 370be180181a..66794faa3d64 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655372289
-SHA256 (bind-9.18.4.tar.xz) = f277ae50159a00c300eb926a9c5d51953038a936bd8242d6913dfb6eac42761d
-SIZE (bind-9.18.4.tar.xz) = 5395040
+TIMESTAMP = 1658484615
+SHA256 (bind-9.18.5.tar.xz) = 0cee078d74f0bdc4ec374435026b25de7892f26540a18b22a02ef728a11dcae7
+SIZE (bind-9.18.5.tar.xz) = 5168224
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 5269d4a779b8..74b67bae6d2a 100644
--- a/dns/bind918/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind918/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2022-05-09 09:32:19 UTC
+--- bin/named/config.c.orig	2022-07-07 14:38:12 UTC
 +++ bin/named/config.c
-@@ -182,6 +182,7 @@ options {\n\
+@@ -183,6 +183,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	parental-source *;\n\
  	parental-source-v6 *;\n\
  	provide-ixfr true;\n\
---- bin/named/server.c.orig	2022-05-09 09:32:19 UTC
+--- bin/named/server.c.orig	2022-07-07 14:38:12 UTC
 +++ bin/named/server.c
-@@ -4523,6 +4523,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4544,6 +4544,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -24,9 +24,22 @@ 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	2022-05-09 09:32:19 UTC
+--- doc/arm/reference.rst.orig	2022-07-07 14:38:12 UTC
++++ doc/arm/reference.rst
+@@ -3991,6 +3991,10 @@ Tuning
+    cannot exceed 7 days and is silently truncated to 7 days if set to a
+    greater value.
+ 
++.. namedconf:statement:: override-cache-ttl
++
++   Enforce the configure cache TTL override.
++
+ .. namedconf:statement:: max-cache-ttl
+ 
+    This sets the maximum time for which the server caches ordinary (positive)
+--- lib/dns/include/dns/view.h.orig	2022-07-07 14:38:12 UTC
 +++ lib/dns/include/dns/view.h
-@@ -155,6 +155,7 @@ struct dns_view {
+@@ -157,6 +157,7 @@ struct dns_view {
  	bool		      requestnsid;
  	bool		      sendcookie;
  	dns_ttl_t	      maxcachettl;
@@ -34,9 +47,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2022-05-09 09:32:19 UTC
+--- lib/dns/resolver.c.orig	2022-07-07 14:38:12 UTC
 +++ lib/dns/resolver.c
-@@ -6184,6 +6184,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6190,6 +6190,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -49,7 +62,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2022-05-09 09:32:19 UTC
+--- lib/isccfg/namedconf.c.orig	2022-07-07 14:38:12 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2092,6 +2092,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 87069d7e0f6c..12d3d509143e 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -221,6 +221,7 @@ include/isccc/types.h
 include/isccc/util.h
 include/isccfg/aclconf.h
 include/isccfg/cfg.h
+include/isccfg/duration.h
 include/isccfg/grammar.h
 include/isccfg/kaspconf.h
 include/isccfg/log.h
@@ -242,19 +243,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.18.4.so
+lib/libbind9-9.18.5.so
 lib/libdns.so
-lib/libdns-9.18.4.so
+lib/libdns-9.18.5.so
 lib/libirs.so
-lib/libirs-9.18.4.so
+lib/libirs-9.18.5.so
 lib/libisc.so
-lib/libisc-9.18.4.so
+lib/libisc-9.18.5.so
 lib/libisccc.so
-lib/libisccc-9.18.4.so
+lib/libisccc-9.18.5.so
 lib/libisccfg.so
-lib/libisccfg-9.18.4.so
+lib/libisccfg-9.18.5.so
 lib/libns.so
-lib/libns-9.18.4.so
+lib/libns-9.18.5.so
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz