From nobody Wed May 29 07:57:37 2024
X-Original-To: dev-commits-src-main@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 4Vq1vP45yhz5M2BJ;
Wed, 29 May 2024 07:57:37 +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 4Vq1vP2SRKz4nBV;
Wed, 29 May 2024 07:57:37 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1716969457;
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=HNiHqohXBjAgpS5/BjV45FPF6avWVfsWBkK/u9VEuPM=;
b=en62ikyfidpW4C4/LIZH4Kadv+E5GGP4p/9lXPOROQzEnvW+ycwgB/TfTgHYHY4iE6daJa
VZo5wO0xAvnqyzUEAk6bZV0OqJ5qNF/eKqrEOEpLsd1CM9ygWSMtGwdqtN6qLqER3njcIU
zXjoh/7L5FFPqBr8STDycVXDiz4noOdE7ivKAt9AyUfNTDyMkJeYkld+zd6vJ36fY4OF5I
NAGx+7vJO0LHwLtv0AVzTQJKe1MUaVuWx1ReEWCBFs5Uup/RIBXIVaErG9DqOrlv5qjy+u
810DeEK7DpiRFNt3/eCvT8gwo03Cu2/QkgpdtQP2DKpfq4EoBL6cX2Cz5EYRPw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716969457; a=rsa-sha256; cv=none;
b=wyzed4SumlLKwb2DqvVXNOhS3cS2ECD+NUIB3V7w1SIiqwvYSLDD+ao74ezq95OZ0z7oHp
oeG40ut0Wps9HU0LMT8XgQjMo+sOVgeHUg3yz8+jQzCVDjpHCxI0p9Si+t37j8sMbQwZ2W
copqo7xsgnp5M9YGWaRsK3etBYxlzFt0iYFlXckVfY4LB7jI8CK0NsaOt5+2pNhmNhPBl5
SVOoTWXolQbV8QQG45L/6SBVErdH/KlhePvCa8/gloC3OmtMW5W9lpj/gO1ZV3GWI/HadQ
K/05Uay0Dd/XCDuC9yf1ap1d3AEJ//AcYxQqFRHQZX/v87qH3wtK/HeR2zQ9SA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1716969457;
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=HNiHqohXBjAgpS5/BjV45FPF6avWVfsWBkK/u9VEuPM=;
b=le6QEBxkkEYrXgstNNnBQuuJe0HuYJX/nPa7O5iF3tDI9IPIitYvKdzNG7W5An/QHJBCiM
JTqOXtFbn4NyvGCzUb5w6q25lPcmLcJc6mya+cQV285IsbwhOOy4aPhi7R9lYzGIXTKSZE
sJr7SmLaWanTN2oX8W10S9N283KJOOAkhQiBj5sYG8EQ3/ljDSXC0x1c1zt9h6adk7fkyP
0fojcBPH/3N+GFk3BKEr13eqpTZd+qGNvkRuuWjhf8v0cjNHOK9AO5lMCdNPvcJ/y4zTXI
VJXwtl5BB4wayuziorWxu9czYK9slKFIO5VMQFCnaS/5I9LOU+WvUhZJ2Rw5UQ==
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 4Vq1vP244Zzp2S;
Wed, 29 May 2024 07:57:37 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44T7vbLQ021398;
Wed, 29 May 2024 07:57:37 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T7vbf4021395;
Wed, 29 May 2024 07:57:37 GMT
(envelope-from git)
Date: Wed, 29 May 2024 07:57:37 GMT
Message-Id: <202405290757.44T7vbf4021395@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: dcb65c5a94d4 - main - csh: Remove hardlink /.cshrc
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: dcb65c5a94d4c622b1d486847dc20488f59974e7
Auto-Submitted: auto-generated
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=dcb65c5a94d4c622b1d486847dc20488f59974e7
commit dcb65c5a94d4c622b1d486847dc20488f59974e7
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-05-27 13:12:18 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-05-29 07:56:58 +0000
csh: Remove hardlink /.cshrc
Remove this historical artifact.
csh will try to use /.csrch if the user has no home directory defined which
is rather unlikely (To be exact if the concatenation of $HOME and "/.cshrc"
fail which is the same thing).
Also, with this change pkg will happily handle 3way merge for /root/.cshrc
Differential Revision: https://reviews.freebsd.org/D45382
Reviewed by: emaste, imp
Sponsored by: Beckhoff Automation GmbH & Co. KG
---
ObsoleteFiles.inc | 3 +++
bin/csh/Makefile | 9 ---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 70e6dcec50b1..bacd17a57b30 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20240527: csh: Remove hardlink /.cshrc
+OLD_FILES+=.cshrc
+
# 20240511: move file system driver manuals to section four
OLD_FILES+=usr/share/man/man5/autofs.5.gz
OLD_FILES+=usr/share/man/man5/cd9660.5.gz
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index d9f40f180343..6b05c01e0a61 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -159,13 +159,4 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
-beforeinstallconfig:
- rm -f ${DESTDIR}/.cshrc
-
-afterinstallconfig:
- # 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 <bsd.prog.mk>