From mandree@FreeBSD.org  Tue Aug 13 20:25:23 2013
Return-Path: <mandree@FreeBSD.org>
Received: from apollo.emma.line.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 31F42CC5
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 13 Aug 2013 20:25:22 +0000 (UTC)
	(envelope-from mandree@FreeBSD.org)
Received: from mandree by apollo.emma.line.org with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <mandree@FreeBSD.org>)
	id 1V9L9m-000HOX-0e
	for FreeBSD-gnats-submit@freebsd.org; Tue, 13 Aug 2013 22:25:30 +0200
Message-Id: <E1V9L9m-000HOX-0e@apollo.emma.line.org>
Date: Tue, 13 Aug 2013 22:25:30 +0200
From: Matthias Andree <mandree@FreeBSD.org>
Reply-To: Matthias Andree <mandree@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: patch can't deal with blanks in filenames, GNU patch can 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         181272
>Category:       bin
>Synopsis:       patch(1) can't deal with blanks in filenames, GNU patch can
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 13 20:30:00 UTC 2013
>Closed-Date:    
>Last-Modified:  Mon Aug 19 18:20:00 UTC 2013
>Originator:     Matthias Andree
>Release:        FreeBSD 9.1-RELEASE-p5 amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 9.1-RELEASE-p5 FreeBSD 9.1-RELEASE-p5 #0: Sat Jul 27 01:14:23 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
FreeBSD 9.1-RELEASE's /usr/bin/patch cannot handle unified patches with
a blank in the filename, while GNU patch (from ports, installed as
gpatch) can.

Note that the filename on +++/--- lines extends from between the blank
after these three characters up to the next tab character.

Arguably this is nonstandard or unspecified behaviour, but then again
POSIX did not specify diff's -u format until very recently; and defers
to GNU diff.
	
>How-To-Repeat:
	
>Fix:

	


>Release-Note:
>Audit-Trail:

From: DEV Nexen <devnexen@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: bin/181272 and misc/181369
Date: Sun, 18 Aug 2013 07:17:39 +0100

 --001a11c34c2a0d93c804e432c936
 Content-Type: multipart/alternative; boundary=001a11c34c2a0d93c304e432c934
 
 --001a11c34c2a0d93c304e432c934
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hello.
 
 I worked yesterday on bin/181272 for patch BSD utility and then I saw today
 misc/181369 so I added few changes for it as well.
 
 Thanks.
 Kindest regards.
 
 David CARLIER
 
 --001a11c34c2a0d93c304e432c934
 Content-Type: text/html; charset=ISO-8859-1
 
 <div dir="ltr">Hello.<div><br></div><div style>I worked yesterday on bin/181272 for patch BSD utility and then I saw today misc/181369 so I added few changes for it as well.</div><div style><br></div><div style>Thanks.</div>
 
 <div style>Kindest regards.</div><div style><br></div><div style>David CARLIER</div></div>
 
 --001a11c34c2a0d93c304e432c934--
 --001a11c34c2a0d93c804e432c936
 Content-Type: text/plain; charset=US-ASCII; name="patch.txt"
 Content-Disposition: attachment; filename="patch.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hkhv6eag0
 
 LS0tIHV0aWwuYy5vcmlnCTIwMTMtMDgtMTcgMTQ6NTQ6NDQuMDAwMDAwMDAwICswMTAwCisrKyB1
 dGlsLmMJMjAxMy0wOC0xOCAwNzoxMzozOS4wMDAwMDAwMDAgKzAxMDAKQEAgLTQwMiwxMiArNDAy
 LDE2IEBACiAJbmFtZSA9IGZ1bGxuYW1lID0gdCA9IHNhdmVzdHIoYXQpOwogCiAJLyogU3RyaXAg
 b2ZmIHVwIHRvIGBzbGVhZGluZycgbGVhZGluZyBzbGFzaGVzIGFuZCBudWxsIHRlcm1pbmF0ZS4g
 Ki8KLQlmb3IgKDsgKnQgJiYgIWlzc3BhY2UoKHVuc2lnbmVkIGNoYXIpKnQpOyB0KyspCisJZm9y
 ICg7ICp0ICYmICp0IT0nXHQnICYmICp0IT0nXG4nOyB0KyspCisJCS8qIFJlcGxhY2UgYW55IHNw
 YWNlIGJ5IDB4MjAgKi8KKwkJaWYgKGlzc3BhY2UoKHVuc2lnbmVkIGNoYXIpICp0KSkKKwkJCWlm
 ICgqKHQrMSkgJiYgKCoodCsxKSA9PSAnXHQnKSkKKwkJCQlicmVhazsKKwkJCSp0ID0gMHgyMDsK
 IAkJaWYgKCp0ID09ICcvJykKIAkJCWlmICgtLXNsZWFkaW5nID49IDApCiAJCQkJbmFtZSA9IHQg
 KyAxOwogCSp0ID0gJ1wwJzsKLQogCS8qCiAJICogSWYgbm8gLXAgb3B0aW9uIHdhcyBnaXZlbiAo
 OTU3IGlzIHRoZSBkZWZhdWx0IHZhbHVlISksCiAJICogd2Ugd2VyZSBnaXZlbiBhIHJlbGF0aXZl
 IHBhdGhuYW1lLAo=
 --001a11c34c2a0d93c804e432c936--

From: DEV Nexen <devnexen@gmail.com>
To: bug-followup@freebsd.org, Matthias Andree <mandree@freebsd.org>
Cc:  
Subject: bin/181272
Date: Mon, 19 Aug 2013 19:17:44 +0100

 --047d7b472460204ed304e450f6ea
 Content-Type: multipart/alternative; boundary=047d7b472460204ed004e450f6e8
 
 --047d7b472460204ed004e450f6e8
 Content-Type: text/plain; charset=ISO-8859-1
 
 Replacement patch.txt thanks to Matthias to point me my small error.
 
 --047d7b472460204ed004e450f6e8
 Content-Type: text/html; charset=ISO-8859-1
 
 <div dir="ltr">Replacement patch.txt thanks to Matthias to point me my small error.</div>
 
 --047d7b472460204ed004e450f6e8--
 --047d7b472460204ed304e450f6ea
 Content-Type: text/plain; charset=US-ASCII; name="patch.txt"
 Content-Disposition: attachment; filename="patch.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_hkk09z0m0
 
 LS0tIHV0aWwuYy5vcmlnCTIwMTMtMDgtMTcgMTQ6NTQ6NDQuMDAwMDAwMDAwICswMTAwCisrKyB1
 dGlsLmMJMjAxMy0wOC0xOCAwNzoxMzozOS4wMDAwMDAwMDAgKzAxMDAKQEAgLTQwMiwxMiArNDAy
 LDE2IEBACiAJbmFtZSA9IGZ1bGxuYW1lID0gdCA9IHNhdmVzdHIoYXQpOwogCiAJLyogU3RyaXAg
 b2ZmIHVwIHRvIGBzbGVhZGluZycgbGVhZGluZyBzbGFzaGVzIGFuZCBudWxsIHRlcm1pbmF0ZS4g
 Ki8KLQlmb3IgKDsgKnQgJiYgIWlzc3BhY2UoKHVuc2lnbmVkIGNoYXIpKnQpOyB0KyspCisJZm9y
 ICg7ICp0ICYmICp0IT0nXHQnICYmICp0IT0nXG4nOyB0KyspCisJCWlmIChpc3NwYWNlKCh1bnNp
 Z25lZCBjaGFyKSAqdCkpCisJCQlpZiAoKih0KzEpICYmICgqKHQrMSkgPT0gJ1x0JykpCisJCQkJ
 YnJlYWs7CiAJCWlmICgqdCA9PSAnLycpCiAJCQlpZiAoLS1zbGVhZGluZyA+PSAwKQogCQkJCW5h
 bWUgPSB0ICsgMTsKIAkqdCA9ICdcMCc7Ci0KIAkvKgogCSAqIElmIG5vIC1wIG9wdGlvbiB3YXMg
 Z2l2ZW4gKDk1NyBpcyB0aGUgZGVmYXVsdCB2YWx1ZSEpLAogCSAqIHdlIHdlcmUgZ2l2ZW4gYSBy
 ZWxhdGl2ZSBwYXRobmFtZSwK
 --047d7b472460204ed304e450f6ea--
>Unformatted:
