From nobody Wed Sep 28 14:24:08 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 4MczJS1y3hz4YG3h; Wed, 28 Sep 2022 14:24:08 +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 4MczJS1Qxfz3dtM; Wed, 28 Sep 2022 14:24:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664375048; 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=z5pGQ56UaPWW80Vu7+YRbKWSoIoeSElvyeegHhFoeRU=; b=Zjibz6ximu/SzQ591GiwFHvxmCd9VIB9ILSWhS/KMWU7qTxogMJ/NkQ0Dnt3tSVW9XTyV+ ky676ZmHaOAAhd5Ob5YixGjyXeHmEOXK41CggC7j7XzrFU4V8PxyNJuEsdKtmI3v5ZNk4I 0AJKVrqXkc9PVnrB4BV1A15JNKgmbKpqaf+oL3bcd8A853WQADHKZhUEfqMLps61BptvNR Kd+5PGhkVM3eNjpzVDZ7oHaUFK6AFzyG1RLxMNta/PxnCPoodko3YobEd457B5IChN9Mtp Ykwa96SpZhGzTHSaZ1GRO8FbmNnQop0PDVgi2ivpNINwlc1yb7S3RstjVGaxRg== 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 4MczJS0VbHzVjY; Wed, 28 Sep 2022 14:24:08 +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 28SEO8wo039645; Wed, 28 Sep 2022 14:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28SEO8in039644; Wed, 28 Sep 2022 14:24:08 GMT (envelope-from git) Date: Wed, 28 Sep 2022 14:24:08 GMT Message-Id: <202209281424.28SEO8in039644@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: 78b484ed5d37 - 2022Q3 - dns/bind9*: fix some race condition in rc script 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: 78b484ed5d37d51a6d20491b348c42b457265385 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664375048; 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=z5pGQ56UaPWW80Vu7+YRbKWSoIoeSElvyeegHhFoeRU=; b=MxvInsdhFb2DbllMldiYOXGCXA4qbpRljzBnAcIU2+CCTt+1fE6jF90ByZ8EsI1+OBYMWh SGid4WZDczA9LFjewVvpvNxqqqgy+2y3pWSZPzLnpUrcrVog3mFGEC8/r0kyo3L5hWyEe2 iwNL7kj1FxmsYmzC/KxP5nyjWDBE0rPWKBEMkm7jOpz+K7t6at+bpFbPT02rElYHpzrPB0 K5onuwh0DjNte+8H5z8DMcq+8fXjxFfb1tllo/THAWb4pWxh9PAeJxpZWPUsuOhZ1xHB6F snYKqJyv3RCJ7ln2Vc9vavVd9DyhILN+zDDJnSq4ZxSKnDxXoGPDUT5ijWw5/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664375048; a=rsa-sha256; cv=none; b=WR3vdQ0wwUIgCNxofYjZ22kMg/1mVB9QuN2Ez4nR38y8ps45pEkH9ygQfQiDUFvh6Ueu4N Hi5JcmAiExB0xrHreyEQ5wY/KBdLyWo7pIgqqmPcMBKOBNeTMnGoYRrgMme7lNR3W2OYtd C/Terte+uVFwPE9vH2iw79nyG4rOzR8d9j/fVl2iEI/89mMdLrU6v0iDo+rCErIQJ/q07v m1nz5ExTeeWrdCNsHLhGAYKi4D3r3YIUQchAXNPG3y1rqurCzyhdJAjyWe/m62uwom+cIC bvpwd9kvxx0NhjTbv63RMf4g/VgOpPc4p5ey+xBffYkaRV5h4ZGNjtdkT2HD1Q== 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=78b484ed5d37d51a6d20491b348c42b457265385 commit 78b484ed5d37d51a6d20491b348c42b457265385 Author: Michael Sinatra AuthorDate: 2022-09-28 14:17:27 +0000 Commit: Mathieu Arnold CommitDate: 2022-09-28 14:23:54 +0000 dns/bind9*: fix some race condition in rc script PR: 265994 MFH: yes (cherry picked from commit 36ab384abd0413b0e3b9ef0c8e7f994eb03d456c) --- dns/bind9-devel/Makefile | 2 +- dns/bind9-devel/files/named.in | 36 ++++++++++++++++++------------------ dns/bind916/Makefile | 2 +- dns/bind916/files/named.in | 36 ++++++++++++++++++------------------ dns/bind918/Makefile | 2 +- dns/bind918/files/named.in | 36 ++++++++++++++++++------------------ 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index e55d42178ea2..0fe98fd09ec5 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -8,7 +8,7 @@ PORTREVISION= 0 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net # XXX: put the ISC master_site diff --git a/dns/bind9-devel/files/named.in b/dns/bind9-devel/files/named.in index 0d19435000cc..ee2fbcb821a7 100644 --- a/dns/bind9-devel/files/named.in +++ b/dns/bind9-devel/files/named.in @@ -309,6 +309,24 @@ rndc() named_prestart() { + # Is the user using a sandbox? + # + if [ -n "${named_chrootdir}" ]; then + rc_flags="${rc_flags} -t ${named_chrootdir}" + checkyesno named_chroot_autoupdate && chroot_autoupdate + + case "${altlog_proglist}" in + *named*) + ;; + *) + warn 'Using chroot without setting altlog_proglist, logging may not' + warn 'work correctly. Run sysrc altlog_proglist+=named' + ;; + esac + else + named_symlink_enable=NO + fi + find_pidfile find_sessionkeyfile @@ -334,24 +352,6 @@ named_prestart() local line nsip firstns - # Is the user using a sandbox? - # - if [ -n "${named_chrootdir}" ]; then - rc_flags="${rc_flags} -t ${named_chrootdir}" - checkyesno named_chroot_autoupdate && chroot_autoupdate - - case "${altlog_proglist}" in - *named*) - ;; - *) - warn 'Using chroot without setting altlog_proglist, logging may not' - warn 'work correctly. Run sysrc altlog_proglist+=named' - ;; - esac - else - named_symlink_enable=NO - fi - # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile index 8e607ca1d2b5..60dbbe1b295e 100644 --- a/dns/bind916/Makefile +++ b/dns/bind916/Makefile @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns net MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 916 diff --git a/dns/bind916/files/named.in b/dns/bind916/files/named.in index 48681ca12f3b..6e225efe0733 100644 --- a/dns/bind916/files/named.in +++ b/dns/bind916/files/named.in @@ -311,6 +311,24 @@ rndc() named_prestart() { + # Is the user using a sandbox? + # + if [ -n "${named_chrootdir}" ]; then + rc_flags="${rc_flags} -t ${named_chrootdir}" + checkyesno named_chroot_autoupdate && chroot_autoupdate + + case "${altlog_proglist}" in + *named*) + ;; + *) + warn 'Using chroot without setting altlog_proglist, logging may not' + warn 'work correctly. Run sysrc altlog_proglist+=named' + ;; + esac + else + named_symlink_enable=NO + fi + find_pidfile find_sessionkeyfile @@ -346,24 +364,6 @@ named_prestart() local line nsip firstns - # Is the user using a sandbox? - # - if [ -n "${named_chrootdir}" ]; then - rc_flags="${rc_flags} -t ${named_chrootdir}" - checkyesno named_chroot_autoupdate && chroot_autoupdate - - case "${altlog_proglist}" in - *named*) - ;; - *) - warn 'Using chroot without setting altlog_proglist, logging may not' - warn 'work correctly. Run sysrc altlog_proglist+=named' - ;; - esac - else - named_symlink_enable=NO - fi - # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index fbd4db198530..1da538d3e70c 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 8a614f6256a5..fb2a9453ad42 100644 --- a/dns/bind918/files/named.in +++ b/dns/bind918/files/named.in @@ -309,6 +309,24 @@ rndc() named_prestart() { + # Is the user using a sandbox? + # + if [ -n "${named_chrootdir}" ]; then + rc_flags="${rc_flags} -t ${named_chrootdir}" + checkyesno named_chroot_autoupdate && chroot_autoupdate + + case "${altlog_proglist}" in + *named*) + ;; + *) + warn 'Using chroot without setting altlog_proglist, logging may not' + warn 'work correctly. Run sysrc altlog_proglist+=named' + ;; + esac + else + named_symlink_enable=NO + fi + find_pidfile find_sessionkeyfile @@ -334,24 +352,6 @@ named_prestart() local line nsip firstns - # Is the user using a sandbox? - # - if [ -n "${named_chrootdir}" ]; then - rc_flags="${rc_flags} -t ${named_chrootdir}" - checkyesno named_chroot_autoupdate && chroot_autoupdate - - case "${altlog_proglist}" in - *named*) - ;; - *) - warn 'Using chroot without setting altlog_proglist, logging may not' - warn 'work correctly. Run sysrc altlog_proglist+=named' - ;; - esac - else - named_symlink_enable=NO - fi - # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \