From nobody Thu Mar 23 15:10:30 2023 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 4Pj80k5JfPz41SSx; Thu, 23 Mar 2023 15:10:30 +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 4Pj80k4pV1z4c6m; Thu, 23 Mar 2023 15:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584230; 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=eOLuzcyQtFwC+NgWz1IHbyj88n3FKKGSVmTgSveQxfA=; b=Yz4XbaRq20ydZe7TWh4wTD1lhyASRTHD88lyX8LzXakIY7WJEuWYTnpfhTkWjCdWFg4+4C Bqgln3UqSrLxnwgLs5INR4tQUCNILBXYZFLADtGeVa/KKipAWKNnhtg+c2pFDzv/i1B97g mNrbVAI9PO/9U8/kqpGXE5CuQ6LdSiGFl4XIxJWkkSkohaA6+Mf1mFcsEojZDrVeMp5VQn mh1WAX1nepildFO0a6KjsjNXbhIHecNzRr6TiA1p90VsuXfCZzDRNidjPcT/wMPBNPquzy w2WUnk67zA+jd6macfNjVXOV8O+qxQ54uBOkChFvZPkg0j+of8qIpACMyfs43Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584230; 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=eOLuzcyQtFwC+NgWz1IHbyj88n3FKKGSVmTgSveQxfA=; b=e019f42Ju1Hdd1UBcgR8tjl/CZxVGd8zvsMDFedG6gIls38Ga86g9z3td0yE4o1EUgFX8s dKLonmPJspeFbyRQCjgtRdIv6h6oQyPnzD80zbsJsRiDmlJ9CmFTj2xmjkF+JnGe0YKip/ 0mEZcskuUHkirNpuYC63dPsfJf1Bm5f2JT4ZdePgPsmxtL02whK89YPTkb4aJzF6EOieQd DKOIYgf3j44ZD0gVoPXzbXWRAAFIyrxkh1Fy0sRq31SqPz64n3ikPVgdEPs/Ql25sqBo1K Ou9KfNSWQyraI1cy+uW/ug1jKht6rqOUMH9yQyuqG/x9xmoIIfQc0R4YNiVZWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679584230; a=rsa-sha256; cv=none; b=Um+YmzaGkMZ/vhI23B6SADSH/IxbPoEPmRdBvHFAYTkncU1UNfwIipmkHCWPHOMW11iwJd hENHISGBVxH0DKa7yvJTeHjU7vop8cRmLxM70zNLV3YExatCCZvEyTnBsAdgSNZu2AmFSL 1i/ELGF1M/R8ISTfE2OMC15brH+ZY6shVEZkazqwTmcDP7U8fLE9E9HVsLXD5pWBqjYdos J30lYTxCNtV56YIxpgQuO7aZTWud8f4hdEHqW1z7rrrBpOOzSKWEiBvIkCKDtOYTxYY+1r KmRdJpyz4+OfR1YvkiBUkCZTcvTIfBhDdRG+Gm/34TkIlRnaevk6I8rU/70KTA== 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 4Pj80k3w9Bzgjq; Thu, 23 Mar 2023 15:10:30 +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 32NFAUIN054177; Thu, 23 Mar 2023 15:10:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NFAUki054176; Thu, 23 Mar 2023 15:10:30 GMT (envelope-from git) Date: Thu, 23 Mar 2023 15:10:30 GMT Message-Id: <202303231510.32NFAUki054176@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: c702ed6eb8d4 - stable/13 - csh: install hard link with same mode as target 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee commit c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee Author: Ed Maste AuthorDate: 2022-11-23 17:14:18 +0000 Commit: Ed Maste CommitDate: 2023-03-23 14:33:01 +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 (cherry picked from commit 67d2aaf078e967bb626cf50c53d679aad71aeaf9) --- bin/csh/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 9aabc047493a..ad1f2011f2cf 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -159,6 +159,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