Upgrade to Patch-2.5.9. Fixes #2239.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8795 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 39 insertions, 6 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 45b230593..aed11de22 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,10 @@
       <para>2009-02-01</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgraded to Patch-2.5.9.  Fixes
+          <ulink url="&lfs-ticket-root;2239">#2239</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgraded to Man-Pages-3.17.  Fixes
           <ulink url="&lfs-ticket-root;2327">#2327</ulink>.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index aa01f2e84..be7b64990 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -143,9 +143,9 @@
     <listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Patch &patch-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Perl &perl-version;</para>
     </listitem>-->
@@ -225,6 +225,10 @@
     </listitem>
 
     <listitem>
+      <para>&patch-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index ece920aa4..a8412d174 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -162,6 +162,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Patch Carriage Return Fix Patch - <token>&patch-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&patch-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&patch-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <!-- <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index de1ee7544..263feffac 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -43,6 +43,12 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
+    <para>Apply a patch that fixes a bug whereby <command>patch</command>
+    fails to apply patches whose lines contain trailing carriage return
+    characters:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&patch-fixes-patch;</userinput></screen>
+
     <para>Prepare Patch for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 3e08cf8c9..a2213f867 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -42,6 +42,12 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
+    <para>Apply a patch that fixes a bug whereby <command>patch</command>
+    fails to apply patches whose lines contain trailing carriage return
+    characters:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&patch-fixes-patch;</userinput></screen>
+
     <para>Prepare Patch for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/packages.ent b/packages.ent
index bcf6ad753..0b174ab99 100644
--- a/packages.ent
+++ b/packages.ent
@@ -391,10 +391,10 @@
 <!ENTITY ncurses-ch6-du "31 MB">
 <!ENTITY ncurses-ch6-sbu "0.7 SBU">
 
-<!ENTITY patch-version "2.5.4">
-<!ENTITY patch-size "183 KB">
-<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.gz">
-<!ENTITY patch-md5 "ee5ae84d115f051d87fcaaef3b4ae782">
+<!ENTITY patch-version "2.5.9">
+<!ENTITY patch-size "197 KB">
+<!ENTITY patch-url "&alpha-gnu;diffutils/patch-&patch-version;.tar.gz">
+<!ENTITY patch-md5 "dacfb618082f8d3a2194601193cf8716">
 <!ENTITY patch-home "&gnu-software;patch/">
 <!ENTITY patch-ch5-du "1.6 MB">
 <!ENTITY patch-ch5-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 54f9958b0..4ae9e8222 100644
--- a/patches.ent
+++ b/patches.ent
@@ -94,6 +94,11 @@
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB"> -->
 
 
+<!ENTITY patch-fixes-patch "patch-&patch-version;-fixes-1.patch">
+<!ENTITY patch-fixes-patch-md5 "a2f0901f42e87ad3d5fefbccee6a09f4">
+<!ENTITY patch-fixes-patch-size "1.7 KB">
+
+
 <!ENTITY perl-consolidated-patch "perl-&perl-version;-consolidated-1.patch">
 <!ENTITY perl-consolidated-patch-md5 "d1bcffb5d671bd659f7ca5c451a0c752">
 <!ENTITY perl-consolidated-patch-size "7.1 KB">