Final sync from lfs svn.

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

18 files changed, 91 insertions, 39 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 260ed14d3..a76aefce0 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1492,7 +1492,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Not run. Requires Man-DB test suite package</seg>
+          <seg>Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 402a696c8..6961afade 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,61 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-02-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merge LFS SVN-20140216 book.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-02-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.5.9.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Incorporate beta FHS.  Add 
+          /usr/share/ppd, /usr/libexec, /usr/share/color, 
+          /usr/local/share/color, /var/lib/color, and /usr/share/dict. 
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Incorporate beta FHS.  Remove overrides
+          for /usr/libexec: coreutils, findutils, gawk, gcc, glibc, 
+          inetutils, man-db, and tar.  Also fixes 
+          <ulink url="&lfs-ticket-root;3498">#3498</ulink>.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Incorporate beta FHS.  Move grub sbin
+          executables from /usr/sbin to /sbin.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Document two new glibc errors in the
+          regression tests.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Move man-db after util-linux to satisfy
+          a test dependency.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update automake tests to accomodate util-linux
+          in /tools and to speed the test up.
+          </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Restore building the flex static library.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-02-14</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 64323dfe7..e4c862f4e 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -49,11 +49,17 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <note><para>The tests take a very long time: over 30 SBUs.</para></note>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
+    <para>There are a couple of tests that incorrectly link to the 
+    wrong version of the flex library, so we temporarily work around
+    the problem.  Also, using the -j4 make option speeds up the tests, even on
+    systems with only one processor due to internal delays in individual
+    tests.  To test the results, issue:</para>
+
+<screen><userinput remap="test">mv -v /usr/lib/libfl.{so,save}
+ln -sv libfl.a /usr/lib/libfl.so
+make -j4 check
+rm -v /usr/lib/libfl.so
+mv -v /usr/lib/libfl.{save,so}</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 9e69a42bd..01c7f9d4e 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -72,12 +72,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 3adc10127..86cdaaa51 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -61,7 +61,6 @@
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1 ./configure \
             --prefix=/usr            \
-            --libexecdir=/usr/lib    \
             --enable-no-install-program=kill,uptime</userinput></screen>
 
     <variablelist>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 65553e8d5..9a3713ebf 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -18,7 +18,7 @@ mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root
 install -dv -m 1777 /tmp /var/tmp
 mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
+mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
 mkdir -pv /usr/{,local/}share/man/man{1..8}
 for dir in /usr /usr/local; do
@@ -30,7 +30,7 @@ esac
 mkdir -v /var/{log,mail,spool}
 ln -sv /run /var/run
 ln -sv /run/lock /var/lock
-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
+mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
 
   <para>Directories are, by default, created with permission mode 755, but
   this is not desirable for all directories. In the commands above, two
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 00828af11..c04beab46 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -46,7 +46,6 @@
     <para>Prepare Findutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                   \
-            --libexecdir=/usr/lib/findutils \
             --localstatedir=/var/lib/locate</userinput></screen>
 
     <variablelist>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 4f6cef1f4..45364de3f 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -48,7 +48,6 @@
     <para>Prepare Flex for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \
-            --disable-static \
             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -98,7 +97,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
 
       <seglistitem>
         <seg>flex, flex++ (link to flex), and lex</seg>
-        <seg>libfl.so and libfl_pic.so</seg>
+        <seg>libfl.{so,a} and libfl_pic.{so.a}</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -143,7 +142,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
       </varlistentry>
 
       <varlistentry id="libfl.so">
-        <term><filename class="libraryfile">libfl.a</filename></term>
+        <term><filename class="libraryfile">libfl.so</filename></term>
         <listitem>
           <para>The <filename class="libraryfile">flex</filename> library</para>
           <indexterm zone="ch-system-flex libfl.so">
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 3db79a01c..6328b2c4c 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -42,7 +42,7 @@
 
     <para>Prepare Gawk for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index a418f43a7..7fe9fe94d 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -72,7 +72,6 @@ cd ../gcc-build</userinput></screen>
 
 <screen><userinput remap="configure">SED=sed                                            \
 ../gcc-&gcc-version;/configure --prefix=/usr               \
-                       --libexecdir=/usr/lib       \
                        --enable-shared             \
                        --enable-threads=posix      \
                        --enable-__cxa_atexit       \
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 9fccea41c..58105b854 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -84,22 +84,12 @@ cd ../glibc-build</userinput></screen>
     --prefix=/usr                \
     --disable-profile            \
     --enable-kernel=&min-kernel;       \
-    --libexecdir=/usr/lib        \
     --enable-obsolete-rpc</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options:</title>
 
       <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib</parameter></term>
-        <listitem>
-          <para>This changes the location of some auxillary files from the
-          default of <filename class="directory">/usr/libexec</filename> to
-          <filename class="directory">/usr/lib</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><parameter>--enable-obsolete-rpc</parameter></term>
         <listitem>
           <para>Installs NIS and RPC related headers that are not installed by
@@ -163,8 +153,14 @@ grep Error glibc-check-log</userinput></screen>
       </listitem>
 
       <listitem>
+        <para>libio/tst-ftell-partial-wide.out fails because it needs a locale
+        that has not yet been generated.</para>
+      </listitem>
+
+      <listitem>
         <para>Other tests known to fail on some architectures are posix/bug-regex32,
-        misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22.</para>
+        misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, nptl/tst-robust8,
+        and stdio-common/bug22.</para>
       </listitem>
 
     </itemizedlist>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 6354a4777..7941debd6 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -47,6 +47,7 @@
     <para>Prepare GRUB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
+            --sbindir=/sbin        \
             --sysconfdir=/etc      \
             --disable-grub-emu-usb \
             --disable-efiemu       \
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 136b6383f..639d04da9 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -48,7 +48,6 @@
     <para>Prepare Inetutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr  \
-    --libexecdir=/usr/sbin \
     --localstatedir=/var   \
     --disable-logger       \
     --disable-syslogd      \
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 196f41dd3..372ee08aa 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -44,7 +44,6 @@
     <para>Prepare Man-DB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr                        \
-            --libexecdir=/usr/lib                \
             --docdir=/usr/share/doc/man-db-&man-db-version; \
             --sysconfdir=/etc                    \
             --disable-setuid                     \
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index f02d88867..c3c3c0738 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -48,8 +48,7 @@
 
 <screen><userinput remap="configure">FORCE_UNSAFE_CONFIGURE=1  \
 ./configure --prefix=/usr \
-            --bindir=/bin \
-            --libexecdir=/usr/sbin</userinput></screen>
+            --bindir=/bin</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/general.ent b/general.ent
index 0ac04d530..5bec10934 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "20140214-SYSTEMD">
-<!ENTITY releasedate     "February 14, 2014">
+<!ENTITY version         "20140217-SYSTEMD">
+<!ENTITY releasedate     "February 17, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index ff38dc698..6037b3a86 100644
--- a/packages.ent
+++ b/packages.ent
@@ -38,7 +38,7 @@
 <!ENTITY automake-md5 "7fc29854c520f56b07aa232a0f880292">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "100 MB">
-<!ENTITY automake-ch6-sbu "less than 0.1 SBU (34.1 SBU with tests)">
+<!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 12 SBU with tests)">
 
 <!ENTITY bash-version "4.2">
 <!ENTITY bash-size "6,845 KB">
@@ -441,10 +441,10 @@
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.58">
-<!ENTITY man-pages-size "1,170 KB">
+<!ENTITY man-pages-version "3.59">
+<!ENTITY man-pages-size "1,172 KB">
 <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "539698a70e0338551d22c24011c03186">
+<!ENTITY man-pages-md5 "d8e4d8287a76ee861351b905044c8e92">
 <!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">
diff --git a/prologue/standards.xml b/prologue/standards.xml
index 21a70d191..863e4e3bc 100644
--- a/prologue/standards.xml
+++ b/prologue/standards.xml
@@ -22,8 +22,9 @@
         POSIX.1-2008</ulink>.</para>
       </listitem>
       <listitem>
-        <para><ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.html">Filesystem
-        Hierarchy Standard (FHS)</ulink></para>
+        <para><ulink 
+        url="http://www.linuxfoundation.org/collaborate/workgroups/lsb/fhs-30-draft-1">
+        Filesystem Hierarchy Standard version 3.0 Draft 1 (FHS)</ulink></para>
 
       </listitem>
       <listitem>