From nobody Fri Oct 17 01:32:19 2025 X-Original-To: dev-commits-src-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 4cnnPH4RZ5z6CGFM; Fri, 17 Oct 2025 01:32:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnnPH3z8Mz4FPm; Fri, 17 Oct 2025 01:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760664739; 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=aJYLk+Xw4zjWdV+mwXhihdgsLmsDvP3P8vger/WTLtY=; b=O6ucoCAezdOUlx9sbvqBDkrK8heQcpYYlCv6N4U5FwcEz8nieEhRCj2Sxu/zTBRwOTx2od U3dme8RjdwtvPGOjTWnq5VqtvcDB+0aR2Bj4q3GLh2BPXYKD8WakmmiTdP7Zl7wtY5K+13 PBQLZnOiIURSoSw2rT+6VphX4doDrvitLFlaUCoe452WBcfZQ3HjHdXqJsf9P/LVVd6445 a3+ziA3ixZTj9cTtkl1ys0we/adZvzaTgW7N4SJgAI2061J6hBuN/KaWBrAy/s2EgTvbIO NM6dM2ZUZW23rcppd2/yu/q5uYrHujP6APBsGTrxVvz5D+A0y19ZhMf715jz8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760664739; 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=aJYLk+Xw4zjWdV+mwXhihdgsLmsDvP3P8vger/WTLtY=; b=y0G51whgXgo9rl4fzZUXn2D9lTOUBP1BiHNIGyrzmRwhibXNppTbfDTVlLOyuaAZ5cI7mX TcYtDfJj1jr+xRsRTB+imqF7jNKf8xhCNGkYYFnYv/rIqdPNxIvitfdW7K/YTk6+OIEVPy h68bekWAugmUpoWxAsZjTAX6M/BYzTKGEXTvdrbEdLwKF6dgTnfohE1cWIJOGzeY8+BOEW HOVe4RiMCfazcjRFJpU8B1PLcplv8tLP3Kg8OEEvm3nnUTJ8vTEK1HyIu/fbOx87ANLcSl Q5zhnrT9YIsHY8I6s6ney0dIaj4ti3MTK30+2liU1/T44hsPXtkC0F+AeFfmIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760664739; a=rsa-sha256; cv=none; b=DqC6j2SGtCfOPoOIvn2fneVXoUPpwa0mrhqCh4v2uemvH4JfPtLMfS4jasR+gczrIlE6P0 q2i78NQHd1W0h92lq46xXl2v6xGcYxCdvO5nTcfVSygzrJAVJlPKli/EjfohHpssd62ZJy FUkEIlV+N6hqrYL86K2pfYV07/sMyuO4sdyQoblUi4xFxkgRjEDxZ18bW+kdC3T/gJWmBO JvmaFoeh38V8gL1XLxOkQ67WSsa1WPxVCJw+CT77Mk96qptt5VVtLmqSeDrgp06FQfScv+ Nu7y/lQ43pMV8LylMLESP/+hq9jAlLdR9kISLOdNPQ2D4Wbz4gby2B16j3MqdQ== 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 4cnnPH3R7YzZf8; Fri, 17 Oct 2025 01:32:19 +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 59H1WJB5036699; Fri, 17 Oct 2025 01:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59H1WJBj036696; Fri, 17 Oct 2025 01:32:19 GMT (envelope-from git) Date: Fri, 17 Oct 2025 01:32:19 GMT Message-Id: <202510170132.59H1WJBj036696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ecd943a5af7d - stable/15 - pkg-stage: Correct /packages permissions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ecd943a5af7d8cb09f9418a8a4d337a72c06fe22 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ecd943a5af7d8cb09f9418a8a4d337a72c06fe22 commit ecd943a5af7d8cb09f9418a8a4d337a72c06fe22 Author: Ed Maste AuthorDate: 2025-10-15 13:04:58 +0000 Commit: Ed Maste CommitDate: 2025-10-17 01:31:29 +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---------. PR: 290222 Reviewed by: cperciva MFC after: 1 minute Sponsored by: The FreeBSD Foundation (cherry picked from commit 2db11dda840c4889aeb719761cdafa62730083a2) --- 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.