[Bug 191641] New: patch(1) may misapply diffs missing final line feed

bugzilla-noreply at freebsd.org bugzilla-noreply at freebsd.org
Sat Jul 5 21:26:45 UTC 2014


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191641

            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 at FreeBSD.org
          Reporter: gavin at 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, try
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:

[...] 
>				  "Northbridge Proximity Temperature", \
>				  "Wireless Module Temperature", }
>				  "Wireless Module Temperature", }
 #define ASMC_MP_TEMPS        { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \

-- 
You are receiving this mail because:
You are the assignee for the bug.


More information about the freebsd-bugs mailing list