From owner-svn-src-head@freebsd.org Mon Mar 13 16:45:27 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7CE1D0A5EB; Mon, 13 Mar 2017 16:45:27 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6616A17F2; Mon, 13 Mar 2017 16:45:27 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-wm0-x230.google.com with SMTP id v186so45081280wmd.0; Mon, 13 Mar 2017 09:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=osH4URHcfN8dQvsjzyKqEfvyU5bAhUDPaic/j8yUXh4=; b=Dvn7tsFIdKlZxQRXuPzzBj7bqES4GbGuXi71FgFdx4wRDvH2pDZM9mUlKiP7+ZG3/g G9MIZ4Fj3bfD28MY6obTzaTKUKsZzNJJCvdCklm96aUtcfnoDn08CNbR6q7brkcFAjAt lf9/E+ZPGnyLm0O91iAcLaVpCedXhvlaJuJ8ldWyv3J3R8LWIc0scXtAWIZ2KJntasu3 4Tk6i+b83SlaxsgUTeqb1JpAdhYpj1lKHSjnySHmu1wfDAseld+MQnzp1JRYalYdS3dw Oq9k/QxvXWpxgDU5kfNfUVSIaQByLysS2NUS7aUJ+uqJMUKTlTlesBzgc0jtCV09ixbx ZOKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=osH4URHcfN8dQvsjzyKqEfvyU5bAhUDPaic/j8yUXh4=; b=WHI6bHRFUhFtFWkGYwY3jUcdk+cDXf0mkjEL/TugGKgKltfHLuGlA5+l5Fhl57ooNg lImTFU5jyMX1qTXwq/+rJ6QiWCxU6eaeUyuFIWL3Pg94Uj7wvCrIOH9dryVRXH82irC/ CNZNDHZtPwokE0r9Xer62IHHkU0jqidaXO9IhI45hAl0AUHYsruIp2OcYfVoM71dhz5F PfM8fOFj36l3QOnvfb/8OvCv53DnRP/bGb6WAnjWwssek9Tm60HM250KG8mray+bBiXn yDzwteXVoMvhZHi79jS8hZa+YykJDzPMMQjzFGUGC9fAJ3GLT2zAatnM30C3o/uESOtc MqGw== X-Gm-Message-State: AFeK/H196ijvakfLvNepqLQVPbCSwnBiKtdTMuwPyw7FEKNOzsDi7LSRsuAlPJ/TE8ql+ago4DMBifEd6GsuTQ== X-Received: by 10.28.72.193 with SMTP id v184mr11175744wma.105.1489423525736; Mon, 13 Mar 2017 09:45:25 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.128.133 with HTTP; Mon, 13 Mar 2017 09:45:25 -0700 (PDT) In-Reply-To: <20170313154059.ibzxffsw46uz73lk@ivaldir.net> References: <201703110501.v2B51UJQ045535@repo.freebsd.org> <758cfa1c-0985-f392-aa74-228f257a676c@freebsd.org> <20170313154059.ibzxffsw46uz73lk@ivaldir.net> From: Adrian Chadd Date: Mon, 13 Mar 2017 09:45:25 -0700 Message-ID: Subject: Re: svn commit: r315051 - in head: . gnu/usr.bin gnu/usr.bin/diff usr.bin usr.bin/diff usr.bin/diff/tests To: Baptiste Daroussin Cc: Michal Meloun , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Mar 2017 16:45:27 -0000 size. think 32/64mb RAM, 8mb flash storage. -adrian On 13 March 2017 at 08:40, Baptiste Daroussin 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