Merge latest lfs svn work into systemd branch. Better to be safe than sorry.

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

appendices/dependencies.xml

@@ -439,8 +439,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, Expat, GCC, Grep, Make, and
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Sed</seg>
+         Make, Sed, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -448,7 +448,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>D-Bus Glib Bindings, Python</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -456,7 +456,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Systemd</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -464,7 +464,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Xorg Libs</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -483,7 +483,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg></seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -539,6 +539,42 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Expat dependency info -->
+  <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
+         Make, and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>XML::Parser</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Expect dependency info -->
   <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
 
@@ -937,6 +973,41 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Gperf dependency info -->
+  <bridgehead renderas="sect2" id="gperf-dep">Gperf</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Expect</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Grep dependency info -->
   <bridgehead renderas="sect2" id="grep-dep">Grep</bridgehead>
 
@@ -1152,6 +1223,41 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Intltool dependency info -->
+  <bridgehead renderas="sect2" id="intltool-dep">Intltool</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Gawk, Glibc, Make, Perl, Sed, and XML::Parser</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Perl</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin IProute2 dependency info -->
   <bridgehead renderas="sect2" id="iproute2-dep">IProute2</bridgehead>
 
@@ -1296,6 +1402,41 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Libcap dependency info -->
+  <bridgehead renderas="sect2" id="libcap-dep">Libcap</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Attr, Bash, Binutils, Coreutils, GCC, Glibc, Perl, Make, and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Systemd</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>Linux-PAM</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Libpipeline dependency info -->
   <bridgehead renderas="sect2" id="libpipeline-dep">Libpipeline</bridgehead>
 
@@ -1977,6 +2118,42 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Systemd dependency info -->
+  <bridgehead renderas="sect2" id="systemd-dep">Systemd</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk, GCC,
+         Glibc, Gperf, Grep, Intltool, Libcap, Make, Sed, and Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Tar dependency info -->
   <bridgehead renderas="sect2" id="tar-dep">Tar</bridgehead>
 
@@ -2157,14 +2334,14 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Xml-Parser dependency info -->
+<!-- Begin XML::Parser dependency info -->
-  <bridgehead renderas="sect2" id="xml-parser-dep">Xml::Parser</bridgehead>
+  <bridgehead renderas="sect2" id="xml-parser-dep">XML::Parser</bridgehead>
 
       <segmentedlist>
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Expat, Make, and Perl.</seg>
+         <seg>Bash, Binutils, Coreutils, Expat, GCC, Glibc, Make, and Perl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2172,7 +2349,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Perl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2180,7 +2357,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Intltool</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2188,7 +2365,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>libwww-perl</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 

chapter01/changelog.xml

@@ -35,6 +35,89 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-04-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merge LFS SVN-20140408 book.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change lex rwapper script to a symbolic 
+          link. Completes 
+          <ulink url="&lfs-ticket-root;3523">#3523</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.14. Fixes 
+          <ulink url="&lfs-ticket-root;3523">#3523</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.18. Fixes 
+          <ulink url="&lfs-ticket-root;3526">#3526</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to flex-2.5.39. Addresses 
+          <ulink url="&lfs-ticket-root;3527">#3527</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gmp-6.0.0a. Fixes 
+          <ulink url="&lfs-ticket-root;3528">#3528</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.64. Fixes 
+          <ulink url="&lfs-ticket-root;3539">#3539</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to systemd-212. Fixes 
+          <ulink url="&lfs-ticket-root;3540">#3540</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-04-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update the example SEARCH_DIR output for i686
+          in the GCC text. Fixes 
+          <ulink url="&lfs-ticket-root;3524">#3524</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata2014b. Fixes 
+          <ulink url="&lfs-ticket-root;3525">#3525</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-17. Fixes 
+          <ulink url="&lfs-ticket-root;3538">#3538</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-03-31</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Remove remaining references to headers-check when
+          installing the linux API headers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-03-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.63. Fixes 
+          <ulink url="&lfs-ticket-root;3522">#3522</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-03-14</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -73,15 +73,15 @@
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>File &file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Flex &flex-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>-->
@@ -97,9 +97,9 @@
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GMP &gmp-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
@@ -130,9 +130,9 @@
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Kmod &kmod-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>-->
@@ -142,9 +142,9 @@
     <!--<listitem>
       <para>Libcap-&libcap-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Libpipeline &libpipeline-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Libtool &libtool-version;</para>
     </listitem>-->

chapter03/packages.xml

@@ -487,6 +487,22 @@
       </listitem>
     </varlistentry>
 
+    <!-- FIXME:
+    <varlistentry>
+      <term>Ncurses Rollup Patch (&ncurses-date;) - 328 KB:</term>
+      <listitem>
+        <para><ulink url="ftp://invisible-island.net/ncurses/&ncurses-version;/"/></para>
+
+        <note>
+          <para>Ncurses Rollup Patch (&ncurses-date;) may no longer be available
+          at the listed location. The site administrators of the master download
+          location occasionally remove older versions when new ones are released.
+          There is no alternative download location yet.</para>
+        </note>
+      </listitem>
+    </varlistentry>
+    -->
+
     <varlistentry>
       <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
       <listitem>

chapter03/patches.xml

@@ -65,15 +65,7 @@
         <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>
-        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
     <varlistentry>
       <term>Systemd Compat Patch - <token>&systemd-compat-patch-size;</token>:</term>
       <listitem>

chapter05/gcc-pass1.xml

@@ -55,11 +55,11 @@
     directory and then change to the directory created.  Only then should you
     proceed with the instructions below.</para></note>
 
-<screen><userinput remap="pre">tar -Jxf ../mpfr-&mpfr-version;.tar.xz
+<screen><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
-tar -Jxf ../gmp-&gmp-version;.tar.xz
+tar -xf ../gmp-&gmp-version;.tar.xz
-mv -v gmp-&gmp-version; gmp
+mv -v gmp-&gmp-extracted-version; gmp
-tar -zxf ../mpc-&mpc-version;.tar.gz
+tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
     <para>The following command will change the location of GCC's default

chapter05/gcc-pass2.xml

@@ -90,11 +90,11 @@ done</userinput></screen>
     packages. Unpack the tarballs and move them into the required directory
     names:</para>
 
-<screen><userinput remap="pre">tar -Jxf ../mpfr-&mpfr-version;.tar.xz
+<screen><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
-tar -Jxf ../gmp-&gmp-version;.tar.xz
+tar -xf ../gmp-&gmp-version;.tar.xz
-mv -v gmp-&gmp-version; gmp
+mv -v gmp-&gmp-extracted-version; gmp
-tar -zxf ../mpc-&mpc-version;.tar.gz
+tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
     <para>Create a separate build directory again:</para>

chapter05/glibc.xml

@@ -173,6 +173,7 @@ esac</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
+<!--
     <para>This package does come with a test suite, however, it cannot be
     run at this time because we do not have a C++ compiler yet.</para>
 
@@ -186,7 +187,7 @@ esac</userinput></screen>
       the Glibc locales anyway, use instructions from <xref
       linkend="ch-system-glibc" role="."/></para>
     </note>
-
+-->
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>

chapter05/linux-headers.xml

@@ -53,13 +53,12 @@
 
 <screen><userinput remap="pre">make mrproper</userinput></screen>
 
-    <para>Now test and extract the user-visible kernel headers from the source.
+    <para>Now extract the user-visible kernel headers from the source.
     They are placed in an intermediate local directory and copied to the needed
     location because the extraction process removes any existing files in
     the target directory.</para>
 
-<screen><userinput remap="make">make headers_check
+<screen><userinput remap="make">make INSTALL_HDR_PATH=dest headers_install
-make INSTALL_HDR_PATH=dest headers_install
 </userinput><userinput remap="install">cp -rv dest/include/* /tools/include</userinput></screen>
 
   </sect2>

chapter06/acl.xml

@@ -60,10 +60,10 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <para>The Acl tests need to be run on a filesystem that supports access
-    controls. Coreutils needs to be compiled with ACL support in order for
+    controls after <application>Coreutils</application> has been built with the
-    the testsuite to complete successfully. To test the results, issue:</para>
+    Acl libraries.  If desired, return to this package and run <command>make
-
+    tests</command> after <application>Coreutils</application> has been built
-<screen><userinput remap="test">make tests</userinput></screen>
+    later in this chapter.</para>
 
     <para>Install the package:</para>
 

chapter06/attr.xml

@@ -59,8 +59,9 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>The Attr tests need to be run on a filesystem that supports extended
+    <para>The tests need to be run on a filesystem that supports extended
-    attributes. To test the results, issue:</para>
+    attributes such as the ext2, ext3, or ext4 filesystems. To test the
+    results, issue:</para>
 
 <screen><userinput remap="test">make tests root-tests</userinput></screen>
 

chapter06/dbus.xml

@@ -48,11 +48,11 @@
 
     <para>Prepare D-Bus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                      \
+<screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --sysconfdir=/etc                  \
+            --sysconfdir=/etc                   \
-            --localstatedir=/var               \
+            --localstatedir=/var                \
-            --docdir=/usr/share/doc/dbus-&dbus-version; \
+            --docdir=/usr/share/doc/dbus-&dbus-version;  \
-            --with-console-auth-dir=/run/console/</userinput></screen>
+            --with-console-auth-dir=/run/console</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter06/e2fsprogs.xml

@@ -61,6 +61,7 @@ cd build</userinput></screen>
 CFLAGS=-I/tools/include              \
 PKG_CONFIG_PATH=/tools/lib/pkgconfig \
 ../configure --prefix=/usr           \
+             --bindir=/bin           \
              --with-root-prefix=""   \
              --enable-elf-shlibs     \
              --disable-libblkid      \
@@ -80,7 +81,8 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-root-prefix=""</parameter></term>
+        <term><parameter>--with-root-prefix=""</parameter> and
+              <parameter>--bindir=/bin</parameter></term>
         <listitem>
           <para>Certain programs (such as the <command>e2fsck</command>
           program) are considered essential programs.  When, for example,

chapter06/flex.xml

@@ -70,19 +70,11 @@
 -->
     <para>A few programs do not know about <command>flex</command> yet and
     try to run its predecessor, <command>lex</command>. To support those
-    programs, create a wrapper script named <filename>lex</filename> that
+    programs, create a symbolic link named <filename>lex</filename> that
-    calls <filename>flex</filename> in <command>lex</command> emulation
+    runs <filename>flex</filename> in <command>lex</command> emulation
     mode:</para>
 
-<screen><userinput remap="install">cat &gt; /usr/bin/lex &lt;&lt; "EOF"
+<screen><userinput remap="install">ln -s flex /usr/bin/lex</userinput></screen>
-<literal>#!/bin/sh
-# Begin /usr/bin/lex
-
-exec /usr/bin/flex -l "$@"
-
-# End /usr/bin/lex</literal>
-EOF
-chmod -v 755 /usr/bin/lex</userinput></screen>
 
   </sect2>
 
@@ -95,7 +87,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>flex, flex++ (link to flex), and lex</seg>
+        <seg>flex, flex++ (link to flex), and lex (link to flex)</seg>
         <seg>libfl.{a,so} and libfl_pic.{a,so}</seg>
         <seg>/usr/share/doc/flex-&flex-version;</seg>
       </seglistitem>

chapter06/gcc.xml

@@ -234,12 +234,16 @@ cd ../gcc-build</userinput></screen>
     href="adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
+<screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib32")
+SEARCH_DIR("/usr/local/lib32")
+SEARCH_DIR("/lib32")
+SEARCH_DIR("/usr/lib32")
+SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
 SEARCH_DIR("/usr/local/lib")
 SEARCH_DIR("/lib")
 SEARCH_DIR("/usr/lib");</computeroutput></screen>
 
-   <para>A 64-bit system may see a few more directories. For example, here
+   <para>A 64-bit system may see a few different directories. For example, here
    is the output from an x86_64 machine:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/x86_64-unknown-linux-gnu/lib64")

chapter06/kmod.xml

@@ -47,7 +47,6 @@
             --bindir=/bin          \
             --sysconfdir=/etc      \
             --with-rootlibdir=/lib \
-            --disable-manpages     \
             --with-xz              \
             --with-zlib</userinput></screen>
 
@@ -61,15 +60,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--disable-manpages</parameter></term>
-        <listitem>
-          <para>This option prevents the man pages from being built, as they
-          rely on libxslt, which isn't available in the chroot
-          environment.</para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><parameter>--with-rootlibdir=/lib</parameter></term>
         <listitem>
@@ -93,7 +83,6 @@
     Linux kernel modules):</para>
 
 <screen><userinput remap="install">make install
-make -C man install
 
 for target in depmod insmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target

chapter06/linux-headers.xml

@@ -52,7 +52,7 @@
 
 <screen><userinput remap="pre">make mrproper</userinput></screen>
 
-    <para>Now test and extract the user-visible kernel headers from the source.
+    <para>Now extract the user-visible kernel headers from the source.
     They are placed in an intermediate local directory and copied to the needed
     location because the extraction process removes any existing files in
     the target directory.  There are also some hidden files used by

chapter06/systemd.xml

@@ -141,7 +141,7 @@ EOF</userinput></screen>
 <screen><userinput remap="test">make -k check</userinput></screen>
 
     <para>Note that some tests might fail because the test are being run in a
-    chroot environment. For full test coverage, the test suite should be ran
+    chroot environment. For full test coverage, the test suite should be run
     from a system booted using Systemd.</para>
 
     <para>Install the package:</para>

chapter06/xml-parser.xml

@@ -63,7 +63,7 @@
     <title>Contents of XML::Parser</title>
 
     <segmentedlist>
-      <segtitle>Installed Perl module</segtitle>
+      <segtitle>Installed module</segtitle>
 
       <seglistitem>
         <seg>Expat.so</seg>

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version         "20140314-systemd">
+<!ENTITY version         "20140412-systemd">
-<!ENTITY releasedate     "March 14, 2014">
+<!ENTITY releasedate     "April 12, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
@@ -34,6 +34,7 @@
 <!ENTITY alpha-gnu       "http://alpha.gnu.org/gnu/">
 <!ENTITY kernel          "https://www.kernel.org/pub/">
 <!ENTITY sourceforge     "http://prdownloads.sourceforge.net/">
+<!ENTITY savannah        "http://download.savannah.gnu.org">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;

packages.ent

@@ -7,22 +7,22 @@
      Allowed deviation in disk usage : 2% -->
 
 
-<!ENTITY attr-version "2.4.47">
-<!ENTITY attr-size "336 KB">
-<!ENTITY attr-url "http://download.savannah.gnu.org/releases/attr/attr-&attr-version;.src.tar.gz">
-<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
-<!ENTITY attr-home " ">
-<!ENTITY attr-ch6-du "3.5 MB">
-<!ENTITY attr-ch6-sbu "0.1 SBU">
-
 <!ENTITY acl-version "2.2.52">
 <!ENTITY acl-size "380 KB">
-<!ENTITY acl-url "http://download.savannah.gnu.org/releases/acl/acl-&acl-version;.src.tar.gz">
+<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.src.tar.gz">
 <!ENTITY acl-md5 "a61415312426e9c2212bd7dc7929abda">
 <!ENTITY acl-home " ">
 <!ENTITY acl-ch6-du "5.4 MB">
 <!ENTITY acl-ch6-sbu "0.2 SBU">
 
+<!ENTITY attr-version "2.4.47">
+<!ENTITY attr-size "336 KB">
+<!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.src.tar.gz">
+<!ENTITY attr-md5 "84f58dec00b60f2dc8fd1c9709291cc7">
+<!ENTITY attr-home " ">
+<!ENTITY attr-ch6-du "3.5 MB">
+<!ENTITY attr-ch6-sbu "0.1 SBU">
+
 <!ENTITY autoconf-version "2.69">
 <!ENTITY autoconf-size "1,186 KB">
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
@@ -164,10 +164,10 @@
 <!ENTITY expect-ch5-du "4.4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.17">
+<!ENTITY file-version "5.18">
-<!ENTITY file-size "694 KB">
+<!ENTITY file-size "699 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "e19c47e069ced7b01ccb4db402cc01d3">
+<!ENTITY file-md5 "d420d8f2990cd344673acfbf8d76ff5a">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "12.4 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -184,10 +184,10 @@
 <!ENTITY findutils-ch6-du "29 MB">
 <!ENTITY findutils-ch6-sbu "0.4 SBU">
 
-<!ENTITY flex-version "2.5.38">
+<!ENTITY flex-version "2.5.39">
-<!ENTITY flex-size "1,590 KB">
+<!ENTITY flex-size "1,575 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
-<!ENTITY flex-md5 "b230c88e65996ff74994d08a2a2e0f27">
+<!ENTITY flex-md5 "77d44c6bb8c0705e0017ab9a84a1502b">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 <!--
 <!ENTITY flex-ch5-du "">
@@ -248,10 +248,11 @@
 <!ENTITY glibc-ch6-du "922 MB">
 <!ENTITY glibc-ch6-sbu "17.1 SBU">
 
-<!ENTITY gmp-version "5.1.3">
+<!ENTITY gmp-version "6.0.0a">
-<!ENTITY gmp-size "1,777 KB">
+<!ENTITY gmp-extracted-version "6.0.0">
+<!ENTITY gmp-size "1,860 KB">
 <!ENTITY gmp-url "http://ftp.gnu.org/gnu/gmp/gmp-&gmp-version;.tar.xz">
-<!ENTITY gmp-md5 "e5fe367801ff067b923d1e6a126448aa">
+<!ENTITY gmp-md5 "1e6da4e434553d2811437aa42c7f7c76">
 <!ENTITY gmp-home "&gnu-software;gmp/">
 <!ENTITY gmp-ch5-du "39 MB">
 <!ENTITY gmp-ch5-sbu "1.5 SBU">
@@ -342,12 +343,12 @@
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "16">
+<!ENTITY kmod-version "17">
-<!ENTITY kmod-size "1,408 KB">
+<!ENTITY kmod-size "1,450 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "3006a0287211212501cdfe1211b29f09">
+<!ENTITY kmod-md5 "bc36d28b12dcb2b664a35411560c5610">
 <!ENTITY kmod-home " ">
-<!ENTITY kmod-ch6-du "34 MB">
+<!ENTITY kmod-ch6-du "36 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
 
 <!ENTITY less-version "458">
@@ -374,10 +375,10 @@
 <!ENTITY libcap-ch6-du "1.7 MB">
 <!ENTITY libcap-ch6-sbu "0.1 SBU">
 
-<!ENTITY libpipeline-version "1.2.6">
+<!ENTITY libpipeline-version "1.3.0">
-<!ENTITY libpipeline-size "761 KB">
+<!ENTITY libpipeline-size "769 KB">
-<!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
+<!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "6d1d51a5dc102af41e0d269d2a31e6f9">
+<!ENTITY libpipeline-md5 "242428c01dca255cdcb2195073a9c6ed">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "7.4 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
@@ -394,13 +395,13 @@
 <!ENTITY libtool-ch6-sbu "3.0 SBU">
 
 <!ENTITY linux-major-version "3">
-<!ENTITY linux-minor-version "13">
+<!ENTITY linux-minor-version "14">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-patch-version "0">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> 
-<!ENTITY linux-size "75,386 KB">
+<!ENTITY linux-size "76,562 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "445aa27da818617409982f42902a6e41">
+<!ENTITY linux-md5 "b621207b3f6ecbb67db18b13258f8ea8">
 <!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,
@@ -435,16 +436,16 @@
 
 <!ENTITY man-db-version "2.6.6">
 <!ENTITY man-db-size "1,415 KB">
-<!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.xz">
+<!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
 <!ENTITY man-db-md5 "5d65d66191080c144437a6c854e17868">
 <!ENTITY man-db-home "http://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.62">
+<!ENTITY man-pages-version "3.64">
-<!ENTITY man-pages-size "1,179 KB">
+<!ENTITY man-pages-size "1,194 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 "3877e1539dcb46bd23605b4d9d73c57d">
+<!ENTITY man-pages-md5 "e39da1ac5a5effd4514809301bad47a8">
 <!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">
@@ -483,7 +484,7 @@
 <!ENTITY patch-size "660 KB">
 <!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.xz">
 <!ENTITY patch-md5 "e9ae5393426d3ad783a300a338c09b72">
-<!ENTITY patch-home "http://savannah.gnu.org/projects/patch/">
+<!ENTITY patch-home "&savannah;/projects/patch/">
 <!ENTITY patch-ch5-du "3.4 MB">
 <!ENTITY patch-ch5-sbu "0.1 SBU">
 <!ENTITY patch-ch6-du "3.4 MB">
@@ -578,18 +579,18 @@
 <!ENTITY texinfo-ch6-du "101 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY systemd-version "211">
+<!ENTITY systemd-version "212">
-<!ENTITY systemd-size    "2,604 KB">
+<!ENTITY systemd-size    "2,659 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "0a70c382b6089526f98073b4ee85ef75">
+<!ENTITY systemd-md5     "257a75fff826ff91cb1ce567091cf270">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
 <!ENTITY systemd-ch6-du  "410 MB">
 <!ENTITY systemd-ch6-sbu "4.5 SBU">
 
-<!ENTITY tzdata-version "2014a">
+<!ENTITY tzdata-version "2014b">
-<!ENTITY tzdata-size "215 KB">
+<!ENTITY tzdata-size "216 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "423a11bcffc10dda578058cf1587d048">
+<!ENTITY tzdata-md5 "c58d556612396d4ca5a17807a79924e5">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">

patches.ent

@@ -23,8 +23,8 @@
 <!ENTITY perl-libc-patch-size "1.6 KB">
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
-<!ENTITY systemd-compat-patch-md5 "0edc54bbe9391cfb072bc737312e6b7a">
+<!ENTITY systemd-compat-patch-md5 "7a1202e996122e6f2e10e94cba862ed8">
-<!ENTITY systemd-compat-patch-size "12 KB">
+<!ENTITY systemd-compat-patch-size "10 KB">
 
 <!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
 <!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156">

prologue/standards.xml

@@ -113,7 +113,7 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
           <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
-          Lsb_release, PAM, Sendmail (or Postfix or Exim) </para>
+          Lsb_release, PAM, Pax, Sendmail (or Postfix or Exim), time </para>
         </listitem>
       </varlistentry>
 
@@ -165,7 +165,7 @@
       <varlistentry>
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
-          <para>time (executable) and pax</para>
+          <para>None</para>
         </listitem>
       </varlistentry>