From owner-freebsd-bugs@FreeBSD.ORG Sat Jul 5 21:26:45 2014 Return-Path: Delivered-To: freebsd-bugs@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 ESMTPS id 35A4D6F6 for ; Sat, 5 Jul 2014 21:26:45 +0000 (UTC) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D1542EDC for ; Sat, 5 Jul 2014 21:26:45 +0000 (UTC) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.14.8/8.14.8) with ESMTP id s65LQiFq084361 for ; Sat, 5 Jul 2014 22:26:44 +0100 (BST) (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: freebsd-bugs@FreeBSD.org Subject: [Bug 191641] New: patch(1) may misapply diffs missing final line feed Date: Sat, 05 Jul 2014 21:26:45 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: 10.0-RELEASE X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: gavin@FreeBSD.org X-Bugzilla-Status: Needs Triage X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: freebsd-bugs@FreeBSD.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jul 2014 21:26:45 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D191641 Bug ID: 191641 Summary: patch(1) may misapply diffs missing final line feed Product: Base System Version: 10.0-RELEASE Hardware: Any OS: Any Status: Needs Triage Severity: Affects Only Me Priority: --- Component: bin Assignee: freebsd-bugs@FreeBSD.org Reporter: gavin@FreeBSD.org I believe that this is unrelated to bug 74127. "patch 2.0-12u10 FreeBSD" may sometimes duplicate the previous line when it should actually insert a blank line. This is reproduceable, for example, t= ry applying the patch in bug 190195 to a checked out r242826 head tree, then compare the expected diff to the resulting diff. I believe this is due to the last line of the patch attached to bug 190195 = not ending with a linefeed. Expected: [...] > "Northbridge Proximity Temperature", \ > "Wireless Module Temperature", } > #define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ Seen: [...]=20 > "Northbridge Proximity Temperature", \ > "Wireless Module Temperature", } > "Wireless Module Temperature", } #define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ --=20 You are receiving this mail because: You are the assignee for the bug.=