From 97645eb1097016ff4fe10db2e1c977812f18b9d4 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Mon, 6 Oct 2008 01:40:35 +0000
Subject: [PATCH] Updated E2fsprogs to 1.41.1

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 09c3912ff..67aa0aeb7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
     <listitem>
       <para>2008-10-05</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated E2fsprogs to 1.41.1.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Added the Mktemp-1.5 package to the list of
           removed items in the Chapter3 'What's new ...' page.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8d474b2f4..32dc2169a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -226,6 +226,10 @@
       <para>&db-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&e2fsprogs-fixes-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&expect-tcl-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 3d51dcd73..8d2c7870d 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,6 +90,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>E2fsprogs Fixes Patch - <token>&e2fsprogs-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&e2fsprogs-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&e2fsprogs-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 61ea12032..29f1beb70 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -43,10 +43,15 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
+    <para>Fix an error with building certain programs by installing a
+    patch:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&e2fsprogs-fixes-patch;</userinput></screen>
+
     <para>Fix a hardcoded path to <filename>/bin/rm</filename> in E2fsprogs'
     testsuite:</para>
 
-    <screen><userinput remap="pre">sed -i -e 's@/bin/rm@/tools&amp;@' lib/blkid/test_probe.in</userinput></screen>
+    <screen><userinput remap="pre">sed -i 's@/bin/rm@/tools&amp;@' lib/blkid/test_probe.in</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
diff --git a/packages.ent b/packages.ent
index fdbc7b665..cdff938bd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -111,15 +111,15 @@
 <!-- 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.40.8">
-<!ENTITY e2fsprogs-size "4,012 KB">
+<!ENTITY e2fsprogs-version "1.41.1">
+<!ENTITY e2fsprogs-size "4,352 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "450e2fb2461b2296fec770ff8fc147ed">
+<!ENTITY e2fsprogs-md5 "ddf13b3c9ece247c457db20ca9a10c3c">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
-<!ENTITY e2fsprogs-ch5-du "38.9 MB">
-<!ENTITY e2fsprogs-ch5-sbu "0.3 SBU">
-<!ENTITY e2fsprogs-ch6-du "45.7 MB">
-<!ENTITY e2fsprogs-ch6-sbu "0.6 SBU">
+<!ENTITY e2fsprogs-ch5-du "38 MB">
+<!ENTITY e2fsprogs-ch5-sbu "0.4 SBU">
+<!ENTITY e2fsprogs-ch6-du "54 MB testsuite included">
+<!ENTITY e2fsprogs-ch6-sbu "0.7 SBU testsuite included">
 
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-lib-version "5.43">
diff --git a/patches.ent b/patches.ent
index 6c0eb1b0d..9b60dc330 100644
--- a/patches.ent
+++ b/patches.ent
@@ -38,15 +38,22 @@
 <!ENTITY db-fixes-patch-md5 "0e1f3a1db6c3ab10f79c4d6dff0c8f31">
 <!ENTITY db-fixes-patch-size "2.3 KB">
 
+
 <!ENTITY diffutils-i18n-patch "diffutils-&diffutils-version;-i18n-1.patch">
 <!ENTITY diffutils-i18n-patch-md5 "c8d481223db274a33b121fb8c25af9f7">
 <!ENTITY diffutils-i18n-patch-size "18 KB">
 
 
+<!ENTITY e2fsprogs-fixes-patch "e2fsprogs-&e2fsprogs-version;-fixes-1.patch">
+<!ENTITY e2fsprogs-fixes-patch-md5 "bea25b4d9410be4675bd2f3179db77c8">
+<!ENTITY e2fsprogs-fixes-patch-size "5.4 KB">
+
+
 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-1.patch">
 <!ENTITY expect-spawn-patch-md5 "ef6d0d0221c571fb420afb7033b3bbba">
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 
+
 <!ENTITY expect-tcl-patch "expect-&expect-version;-tcl_8.5.4_fix-1.patch">
 <!ENTITY expect-tcl-patch-md5 "6904a384960ce0e8f0d0b32f7903d7a1">
 <!ENTITY expect-tcl-patch-size "4.1 KB">