Sync development and systemd branches.

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

7 files changed, 74 insertions, 83 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 486cd776a..08d1f21dd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,40 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-05-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Linux-3.9.2. Fixes
+          <ulink url="&lfs-ticket-root;3345">#3345</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-05-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to gawk-4.1.0. Fixes
+          <ulink url="&lfs-ticket-root;3343">#3343</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-05-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to linux-3.9.1. Fixes
+          <ulink url="&lfs-ticket-root;3342">#3342</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to gettext-0.18.2.1. Fixes
+          <ulink url="&lfs-ticket-root;3298">#3298</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-05-04</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d041a06c7..23fdb0771 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -73,18 +73,18 @@
     <!--<listitem>
       <para>Flex &flex-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gawk &gawk-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gettext &gettext-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>-->
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index e2d2526f8..a163fb9ba 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -46,9 +46,12 @@ ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib
 sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
 ln -sv bash /bin/sh</userinput></screen>
 
-  <para>A proper Linux system maintains a list of the mounted file systems in
-  the file <filename>/etc/mtab</filename>. Systemd requires it to be a
-  symbolic link to  <filename>/proc/self/mounts</filename>:</para>
+  <para>Historically, Linux maintains a list of the mounted file systems in the
+  file <filename>/etc/mtab</filename>. Modern kernels maintain this list
+  internally and exposes it to the user via the <filename
+  class="directory">/proc</filename> filesystem. To satisfy utilities that
+  expect the presence of <filename>/etc/mtab</filename>, create the following
+  symbolic link:</para>
 
 <screen><userinput>ln -s /proc/self/mounts /etc/mtab</userinput></screen>
 
@@ -92,6 +95,7 @@ usb:x:14:
 cdrom:x:15:
 adm:x:16:
 messagebus:x:18:
+systemd-journal:x:23:
 mail:x:34:
 nogroup:x:99:</literal>
 EOF</userinput></screen>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index a331d669c..79773a9fd 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -47,7 +47,7 @@
 
     <para>Prepare Flex for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr             \
+<screen><userinput remap="configure">./configure --prefix=/usr \
             --docdir=/usr/share/doc/flex-&flex-version;</userinput></screen>
 
     <para>Compile the package:</para>
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 832def654..068cccfc8 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -68,12 +68,15 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>awk (link to gawk), dgawk, gawk, gawk-&gawk-version;, grcat, igawk,
-        pgawk, pgawk-&gawk-version;, and pwcat</seg>
-        <seg>/usr/lib/awk, /usr/share/awk</seg>
+        <seg>awk (link to gawk), gawk, gawk-&gawk-version;, and igawk</seg>
+        <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so,
+        readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
+        testext.so, and time.so</seg>
+        <seg>/usr/lib/{,g}awk, /usr/share/awk</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -92,16 +95,6 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
         </listitem>
       </varlistentry>
 
-      <varlistentry id="dgawk">
-        <term><command>dgawk</command></term>
-        <listitem>
-          <para>An awk debugger</para>
-          <indexterm zone="ch-system-gawk dgawk">
-            <primary sortas="b-dgawk">dgawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gawk">
         <term><command>gawk</command></term>
         <listitem>
@@ -123,16 +116,6 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
         </listitem>
       </varlistentry>
 
-      <varlistentry id="grcat">
-        <term><command>grcat</command></term>
-        <listitem>
-          <para>Dumps the group database <filename>/etc/group</filename></para>
-          <indexterm zone="ch-system-gawk grcat">
-            <primary sortas="b-grcat">grcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="igawk">
         <term><command>igawk</command></term>
         <listitem>
@@ -143,36 +126,6 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
         </listitem>
       </varlistentry>
 
-      <varlistentry id="pgawk">
-        <term><command>pgawk</command></term>
-        <listitem>
-          <para>The profiling version of <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk pgawk">
-            <primary sortas="b-pgawk">pgawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgawk-version">
-        <term><command>pgawk-&gawk-version;</command></term>
-        <listitem>
-          <para>Hard link to <command>pgawk</command></para>
-          <indexterm zone="ch-system-gawk pgawk-version">
-            <primary sortas="b-pgawk-&gawk-version;">pgawk-&gawk-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwcat">
-        <term><command>pwcat</command></term>
-        <listitem>
-          <para>Dumps the password database <filename>/etc/passwd</filename></para>
-          <indexterm zone="ch-system-gawk pwcat">
-            <primary sortas="b-pwcat">pwcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>
diff --git a/general.ent b/general.ent
index fcbed754d..1809fe4f0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SYSTEMD-20130504">
-<!ENTITY releasedate     "May 4, 2013">
+<!ENTITY version         "SYSTEMD-20130518">
+<!ENTITY releasedate     "May 18, 2013">
 <!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.4">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 6428175c8..f139e6ba6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -45,7 +45,7 @@
 <!ENTITY bc-version "1.06.95">
 <!ENTITY bc-size "288 KB">
 <!ENTITY bc-url "&alpha-gnu;bc/bc-&bc-version;.tar.bz2">
-<!ENTITY bc-md5 "5126a721b73f97d715bb72c13c889035 ">
+<!ENTITY bc-md5 "5126a721b73f97d715bb72c13c889035">
 <!ENTITY bc-home "&gnu-software;bc/">
 <!ENTITY bc-ch6-du "3 MB">
 <!ENTITY bc-ch6-sbu "0.1 SBU">
@@ -188,10 +188,10 @@
 <!ENTITY flex-ch6-du "39 MB">
 <!ENTITY flex-ch6-sbu "0.4 SBU">
 
-<!ENTITY gawk-version "4.0.2">
-<!ENTITY gawk-size "1,589 KB">
+<!ENTITY gawk-version "4.1.0">
+<!ENTITY gawk-size "2,004 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "8a9b2f1170ac9dcd3eb13716b5ec4021">
+<!ENTITY gawk-md5 "b18992ff8faf3217dab55d2d0aa7d707">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-ch5-du "30 MB">
 <!ENTITY gawk-ch5-sbu "0.2 SBU">
@@ -220,15 +220,15 @@
 <!ENTITY gdbm-ch6-du "8.5 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.18.2">
-<!ENTITY gettext-size "15,330 KB">
+<!ENTITY gettext-version "0.18.2.1">
+<!ENTITY gettext-size "15,552 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "0c86e5af70c195ab8bd651d17d783928">
+<!ENTITY gettext-md5 "034c8103b14654ebd300fadac44d6f14">
 <!ENTITY gettext-home "&gnu-software;gettext/">
-<!ENTITY gettext-ch5-du "101 MB">
+<!ENTITY gettext-ch5-du "118 MB">
 <!ENTITY gettext-ch5-sbu "0.6 SBU">
 <!ENTITY gettext-ch6-du "180 MB">
-<!ENTITY gettext-ch6-sbu "2.3 SBU">
+<!ENTITY gettext-ch6-sbu "1.7 SBU">
 
 <!ENTITY glibc-version "2.17">
 <!ENTITY glibc-size "10,725 KB">
@@ -379,12 +379,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "9">
-<!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;">
-<!ENTITY linux-size "70,414 KB">
+<!ENTITY linux-patch-version "2">
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
+<!ENTITY linux-size "70,409 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "4348c9b6b2eb3144d601e87c19d5d909">
+<!ENTITY linux-md5 "e406cc1bb5618a4ea88470f4d3d3d6e1">
 <!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,
@@ -392,9 +392,9 @@
 <!ENTITY linux-ch8-du "700 - 6800 MB (typically about 800-900 MB)">
 <!ENTITY linux-ch8-sbu "3.0 - 49.0 SBU (typically about 6 SBU)">
 
-<!ENTITY linux-headers-ch5-du "580 MB">
+<!ENTITY linux-headers-ch5-du "584 MB">
 <!ENTITY linux-headers-ch5-sbu "0.1 SBU">
-<!ENTITY linux-headers-ch6-du "580 MB">
+<!ENTITY linux-headers-ch6-du "588 MB">
 <!ENTITY linux-headers-ch6-sbu "0.1 SBU">
 
 <!ENTITY m4-version "1.4.16">
@@ -570,12 +570,12 @@
 <!ENTITY texinfo-ch6-du "101 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY systemd-version "202">
-<!ENTITY systemd-size    "2,104 KB">
+<!ENTITY systemd-version "204">
+<!ENTITY systemd-size    "2,140 KB">
 <!ENTITY systemd-url     "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "3136c6912d3ee1f6d4deb16234783731">
+<!ENTITY systemd-md5     "a07619bb19f48164fbf0761d12fd39a8">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "35 MB">
+<!ENTITY systemd-ch6-du  "36 MB">
 <!ENTITY systemd-ch6-sbu "0.1 SBU">
 
 <!ENTITY tzdata-version "2013c">