From nobody Fri Jul 15 14:30:51 2022 X-Original-To: dev-commits-ports-all@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 4Lkv0q3twsz4Wmx5; Fri, 15 Jul 2022 14:30:51 +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 4Lkv0q3QJ2z41Dr; Fri, 15 Jul 2022 14:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657895451; 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=rSQ7q9XwDt1nGsuVweLn/lDV5Ezwf31zHi57Wn9C12g=; b=Eo30laqagWhK3v64H4xX4F8DBhciyjGLOFGeHAAg0J/bT+fVkBjE4JLWdDKPwofrtEAUm0 3uuWlVsNuh3nn/Q1v7Ugj+UBtyZTs7YGs7pOoYDvDsp74R1v5vhTKYcgqGzmuAnMzzRwYe Z8cLD0U0gGdJW/0MBiMtF+wwDo67DS7rbiMZYVWPwkGMZq5vCk7ijmqe6giZVxf20eY4pD hydxXl/CvgjiRDDncdQT4w7mT7c82RH/eF/Mmb/u6Dh7ULyPE83wYx3FcFI1ZZ/WexH/s7 tnmMQf6ILwSBNjljzwgKWfIMfDbqAocmEqFNNuVLI+DTVw4vVGFrDOSrHaQSRQ== 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 4Lkv0q2W6rzlns; Fri, 15 Jul 2022 14:30:51 +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 26FEUp8u071543; Fri, 15 Jul 2022 14:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FEUp6l071528; Fri, 15 Jul 2022 14:30:51 GMT (envelope-from git) Date: Fri, 15 Jul 2022 14:30:51 GMT Message-Id: <202207151430.26FEUp6l071528@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: fa2609e30ffe - main - dns/bind918: fix nullfs mount when chrooted List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: fa2609e30ffecf7ae3818b84bb9c017ccecc5892 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657895451; 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=rSQ7q9XwDt1nGsuVweLn/lDV5Ezwf31zHi57Wn9C12g=; b=uPYxkYEazHVIq12ecQ4WOAAi8Q1ELEkNetHyjbDlf91iOGZN3Rw6+mZusRYG5Nl/QelxoH H8ijR0ef8zte92KLzggh0dklgx+v1IaST9eb/uiWO/PewUsiQW4C7uThDg8NznsbEx/OeM B7VWW4HMyT0QBSisjDhIp9KRT8G/o46E+JsWVDeyh/6uq886t8wH2m3ehVvpa4LCrn7Wx+ IZHP6ezxRLoX1wkW820bVShGLnYi+6+X0HYQpFXIjKZVeDngplAGc8hXTEbkYK43Wuou0x FI5mcRZeafSC5Qnt0w89mvoV4A3ggyUNP2YTUZlMXC0mv3GU3qc5g7dimjJ0Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657895451; a=rsa-sha256; cv=none; b=WhXOgLLZpa05i7CqxED0FvCwacLzT4XTQbcPg5PnmAnlrkplJIhruN2CqL+pMvVA+eRsmq 7HtLA/l1MNaBj6kM8CP08aFi18CcYhV3mQIGUWAsMq++jt5Ihm7AUiCqSnB2D1PM/fYxQ1 jJs2pl7nruCaiKbQwuC/SJ4JmC1JjfhWaIUOMGK2jGl+Wv8i0HYM2BWewb73PmSX/pcD30 9FNrYRtj6IdrAkKC/TZNqMRLaUpwiq+jCys21d5roFQgys89ft6e002GK58nyhorctRAL3 ox47wwNRf5LZc2R9il4M5A4T3S6e8rNzQv3SVKnyjDeDfpXTDSfzcRxV/VW+XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa2609e30ffecf7ae3818b84bb9c017ccecc5892 commit fa2609e30ffecf7ae3818b84bb9c017ccecc5892 Author: Tatsuki Makino AuthorDate: 2022-07-15 14:26:44 +0000 Commit: Mathieu Arnold CommitDate: 2022-07-15 14:30:17 +0000 dns/bind918: fix nullfs mount when chrooted PR: 263487 --- 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