Date: Mon, 13 Mar 2017 09:45:25 -0700 From: Adrian Chadd <adrian.chadd@gmail.com> To: Baptiste Daroussin <bapt@freebsd.org> Cc: Michal Meloun <mmel@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@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: <CAJ-VmonSMzRXv7wz9WEkQcyKr%2BTtTBF0PfoOhiwteAmiTuFz8A@mail.gmail.com> In-Reply-To: <20170313154059.ibzxffsw46uz73lk@ivaldir.net> References: <201703110501.v2B51UJQ045535@repo.freebsd.org> <758cfa1c-0985-f392-aa74-228f257a676c@freebsd.org> <20170313154059.ibzxffsw46uz73lk@ivaldir.net>
next in thread | previous in thread | raw e-mail | index | archive | help
size. think 32/64mb RAM, 8mb flash storage. -adrian On 13 March 2017 at 08:40, Baptiste Daroussin <bapt@freebsd.org> wrote: > On Mon, Mar 13, 2017 at 09:55:52AM +0100, Michal Meloun wrote: >> >> >> 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 >> > >> > Log: >> > Import diff from OpenBSD and remove GNU diff >> > >> > Some of the modifications from the previous summer of code has been integrated >> > Modification for compatibility with GNU diff output has been added >> > >> > 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 >> > >> > Capsicumize diffing 2 regular files >> > Add a simple test suite >> > >> > Approved by: AsiaBSDcon devsummit >> > Obtained from: OpenBSD, GSoC >> > Relnotes: yes >> > >> >> It seems that this commit breaks mergemaster (but I'm not sure): >> >> ----- >> diff: unable to limit rights on: /etc/casper/system.dns: Function not >> implemented >> --- >> >> Michal > > Yes you were right I forgot a test against systems without capsicum, but that > makes me wonder why you do build your system without capsicum? > > Best regards, > Bapt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmonSMzRXv7wz9WEkQcyKr%2BTtTBF0PfoOhiwteAmiTuFz8A>