From 7e511ce3d7c68bcd0505da87ee2e3e64bd9982aa Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 1 Mar 2010 21:51:05 +0000
Subject: Upgrade to Util-Linux-NG-2.17.1. Fixes #2581.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9212 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml     |  4 ++++
 chapter01/whatsnew.xml      |  4 ++--
 chapter05/util-linux-ng.xml | 23 +----------------------
 packages.ent                |  6 +++---
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5603de930..df25e43e3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2010-03-01</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Util-Linux-NG-2.17.1. Fixes
+          <ulink url="&lfs-ticket-root;2581">#2581</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to Diffutils-2.9. Fixes
           <ulink url="&lfs-ticket-root;2577">#2577</ulink>. This also drops
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e1b9a4a50..fada5db61 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -187,9 +187,9 @@
     <!--<listitem>
       <para>&udev-config;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux-NG &util-linux-ng-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Vim &vim-version;</para>
     </listitem>-->
diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml
index 955698e3a..f8c003c36 100644
--- a/chapter05/util-linux-ng.xml
+++ b/chapter05/util-linux-ng.xml
@@ -46,19 +46,7 @@
     <para>Prepare Util-linux-ng for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
-<!--
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>- -with-fsprobe</parameter></term>
-        <listitem>
-          <para>This tells Util-Linux-NG to use its own version of the libblkid
-          library, rather than a system-installed version.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
+
     <para>Only a few of the utilities contained in this package need to be
     built:</para>
 
@@ -66,15 +54,6 @@
 make -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> -->
-
     <para>This package does not come with a test suite.</para>
 
     <para>Install the shared libraries required by E2fsprogs:</para>
diff --git a/packages.ent b/packages.ent
index 7f5da884f..662e14919 100644
--- a/packages.ent
+++ b/packages.ent
@@ -515,10 +515,10 @@
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
 <!ENTITY udev-config-home " ">
 
-<!ENTITY util-linux-ng-version "2.17">
-<!ENTITY util-linux-ng-size "3,680 KB">
+<!ENTITY util-linux-ng-version "2.17.1">
+<!ENTITY util-linux-ng-size "3,712 KB">
 <!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v2.17/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "11cc8a0138019e7060dd275d47dbc096">
+<!ENTITY util-linux-ng-md5 "1771802e8f4c795f72f06efb1fc61587">
 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
 <!ENTITY util-linux-ng-ch5-du "19 MB">
 <!ENTITY util-linux-ng-ch5-sbu "0.1 SBU">
-- 
cgit v1.2.3-54-g00ecf