bind920: Apply fix for upstream issue 5215.

[Havard Eidnes (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Wed Mar 5 15:26:39 2025 +0100
Changeset:	ed49d0874fef45e90fce8c0c7ebdceafcd8622b7

Modified Files:
	bind920/Makefile
	bind920/distinfo
	bind920/patches/patch-lib_dns_zone.c

Log Message:
bind920: Apply fix for upstream issue 5215.

This is https://gitlab.isc.org/isc-projects/bind9/-/issues/5215

Bump PKGREVISION.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed49d0874fef45e90fce8c0c7ebdceafcd8622b7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bind920/Makefile                     |  2 +-
 bind920/distinfo                     |  2 +-
 bind920/patches/patch-lib_dns_zone.c | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diffs:
diff --git a/bind920/Makefile b/bind920/Makefile
index 19f98b4b13..76689c3476 100644
--- a/bind920/Makefile
+++ b/bind920/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.isc.org/isc/bind9/${BIND_VERSION}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/bind920/distinfo b/bind920/distinfo
index 3bfd60f985..6aaab22b6f 100644
--- a/bind920/distinfo
+++ b/bind920/distinfo
@@ -6,4 +6,4 @@ Size (bind-9.20.6.tar.xz) = 5639720 bytes
 SHA1 (patch-bin_named_statschannel.c) = 0be5baa65ad129f5ed551ae239d49091c177d91d
 SHA1 (patch-configure.ac) = f1f672271aa38c10b12d12d48455eb0af82d270c
 SHA1 (patch-lib_dns_include_dns_zone.h) = 14cc09f7ad1fa9cd29ec089c294111c48a403535
-SHA1 (patch-lib_dns_zone.c) = e6d1e643181271c185bc92fb188becb85f7340fb
+SHA1 (patch-lib_dns_zone.c) = 4010551aa4b9d8c302137da94db96aa27285dde4
diff --git a/bind920/patches/patch-lib_dns_zone.c b/bind920/patches/patch-lib_dns_zone.c
index 5d940949aa..aed40188f2 100644
--- a/bind920/patches/patch-lib_dns_zone.c
+++ b/bind920/patches/patch-lib_dns_zone.c
@@ -3,6 +3,9 @@ $NetBSD$
 Apply patch from https://gitlab.isc.org/isc-projects/bind9/-/issues/5198
 to work around core dump observed there.
 
+Also apply fix for https://gitlab.isc.org/isc-projects/bind9/-/issues/5215
+to work around a similar core dump / crash.
+
 --- lib/dns/zone.c.orig	2025-02-11 17:35:31.021335759 +0000
 +++ lib/dns/zone.c
 @@ -18212,18 +18212,22 @@ dns_zone_getsourceaddr(dns_zone_t *zone)
@@ -33,3 +36,14 @@ to work around core dump observed there.
  }
  
  isc_time_t
+@@ -18284,7 +18288,9 @@ get_request_transport_type(dns_zone_t *z
+ 					 : DNS_TRANSPORT_UDP;
+ 
+ 		/* Check if the peer is forced to always use TCP. */
+-		if (transport_type != DNS_TRANSPORT_TCP) {
++		if (transport_type != DNS_TRANSPORT_TCP &&
++		    !dns_remote_done(&zone->primaries))
++		 {
+ 			isc_result_t result;
+ 			isc_sockaddr_t primaryaddr;
+ 			isc_netaddr_t primaryip;