From 3a35b11da1a0443b04f26a3ff8d06d22f3d30ffe Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 25 Jan 2006 21:26:09 +0000
Subject: Fix sort's numeric sort order and add en_US.UTF8 locale to improve
 coreutils' test coverage

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7302 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 6 ++++++
 chapter03/patches.xml   | 2 +-
 chapter06/glibc.xml     | 1 +
 patches.ent             | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d0a71dc34..893aabedc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,12 @@
     <listitem>
       <para>January 25, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade coreutils i18n patch to version 2 to fix
+          <command>sort -n</command> and add the en_US.UTF-8 locale to improve
+          coreutils' test coverage.  Fixes bugs 1688 and 1689.  Thanks to
+          Alexander Patrakov.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add information about package management.  Thanks to
           the BLFS project for the text.</para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1f59fe43e..b292a2a9b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -35,7 +35,7 @@
     <varlistentry>
       <term>Coreutils Internationalization Fixes Patch - 110 KB:</term>
       <listitem>
-        <para><ulink url="&alexpatches;&coreutils-i18n-patch;"/></para>
+        <para><ulink url="&patches-root;&coreutils-i18n-patch;"/></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index a3feb8a45..c69710f50 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -175,6 +175,7 @@ localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
 localedef -i en_HK -f ISO-8859-1 en_HK
 localedef -i en_PH -f ISO-8859-1 en_PH
 localedef -i en_US -f ISO-8859-1 en_US
+localedef -i en_US -f UTF-8 en_US.UTF-8
 localedef -i es_MX -f ISO-8859-1 es_MX
 localedef -i fa_IR -f UTF-8 fa_IR
 localedef -i fr_FR -f ISO-8859-1 fr_FR
diff --git a/patches.ent b/patches.ent
index 6216cc04d..1a5903c6a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -4,7 +4,7 @@
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 
-<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
+<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-2.patch">
 <!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
 
-- 
cgit v1.2.3-54-g00ecf