git: 0605372462bf - 2023Q1 - dns/bind918: update to 9.18.12

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Wed, 15 Feb 2023 16:52:12 UTC
The branch 2023Q1 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0605372462bfe911e5edec326353f25fef2e62bc

commit 0605372462bfe911e5edec326353f25fef2e62bc
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2023-02-15 16:45:02 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2023-02-15 16:51:09 +0000

    dns/bind918: update to 9.18.12
    
    Changes:        https://downloads.isc.org/isc/bind9/9.18.12/doc/arm/html/notes.html#notes-for-bind-9-18-12
    (cherry picked from commit 0609537c5137e8f413c99bef6fa5ec4e9e5a92f2)
---
 dns/bind-tools/pkg-plist                           | 14 +++++++-------
 dns/bind918/Makefile                               |  2 +-
 dns/bind918/distinfo                               |  6 +++---
 dns/bind918/files/extrapatch-bind-min-override-ttl | 16 ++++++++--------
 dns/bind918/pkg-plist                              | 14 +++++++-------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index aa19fe967e91..cd17fa1ac660 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.11.so
+lib/bind-tools/libbind9-9.18.12.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.18.11.so
+lib/bind-tools/libdns-9.18.12.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.18.11.so
+lib/bind-tools/libirs-9.18.12.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.18.11.so
+lib/bind-tools/libisc-9.18.12.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.18.11.so
+lib/bind-tools/libisccc-9.18.12.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.18.11.so
+lib/bind-tools/libisccfg-9.18.12.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.18.11.so
+lib/bind-tools/libns-9.18.12.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 123abfcb3a7c..2db111fce463 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.11
+ISCVERSION=	9.18.12
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo
index c7db19ce39eb..ef589a070a7b 100644
--- a/dns/bind918/distinfo
+++ b/dns/bind918/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674661848
-SHA256 (bind-9.18.11.tar.xz) = 8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158
-SIZE (bind-9.18.11.tar.xz) = 5284184
+TIMESTAMP = 1676477982
+SHA256 (bind-9.18.12.tar.xz) = 47766bb7b063aabbad054386b190aa7f6c14524427afd427c30ec426512027e7
+SIZE (bind-9.18.12.tar.xz) = 5420940
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index fb51bea24e30..08df7fe724b8 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-01-12 22:21:15 UTC
+--- bin/named/config.c.orig	2023-02-03 11:25:47 UTC
 +++ bin/named/config.c
 @@ -184,6 +184,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	2023-01-12 22:21:15 UTC
+--- bin/named/server.c.orig	2023-02-03 11:25:47 UTC
 +++ bin/named/server.c
 @@ -4547,6 +4547,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	2023-01-12 22:21:15 UTC
+--- doc/arm/reference.rst.orig	2023-02-03 11:25:47 UTC
 +++ doc/arm/reference.rst
-@@ -4277,6 +4277,10 @@ Tuning
+@@ -4288,6 +4288,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-01-12 22:21:15 UTC
+--- lib/dns/include/dns/view.h.orig	2023-02-03 11:25:47 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-01-12 22:21:15 UTC
+--- lib/dns/resolver.c.orig	2023-02-03 11:25:47 UTC
 +++ lib/dns/resolver.c
 @@ -6253,6 +6253,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
@@ -62,9 +62,9 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2023-01-12 22:21:15 UTC
+--- lib/isccfg/namedconf.c.orig	2023-02-03 11:25:47 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2096,6 +2096,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2100,6 +2100,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
  	{ "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist
index 6d2976e9de80..fe9832dec2c2 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.11.so
+lib/libbind9-9.18.12.so
 lib/libdns.so
-lib/libdns-9.18.11.so
+lib/libdns-9.18.12.so
 lib/libirs.so
-lib/libirs-9.18.11.so
+lib/libirs-9.18.12.so
 lib/libisc.so
-lib/libisc-9.18.11.so
+lib/libisc-9.18.12.so
 lib/libisccc.so
-lib/libisccc-9.18.11.so
+lib/libisccc-9.18.12.so
 lib/libisccfg.so
-lib/libisccfg-9.18.11.so
+lib/libisccfg-9.18.12.so
 lib/libns.so
-lib/libns-9.18.11.so
+lib/libns-9.18.12.so
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz