r7ddlJ+F1cqFbI e1o+UYAGUYdyuBCnNS8SQeVxph/TN6D0t2E6cyZFwifDUfqc3g1WO1utz+DImdDCkWdQGm npfyKzDPPUp9CZnGk5+qqne3FiIdhtC58SaqisAFnbXeXaIhGcvXEB50l8QuCHn00Nj34H YXxgjJe8EahO5HRWQMaYlBJG6qFW4sBmnv6DhdAQ8SxtUeo3r+2i0/Vuam57EhFqWU8e/Z GXMMHG2Tk8j3zOmGGiACU8DoUDQyVgUh5zYQk4WatnCZ7cGRXNZ3WFZZP8jbEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760664808; 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=3cITFbziyP1gsbsjltySPOZpRg15ZB0Tiq1LkM//mZE=; b=iCCSsyheRY5kOKYpsebkhTs/1WqYW8G2lF2Yjo8x9MedSvz/nBuDxQmZohc7YtEYDc7CeL fGh2qSJ9PLoAk+pHEYLW0N2J4ZGel8BTYMwHAWg4CsEi1uj20+I9bUTdvRWZ1mHM2QslHG jWra3IXqFL0dvxqhjZfekuUQhBPVzz6583ybLxG25SOu+B3AtZFCnj5h8x/ZY+FMT7+pWA ZraeqCjrwKEr31yosItP0y1CAyd4/Grrc62X/Edkj2dOtinM4UFC/UL91pgs5JhOWVBPSO z+JqPgpPmvsQ/OFrUSmmASQtgBGofNkZ9Dp+1/O1CNd08Nqa11J5FRF/raRjRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760664808; a=rsa-sha256; cv=none; b=f6FdBZ7ziizKTU+JZm9Gsf6wlqKkAWEeashpH+DVfOjvpIyGvSqOVBOW6wfbhSGz8FYz1C CTGrcka+ccdataHPC9s9jvSeGSrA5udGNt6BWy6q4CJzDj7sWkvvYc0AGruz9F7pVYwfsB 94eR5wngcfgusJwFe00efWJCnjgsvjuV4cTM7B1QTxe05VfIjrQ79qb/9Q1+Q7LD9xWyNP kF6baxIM9pTZxB/3FObdMW+62gKtfrlYOKJ5szkmrXa5VaS+09L8MRK36yWiGehQghrztx 6Sr0Z0by8yKBGdacmRXT6CyhIjYAOvhQwfq8NlviLmzZyFqXOvISodKkGPwHfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cnnQc3gH3zZS9; Fri, 17 Oct 2025 01:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59H1XS73037206; Fri, 17 Oct 2025 01:33:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59H1XSuJ037203; Fri, 17 Oct 2025 01:33:28 GMT (envelope-from git) Date: Fri, 17 Oct 2025 01:33:28 GMT Message-Id: <202510170133.59H1XSuJ037203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b5d5181d74f0 - releng/15.0 - pkg-stage: Correct /packages permissions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: b5d5181d74f0b78530df8b94a7248a409c3ea72c Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d5181d74f0b78530df8b94a7248a409c3ea72c commit b5d5181d74f0b78530df8b94a7248a409c3ea72c Author: Ed Maste AuthorDate: 2025-10-15 13:04:58 +0000 Commit: Colin Percival CommitDate: 2025-10-17 01:33:12 +0000 pkg-stage: Correct /packages permissions Include /packages in the METALOG used to create dvd1.iso. Previously we used an expression ^./packages/ (with a trailing /) which did not match /packages itself, and then with no METALOG entry /packages on dvd1.iso ended up with mode d---------. Approved by: re (cperciva) PR: 290222 Reviewed by: cperciva MFC after: 1 minute Sponsored by: The FreeBSD Foundation (cherry picked from commit 2db11dda840c4889aeb719761cdafa62730083a2) (cherry picked from commit ecd943a5af7d8cb09f9418a8a4d337a72c06fe22) --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index f9216b52b088..6d460a83e1da 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -110,7 +110,7 @@ ${PKGCMD} repo ${PKG_REPODIR} if [ $NO_ROOT ]; then mtree -c -p $ROOTDIR | mtree -C -k type,mode,link,size | \ - grep '^./packages/' >> $ROOTDIR/METALOG + grep '^./packages[/ ]' >> $ROOTDIR/METALOG fi # Always exit '0', even if pkg(8) complains about conflicts.