git: 34f95b934d08 - 2022Q3 - dns/bind918: fix nullfs mount when chrooted

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Fri, 22 Jul 2022 13:53:49 UTC
The branch 2022Q3 has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=34f95b934d089c23e1ae98ea363ee6eb42f862ad

commit 34f95b934d089c23e1ae98ea363ee6eb42f862ad
Author:     Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2022-07-15 14:26:44 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2022-07-22 13:52:18 +0000

    dns/bind918: fix nullfs mount when chrooted
    
    PR:             263487
    (cherry picked from commit fa2609e30ffecf7ae3818b84bb9c017ccecc5892)
---
 dns/bind918/Makefile       | 2 +-
 dns/bind918/files/named.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile
index 6c09f3078009..09aa5a70febc 100644
--- a/dns/bind918/Makefile
+++ b/dns/bind918/Makefile
@@ -7,7 +7,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind918 here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
diff --git a/dns/bind918/files/named.in b/dns/bind918/files/named.in
index 0d19435000cc..8a614f6256a5 100644
--- a/dns/bind918/files/named.in
+++ b/dns/bind918/files/named.in
@@ -141,7 +141,7 @@ chroot_autoupdate()
 	# The OpenSSL engines and BIND9 plugins should be present in the
 	# chroot, named loads them after chrooting.
 	null_mount_or_copy ${_openssl_engines}
-	null_mount_or_copy %%PREFIX%%/lib/named
+	null_mount_or_copy %%PREFIX%%/lib/bind
 
 	# Copy and/or update key files to the chroot /etc
 	#
@@ -225,7 +225,7 @@ named_stop()
 named_poststop()
 {
 	if [ -n "${named_chrootdir}" ]; then
-		null_umount %%PREFIX%%/lib/named
+		null_umount %%PREFIX%%/lib/bind
 		null_umount ${_openssl_engines}
 		if [ -c ${named_chrootdir}/dev/null ]; then
 			# unmount /dev