From nobody Mon Jun 07 19:58:01 2021 X-Original-To: freebsd-current@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 9E98F9521F1 for ; Mon, 7 Jun 2021 19:58:06 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound4s.ore.mailhop.org (outbound4s.ore.mailhop.org [54.185.97.28]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4FzPLQ2kLhz4SlD for ; Mon, 7 Jun 2021 19:58:06 +0000 (UTC) (envelope-from ian@freebsd.org) ARC-Seal: i=1; a=rsa-sha256; t=1623095885; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=DOrgYS+SBQKFDQO+dT8XvGNy/v6R+XSPeVkpkZmjcD4yWMdxwWduAder6OvcW70RiX2y/ryXd2ZSM 02mBEIcEcyWH153RJMXUxxhCTgay52i1WJAuJEYt8iRs6EhMk0CGkpO9i7c5NlYMi6efEMKdfb+wID ox4CywdTvvGJZz5yunv2U+mcdyEX7fnasz0lb6U72qZlC8HwbJiLWwyq5y3Fbk8ac3wV+nli8hncrG ilqgs0gsuAEkdNfKC43qtm1iOYTQcXcAPllX/ykrZ1lVNQ49YUqmZZ4cd/RCq3zmpaVQBqWkvWZqj+ fwrybsXaIhxVVWE418gosWufZl1414A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:dkim-signature:from; bh=NUVud0DNdCOBO0oF3ngpf7BtLRUJIGYTlvyz2dFV0Oo=; b=NDX9N/S52CzHMVNf6gWfWvq7hfeyTCTHD4XzLJB8CnEv6l6yvqaPLVp6/B/OhH+5Hf9UydIZDbGiL l8SqpJK0gtYbiNooyvQ3WEx82iyAs0PeIVOK1VTTf/EvmOU19QlKwz99NkNWntYAoKeYcZXY4hmEWZ te1oORgzy/1iKeIXEB0EOhMefFWGoHs99QHuUOfpAc5BtZkia19j/cF43r7W8fv/9YfoB1lVRxKffG LPDGDOTtQkpfQOAFFNMVptDzbCThmCW0yUQ4u+mjC793xbCjoMdB+SsKL5+Y2FIimM51WTUreDaaqy iPU+J7RWvwaLZNt6yeR0CH06T96PriQ== ARC-Authentication-Results: i=1; outbound4.ore.mailhop.org; spf=softfail smtp.mailfrom=freebsd.org smtp.remote-ip=67.177.211.60; dmarc=none header.from=freebsd.org; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:content-type:references:in-reply-to: date:cc:to:from:subject:message-id:from; bh=NUVud0DNdCOBO0oF3ngpf7BtLRUJIGYTlvyz2dFV0Oo=; b=pelFcQRJjXcjFki0XxWDQj5Cm16S8GkEl0XcIjTrEaZonOmdi13E0F9GW+W34j06W7bI+cS8+P56I vmwJw9ntNe+st6BjLEUqrMdIjVwKGerut92MwOwxWz+vlIUtTy8pKlM1il1+a4waQwUNMwMtS6lQ2f vk7Agqhd4PaUj7WmnSIoZ4MrmsVPAAEmYN4MHZB3QNqIaOEXkEMgDqpYKnrydwjqcbdd9anyZ0fm1t BU4SIjIb5lA3ON4QrpZDfrGFyI/AO608JnX/uB8KtTM9kKWeHWCmLTECz4tO2SC7wcfUYYAbdXzI79 CvyW0Wo2+ihzlvzMNtJxlgETCfw318A== X-Originating-IP: 67.177.211.60 X-MHO-RoutePath: aGlwcGll X-MHO-User: a9f2190d-c7ca-11eb-a655-89389772cfc7 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (c-67-177-211-60.hsd1.co.comcast.net [67.177.211.60]) by outbound4.ore.mailhop.org (Halon) with ESMTPSA id a9f2190d-c7ca-11eb-a655-89389772cfc7; Mon, 07 Jun 2021 19:58:04 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id 157Jw1Up053754; Mon, 7 Jun 2021 13:58:01 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <2a280bc83d9a6289b3443329eb15bb0cb6c75063.camel@freebsd.org> Subject: Re: Files in /etc containing empty VCSId header From: Ian Lepore To: Warner Losh , John Baldwin Cc: Michael Gmelin , "freebsd-current@freebsd.org" Date: Mon, 07 Jun 2021 13:58:01 -0600 In-Reply-To: References: <20210520183705.3673dfb2@bsd64.grem.de> <2bd37d63-1806-b621-a32b-954c912bd16b@FreeBSD.org> Content-Type: text/plain; charset="ASCII" X-Mailer: Evolution 3.28.5 FreeBSD GNOME Team List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FzPLQ2kLhz4SlD X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Mon, 2021-06-07 at 13:53 -0600, Warner Losh wrote: > On Mon, Jun 7, 2021 at 12:26 PM John Baldwin wrote: > > > On 5/20/21 9:37 AM, Michael Gmelin wrote: > > > Hi, > > > > > > After a binary update using freebsd-update, all files in /etc > > > contain > > > "empty" VCS Id headers, e.g., > > > > > > $ head /etc/nsswitch.conf > > > # > > > # nsswitch.conf(5) - name service switch configuration file > > > # $FreeBSD$ > > > # > > > group: compat > > > group_compat: nis > > > hosts: files dns > > > netgroup: compat > > > networks: files > > > passwd: compat > > > > > > After migrating to git, I would've expected those to contain > > > something > > > else or disappear completely. Is this expected and are there any > > > plans > > > to remove them completely? > > > > I believe we might eventually remove them in the future, but doing > > so > > right now would introduce a lot of churn and the conversion to git > > had enough other churn going on. > > > > We'd planned on not removing things that might be merged to stable/12 > since > those releases (12.3 only I think) will be built out of svn. We'll > likely > start to > remove things more widely as the stable/12 branch reaches EOL and > after. > > Warner It would be really nice if, instead of just deleting the $FreeBSD$ markers, they could be replaced with the path/filename of the file in the source tree. Sometimes it's a real interesting exercise to figure out where a file on your runtime system comes from in the source world. All the source tree layout changes that happened for packaged-base makes it even more interesting. -- Ian