From a44d116ea21adad136b3682472a206478ab619e0 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 3 Jan 2010 19:02:47 +0000
Subject: [PATCH] Upgrade to Patch-2.6.1. Fixes #2538.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9141 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml | 2 +-
 chapter01/changelog.xml     | 4 ++++
 chapter01/whatsnew.xml      | 4 ++++
 chapter03/patches.xml       | 8 ++++++++
 chapter06/patch.xml         | 5 +++++
 packages.ent                | 6 +++---
 patches.ent                 | 5 +++++
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index bbdf00569..a0a1eafbf 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1434,7 +1434,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Ed</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5db52c334..b263747cf 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2010-01-03</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Patch-2.6.1. Fixes
+          <ulink url="&lfs-ticket-root;2538">#2538</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to Glibc-2.11.1. Fixes
           <ulink url="&lfs-ticket-root;2537">#2537</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b6c3b3477..a125d4e2d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -226,6 +226,10 @@
       <para>gzip-1.3.13-zdiff-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>patch-2.6.1-test_fix-1.patch</para>
+    </listitem>
+
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 8bc7ab7dc..f679fdacf 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -138,6 +138,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Patch Testsuite Fix Patch - <token>&patch-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&patch-test-patch;"/></para>
+        <para>MD5 sum: <literal>&patch-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <!-- <varlistentry>
       <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index da7fcb3f7..a106962ef 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -42,6 +42,11 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
+    <para>Apply a patch to prevent a test that requires <command>ed</command>
+    from being run:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&patch-test-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 0249c4547..94f3c8f4f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -383,10 +383,10 @@
 <!ENTITY ncurses-ch6-du "35 MB">
 <!ENTITY ncurses-ch6-sbu "0.8 SBU">
 
-<!ENTITY patch-version "2.6">
-<!ENTITY patch-size "244 KB">
+<!ENTITY patch-version "2.6.1">
+<!ENTITY patch-size "248 KB">
 <!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.bz2">
-<!ENTITY patch-md5 "5729b1430ba6c2216e0f3eb18f213c81">
+<!ENTITY patch-md5 "0818d1763ae0c4281bcdc63cdac0b2c0">
 <!ENTITY patch-home "http://directory.fsf.org/project/patch/">
 <!ENTITY patch-ch5-du "1.9 MB">
 <!ENTITY patch-ch5-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index fb7109e1e..9246e2349 100644
--- a/patches.ent
+++ b/patches.ent
@@ -74,6 +74,11 @@
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
 
+<!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
+<!ENTITY patch-test-patch-md5 "c51e1a95bfc5310635d05081472c3534">
+<!ENTITY patch-test-patch-size "1 KB">
+
+
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 <!ENTITY perl-libc-patch-md5 "800dfd3c9618731ee5cf57f77a7942b4">
 <!ENTITY perl-libc-patch-size "1 KB">