misc/181369: incompatibility between bsdpatch and gnupatch dealing of filename's delimiter
Chie Taguchi
taguchi.ch at gmail.com
Sun Aug 18 03:50:00 UTC 2013
>Number: 181369
>Category: misc
>Synopsis: incompatibility between bsdpatch and gnupatch dealing of filename's delimiter
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 18 03:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Chie Taguchi
>Release: FreeBSD 10-CURRENT
>Organization:
>Environment:
FreeBSD raspberry-pi 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Tue Aug 13 03:22:23 JST 2013 user at arty:/usr/home/user/crochet-freebsd/work/obj/arm.armv6/usr/src.arm/sys/RPI-B-ELY arm
>Description:
During my building, i got a patch error, following:
===> Applying FreeBSD patch /usr/ports/x11-servers/xorg-server/files/patch-
Xserver-hw-xfree86-os-support-bsd-Makefile.in
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: programs/Xserver/hw/xfree86/os-support/bsd/Makefile.in
|diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/Makefile.in orig prog
rams/Xserver/hw/xfree86/os-support/bsd/Makefile.in
|--- hw/xfree86/os-support/bsd/Makefile.in .orig Tue Oct 4 01:46:14 2005
|+++ hw/xfree86/os-support/bsd/Makefile.in Thu Jan 26 14:57:56 2006
--------------------------
File to patch: ^C
root at raspberry-pi:/usr/ports/x11-servers/xorg-server # => Patch patch-Xserv
er-hw-xfree86-os-support-bsd-Makefile.in failed to apply cleanly.
-----error-end
i find this error caused by a space after filename 'Makefile.in '.
and this error made by only bsdpatch, not gnupatch.
because of bsdpatch see filename's space is not a delimiter, but gnupatch
see it a delimiter.
i think this difference maybe a specification for bsdpatch, not a bug,
because bsdpatch can deal filename, inside-space.
but it is not good for developers to exist such incompatibility between
bsdpatch and gnupatch.
>How-To-Repeat:
suffix a space at filename in any patchfile, example:
--- hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004
+++ hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004
add a space 'hw/xfree86/xorgconf.cpp'-> 'hw/xfree86/xorgconf.cpp '
# patch < patchfile
it will fail to patch. but,
# gnupatch < patchfile
it will success to patch.
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-bugs
mailing list