Import latest lfs changes.

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

27 files changed, 276 insertions, 160 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c47a7b9c8..019bcb68e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,129 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-07-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merged LFS SVN-20140723.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed --disable-syslogd from Inetutils
+          instructions - it's redundant as it's covered by --disable-servers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.25. Fixes
+          <ulink url="&lfs-ticket-root;3627">#3627</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Text fixes - removed mention of
+          /usr/{doc,info,man} symlinks that are no longer created, and made
+          minor updates to several packages' installed file lists.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to coreutils-8.23. Fixes
+          <ulink url="&lfs-ticket-root;3639">#3639</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add binutils patch to fix lto test suite.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.15.6. Fixes
+          <ulink url="&lfs-ticket-root;3638">#3638</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-4.9.1. Fixes
+          <ulink url="&lfs-ticket-root;3637">#3637</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.2. Fixes
+          <ulink url="&lfs-ticket-root;3636">#3636</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.15.5. Fixes
+          <ulink url="&lfs-ticket-root;3634">#3634</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.70. Fixes
+          <ulink url="&lfs-ticket-root;3633">#3633</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.42.11. Fixes
+          <ulink url="&lfs-ticket-root;3635">#3635</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-07-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Removed references to /lib/udev/devices. Fixes
+          <ulink url="&lfs-ticket-root;3620">#3620</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.15.4. Fixes
+          <ulink url="&lfs-ticket-root;3623">#3623</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Removed systemd references in bootscripts. Fixes
+          <ulink url="&lfs-ticket-root;3624">#3624</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Simlify lto instructions in chapter 6 gcc. Fixes
+          <ulink url="&lfs-ticket-root;3626">#3626</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update XML-Parser source location. Fixes
+          <ulink url="&lfs-ticket-root;3628">#3628</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to eudev-1.9. Fixes
+          <ulink url="&lfs-ticket-root;3630">#3630</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kbd-2.0.2. Fixes
+          <ulink url="&lfs-ticket-root;3631">#3631</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-07-06</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 585591215..f4fc87d26 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -52,9 +52,9 @@
     <listitem>
       <para>Check &check-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Coreutils &coreutils-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>D-Bus-&dbus-version;</para>
     </listitem>
@@ -127,9 +127,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
@@ -247,8 +247,13 @@
       <para>&binutils-lto-patch;</para>
     </listitem>
     <listitem>
+      <para>&binutils-lto-testsuite-patch;</para>
+    </listitem>
+<!--
+    <listitem>
       <para>&coreutils-shuf-segfault-patch;</para>
     </listitem>
+ -->
     <listitem>
       <para>&mpfr-fixes-patch;</para>
     </listitem>
@@ -260,15 +265,19 @@
   <itemizedlist>
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
+
     <listitem>
       <para>bash-4.2-fixes-12.patch</para>
     </listitem>
+
     <listitem>
       <para>perl-5.18.2-libc-1.patch</para>
     </listitem>
+
     <listitem>
       <para>readline-6.2-fixes-2.patch</para>
     </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 271eca266..712f1b218 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -43,6 +43,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Binutils LTO Testsuite Patch - <token>&binutils-lto-testsuite-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-lto-testsuite-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-lto-testsuite-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
@@ -57,7 +65,7 @@
         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Coreutils shuf Segmentation Fault Fix Patch - <token>&coreutils-shuf-segfault-patch-size;</token>:</term>
       <listitem>
@@ -65,7 +73,8 @@
         <para>MD5 sum: <literal>&coreutils-shuf-segfault-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
+<!--
     <varlistentry>
       <term>E2fsprogs Fix Test Patch - <token>&e2fsprogs-fix-test-patch-size;</token>:</term>
       <listitem>
@@ -73,7 +82,8 @@
         <para>MD5 sum: <literal>&e2fsprogs-fix-test-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
+<!--
     <varlistentry>
       <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -81,7 +91,7 @@
         <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
@@ -105,15 +115,7 @@
         <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
-    <varlistentry>
-      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-libc-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
+
     <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 1b25e50f3..007b44e7d 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -44,6 +44,7 @@
     <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools                \
+            --without-python               \
             --disable-makeinstall-chown    \
             --without-systemdsystemunitdir \
             PKG_CONFIG=""</userinput></screen>
@@ -52,6 +53,15 @@
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
+        <term><parameter>--without-python</parameter></term>
+        <listitem>
+          <para>This switch disables using <application>Python</application>
+          if it is installed on the host system.  It avoids trying to build
+          unneeded bindings.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--disable-makeinstall-chown</parameter></term>
         <listitem>
           <para>This switch disables using the <command>chown</command> command
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 8f7c7df83..71868fdfc 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -69,6 +69,10 @@ sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
 
+    <para>Fix some LTO tests in the test suite:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index d7577694f..bda489c28 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -40,16 +40,21 @@
 
   <sect2 role="installation">
     <title>Installation of Coreutils</title>
-
+<!--
     <para>First, fix a segfault in <command>shuf</command> program:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&coreutils-shuf-segfault-patch;</userinput></screen>
+-->
 
     <para>POSIX requires that programs from Coreutils recognize character
-    boundaries correctly even in multibyte locales. The following patch
-    fixes this non-compliance and other internationalization-related bugs:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch;</userinput></screen>
+    boundaries correctly even in multibyte locales. The following patch fixes
+    this non-compliance and other internationalization-related bugs.
+    Afterwards make sure the timestamp for <filename>Makefile.in</filename> is
+    later than all other files to prevent a <command>make</command>
+    error:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&coreutils-i18n-patch; &amp;&amp;
+touch Makefile.in</userinput></screen>
 
     <note>
       <para>In the past, many bugs were found in this patch. When reporting new
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index f22f8d535..2f5da5920 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -53,16 +53,7 @@ mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
     <title>FHS Compliance Note</title>
 
     <para>The directory tree is based on the Filesystem Hierarchy Standard (FHS)
-    (available at <ulink url="http://www.pathname.com/fhs/"/>). In addition to
-    the FHS, we create compatibility symlinks for the <filename
-    class="directory">man</filename>, <filename
-    class="directory">doc</filename>, and <filename
-    class="directory">info</filename> directories since many packages still try
-    to install their documentation into <filename
-    class="directory">/usr/&lt;directory&gt;</filename> or <filename
-    class="directory">/usr/local/&lt;directory&gt;</filename> as opposed to
-    <filename class="directory">/usr/share/&lt;directory&gt;</filename> or
-    <filename class="directory">/usr/local/share/&lt;directory&gt;</filename>.
+    (available at <ulink url="http://www.pathname.com/fhs/"/>).
     The FHS also stipulates the existence of <filename
     class="directory">/usr/local/games</filename> and <filename
     class="directory">/usr/share/games</filename>. The FHS is not precise as to
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 2d776acfd..66da2ba8c 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -93,11 +93,6 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
 
 <screen><userinput remap="install">ln -sv /etc/machine-id /var/lib/dbus</userinput></screen>
 
-    <para>Finally, generate a D-Bus UUID to avoid possible warnings 
-    when building some packages in BLFS:</para>
-
-<screen><userinput remap="install">dbus-uuidgen --ensure</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-dbus" role="content">
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index ca9268d48..7212860f1 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,11 +44,10 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>First fix some problems with running regression tests in the LFS chroot
+    <para>First fix a problem with running regression tests in the LFS chroot
     environment:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&e2fsprogs-fix-test-patch;
-sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
 
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
@@ -172,7 +171,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
         <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs,e2freefrag,
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 725bc21f8..b856e67d9 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -84,7 +84,7 @@
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
+      <segtitle>Installed directory</segtitle>
 
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 9ab97ea22..5b8997258 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -40,11 +40,12 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
+<!--
     <para>First fix a problem identified upstream that causes some 
     programs to fail:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
+-->
 <!--
     <para>As in <xref linkend="ch-tools-gcc-pass2"/>, apply the following
     <command>sed</command> to force the build to use the
@@ -154,15 +155,7 @@ cd ../gcc-build</userinput></screen>
     Link Time Optimization (LTO):</para> 
 
 <screen><userinput remap="install">install -dm755 /usr/lib/bfd-plugins
-pushd /usr/lib/bfd-plugins
-
-if [ $(uname -m) == "i686" ]; then 
-   ln -sfv ../../libexec/gcc/i686-pc-linux-gnu/&gcc-version;/liblto_plugin.so 
-else
-   ln -sfv ../../libexec/gcc/x86_64-unknown-linux-gnu/&gcc-version;/liblto_plugin.so 
-fi
-
-popd</userinput></screen>
+ln -sfv ../../libexec/gcc/$(gcc -dumpmachine)/&gcc-version;/liblto_plugin.so /usr/lib/bfd-plugins/</userinput></screen>
 
     <para>Now that our final toolchain is in place, it is important to again ensure
     that compiling and linking will work as expected. We do this by performing
diff --git a/chapter06/gdbm.xml b/chapter06/gdbm.xml
index a5dacdbcc..a4b36f18f 100644
--- a/chapter06/gdbm.xml
+++ b/chapter06/gdbm.xml
@@ -79,7 +79,7 @@
     <title>Contents of GDBM</title>
 
     <segmentedlist>
-      <segtitle>Installed program</segtitle>
+      <segtitle>Installed programs</segtitle>
       <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
diff --git a/chapter06/gperf.xml b/chapter06/gperf.xml
index 92dd637c7..244342c1e 100644
--- a/chapter06/gperf.xml
+++ b/chapter06/gperf.xml
@@ -62,7 +62,7 @@
     <title>Contents of Gperf</title>
 
     <segmentedlist>
-      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed program</segtitle>
 
       <seglistitem>
         <seg>gperf</seg>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 7cb9b6b5b..541b062f9 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -50,7 +50,6 @@
 <screen><userinput remap="configure">./configure --prefix=/usr  \
     --localstatedir=/var   \
     --disable-logger       \
-    --disable-syslogd      \
     --disable-whois        \
     --disable-servers</userinput></screen>
 
@@ -68,14 +67,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-syslogd</parameter></term>
-        <listitem>
-          <para>This option prevents Inetutils from installing the System Log
-          Daemon, which is installed with the Sysklogd package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--disable-whois</parameter></term>
         <listitem>
           <para>This option disables the building of the Inetutils
diff --git a/chapter06/intltool.xml b/chapter06/intltool.xml
index 4eea82d0b..fb170ea8e 100644
--- a/chapter06/intltool.xml
+++ b/chapter06/intltool.xml
@@ -64,7 +64,7 @@ install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-&intltool-version;/I18N
     <title>Contents of Intltool</title>
 
     <segmentedlist>
-      <segtitle>Installed program</segtitle>
+      <segtitle>Installed programs</segtitle>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 8940165b4..d86037f33 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -65,9 +65,9 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
     <para>This package comes with a test suite, but due to assumptions it makes,
     it is not possible to reliably run these tests from within the chroot
     environment. If you wish to run these tests after booting into your new LFS
-    system, ensure you select <filename>/proc/config.gz</filename>
-    CONFIG_IKCONFIG_PROC (&quot;General setup&quot; -> &quot;Enable access to
-    .config through /proc/config.gz&quot;) support into your kernel then run
+    system, ensure you enable <filename>/proc/config.gz</filename> support
+    in your kernel (&quot;General setup&quot; -> &quot;Enable access to
+    .config through /proc/config.gz&quot; [CONFIG_IKCONFIG_PROC]), then run
     'make alltests' from the <filename class="directory">testsuite/</filename>
     subdirectory.</para>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 669365703..fa415fdb8 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -270,7 +270,7 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
       <varlistentry id="psfaddtable">
         <term><command>psfaddtable</command></term>
         <listitem>
-          <para>A link to <command>psfxtable</command></para>
+          <para>Adds a Unicode character table to a console font</para>
           <indexterm zone="ch-system-kbd psfaddtable">
             <primary sortas="b-psfaddtable">psfaddtable</primary>
           </indexterm>
@@ -280,7 +280,8 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
       <varlistentry id="psfgettable">
         <term><command>psfgettable</command></term>
         <listitem>
-          <para>A link to <command>psfxtable</command></para>
+          <para>Extracts the embedded Unicode character table from a console
+          font</para>
           <indexterm zone="ch-system-kbd psfgettable">
             <primary sortas="b-psfgettable">psfgettable</primary>
           </indexterm>
@@ -290,7 +291,8 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
       <varlistentry id="psfstriptable">
         <term><command>psfstriptable</command></term>
         <listitem>
-          <para>A link to <command>psfxtable</command></para>
+          <para>Removes the embedded Unicode character table from a console
+          font</para>
           <indexterm zone="ch-system-kbd psfstriptable">
             <primary sortas="b-psfstriptable">psfstriptable</primary>
           </indexterm>
@@ -300,7 +302,7 @@ cp -R -v docs/doc/* /usr/share/doc/kbd-&kbd-version;</userinput></screen>
       <varlistentry id="psfxtable">
         <term><command>psfxtable</command></term>
         <listitem>
-          <para>Handle Unicode character tables for console fonts</para>
+          <para>Handles Unicode character tables for console fonts</para>
           <indexterm zone="ch-system-kbd psfxtable">
             <primary sortas="b-psfxtable">psfxtable</primary>
           </indexterm>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index cc0549d42..d7231aa7c 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -78,7 +78,7 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package and man pages, and create symlinks for
+    <para>Install the package, and create symlinks for
     compatibility with Module-Init-Tools (the package that previously handled
     Linux kernel modules):</para>
 
@@ -97,7 +97,7 @@ ln -sv kmod /bin/lsmod</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed library</segtitle>
 
       <seglistitem>
         <seg>depmod (link to kmod), insmod (link to kmod), kmod, 
diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml
index d9ecf4e55..117b57158 100644
--- a/chapter06/libpipeline.xml
+++ b/chapter06/libpipeline.xml
@@ -76,7 +76,7 @@
     <title>Contents of Libpipeline</title>
 
     <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
+      <segtitle>Installed library</segtitle>
 
       <seglistitem>
         <seg>libpipeline.so</seg>
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 517baf755..2205a9df8 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -52,9 +52,10 @@
             --enable-thread-safe \
             --docdir=/usr/share/doc/mpfr-&mpfr-version;</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para>Compile the package and generate the HTML documentation:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make
+make html</userinput></screen>
 
     <important>
       <para>The test suite for MPFR in this section is considered critical.
@@ -65,14 +66,10 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and its documentation:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
-
-    <para>Install the documentation:</para>
-
-<screen><userinput remap="make">make html
-</userinput><userinput remap="install">make install-html</userinput></screen>
+<screen><userinput remap="install">make install
+make install-html</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 3dbafd4d7..f0dbec3cf 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -128,7 +128,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so</useri
       <varlistentry id="pidof">
         <term><command>pidof</command></term>
         <listitem>
-          <para>Looks up processes based on their name and other attributes</para>
+          <para>Reports the PIDs of the given programs</para>
           <indexterm zone="ch-system-procps pidof">
             <primary sortas="b-pidof">pidof</primary>
           </indexterm>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 684edebee..c844a0111 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -62,7 +62,7 @@ EOF</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                         \
+<screen><userinput remap="configure">./configure --prefix=/usr                                           \
             --sysconfdir=/etc                                       \
             --localstatedir=/var                                    \
             --config-cache                                          \
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index e34678367..c24b2e59f 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -84,11 +84,12 @@
     If the <filename>/usr/share/info/dir</filename> file ever needs to be
     recreated, the following optional commands will accomplish the task:</para>
 
-<screen role="nodump"><userinput>cd /usr/share/info
+<screen role="nodump"><userinput>pushd /usr/share/info
 rm -v dir
 for f in *
-do install-info $f dir 2&gt;/dev/null
-done</userinput></screen>
+  do install-info $f dir 2&gt;/dev/null
+done
+popd</userinput></screen>
 
   </sect2>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 5afa8965b..87f70f0ea 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -45,14 +45,10 @@
     <para>The FHS recommends using the <filename
     class="directory">/var/lib/hwclock</filename> directory instead of the
     usual <filename class="directory">/etc</filename> directory as the
-    location for the <filename>adjtime</filename> file. To make the
-    <command>hwclock</command> program FHS-compliant, run the
-    following:</para>
+    location for the <filename>adjtime</filename> file.  First create a directory
+    to enable storage for the <command>hwclock</command> program:</para>
 
-<screen><userinput remap="pre">sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-          $(grep -rl '/etc/adjtime' .)
-
-mkdir -pv /var/lib/hwclock</userinput></screen>
+<screen><userinput remap="pre">mkdir -pv /var/lib/hwclock</userinput></screen>
 
   </sect2>
 
@@ -61,7 +57,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure</userinput></screen>
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -79,10 +75,6 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
     <screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen> 
     </warning>
 
-    <note><para>Two tests, last/ipv6 and last/last, fail in the chroot environment
-    due to the DNS resolver not being active yet.  If the tests are rerun after
-    booting, they pass.</para></note>
-
     <screen><userinput remap="test">chown -Rv nobody .
 su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
@@ -102,12 +94,12 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
       <seglistitem>
         <seg>addpart, agetty, blkdiscard, blkid, blockdev, cal, cfdisk, chcpu,
-        chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, delpart, dmesg,
+        chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
         eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock,
         i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to
         last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
-        lslocks, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+        lslocks, lslogins, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
         more, mount, mountpoint, namei, partx, pg, pivot_root, prlimit, raw,
         readprofile, rename, renice, resizepart, rev, rtcwake, script,
         scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
@@ -117,8 +109,8 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
 
         <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
 
-        <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
-        /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
+        <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
+        /usr/include/uuid, /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -272,17 +264,6 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="cytune">
-        <term><command>cytune</command></term>
-        <listitem>
-          <para>Tunes the parameters of the serial line drivers for
-          Cyclades cards</para>
-          <indexterm zone="ch-system-util-linux cytune">
-            <primary sortas="b-cytune">cytune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="delpart">
         <term><command>delpart</command></term>
         <listitem>
@@ -646,6 +627,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="lslogins">
+        <term><command>lslogins</command></term>
+        <listitem>
+          <para>Lists information about users, groups and system accounts</para>
+          <indexterm zone="ch-system-util-linux lslogins">
+            <primary sortas="b-lslogins">lslogins</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mcookie">
         <term><command>mcookie</command></term>
         <listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index d400249be..840440cac 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -119,7 +119,7 @@ done</userinput></screen>
     additional libraries to be installed. For more information on this
     process, refer to the Vim documentation and the Vim installation page
     in the BLFS book at <ulink
-    url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
+    url="&blfs-root;view/svn/postlfs/vim.html"/>.</para>
 
   </sect2>
 
@@ -195,13 +195,13 @@ set spell</literal></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
+      <segtitle>Installed directories</segtitle>
 
       <seglistitem>
        <seg> ex (link to vim), rview (link to vim), rvim (link to vim), vi
        (link to vim), view (link to vim), vim, vimdiff (link to vim), vimtutor,
        and xxd</seg>
-        <seg>/usr/share/vim</seg>
+        <seg>/usr/share/doc/vim-&vim-version;, /usr/share/vim</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/packages.ent b/packages.ent
index 2fbcff441..69be5ae86 100644
--- a/packages.ent
+++ b/packages.ent
@@ -100,10 +100,10 @@
 <!ENTITY check-ch5-du "6.9 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.22">
-<!ENTITY coreutils-size "5,210 KB">
+<!ENTITY coreutils-version "8.23">
+<!ENTITY coreutils-size "5,250 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "8fb0ae2267aa6e728958adc38f8163a2">
+<!ENTITY coreutils-md5 "abed135279f87ad6762ce57ff6d89c41">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "133 MB">
 <!ENTITY coreutils-ch5-sbu "0.8 SBU">
@@ -139,10 +139,10 @@
 <!-- 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.42.10">
-<!ENTITY e2fsprogs-size "5,983 KB">
+<!ENTITY e2fsprogs-version "1.42.11">
+<!ENTITY e2fsprogs-size "6,205 KB">
 <!ENTITY e2fsprogs-url "http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "62bfe2fe0a194c5c37165789ac2825a8">
+<!ENTITY e2fsprogs-md5 "412acbbd64a866c2ed1c729deaf4ae7c">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "64 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.7 SBU">
@@ -206,17 +206,17 @@
 <!ENTITY gawk-ch6-du "30 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.9.0">
-<!ENTITY gcc-size "87,576 KB">
+<!ENTITY gcc-version "4.9.1">
+<!ENTITY gcc-size "87,749 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "9709b49ae0e904cbb0a6a1b62853b556">
+<!ENTITY gcc-md5 "fddf71348546af523353bd43d34919c1">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
-<!ENTITY gcc-ch5p1-du "1.4 GB">
-<!ENTITY gcc-ch5p1-sbu "5.5 SBU">
-<!ENTITY gcc-ch5p2-du "1.8 GB">
-<!ENTITY gcc-ch5p2-sbu "7.1 SBU">
-<!ENTITY gcc-ch6-du "2.2 GB">
-<!ENTITY gcc-ch6-sbu "55.6 SBU">
+<!ENTITY gcc-ch5p1-du "2.0 GB">
+<!ENTITY gcc-ch5p1-sbu "7.3 SBU">
+<!ENTITY gcc-ch5p2-du "2.2 GB">
+<!ENTITY gcc-ch5p2-sbu "9.6 SBU">
+<!ENTITY gcc-ch6-du "2.5 GB">
+<!ENTITY gcc-ch6-sbu "83 SBU">
 
 <!ENTITY gdbm-version "1.11">
 <!ENTITY gdbm-size "796 KB">
@@ -228,10 +228,10 @@
 <!ENTITY gdbm-ch6-du "8.5 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.19.1">
-<!ENTITY gettext-size "6,456 KB">
+<!ENTITY gettext-version "0.19.2">
+<!ENTITY gettext-size "6,467 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "b52987f49bc99fa8b410270d47a9d52b">
+<!ENTITY gettext-md5 "1e6a827f5fbd98b3d40bd16b803acc44">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "119 MB">
 <!ENTITY gettext-ch5-sbu "0.6 SBU">
@@ -335,10 +335,10 @@
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
 
-<!ENTITY kbd-version "2.0.1">
-<!ENTITY kbd-size "1,962 KB">
+<!ENTITY kbd-version "2.0.2">
+<!ENTITY kbd-size "2,105 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.gz">
-<!ENTITY kbd-md5 "e9f2b7046312c11cec9e52e22f307b6a">
+<!ENTITY kbd-md5 "ba56fb5bfd44acea83fc5dac4a9b7f15">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
@@ -388,12 +388,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "15">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "6">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "77,813 KB">
+<!ENTITY linux-size "77,822 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "72bd0bf0e773963217c89cddbf3e0048">
+<!ENTITY linux-md5 "739272475e2e3981974e1f083d0eba47">
 <!ENTITY linux-home "http://www.kernel.org/">
 <!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -434,10 +434,10 @@
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.69">
-<!ENTITY man-pages-size "1,232 KB">
+<!ENTITY man-pages-version "3.70">
+<!ENTITY man-pages-size "1,237 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "0b1feceef945e5d53c3ea63307163e8c">
+<!ENTITY man-pages-md5 "e5a3fc1d7ae4f03a27676d7bad725416">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "23 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
@@ -587,10 +587,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY util-linux-version "2.24.2">
-<!ENTITY util-linux-size "3,503 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.24/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "3f191727a0d28f7204b755cf1b6ea0aa">
+<!ENTITY util-linux-version "2.25">
+<!ENTITY util-linux-size "3,596 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.25/util-linux-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-md5 "4c78fdef4cb882caafad61e33cafbc14">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-ch5-du "89 MB">
 <!ENTITY util-linux-ch5-sbu "0.6 SBU">
@@ -608,7 +608,7 @@
 
 <!ENTITY xml-parser-version "2.42_01">
 <!ENTITY xml-parser-size "236 KB">
-<!ENTITY xml-parser-url "http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
+<!ENTITY xml-parser-url "http://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz">
 <!ENTITY xml-parser-md5 "a4650aebcc464bb91113c2c356da8210">
 <!ENTITY xml-parser-home "https://github.com/chorny/XML-Parser">
 <!ENTITY xml-parser-ch6-du "2.5 MB">
diff --git a/patches.ent b/patches.ent
index 1402beac5..9726b5a31 100644
--- a/patches.ent
+++ b/patches.ent
@@ -10,6 +10,10 @@
 <!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
 <!ENTITY binutils-lto-patch-size "2.0 KB">
 
+<!ENTITY binutils-lto-testsuite-patch "binutils-&binutils-version;-lto_testsuite-1.patch">
+<!ENTITY binutils-lto-testsuite-patch-md5 "a6647fdb3cca512962bb1433bb6b4f9f">
+<!ENTITY binutils-lto-testsuite-patch-size "3.0 KB">
+
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
@@ -18,21 +22,26 @@
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
-<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-4.patch">
-<!ENTITY coreutils-i18n-patch-md5 "54c99871cd0ca20f29bdc9462e27f0df">
-<!ENTITY coreutils-i18n-patch-size "140 KB">
+<!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
+<!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
+<!ENTITY coreutils-i18n-patch-size "138 KB">
 
+<!--
 <!ENTITY coreutils-shuf-segfault-patch "coreutils-&coreutils-version;-shuf_segfault-1.patch">
 <!ENTITY coreutils-shuf-segfault-patch-md5 "f1b5b35392914e327b1b6bbbb454d256">
 <!ENTITY coreutils-shuf-segfault-patch-size "4 KB">
-
+-->
+<!--
 <!ENTITY e2fsprogs-fix-test-patch "e2fsprogs-&e2fsprogs-version;-fix_test-1.patch">
 <!ENTITY e2fsprogs-fix-test-patch-md5 "7c20605628536db298bb3bb4666047bf">
 <!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB">
+-->
 
+<!--
 <!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
 <!ENTITY gcc-upstream-patch-md5 "f070aae5f5f92259ed167539725e6241">
 <!ENTITY gcc-upstream-patch-size "4.0 KB">
+-->
 
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
@@ -46,12 +55,6 @@
 <!ENTITY mpfr-fixes-patch-md5 "aaf52416b309dd0b8c5eb92ae9c210c1">
 <!ENTITY mpfr-fixes-patch-size "43 KB">
 
-<!--
-<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "daf5c64fd7311e924966842680535f8f">
-<!ENTITY perl-libc-patch-size "1.6 KB">
--->
-
 <!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-1.patch">
 <!ENTITY readline-fixes-patch-md5 "bbee7fad08474328b807e6828c26a961">
 <!ENTITY readline-fixes-patch-size "3.1 KB">