From 0556946c4d5cd37fad789f2512ba5d2ea916459c Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Tue, 7 Oct 2008 14:40:52 +0000
Subject: Updated Util-linux-ng to 2.14.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8597 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     |  3 +++
 chapter01/whatsnew.xml      |  4 ++++
 chapter05/util-linux-ng.xml |  9 +++++++--
 chapter06/util-linux-ng.xml |  4 +++-
 packages.ent                | 14 +++++++-------
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 03b4e74a9..dcd55845d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
     <listitem>
       <para>2008-10-07</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated Util-linux-ng to 2.14.1.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated Texinfo to 4.13.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index eacc4c87f..d6a2bae1e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -351,6 +351,10 @@
       <para>sysklogd-1.4.1-fixes-2.patch</para>
     </listitem>
 
+    <listitem>
+      <para>Util-linux 2.12r</para>
+    </listitem>
+
     <listitem>
       <para>vim-7.1-fixes-1.patch</para>
     </listitem>
diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml
index 99d9dda0e..b4f2aab1a 100644
--- a/chapter05/util-linux-ng.xml
+++ b/chapter05/util-linux-ng.xml
@@ -50,14 +50,19 @@
     <para>Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen><userinput remap="make">make -C mount mount umount
+<screen><userinput remap="make">make BLKID_LIBS="-lblkid -luuid" -C mount mount umount
 make -C text-utils more</userinput></screen>
 
+    <!-- Not sure why this is in there. There is no test suite. Though
+         running 'make check' may build these programs, there is no
+         testing done.
     <para>This package comes with a test suite, but running it will cause all of
     the binaries to be built and tested.  If you still wish to run the tests,
     issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen> -->
+
+    <para>This package does not come with a test suite.</para>
 
     <para>Copy these programs to the temporary tools directory:</para>
 
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
index 5cb412262..3ff2116ea 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux-ng.xml
@@ -62,7 +62,9 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make BLKID_LIBS="-lblkid -luuid"</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
 
     <para>Install the package:</para>
 
diff --git a/packages.ent b/packages.ent
index 7e4209db7..8cf09d2ff 100644
--- a/packages.ent
+++ b/packages.ent
@@ -523,15 +523,15 @@
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-home " ">
 
-<!ENTITY util-linux-ng-version "2.13.1">
-<!ENTITY util-linux-ng-size "2,788 KB">
-<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.13/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "424badc1832e4b5291a2ec04e9e244f4">
+<!ENTITY util-linux-ng-version "2.14.1">
+<!ENTITY util-linux-ng-size "2,929 KB">
+<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.14/util-linux-ng-&util-linux-ng-version;.tar.bz2">
+<!ENTITY util-linux-ng-md5 "9aab772ee9b1f4e67dff98169f3cb380">
 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
-<!ENTITY util-linux-ng-ch5-du "8.9 MB">
+<!ENTITY util-linux-ng-ch5-du "19 MB">
 <!ENTITY util-linux-ng-ch5-sbu "less than 0.1 SBU">
-<!ENTITY util-linux-ng-ch6-du "17.2 MB">
-<!ENTITY util-linux-ng-ch6-sbu "0.2 SBU">
+<!ENTITY util-linux-ng-ch6-du "29 MB">
+<!ENTITY util-linux-ng-ch6-sbu "0.3 SBU">
 
 <!ENTITY vim-version "7.1">
 <!ENTITY vim-docdir "vim/vim71">
-- 
cgit v1.2.3-54-g00ecf