diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/patch/Manifest | 6 | ||||
| -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 |
2 files changed, 19 insertions, 5 deletions
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index 90d75d0b44f9..6a35c13dd6f4 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -1,7 +1,7 @@ -MD5 9d0781dc0afc19d3ded0c20299f755bc ChangeLog 4166 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 1a238c554d76e5a610a234935f6745ff patch-2.5.9.ebuild 1438 -MD5 94fb76de8d4b0bad733cbf01aa3bae6d patch-2.5.9-r1.ebuild 1104 +MD5 4f8622f6d61dc78dcc5069d9dcb573b5 ChangeLog 3745 +MD5 0e6d848f04afec9ccd77139044915be0 patch-2.5.9-r1.ebuild 1119 +MD5 1e629202590bd2a4586fb1e4231e50e2 files/patch-2.5.9-cr-stripping.patch 1355 MD5 7113f2413944cb06cecdd0c57ab54078 files/digest-patch-2.5.9 63 -MD5 4d1e5f04f223836b5c65c0995abd16ff files/2.5.9-deb-cr.patch 866 MD5 7113f2413944cb06cecdd0c57ab54078 files/digest-patch-2.5.9-r1 63 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]); |