Date: Mon, 13 Mar 2017 16:40:59 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: mmel@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r315051 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin usr.bin/diff usr.bin/diff/tests Message-ID: <20170313154059.ibzxffsw46uz73lk@ivaldir.net> In-Reply-To: <758cfa1c-0985-f392-aa74-228f257a676c@freebsd.org> References: <201703110501.v2B51UJQ045535@repo.freebsd.org> <758cfa1c-0985-f392-aa74-228f257a676c@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--o4igkzfpgvy7d5ao Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 13, 2017 at 09:55:52AM +0100, Michal Meloun wrote: >=20 >=20 > On 11.03.2017 6:01, Baptiste Daroussin wrote: > > Author: bapt > > Date: Sat Mar 11 05:01:29 2017 > > New Revision: 315051 > > URL: https://svnweb.freebsd.org/changeset/base/315051 > >=20 > > Log: > > Import diff from OpenBSD and remove GNU diff > > =20 > > Some of the modifications from the previous summer of code has been i= ntegrated > > Modification for compatibility with GNU diff output has been added > > =20 > > Main difference with OpenBSD: > > Implement multiple GNU diff options: > > * --ignore-file-name-case > > * --no-ignore-file-name-case > > * --normal > > * --tabsize > > * --strip-trailing-cr > > Make diff -p compatible with GNU diff > > Implement diff -l > > Make diff -r compatible with GNU diff > > =20 > > Capsicumize diffing 2 regular files > > Add a simple test suite > > =20 > > Approved by: AsiaBSDcon devsummit > > Obtained from: OpenBSD, GSoC > > Relnotes: yes > >=20 >=20 > It seems that this commit breaks mergemaster (but I'm not sure): >=20 > ----- > diff: unable to limit rights on: /etc/casper/system.dns: Function not > implemented > --- >=20 > Michal Yes you were right I forgot a test against systems without capsicum, but th= at makes me wonder why you do build your system without capsicum? Best regards, Bapt --o4igkzfpgvy7d5ao Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAljGvW4ACgkQY4mL3PG3 Plrlvw//fYzrrHjyZ/sDad81lFVCO5J45bI5pgNOnFLzuCXy+pm4AzGFyF/RZL5Q kKtk2zKirhfuMKHMJXxl2Rt2cErkjLm43wCk4E7MAyFT50KD/i6ntGbyXFgFnAvd lXFdQ7vptJVnr12h/30SfZsr91hBXNQedIKFyaqhA/qeb8xhdeD4hux5+cI5Wmpy uLJMl4KZLNYFIbR47vfz0UhtvKvYAkcx5Rzmb6aYzsyC1tL2gYuilJLUqXCw1iSW 6rKeX9brd5OYSwrhNY0ayH69pW32j3R8B+NWXWvqCW+0+N1Lue5yEORD9ZOsGHtl 0lspexmlqrdcjGqjO5ipTYwiahcnmg6qa9cTqrzuyMHWgzJcBWdfPG7Oun2e8pt5 TriaqZoNshMCwzX5vEyqYQ96Qs9RU8hq5dkpF1reKxAp7Iq7iOLq8bFC/ao/DGDz 0gXWn0nHs7NTmNlkk8QZDM8tgeBchPRtG8vJEpL9kMDR6FjiCfmn5a1nMRJeR7pc 3x1furz2WBrUJxt1MzROR0HKJRZxTr/M30QJEIzpL3V0u/3ybzOyA+bw2EKTGAQF dg/P5K377qjt+eQENqklEZiMQ50Re8YKREWvIxYqQKfFcz2IklJFGJv+fnKpszpH OrkRGSLXVCr3yhdP0n/qLnM2CEkEPcV0DE4WLOorm/7v1xe0iJE= =zK7Y -----END PGP SIGNATURE----- --o4igkzfpgvy7d5ao--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170313154059.ibzxffsw46uz73lk>