From nobody Wed Sep 10 20:41:51 2025 X-Original-To: pkgbase@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 4cMXfl3x8kz66rXn for ; Wed, 10 Sep 2025 20:41:51 +0000 (UTC) (envelope-from bugzilla-noreply@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 4cMXfl3VjXz448V for ; Wed, 10 Sep 2025 20:41:51 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757536911; 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: in-reply-to:in-reply-to:references:references; bh=DxEBfu8S6J7C0VqiOy1ZtJ1bUtj4bQ1o2qbfl5Xb6ZU=; b=mIGEQrfGzZM+IP9O9BcWXyfCgKGPozUb18kB2/Pz+dX//PxutP35nZusxHRqXZQ7TPzsd0 jIKBvf6oL0rEjQI44CeWvpLEhHgt5k52+jIjjs+cjH+K7xZMp6C252HUw0gKCFHb1E5ZYK Gh1qPRbRBQV0hdUYfBs6F2isrvAB3oxZmjMbjhxJ/edMaNm5u580W6mY3s6x0RGVn4pb57 q4+qN0keDdU9N/ZuS0SwFT9bRqX2lHQCHO+pJouVH9+Bfitqv+SgzdSgCYkG+Wp6jkGvtx 2Cnl0Y2LGglriH/997hBq3N7e2mjItXgo/xr1WZBBZY92C9of+x8wLViXA8zcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757536911; 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: in-reply-to:in-reply-to:references:references; bh=DxEBfu8S6J7C0VqiOy1ZtJ1bUtj4bQ1o2qbfl5Xb6ZU=; b=TNt+u/WXiP86UCoFlTkRF8Nb0jiw+aHvbNDQMmOy/VyTOnCFnXLH7e1hR/fNfTo6p7UJMX kKn542CDG8VF+dpDT1/9UybURvdC/21Cbm1QlYVWOwx5uJHr0U3sjWeIyWH2rObF5B9bmE GYtaeuh//b5saBwBnJcvmVJxoRkKn4thxC47HF0ONTu+P9Tpo1bf4u8OB9aTASIk0+wrU1 zKQPTrwludFoO2gEv+EglgXxVwxUaghYEEeybDxskDpH95tkUkHR0i0q++U2ho0nAHwhAg TimTGqEqP8LGIoO+EOHVpA7ADHYtWOA7nNpkV0tKwGTpu00ROrsbMh4G8PmOgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757536911; a=rsa-sha256; cv=none; b=ar8rkSpKlRkosBv/5UYpf2cXY77iRPwCaSeK43+zayFzLY1JuHB9UYPlnr0fdgiHWjmApZ t7+/xwDD3oMeutK6U7M19SSnWEpH4HZZ8Vmlm5G8G8DkcPQHQAvHR+HS89Lt3E1qwle6DK h5CCW3KmCCf25CJ4jdBDeftNbplUEw2vyx+n4NRwzT7mcTfcTBsgn2AyZBGp/UsnbDsw1M u79tiy2br+uQWIz3vxa646MWjb8NugzJc/I8/NV2+EFQ7n10wN1eyjHiHFJ4LuePp5NzBL rGazTGCeM/tfHY8mwQxqOBN1gXo2CETtrSudmirEvLF9hXUXbgK8C8ebZsm1Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 4cMXfl3425zd58 for ; Wed, 10 Sep 2025 20:41:51 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 58AKfpvn030544 for ; Wed, 10 Sep 2025 20:41:51 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 58AKfpl0030543 for pkgbase@FreeBSD.org; Wed, 10 Sep 2025 20:41:51 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: pkgbase@FreeBSD.org Subject: [Bug 289097] Base upgrades must not lose user customisations in dot files such as /root/.cshrc and /root/.profile Date: Wed, 10 Sep 2025 20:41:51 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: conf X-Bugzilla-Version: 14.3-RELEASE X-Bugzilla-Keywords: pkgbase X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ivy@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@FreeBSD.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D289097 --- Comment #6 from commit-hook@FreeBSD.org --- A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Df103de98b855e69f1c0e1e90f7a174ae0= 6acf892 commit f103de98b855e69f1c0e1e90f7a174ae06acf892 Author: Lexi Winter AuthorDate: 2025-09-02 08:22:56 +0000 Commit: Lexi Winter CommitDate: 2025-09-10 20:41:08 +0000 sh, csh: Add config tag to /.profile and /.cshrc The file /.profile is installed as a hard link to /root/.profile. The file in /root has the config tag, but the file in / does not, which causes it to be overwritten by pkg upgrade. Since they're linked, this also overwrites the file in /root. Add the config tag to the file in / as well, so pkg treates both links as config files and won't overwrite them. For stable/14, also add this to /.cshrc, which is no longer installed in 15.0. PR: 289097 MFC after: 3 days Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D52162 (cherry picked from commit aa730a66bc74696df85b21ec2719c75d8eab8c9f) sh: Fix non-NO_ROOT installconfig When building without NO_ROOT, ${TAG_ARGS} is not set, which means we pass ",config" as an install(1) argument. Only add the config tag if ${TAG_ARGS} is defined to begin with. Fixes: aa730a66bc74 ("sh: Add config tag to /.profile") Reported by: bz (cherry picked from commit b197d2abcb6895d78bc9df8404e374397aa44748) bin/csh/Makefile | 4 ++-- bin/sh/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --=20 You are receiving this mail because: You are on the CC list for the bug.=