dns/bind918: update to 9.18.33

Security:	CVE-2024-11187, CVE-2024-12705

4 files changed, 19 insertions, 19 deletions

diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 950a1abc4bfa..bda54f6286cf 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.32
+DISTVERSION=	9.18.33
 PORTREVISION=	0
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${DISTVERSION}
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index 5a9e91229d9a..7b2ed08187ac 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734171277
-SHA256 (bind-9.18.32.tar.xz) = dc840cdf9d54578d98400f2edf7008b1b33a1721be6e490eb1e42d0d11d9cff4
-SIZE (bind-9.18.32.tar.xz) = 5332480
+TIMESTAMP = 1738572657
+SHA256 (bind-9.18.33.tar.xz) = fb373fac5ebbc41c645160afd5a9fb451918f6c0e69ab1d9474154e2b515de40
+SIZE (bind-9.18.33.tar.xz) = 5341616
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 2f0f8481af96..a07fa6623be0 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	2024-12-03 13:00:51 UTC
+--- bin/named/config.c.orig	2025-01-20 13:39:30 UTC
 +++ bin/named/config.c
-@@ -185,6 +185,7 @@ options {\n\
+@@ -186,6 +186,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\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	2024-12-03 13:00:51 UTC
+--- bin/named/server.c.orig	2025-01-20 13:39:30 UTC
 +++ bin/named/server.c
 @@ -4663,6 +4663,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -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	2024-12-03 13:00:51 UTC
+--- doc/arm/reference.rst.orig	2025-01-20 13:39:31 UTC
 +++ doc/arm/reference.rst
 @@ -4388,6 +4388,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	2024-12-03 13:00:51 UTC
+--- lib/dns/include/dns/view.h.orig	2025-01-20 13:39:31 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	2024-12-03 13:00:51 UTC
+--- lib/dns/resolver.c.orig	2025-01-20 13:39:31 UTC
 +++ lib/dns/resolver.c
-@@ -6306,6 +6306,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6355,6 +6355,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	2024-12-03 13:00:51 UTC
+--- lib/isccfg/namedconf.c.orig	2025-01-20 13:39:31 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2105,6 +2105,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index b1a3139e74f9..601d222032be 100644
--- a/dns/bind918/pkg-plist
+++ b/dns/bind918/pkg-plist
@@ -240,19 +240,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.18.32.so
+lib/libbind9-9.18.33.so
 lib/libdns.so
-lib/libdns-9.18.32.so
+lib/libdns-9.18.33.so
 lib/libirs.so
-lib/libirs-9.18.32.so
+lib/libirs-9.18.33.so
 lib/libisc.so
-lib/libisc-9.18.32.so
+lib/libisc-9.18.33.so
 lib/libisccc.so
-lib/libisccc-9.18.32.so
+lib/libisccc-9.18.33.so
 lib/libisccfg.so
-lib/libisccfg-9.18.32.so
+lib/libisccfg-9.18.33.so
 lib/libns.so
-lib/libns-9.18.32.so
+lib/libns-9.18.33.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz
 @comment share/man/man1/dig.1.gz