dns/bind918: update to 9.18.7

Changes:	https://downloads.isc.org/isc/bind9/9.18.7/doc/arm/html/notes.html#notes-for-bind-9-18-7
MFH:            yes
Security:       CVE-2022-2795 CVE-2022-2881 CVE-2022-2906 CVE-2022-3080 CVE-2022-38177 CVE-2022-38178
(cherry picked from commit 15c63d09366ccf91e52b4a1ac18ac41b9afeec37)

5 files changed, 28 insertions, 28 deletions

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 56c5f4c1a4c3..d3a0a3d21585 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.5.so
+lib/bind-tools/libbind9-9.18.7.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.18.5.so
+lib/bind-tools/libdns-9.18.7.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.18.5.so
+lib/bind-tools/libirs-9.18.7.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.18.5.so
+lib/bind-tools/libisc-9.18.7.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.18.5.so
+lib/bind-tools/libisccc-9.18.7.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.18.5.so
+lib/bind-tools/libisccfg-9.18.7.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.18.5.so
+lib/bind-tools/libns-9.18.7.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 7352c92776b8..e28c1a714d51 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -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.5
+ISCVERSION=	9.18.7
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index 66794faa3d64..bb427774cf71 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1658484615
-SHA256 (bind-9.18.5.tar.xz) = 0cee078d74f0bdc4ec374435026b25de7892f26540a18b22a02ef728a11dcae7
-SIZE (bind-9.18.5.tar.xz) = 5168224
+TIMESTAMP = 1663770245
+SHA256 (bind-9.18.7.tar.xz) = 9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981
+SIZE (bind-9.18.7.tar.xz) = 5626820
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 74b67bae6d2a..abb9609c6700 100644
--- a/dns/bind918/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind918/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2022-07-07 14:38:12 UTC
+--- bin/named/config.c.orig	2022-09-08 12:42:18 UTC
 +++ bin/named/config.c
 @@ -183,6 +183,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
  	parental-source *;\n\
  	parental-source-v6 *;\n\
  	provide-ixfr true;\n\
---- bin/named/server.c.orig	2022-07-07 14:38:12 UTC
+--- bin/named/server.c.orig	2022-09-08 12:42:18 UTC
 +++ bin/named/server.c
 @@ -4544,6 +4544,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -24,9 +24,9 @@ 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);
---- doc/arm/reference.rst.orig	2022-07-07 14:38:12 UTC
+--- doc/arm/reference.rst.orig	2022-09-08 12:42:18 UTC
 +++ doc/arm/reference.rst
-@@ -3991,6 +3991,10 @@ Tuning
+@@ -4344,6 +4344,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
     greater value.
  
@@ -35,9 +35,9 @@ Add the override-cache-ttl feature.
 +   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
+    :tags: server
+    :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
+--- lib/dns/include/dns/view.h.orig	2022-09-08 12:42:18 UTC
 +++ lib/dns/include/dns/view.h
 @@ -157,6 +157,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -47,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-07-07 14:38:12 UTC
+--- lib/dns/resolver.c.orig	2022-09-08 12:42:18 UTC
 +++ lib/dns/resolver.c
-@@ -6190,6 +6190,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6225,6 +6225,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -62,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-07-07 14:38:12 UTC
+--- lib/isccfg/namedconf.c.orig	2022-09-08 12:42:18 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 12d3d509143e..56d68841cc68 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -243,19 +243,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.18.5.so
+lib/libbind9-9.18.7.so
 lib/libdns.so
-lib/libdns-9.18.5.so
+lib/libdns-9.18.7.so
 lib/libirs.so
-lib/libirs-9.18.5.so
+lib/libirs-9.18.7.so
 lib/libisc.so
-lib/libisc-9.18.5.so
+lib/libisc-9.18.7.so
 lib/libisccc.so
-lib/libisccc-9.18.5.so
+lib/libisccc-9.18.7.so
 lib/libisccfg.so
-lib/libisccfg-9.18.5.so
+lib/libisccfg-9.18.7.so
 lib/libns.so
-lib/libns-9.18.5.so
+lib/libns-9.18.7.so
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz