Update to e2fsprogs-1.41.10.

Make more robust output in version check for glibc.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9200 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 26 insertions, 14 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 77404697f..ba31a96f5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,22 @@
 -->
 
     <listitem>
+      <para>2010-02-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] Update to e2fsprogs-1.41.10. Fixes
+          <ulink url="&lfs-ticket-root;2576">#2576</ulink>. This
+          also reverts the changes made in response to 
+          <ulink url="&lfs-ticket-root;2586">#2586</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] Make more robust output in version check
+          for glibc.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2010-02-21</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index a1800b8e8..4c851a02f 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,11 +44,6 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>First fix a programming error:</para>
-
-<screen><userinput remap="configure">sed -i -e '74i\
-        new_table->readline_shutdown = 0;'  lib/ss/invocation.c</userinput></screen>
-
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
diff --git a/general.ent b/general.ent
index dff4445d6..840c5aab3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-201002021">
-<!ENTITY releasedate "February 21, 2010">
+<!ENTITY version "SVN-201002022">
+<!ENTITY releasedate "February 22, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index f263059f2..ba669d490 100644
--- a/packages.ent
+++ b/packages.ent
@@ -98,15 +98,16 @@
 <!-- NOTE: When updating e2fsprogs, remember to check the list
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.41.9">
-<!ENTITY e2fsprogs-size "4,348 KB">
+<!ENTITY e2fsprogs-version "1.41.10">
+<!ENTITY e2fsprogs-size "4,363 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "52f60a9e19a02f142f5546f1b5681927">
+<!ENTITY e2fsprogs-md5 "f9c7bb5c036a119453ce02fa871038da">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
+<!--
 <!ENTITY e2fsprogs-ch5-du "38 MB">
-<!ENTITY e2fsprogs-ch5-sbu "0.3 SBU">
-<!ENTITY e2fsprogs-ch6-du "41 MB testsuite included">
-<!ENTITY e2fsprogs-ch6-sbu "0.7 SBU testsuite included">
+<!ENTITY e2fsprogs-ch5-sbu "0.3 SBU"> -->
+<!ENTITY e2fsprogs-ch6-du "45 MB testsuite included">
+<!ENTITY e2fsprogs-ch6-sbu "0.5 SBU testsuite included">
 
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-lib-version "5.43">
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 36470c07c..116d0e6d9 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -167,7 +167,7 @@ if [ -e /usr/bin/awk ];
   then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; 
   else echo "awk not found"; fi
 gcc --version | head -n1
-/lib/libc.so.6 | head -n1 | cut -d" " -f1-7
+/lib/libc.so.6 | head -n1 | cut -d"," -f1
 grep --version | head -n1
 gzip --version | head -n1
 cat /proc/version