git: 06055457b9b7 - 2023Q1 - dns/bind916: update to 9.16.39

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Wed, 15 Mar 2023 20:26:36 UTC
The branch 2023Q1 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=06055457b9b7f3680074e98fe419dffb5f60e3ac

commit 06055457b9b7f3680074e98fe419dffb5f60e3ac
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2023-03-15 20:11:45 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2023-03-15 20:20:28 +0000

    dns/bind916: update to 9.16.39
    
    Changes:        https://downloads.isc.org/isc/bind9/9.16.39/doc/arm/html/notes.html#notes-for-bind-9-16-39
    (cherry picked from commit 0611760c0ecfe38746241b7440b1d0e20fba4506)
---
 dns/bind916/Makefile                               |  2 +-
 dns/bind916/distinfo                               |  6 +++---
 dns/bind916/files/extrapatch-bind-min-override-ttl | 12 ++++++------
 dns/bind916/files/patch-configure                  |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 77a89530d38f..f6faab878137 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=		compiler:c11 cpe libedit pkgconfig ssl tar:xz
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.16.38
+ISCVERSION=	9.16.39
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index cc7d96045f3e..0e0795697736 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676477889
-SHA256 (bind-9.16.38.tar.xz) = 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f
-SIZE (bind-9.16.38.tar.xz) = 5112340
+TIMESTAMP = 1678904856
+SHA256 (bind-9.16.39.tar.xz) = dd2bbac60c4406652762768af73a034092c7409a5f354ac42858c83f601a3fc1
+SIZE (bind-9.16.39.tar.xz) = 5120164
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 8bdbde740cfd..97f7ef724f35 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/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:45:02 UTC
+--- bin/named/config.c.orig	2023-03-06 13:03:49 UTC
 +++ bin/named/config.c
 @@ -177,6 +177,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-01-12 22:45:02 UTC
+--- bin/named/server.c.orig	2023-03-06 13:03:49 UTC
 +++ bin/named/server.c
-@@ -4444,6 +4444,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4446,6 +4446,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);
---- lib/dns/include/dns/view.h.orig	2023-01-12 22:45:02 UTC
+--- lib/dns/include/dns/view.h.orig	2023-03-06 13:03:49 UTC
 +++ lib/dns/include/dns/view.h
 @@ -154,6 +154,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,7 +34,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:45:02 UTC
+--- lib/dns/resolver.c.orig	2023-03-06 13:03:49 UTC
 +++ lib/dns/resolver.c
 @@ -6494,6 +6494,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
@@ -49,7 +49,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-01-12 22:45:02 UTC
+--- lib/isccfg/namedconf.c.orig	2023-03-06 13:03:49 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2054,6 +2054,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index 20d6b825dbc4..e65c7ecaff08 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2023-02-03 17:17:35 UTC
+--- configure.orig	2023-03-06 13:03:49 UTC
 +++ configure
-@@ -17965,27 +17965,9 @@ done
+@@ -18104,27 +18104,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -18028,47 +18010,7 @@ $as_echo "no" >&6; } ;;
+@@ -18167,47 +18149,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23519,7 +23461,7 @@ $as_echo "" >&6; }
+@@ -23668,7 +23610,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).