From owner-freebsd-stable@freebsd.org Thu Dec 31 08:12:43 2020
Return-Path: <owner-freebsd-stable@freebsd.org>
Delivered-To: freebsd-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 335714B832A
for <freebsd-stable@mailman.nyi.freebsd.org>;
Thu, 31 Dec 2020 08:12:43 +0000 (UTC)
(envelope-from zarychtam@plan-b.pwste.edu.pl)
Received: from plan-b.pwste.edu.pl (plan-b.pwste.edu.pl
[IPv6:2001:678:618::40])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "plan-b.pwste.edu.pl", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4D619Q01Gmz4RM4
for <freebsd-stable@freebsd.org>; Thu, 31 Dec 2020 08:12:41 +0000 (UTC)
(envelope-from zarychtam@plan-b.pwste.edu.pl)
Received: from fomalhaut.potoki.eu ([IPv6:2001:470:71:d47:294e:c4f4:4599:8768])
(authenticated bits=0)
by plan-b.pwste.edu.pl (8.16.1/8.16.1) with ESMTPSA id 0BV8CTWk076529
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO);
Thu, 31 Dec 2020 09:12:38 +0100 (CET)
(envelope-from zarychtam@plan-b.pwste.edu.pl)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=plan-b.pwste.edu.pl;
s=plan-b-mailer; t=1609402358;
bh=mPCOLpjjcdLd8JA/urj5pqnFWepCSo9XhBM6fWmVu1I=;
h=To:References:From:Subject:Date:In-Reply-To;
b=yyTNdOWZhlYmoN7DzqpAzpl7xe77qPKJpPta5lRY8UiPJC3MvyipojOYTI/v/YqDK
v+ryHZCDx95aW2OmP5/f7I7hSbnR4klCOdMQkNDxCn7oUQXs2RQmsVjgl7s5aoUxAp
7HM4l7MRSt37n+LI/Tq4+Rl61F3cbJpb6gRR5TKz+X4nEaHvULuvyGd1QO32swJX2U
VIzip5NP85mB3Wa7FedZ0WdPTqfoJVeOlekJM6vnrzfX1hIq29p4fzmwbluRBjeFRz
1nGPZfrJtf05Zw80Ny7PCG1rG29ApSaG4ZW5YS2+kMIBI7+nN9yPGCqJd5nCTHTyyg
hZkVl7h/HkgMw==
X-Authentication-Warning: plan-b.pwste.edu.pl: Host
[IPv6:2001:470:71:d47:294e:c4f4:4599:8768] claimed to be fomalhaut.potoki.eu
To: Helge Oldach <freebsd@oldach.net>, freebsd-stable@freebsd.org
References: <202012310750.0BV7oH12097374@nuc.oldach.net>
From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend
Message-ID: <46cc263a-7469-7319-5966-a7905845d44b@plan-b.pwste.edu.pl>
Date: Thu, 31 Dec 2020 09:12:29 +0100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101
Thunderbird/78.6.0
MIME-Version: 1.0
In-Reply-To: <202012310750.0BV7oH12097374@nuc.oldach.net>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Language: en-US
X-Rspamd-Queue-Id: 4D619Q01Gmz4RM4
X-Spamd-Bar: ---
Authentication-Results: mx1.freebsd.org;
dkim=pass header.d=plan-b.pwste.edu.pl header.s=plan-b-mailer
header.b=yyTNdOWZ;
dmarc=pass (policy=none) header.from=plan-b.pwste.edu.pl;
spf=none (mx1.freebsd.org: domain of zarychtam@plan-b.pwste.edu.pl has no SPF
policy when checking 2001:678:618::40)
smtp.mailfrom=zarychtam@plan-b.pwste.edu.pl
X-Spamd-Result: default: False [-3.80 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[];
ARC_NA(0.00)[];
R_DKIM_ALLOW(-0.20)[plan-b.pwste.edu.pl:s=plan-b-mailer];
MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[];
TO_DN_SOME(0.00)[]; DWL_DNSWL_MED(-2.00)[pwste.edu.pl:dkim];
NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain];
HAS_XAW(0.00)[]; NEURAL_SPAM_MEDIUM(1.00)[1.000];
SPAMHAUS_ZRD(0.00)[2001:678:618::40:from:127.0.2.255];
TO_MATCH_ENVRCPT_SOME(0.00)[];
DKIM_TRACE(0.00)[plan-b.pwste.edu.pl:+];
RCPT_COUNT_TWO(0.00)[2];
DMARC_POLICY_ALLOW(-0.50)[plan-b.pwste.edu.pl,none];
NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record];
FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+];
RBL_DBL_DONT_QUERY_IPS(0.00)[2001:678:618::40:from];
ASN(0.00)[asn:206006, ipnet:2001:678:618::/48, country:PL];
RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable];
RCVD_COUNT_TWO(0.00)[2]
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-stable>,
<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Dec 2020 08:12:43 -0000
W dniu 31.12.2020 o=C2=A008:50, Helge Oldach pisze:
> Warner Losh wrote on Wed, 23 Dec 2020 17:58:10 +0100 (CET):
>> On Wed, Dec 23, 2020 at 3:35 AM Marek Zarychta < zarychtam at plan-b.p=
wste.edu.pl> wrote:
>>> In file header, we have now only $FreeBSD$ since svn tags
>>> disappeared after the transition. Adding ident tags to certain
>>> files which are updated by mergemaster(8) or etcupdated(8) would be
>>> appreciated.
>> mergemaster and etcupdate can cope without them.
> Mergemaster is looking for "[$]${ID_TAG}:" (note the colon) which will
> break with the git "$FreeBSD$" scheme. This makes autoupdate annoyingly=
> explicit as local changes to /etc files will no longer be recognized as=
> "accepted".
>
> Furthermore, will the replay from git to svn (for stable branches)
> retain the existing "$FreeBSD: ..." tags? I guess not...
>
> The only sensible way out is to retire mergemaster and switch to
> etcupdate. This would affect any stable/1? users building from source.
>
> IMHO this is suprising behaviour and deserves a note in UPDATING.
>
> Kind regards
> Helge
>
We can still make use of these $FreeBSD$ tags with Git clean and smudge
filters.[1] This will help to keep the track of files updated by
mergemaster(8) or etcupdate(8). The whole work can be done at
local git repository administrator level.
The filters should be applied to only the files important for mergemagste=
r. Applying filters to the whole repository incredibly slows it down.
So far I found the reasonable subset of filtered files looking like this:=
etc/*
etc/*/*
libexec/rc/*
libexec/rc/rc.d/*
*.conf
dot.??*
lib/libc/gen/shells
lib/libc/net/hosts
lib/libpam/pam.d/*
usr.sbin/cron/cron/crontab
crypto/openssh/ssh*_config
[1]https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes
Regards,
--=20
Marek Zarychta