From nobody Fri Jul 22 13:53:49 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lq9rt24ghz4XHfJ; Fri, 22 Jul 2022 13:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lq9rt1Kfmz3GHZ; Fri, 22 Jul 2022 13:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658498030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Xi8DFHFu0E7eB4rle9/lr0l0uFB9FDbdvuJnncK7ec=; b=PHVKaUnCAzJK7ydHBOoXGmx8blWYyecszu0B0DfEnJaygdgV53NzMTydiCE3lLinvjZjHn Xqdf1RPewCL6ngRaCSTkJzLu2taYtSMjxOeqpEn6ynW/4Mn1S+5Fu+k2X1ODMwHCbq9J5D aNbogijhtCfAQKVFF+Fe085qWaO+HKO3IFDcdhOylUPwclD5J4/BJQRj25vSuwFX30lJ67 y1hhHVn23swK5mVv6+5G5bXjRj30CzH7tNW333f+t39L/ouIa7CYbU0lvttOLqe6359VcP GJynXlPlX3khLt9QIXJPbmps33zjLRC671xJsmJMqbbb+MAstYHnYRAnT2+3CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lq9rt0LzPz13Sm; Fri, 22 Jul 2022 13:53:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26MDrnS1072386; Fri, 22 Jul 2022 13:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26MDrnhh072385; Fri, 22 Jul 2022 13:53:49 GMT (envelope-from git) Date: Fri, 22 Jul 2022 13:53:49 GMT Message-Id: <202207221353.26MDrnhh072385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: 34f95b934d08 - 2022Q3 - dns/bind918: fix nullfs mount when chrooted List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 34f95b934d089c23e1ae98ea363ee6eb42f862ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658498030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Xi8DFHFu0E7eB4rle9/lr0l0uFB9FDbdvuJnncK7ec=; b=DOMexDKaACqAVpug3fzoPkWgdGKDVdLe5Lj89VMQDbGpg6Pb2Ydkzs9bz6dyGZYVmsnkR5 1IKBN+S5Q2CWaSWNu3wkQeSSAPFDxI5v7vRrsMwLG1cN/MlWHypjiWm3c2kidRuLAZowfq /ZpMwAobfmawSP2EY4gthuOsI1TIuTtInYFiNItfA2fjWMfrWqUyEkWl/892JkaBvUQhuf iTQtU8MLuJ6N2QBTj34TeThV0UzV/OrmYEAT2g6/TsQHO+Rwomlc3ImHc0NFmsZDGhvzAY 4jAmnEbTrR8FHP7ATixY9Dtu9tvEwycr/lDMam/bArHiNFVRy3SnFxJofSwqQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658498030; a=rsa-sha256; cv=none; b=Jl/9zaDvfiBKCE7Y3qqz9oYgJulpir8TtH5A3y/xvRqQ0ZlJ43EUdPDkXrnW4BEmCQ5xeR /V9kvPvEz091fCfAtzAtDkgVqOtBLLskYQ50mQqQkV8mE8DX5OL2ZrzCPjKUwbgj2j9wKR 2tZmasu0GS+eO/pbwqPkTX37WXsLLrE6X2Otf+9XKtAeSfe1HATA0xpfF32pfrIuCJ0+WY /mPpUI1CkGziapA2cYXcvlIx4MEsL+uHgZg7p2leWRyBryTAuHGRFZmIXvXXNqY1EU4MqZ f9pZuiU22vk5SGO+miO18c8lDGr2H/ZN30w4QLnQMGXVNE6rVTtqXnYk29cOUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=34f95b934d089c23e1ae98ea363ee6eb42f862ad commit 34f95b934d089c23e1ae98ea363ee6eb42f862ad Author: Tatsuki Makino AuthorDate: 2022-07-15 14:26:44 +0000 Commit: Mathieu Arnold 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