From 5d127881da1fee0cd175ef18f1628f9bf6431e29 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 18 Apr 2011 18:56:37 +0000
Subject: [PATCH] Upgrade to Coreutils-8.11. Fixes #2858.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9505 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 9 ++++++---
 chapter03/patches.xml   | 8 --------
 chapter06/coreutils.xml | 8 --------
 packages.ent            | 6 +++---
 patches.ent             | 6 +-----
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 641c297c8..9f1ce77d5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-04-18</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Coreutils-8.11. Fixes
+          <ulink url="&lfs-ticket-root;2858">#2858</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Man-DB-2.6.0.2, including adding its
           dependency, libpipeline-1.2.0. Fixes
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 356aa4fd8..a146a232b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -46,9 +46,9 @@
     <!--<listitem>
       <para>Bzip2 &bzip2-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>
@@ -228,7 +228,7 @@
       <para>&bash-fixes-patch;</para>
     </listitem>
     <listitem>
-      <para>coreutils-&coreutils-version;-sparse_fiemap-1.patch</para>
+      <para>&coreutils-i18n-patch;</para>
     </listitem>
     <listitem>
       <para>&gcc-crosscompile-patch;</para>
@@ -243,6 +243,9 @@
 
   <itemizedlist>
     <title>Removed:</title>
+    <listitem>
+      <para>coreutils-8.10-i18n-1.patch</para>
+    </listitem>
     <listitem>
       <para>dejagnu-1.4.4-consolidated-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f2e6e6cb2..59dc63258 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -42,14 +42,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Coreutils Sparse-Fiemap Test Fix Patch - <token>&coreutils-sparse_fiemap-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&coreutils-sparse_fiemap-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-sparse_fiemap-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index eedd2627b..4756dfeee 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -62,14 +62,6 @@ esac</userinput></screen>
       without this patch.</para>
     </note>
 
-    <para>Apply a patch to fix a known issue with the test suite:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-sparse_fiemap-patch;</userinput></screen>
-
-    <para>And fix another test:</para>
-
-<screen><userinput remap="pre">sed -i 's/^cmp sparse copy/wait; cmp sparse copy/' tests/cp/sparse-to-pipe</userinput></screen>
-
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/packages.ent b/packages.ent
index 8c4fc3864..34912c089 100644
--- a/packages.ent
+++ b/packages.ent
@@ -68,10 +68,10 @@
 <!ENTITY bzip2-ch6-du "6.4 MB">
 <!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY coreutils-version "8.10">
-<!ENTITY coreutils-size "11,064 KB">
+<!ENTITY coreutils-version "8.11">
+<!ENTITY coreutils-size "11,226 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
-<!ENTITY coreutils-md5 "74d54d09fc5c1bd3337127f49c88b1c5">
+<!ENTITY coreutils-md5 "eabaf2593f4b978dea13044d6acc2dc8">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "88 MB">
 <!ENTITY coreutils-ch5-sbu "0.7 SBU">
diff --git a/patches.ent b/patches.ent
index 19638a6e5..16f7563cd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -13,13 +13,9 @@
 
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "28895e1112835ca04119158d1883a6d5">
+<!ENTITY coreutils-i18n-patch-md5 "ced3542ba0cf7df395bb5b67c3f94f21">
 <!ENTITY coreutils-i18n-patch-size "120 KB">
 
-<!ENTITY coreutils-sparse_fiemap-patch "coreutils-&coreutils-version;-sparse_fiemap-1.patch">
-<!ENTITY coreutils-sparse_fiemap-patch-md5 "3fa59f8eb59712a80a3302ef5d9ab197">
-<!ENTITY coreutils-sparse_fiemap-patch-size "4.5 KB">
-
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
 <!ENTITY coreutils-uname-patch-md5 "500481b75892e5c07e19e9953a690e54">
 <!ENTITY coreutils-uname-patch-size "1.6 KB">