diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-09-01 05:53:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-01 05:53:54 +0000 |
| commit | dfdbe772026b2c48cf114b7e8dcb4d07ca8439fd (patch) | |
| tree | d8474cc18c1cf70b46b8135e235d477a37d301d9 /sys-devel/patch | |
| parent | arm/hppa/ia64/s390/x86 stable (diff) | |
| download | gentoo-2-dfdbe772026b2c48cf114b7e8dcb4d07ca8439fd.tar.gz gentoo-2-dfdbe772026b2c48cf114b7e8dcb4d07ca8439fd.tar.bz2 gentoo-2-dfdbe772026b2c48cf114b7e8dcb4d07ca8439fd.zip | |
rename
Diffstat (limited to 'sys-devel/patch')
| -rw-r--r-- | sys-devel/patch/files/patch-2.5.9-cr-stripping.patch (renamed from sys-devel/patch/files/2.5.9-deb-cr.patch) | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sys-devel/patch/files/2.5.9-deb-cr.patch b/sys-devel/patch/files/patch-2.5.9-cr-stripping.patch index 67cc9b196e94..ccb676c53637 100644 --- a/sys-devel/patch/files/2.5.9-deb-cr.patch +++ b/sys-devel/patch/files/patch-2.5.9-cr-stripping.patch @@ -1,5 +1,19 @@ ---- patch-2.5.9.orig/pch.c -+++ patch-2.5.9/pch.c + From: Paul Eggert + Subject: Re: patch2.5.9 fails on some dos generated patches + Date: Thu, 05 May 2005 17:46:30 -0700 + User-agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.4 (gnu/linux) + +This should fix your problem: + +2003-07-02 Paul Eggert <address@hidden> + + * pch.c (intuit_diff_type): If a unified-diff header line contains + trailing CR, strip CR from each body line. This corrects a bug + introduced in the 2003-05-18 patch. Bug reported by Andreas + Gruenbacher. + +--- pch.c ++++ pch.c @@ -366,10 +366,16 @@ if (!stars_last_line && strnEQ(s, "*** ", 4)) name[OLD] = fetchname (s+4, strippath, &p_timestamp[OLD]); |