From owner-freebsd-questions@freebsd.org Sun Dec 22 20:09:12 2019 Return-Path: Delivered-To: freebsd-questions@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 036C61DBA8B for ; Sun, 22 Dec 2019 20:09:12 +0000 (UTC) (envelope-from contact@evilham.com) Received: from yggdrasil.evilham.com (yggdrasil.evilham.com [46.19.33.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47gtqB6bdlz3JZ1 for ; Sun, 22 Dec 2019 20:09:10 +0000 (UTC) (envelope-from contact@evilham.com) Received: from yggdrasil.evilham.com (unknown [IPv6:2a0a:e5c1:121:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by yggdrasil.evilham.com (Postfix) with ESMTPSA id 47gtq259Jfz3wf3; Sun, 22 Dec 2019 21:09:02 +0100 (CET) From: Evilham To: Andrea Venturoli Cc: freebsd-questions@freebsd.org Subject: Re: Some comments about /usr/bin/diff References: <5ced220c-257d-280c-6c9a-7bd3242c40d8@netfence.it> In-reply-to: <5ced220c-257d-280c-6c9a-7bd3242c40d8@netfence.it> Date: Sun, 22 Dec 2019 21:09:00 +0100 Message-ID: <74d50f0a-886c-4e42-b70e-614dd057788f@yggdrasil.evilham.com> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Rspamd-Queue-Id: 47gtqB6bdlz3JZ1 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=evilham.com; spf=pass (mx1.freebsd.org: domain of contact@evilham.com designates 46.19.33.155 as permitted sender) smtp.mailfrom=contact@evilham.com X-Spamd-Result: default: False [-6.49 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; IP_SCORE(-3.69)[ip: (-9.86), ipnet: 46.19.32.0/21(-4.93), asn: 196752(-3.67), country: NL(0.03)]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[evilham.com,none]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:196752, ipnet:46.19.32.0/21, country:NL]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Dec 2019 20:09:12 -0000 Hello Andrea, On dg., des. 22 2019, Andrea Venturoli wrote: > I recently upgraded a box from 11.3 to 12.1 and I see diff has > changed a > lot: IIUIC on 11.3 I had GNU diff (possibly from > /usr/src/contrib/diff?), while on 12.1 I have a different > version (I > believe it's BSD diff, from /usr/src/usr.bin/diff). > I don't believe this change comes from some local settings of > mine, but > I didn't see it mentioned in the release notes (either for 12.0 > or 12.1). > I think I know the reasons behind this (licenses) and I > understand it: > only, if I had known, I wouldn't have lost almost one day after > a script > that used to work before. This is directly from UPDATING: 20170420: GNU diff has been replaced by a BSD licensed diff. Some features of GNU diff has not been implemented, if those are needed a newer version of GNU diff is available via the diffutils package under the gdiff name. But to be fair I am unsure checking this file is recommended anywhere on the documentation for "normal" update flows; maybe it should be? There is a note on the Release notes for 11.2: The BSD-licensed diff(1) utility has been imported from OpenBSD, which is installed if WITHOUT_GNU_DIFF is set in src.conf(5), and otherwise not installed by default. [r331465] But I didn't see a note about the default changing on the release notes for 11.3, 12.0 or 12.1. If that changed (and it looks like it did as I don't have GNU diff) maybe the man src.conf shouldn't be talking about WITHOUT_GNU_DIFF any longer as it does nothing? Hopefully someone can confirm this. Your other comments regarding diff should probably be documented in form of a feature request + bug respectively. -- Evilham