From owner-freebsd-current@FreeBSD.ORG Sat Jul 27 15:08:26 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E899C2F9 for ; Sat, 27 Jul 2013 15:08:26 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm20.bullet.mail.bf1.yahoo.com (nm20.bullet.mail.bf1.yahoo.com [98.139.212.179]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 710DD292C for ; Sat, 27 Jul 2013 15:08:26 +0000 (UTC) Received: from [98.139.212.152] by nm20.bullet.mail.bf1.yahoo.com with NNFMP; 27 Jul 2013 15:08:19 -0000 Received: from [98.139.213.9] by tm9.bullet.mail.bf1.yahoo.com with NNFMP; 27 Jul 2013 15:08:19 -0000 Received: from [127.0.0.1] by smtp109.mail.bf1.yahoo.com with NNFMP; 27 Jul 2013 15:08:19 -0000 X-Yahoo-Newman-Id: 170996.99060.bm@smtp109.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 1l4IKDEVM1kOzMyvfo61.BF9i6.N55Y3mtlN0Mgw6NcsGHr yrNgyFOdY4GJrz2lSH4WnOhwsBHXbiqS3cVlz5x80bskNmVV0b2x8iCklNNi a6ckFmFSElSH9MtAw6TVF_m3GLZF1dVmiioJbDWtkMxnxsMQXyTkSiPVHJoY 4YEv1lIat8Pz17mam78OWRyBZqVmuTBNqdR7Fs7CweD55bm94jKV8TOwi4Dj qhztsA3UMWWugov1YqcXwFWIihitrD3cJdjGQbLVKWAFTih8CZmy6SMRffnn 63zxTO96o51ynej5j9zTSUdwsKTMiAcMEOUrpnseyCiOYwQG.GH_a8SYpslm jRLl90DwEUt7bFraL2WnmYnLMqrNrJ_eskn6tYBIfiOK1lMjLscBzZL3D1qf WPpQrzRxA..TyGLH.WnPWrf6Hs52aT.9pWh.eTnsjVP3YcaT7MjgrxFh4t.m DTpdNQa1GStwnQMBmxw71K0GpV6pXay64GQtL1QdA4U.KLA9AV2E_xd2Qygf MIoYcSy1hl1DEhH3jykGihTcKnZauRwCx9GX3uAIFBZpUE0zwzx.TuP9DllC 7pxw._fml_Z3VjmR7_21IemkNVkkw8U82opG.sRQ6_9HxqMnrMDXvXAHv6mx kDnxee6z2C2EqywhUfDzUad0JC2F4.ho0jDGt4_PQV_tQ9YEQhktoz8Dndf_ NqrIWxYNCmig9e08ul.V9cq2hgebuZUVM7.zzsE64oXCSvRxFCG1y.RrBQL0 5pGiJArK9MvKeE_F4_bn6KJQ5DQ-- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with ) by smtp109.mail.bf1.yahoo.com with SMTP; 27 Jul 2013 08:08:19 -0700 PDT Message-ID: <51F3E261.9090903@FreeBSD.org> Date: Sat, 27 Jul 2013 10:08:17 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130630 Thunderbird/17.0.7 MIME-Version: 1.0 To: Jan Beich Subject: Re: [Heads up] BSD-licensed patch becoming the default RSN. References: <51F2E627.9090907@FreeBSD.org> <1V2ssp-000Nrk-Q8@internal.tormail.org> In-Reply-To: <1V2ssp-000Nrk-Q8@internal.tormail.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: FreeBSD Current , Xin Li X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jul 2013 15:08:27 -0000 OK; On further revision ... On 26.07.2013 20:01, Jan Beich wrote: > bsdpatch doesn't list files of the failed hunks with -C and -s option. > This may be less convenient if you edit a patch directly rather than > regen it after polluting the tree. > > $ patch -CEfsp0 -i /path/to/varsym.diff > 1 out of 1 hunks failed > 1 out of 2 hunks failed > 2 out of 2 hunks failed > 1 out of 5 hunks failed > 1 out of 1 hunks failed > 1 out of 1 hunks failed > 1 out of 1 hunks failed > zsh: exit 1 > > $ gnupatch -CEfsp0 -i /path/to/varsym.diff > 1 out of 1 hunks failed--saving rejects to contrib/openbsm/etc/audit_event.rej > 1 out of 2 hunks failed--saving rejects to lib/libc/sys/Makefile.inc.rej > 2 out of 2 hunks failed--saving rejects to sys/security/audit/audit_private.h.rej > 1 out of 5 hunks failed--saving rejects to sys/security/audit/audit.h.rej > 1 out of 1 hunks failed--saving rejects to sys/bsm/audit_kevents.h.rej > 1 out of 1 hunks failed--saving rejects to sys/kern/syscalls.master.rej > 1 out of 1 hunks failed--saving rejects to sys/sys/priv.h.rej > zsh: exit 8 The change came from OpenBSD, which took it from DragonFlyBSD: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/patch/patch.c.diff?r1=1.49;r2=1.50 It was merged as part of some OpenBSD syncing in patch.c http://svnweb.freebsd.org/base?view=revision&revision=246091 Cheers, Pedro.