dns/bind918: update to 9.18.16

Security:	CVE-2023-2828, CVE-2023-2911
(cherry picked from commit 3d618ab1416735b585232a6f2faa09c34923a57b)

5 files changed, 27 insertions, 27 deletions

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 8d124adf1373..bcb0b31dd4ad 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.14.so
+lib/bind-tools/libbind9-9.18.16.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.18.14.so
+lib/bind-tools/libdns-9.18.16.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.18.14.so
+lib/bind-tools/libirs-9.18.16.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.18.14.so
+lib/bind-tools/libisc-9.18.16.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.18.14.so
+lib/bind-tools/libisccc-9.18.16.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.18.14.so
+lib/bind-tools/libisccfg-9.18.16.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.18.14.so
+lib/bind-tools/libns-9.18.16.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 30005c8aef35..5410e2297e31 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -44,7 +44,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.14
+ISCVERSION=	9.18.16
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index 3ceaf4c770f4..a92ce47263b8 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1681908716
-SHA256 (bind-9.18.14.tar.xz) = 9ae12edf6ac3c430b33ecd1a7c0c0c60875d255185eb87850fa9a5e794a64a09
-SIZE (bind-9.18.14.tar.xz) = 5481396
+TIMESTAMP = 1687331488
+SHA256 (bind-9.18.16.tar.xz) = c88234fe07ee75c3c8a9e59152fee64b714643de8e22cf98da3db4d0b57e0775
+SIZE (bind-9.18.16.tar.xz) = 5462456
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 6cf98babcdcd..8eebb521a0d0 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	2023-04-11 16:58:59 UTC
+--- bin/named/config.c.orig	2023-06-09 13:48:46 UTC
 +++ bin/named/config.c
 @@ -184,6 +184,7 @@ options {\n\
  	notify-source *;\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	2023-04-11 16:58:59 UTC
+--- bin/named/server.c.orig	2023-06-09 13:48:46 UTC
 +++ bin/named/server.c
-@@ -4549,6 +4549,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4571,6 +4571,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -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	2023-04-11 16:58:59 UTC
+--- doc/arm/reference.rst.orig	2023-06-09 13:48:46 UTC
 +++ doc/arm/reference.rst
-@@ -4297,6 +4297,10 @@ Tuning
+@@ -4311,6 +4311,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
     greater value.
  
@@ -37,7 +37,7 @@ Add the override-cache-ttl feature.
  .. namedconf:statement:: max-cache-ttl
     :tags: server
     :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
---- lib/dns/include/dns/view.h.orig	2023-04-11 16:58:59 UTC
+--- lib/dns/include/dns/view.h.orig	2023-06-09 13:48:46 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	2023-04-11 16:58:59 UTC
+--- lib/dns/resolver.c.orig	2023-06-09 13:48:46 UTC
 +++ lib/dns/resolver.c
-@@ -6253,6 +6253,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6260,6 +6260,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	2023-04-11 16:58:59 UTC
+--- lib/isccfg/namedconf.c.orig	2023-06-09 13:48:46 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2100,6 +2100,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 08393dbc9a93..a720e1cd9634 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -241,19 +241,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.18.14.so
+lib/libbind9-9.18.16.so
 lib/libdns.so
-lib/libdns-9.18.14.so
+lib/libdns-9.18.16.so
 lib/libirs.so
-lib/libirs-9.18.14.so
+lib/libirs-9.18.16.so
 lib/libisc.so
-lib/libisc-9.18.14.so
+lib/libisc-9.18.16.so
 lib/libisccc.so
-lib/libisccc-9.18.14.so
+lib/libisccc-9.18.16.so
 lib/libisccfg.so
-lib/libisccfg-9.18.14.so
+lib/libisccfg-9.18.16.so
 lib/libns.so
-lib/libns-9.18.14.so
+lib/libns-9.18.16.so
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz