From nobody Tue Nov 29 21:04:21 2022 X-Original-To: dev-commits-src-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 4NMFFd6r8Lz4jlhg; Tue, 29 Nov 2022 21:04:21 +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 4NMFFd6J9Yz3NJH; Tue, 29 Nov 2022 21:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669755861; 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=eNbZdyrHgweZDFOaHJLwQMSTqCrqgbiPxYnEyI/EBsY=; b=Ahk7/JIHq0clTWexKBk0OXbx7sVeyZ95/jERk0CeMcUAREpnagi2GIzMhmFIsC+FgGB2gq C/HmngYNKjeqAsG2KwhydADDgyVgFqu3tOyw3DLdbkCws9fBKCNvC6LE1DpIff4w+Y4IM5 Sdivr3ARh//2IDJGTagrGnlp/qLQNlMVg/fHBNNGcoeivZZJCOU/+tfMInarzWirhTpWJL 6AsnLvnGBPkyUKpZa4vAx6zzZksGROD6KV9gsTOxmNHpqA4eBeeDqKqJscZIlnPWy8m0TS mPCBeZ1KzRihovhNdI6AM9mDRfcFSYOuKtWqg0ehK54yqM4UyuAEIqIIvN4Idg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669755861; 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=eNbZdyrHgweZDFOaHJLwQMSTqCrqgbiPxYnEyI/EBsY=; b=PTTCWZVEcab3LL916q+7cC8ex2O98zpllv9veMnmRaHVfhkqiiBhGjjQ14irQ41JwXnVFj WgQI9sxLs86YSKBy3otViAB8Q53FX+vwxKe20XQKl4fN8eINEttMmPkBujgcTMgwlludCr fpx9e8kIlJ6UQFcUQLaBPqLjW3FplIBLcFK+XW5S8SViE+ZWKXQUHNStlp9csN8db4QnjI Bib74hAopLrGZPa/i7VWrerfVjrMUAlFyXtx5TL3ljeRDV/dnxj3PPxmcMg9VimLzXih7C l9wCV0r48Cl+7+VB+HLFUctXAcOmjP04s8wV4myzLaVqy8GpZxvYt8DCwW8cvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669755861; a=rsa-sha256; cv=none; b=F/B8j2mcY0L7NNmysn63dVQnW+r+hOR6524/WWlDn9S1u0/Nc1ZAHRIm4gbJDoC5mqwom8 mZnC7icpcw98hFK9aj+LhT6OXSuicabWfUGKSbBi19jSp9/L3Dg/1TXB2jRqB37KE9M3ZI N53I2T5b8ll5VKOisaNDvU3rFHrk1zg+Lj3StRLaoYT80+WC4tw/1i5+O7tzEFm1o6tIS7 a+6sZG+imWHpWXbZkhZeLWgkFtzPaD900dUvwb2oecmkIy6AdLFQXOwp7Km7qez/Fc7ZLX iiMB6H+HKkowiJRMtVOrBG6pKBSY2CZsC5NrK5ewWlGrqfqeBwNdWppF0mJ6og== 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 4NMFFd5K4FzWp0; Tue, 29 Nov 2022 21:04:21 +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 2ATL4Lor041181; Tue, 29 Nov 2022 21:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATL4Let041180; Tue, 29 Nov 2022 21:04:21 GMT (envelope-from git) Date: Tue, 29 Nov 2022 21:04:21 GMT Message-Id: <202211292104.2ATL4Let041180@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 67d2aaf078e9 - main - csh: install hard link with same mode as target 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 67d2aaf078e967bb626cf50c53d679aad71aeaf9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67d2aaf078e967bb626cf50c53d679aad71aeaf9 commit 67d2aaf078e967bb626cf50c53d679aad71aeaf9 Author: Ed Maste AuthorDate: 2022-11-23 17:14:18 +0000 Commit: Ed Maste CommitDate: 2022-11-29 21:04:05 +0000 csh: install hard link with same mode as target Previously when using NO_ROOT we recorded METALOG entries for the /.cshrc hard link with a different file mode than the link target, which is not permitted. We cannot just set LINKMODE here as it would also apply to the hard link for the tcsh binary. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37499 --- bin/csh/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 2281c11538d0..d59626703685 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -162,6 +162,9 @@ beforeinstallconfig: rm -f ${DESTDIR}/.cshrc afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc + # XXX Set link mode explicitly via -m. We cannot use LINKMODE for this + # link, as it would also apply to the tcsh link above. + ${INSTALL_LINK} ${TAG_ARGS} -m ${CONFMODE} ${DESTDIR}/root/.cshrc \ + ${DESTDIR}/.cshrc .include