From fd4ec730adcc9f07bf3e816e904af95667e8adf9 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 16 Sep 2012 13:58:10 +0000
Subject: Upgrade to Patch-2.7. Fixes #3182.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index abcc6befa..0e2fe0398 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2012-09-16</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Patch-2.7.  Fixes
+          <ulink url="&lfs-ticket-root;3182">#3182</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to MPC-1.0.1.  Fixes
           <ulink url="&lfs-ticket-root;3181">#3181</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0ebeb6bcd..381f8f151 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -151,9 +151,9 @@
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Patch &patch-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Perl &perl-version;</para>
     </listitem>-->
@@ -243,6 +243,10 @@
       <para>kmod-9-testsuite-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>patch-2.6.1-test_fix-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e63252598..bbf27a518 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -115,14 +115,6 @@
       </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 2b52d142d..da7fcb3f7 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -42,11 +42,6 @@
   <sect2 role="installation">
     <title>Installation of Patch</title>
 
-    <para>Apply a patch to prevent the test suite from running a test that
-    requires <command>ed</command>:</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>
@@ -57,7 +52,7 @@
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make -k check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/packages.ent b/packages.ent
index b56503570..4f0d53a4e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -409,10 +409,10 @@
 <!ENTITY ncurses-ch6-du "40 MB">
 <!ENTITY ncurses-ch6-sbu "0.6 SBU">
 
-<!ENTITY patch-version "2.6.1">
-<!ENTITY patch-size "248 KB">
-<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.bz2">
-<!ENTITY patch-md5 "0818d1763ae0c4281bcdc63cdac0b2c0">
+<!ENTITY patch-version "2.7">
+<!ENTITY patch-size "659 KB">
+<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.xz">
+<!ENTITY patch-md5 "d443f9d9a7d1bf1715831883917699d9">
 <!ENTITY patch-home "http://savannah.gnu.org/projects/patch/">
 <!ENTITY patch-ch5-du "3.4 MB">
 <!ENTITY patch-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 7d11369c8..aaa639b28 100644
--- a/patches.ent
+++ b/patches.ent
@@ -67,11 +67,6 @@
 <!ENTITY make-fixes-patch-size "9.7 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-2.patch">
 <!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
 <!ENTITY perl-libc-patch-size "1.6 KB">
-- 
cgit v1.2.3-54-g00ecf