dns/bind918: update to 9.18.26

(cherry picked from commit efba1313a591f9231c7fdd947ba67986673f7997)

5 files changed, 25 insertions, 25 deletions

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 60ab87db9657..ac953e9d63f3 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.24.so
+lib/bind-tools/libbind9-9.18.26.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.18.24.so
+lib/bind-tools/libdns-9.18.26.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.18.24.so
+lib/bind-tools/libirs-9.18.26.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.18.24.so
+lib/bind-tools/libisc-9.18.26.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.18.24.so
+lib/bind-tools/libisccc-9.18.26.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.18.24.so
+lib/bind-tools/libisccfg-9.18.26.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.18.24.so
+lib/bind-tools/libns-9.18.26.so
 share/man/man1/arpaname.1.gz
 share/man/man1/delv.1.gz
 share/man/man1/dig.1.gz
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index f9cfbf12a612..d093babefdc6 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -1,7 +1,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-DISTVERSION=	9.18.24
+DISTVERSION=	9.18.26
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index 72325792e8d9..d47edab06953 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707897747
-SHA256 (bind-9.18.24.tar.xz) = 709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66
-SIZE (bind-9.18.24.tar.xz) = 5515528
+TIMESTAMP = 1713682828
+SHA256 (bind-9.18.26.tar.xz) = 75ffee52731e9604c849b658df29e927f1c4f01d5a71ea3ebcbeb63702cb6651
+SIZE (bind-9.18.26.tar.xz) = 5519432
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 6bd113a99594..ccdd0e4de815 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-11-09 12:44:11 UTC
+--- bin/named/config.c.orig	2024-04-03 09:39:01 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-11-09 12:44:11 UTC
+--- bin/named/server.c.orig	2024-04-03 09:39:01 UTC
 +++ bin/named/server.c
-@@ -4571,6 +4571,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4574,6 +4574,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);
---- doc/arm/reference.rst.orig	2023-11-09 12:44:11 UTC
+--- doc/arm/reference.rst.orig	2024-04-03 09:39:01 UTC
 +++ doc/arm/reference.rst
 @@ -4338,6 +4338,10 @@ Tuning
     cannot exceed 7 days and is silently truncated to 7 days if set to a
@@ -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-11-09 12:44:12 UTC
+--- lib/dns/include/dns/view.h.orig	2024-04-03 09:39:01 UTC
 +++ lib/dns/include/dns/view.h
 @@ -157,6 +157,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -47,7 +47,7 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2023-11-09 12:44:12 UTC
+--- lib/dns/resolver.c.orig	2024-04-03 09:39:01 UTC
 +++ lib/dns/resolver.c
 @@ -6252,6 +6252,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-11-09 12:44:12 UTC
+--- lib/isccfg/namedconf.c.orig	2024-04-03 09:39:01 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 5ec06237b006..21deb99a906d 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.24.so
+lib/libbind9-9.18.26.so
 lib/libdns.so
-lib/libdns-9.18.24.so
+lib/libdns-9.18.26.so
 lib/libirs.so
-lib/libirs-9.18.24.so
+lib/libirs-9.18.26.so
 lib/libisc.so
-lib/libisc-9.18.24.so
+lib/libisc-9.18.26.so
 lib/libisccc.so
-lib/libisccc-9.18.24.so
+lib/libisccc-9.18.26.so
 lib/libisccfg.so
-lib/libisccfg-9.18.24.so
+lib/libisccfg-9.18.26.so
 lib/libns.so
-lib/libns-9.18.24.so
+lib/libns-9.18.26.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz
 @comment share/man/man1/dig.1.gz