svn commit: r315051 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin usr.bin/diff usr.bin/diff/tests

[Baptiste Daroussin]

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20170313/3ddb05ab/attachment.sig>