From owner-freebsd-current@FreeBSD.ORG Sat Jul 27 01:02:26 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E5D04B9A; Sat, 27 Jul 2013 01:02:26 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 984D129F9; Sat, 27 Jul 2013 01:02:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1V2stn-0002Gy-OB; Sat, 27 Jul 2013 05:02:20 +0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:Date:X-TorMail-User:Content-Type:MIME-Version:References:In-Reply-To:Subject:Cc:To:From; bh=jVHwJLu9CxjduCVO73s5uGBx3YRIC2/54WLIBnYqWRc=; b=kaVdlqg5Y5pctpF+hrmpa/R2e5N9ONglz8Zkuc6pyChY5IJmm7of4uFV57AwmheLtvm5PhpCr+l7ggHexYwJomzhCwMpkZMLsbjOPohGj+5gFMUYybqZQhsyfrsGCn7W9mog07LqkOQIsEUr2FkGmVtYB2WUBHOdE/HlQC4mnbs=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1V2ssp-000Nrk-Q8; Sat, 27 Jul 2013 01:01:21 +0000 From: Jan Beich To: Pedro Giffuni Subject: Re: [Heads up] BSD-licensed patch becoming the default RSN. In-Reply-To: <51F2E627.9090907@FreeBSD.org> (Pedro Giffuni's message of "Fri, 26 Jul 2013 16:12:07 -0500") References: <51F2E627.9090907@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Date: Sat, 27 Jul 2013 01:01:21 +0000 Message-Id: <1V2ssp-000Nrk-Q8@internal.tormail.org> Cc: FreeBSD Current 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 01:02:27 -0000 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