From a905be8285bc7d448461de3d3890c5533e4b37c3 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 13 Jul 2014 22:21:37 +0000
Subject: Remove unneeded e2fsprogs patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10628 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/whatsnew.xml  |  3 ++-
 chapter03/patches.xml   | 14 +++-----------
 chapter06/e2fsprogs.xml |  5 ++---
 patches.ent             |  8 ++------
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d5752e0c6..cb73a83b0 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -247,9 +247,10 @@
     <!--<listitem>
       <para>dbus-&dbus-version;</para>
     </listitem>-->
+    <!--
     <listitem>
       <para>eudev-&e2fsprogs-fix-test-patch;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>eudev-&eudev-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5b16a71d3..7e876ffa5 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -65,7 +65,7 @@
         <para>MD5 sum: <literal>&coreutils-shuf-segfault-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>E2fsprogs Fix Test Patch - <token>&e2fsprogs-fix-test-patch-size;</token>:</term>
       <listitem>
@@ -73,7 +73,7 @@
         <para>MD5 sum: <literal>&e2fsprogs-fix-test-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -105,15 +105,7 @@
         <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
+
     <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index ca9268d48..2bdfaf0cd 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,11 +44,10 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>First fix some problems with running regression tests in the LFS chroot
+    <para>First fix a problem with running regression tests in the LFS chroot
     environment:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&e2fsprogs-fix-test-patch;
-sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
diff --git a/patches.ent b/patches.ent
index 42e59e8e2..08851cbfb 100644
--- a/patches.ent
+++ b/patches.ent
@@ -26,9 +26,11 @@
 <!ENTITY coreutils-shuf-segfault-patch-md5 "f1b5b35392914e327b1b6bbbb454d256">
 <!ENTITY coreutils-shuf-segfault-patch-size "4 KB">
 
+<!--
 <!ENTITY e2fsprogs-fix-test-patch "e2fsprogs-&e2fsprogs-version;-fix_test-1.patch">
 <!ENTITY e2fsprogs-fix-test-patch-md5 "7c20605628536db298bb3bb4666047bf">
 <!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB">
+-->
 
 <!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
 <!ENTITY gcc-upstream-patch-md5 "f070aae5f5f92259ed167539725e6241">
@@ -46,12 +48,6 @@
 <!ENTITY mpfr-fixes-patch-md5 "aaf52416b309dd0b8c5eb92ae9c210c1">
 <!ENTITY mpfr-fixes-patch-size "43 KB">
 
-<!--
-<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
-<!ENTITY perl-libc-patch-size "1.6 KB">
--->
-
 <!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-1.patch">
 <!ENTITY readline-fixes-patch-md5 "bbee7fad08474328b807e6828c26a961">
 <!ENTITY readline-fixes-patch-size "3.1 KB">
-- 
cgit v1.2.3-54-g00ecf