From owner-freebsd-bugs@FreeBSD.ORG Sun Aug 18 03:50:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.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 BC496FCC for ; Sun, 18 Aug 2013 03:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9CB952C5A for ; Sun, 18 Aug 2013 03:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r7I3o0Rq063071 for ; Sun, 18 Aug 2013 03:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r7I3o0UI063070; Sun, 18 Aug 2013 03:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 18 Aug 2013 03:50:00 GMT Resent-Message-Id: <201308180350.r7I3o0UI063070@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chie Taguchi 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 E819AF9B for ; Sun, 18 Aug 2013 03:44:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B74632C47 for ; Sun, 18 Aug 2013 03:44:55 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7I3itJq048816 for ; Sun, 18 Aug 2013 03:44:55 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7I3itlX048815; Sun, 18 Aug 2013 03:44:55 GMT (envelope-from nobody) Message-Id: <201308180344.r7I3itlX048815@oldred.freebsd.org> Date: Sun, 18 Aug 2013 03:44:55 GMT From: Chie Taguchi To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/181369: incompatibility between bsdpatch and gnupatch dealing of filename's delimiter X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 03:50:00 -0000 >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@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@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: