Sync devel and systemd branches.

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

6 files changed, 63 insertions, 78 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 81a2bf85d..8f3db4ea9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,42 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-06-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.42.8. Fixes 
+          <ulink url="&lfs-ticket-root;3368">#3368</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-db-2.6.4. Fixes 
+          <ulink url="&lfs-ticket-root;3369">#3369</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.14. Fixes 
+          <ulink url="&lfs-ticket-root;3366">#3366</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.9.7. Fixes
+          <ulink url="&lfs-ticket-root;3367">#3367</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-06-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.13.4. Fixes 
+          <ulink url="&lfs-ticket-root;3364">#3364</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.9.6. Fixes
+          <ulink url="&lfs-ticket-root;3363">#3363</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-06-10</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f13cea3eb..a6d3e6514 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -58,9 +58,9 @@
     <listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
@@ -139,9 +139,9 @@
     <!--<listitem>
       <para>Make &make-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-DB &man-db-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Man-pages &man-pages-version;</para>
     </listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 53ea72496..f91469d8c 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -50,7 +50,8 @@
 <screen><userinput remap="make">make</userinput></screen>
 
     <note><para>The tests take a very long time: over 30 SBUs.  Running
-    the tests is not recommended.</para></note>
+    the tests is not recommended. At least one test (of over 3000) is
+    known to intermittently fail.</para></note>
 
     <para>To test the results, issue:</para>
 
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index b9c4ec8b1..cdc47822e 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -119,7 +119,9 @@ cd build</userinput></screen>
     If you do not have significantly more RAM than this, be sure to enable
     sufficient swap space for the test. See <xref
     linkend="space-creatingfilesystem"/> and <xref linkend="space-mounting"/>
-    for details on creating and enabling swap space.</para>
+    for details on creating and enabling swap space.  Additionally,
+    three tests try to allocate a two terabyte partition and will fail
+    unless you have at least that much unused disk space available.</para>
 
     <para>Install the binaries, documentation, and shared libraries:</para>
 
@@ -160,10 +162,10 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2freefrag,
-        e2fsck, e2image, e2initrd_helper, e2label, e2undo, e4defrag, filefrag, fsck.ext2,
+        <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, 
+        e2fsck, e2image, e2label, e2undo, fsck.ext2,
         fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr, mk_cmds, mke2fs,
-        mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, mklost+found,
+        mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, 
         resize2fs, and tune2fs</seg>
         <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so},
         libquota.a and libss.{a,so}</seg>
@@ -237,16 +239,6 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         </listitem>
       </varlistentry>
 
-      <varlistentry id="e2freefrag">
-        <term><command>e2freefrag</command></term>
-        <listitem>
-          <para> Reports free space fragmentation information</para>
-          <indexterm zone="ch-system-e2fsprogs e2freefrag">
-            <primary sortas="b-e2freefrag">e2freefrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="e2fsck">
         <term><command>e2fsck</command></term>
         <listitem>
@@ -270,17 +262,6 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         </listitem>
       </varlistentry>
 
-      <varlistentry id="e2initrd_helper">
-        <term><command>e2initrd_helper</command></term>
-        <listitem>
-          <para>Prints the FS type of a given filesystem, given either a
-          device name or label</para>
-          <indexterm zone="ch-system-e2fsprogs e2initrd_helper">
-            <primary sortas="b-e2initrd_helper">e2initrd_helper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="e2label">
         <term><command>e2label</command></term>
         <listitem>
@@ -305,26 +286,6 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         </listitem>
       </varlistentry>
 
-      <varlistentry id="e4defrag">
-        <term><command>e4defrag</command></term>
-        <listitem>
-          <para>Online defragmenter for ext4 filesystems</para>
-          <indexterm zone="ch-system-e2fsprogs e4defrag">
-            <primary sortas="b-e4defrag">e4defrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="filefrag">
-        <term><command>filefrag</command></term>
-        <listitem>
-          <para>Reports on how badly fragmented a particular file might be</para>
-          <indexterm zone="ch-system-e2fsprogs filefrag">
-            <primary sortas="b-filefrag">filefrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="fsck.ext2">
         <term><command>fsck.ext2</command></term>
         <listitem>
@@ -459,19 +420,6 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         </listitem>
       </varlistentry>
 
-      <varlistentry id="mklost-found">
-        <term><command>mklost+found</command></term>
-        <listitem>
-          <para>Used to create a <filename class="directory">lost+found</filename>
-          directory on an <systemitem class="filesystem">ext2</systemitem> file
-          system; it pre-allocates disk blocks to this directory to lighten the
-          task of <command>e2fsck</command></para>
-          <indexterm zone="ch-system-e2fsprogs mklost-found">
-            <primary sortas="b-mklost+found">mklost+found</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="resize2fs">
         <term><command>resize2fs</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index cbc050622..d6ef73832 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SYSTEMD-20130610">
-<!ENTITY releasedate     "June 10, 2013">
+<!ENTITY version         "SYSTEMD-20130626">
+<!ENTITY releasedate     "June 26, 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 7d4d13916..826752d86 100644
--- a/packages.ent
+++ b/packages.ent
@@ -31,11 +31,11 @@
 <!ENTITY autoconf-ch6-du "17.1 MB">
 <!ENTITY autoconf-ch6-sbu "4.5 SBU">
 
-<!ENTITY automake-version "1.13.3">
-<!ENTITY am-minor-version "1.13">
-<!ENTITY automake-size "1,416 KB">
+<!ENTITY automake-version "1.14">
+<!ENTITY am-minor-version "1.14">
+<!ENTITY automake-size "1,452 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "e181a81bb57097a6c8c52cdb91c4b2b9">
+<!ENTITY automake-md5 "cb3fba6d631cddf12e230fd0cc1890df">
 <!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)">
@@ -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.7">
-<!ENTITY e2fsprogs-size "5,856 KB">
+<!ENTITY e2fsprogs-version "1.42.8">
+<!ENTITY e2fsprogs-size "5,852 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "a1ec22ef003688dae9f76c74881b22b9">
+<!ENTITY e2fsprogs-md5 "8ef664b6eb698aa6b733df59b17b9ed4">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "64 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.7 SBU">
@@ -395,12 +395,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "9">
-<!ENTITY linux-patch-version "5">
+<!ENTITY linux-patch-version "7">
 <!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,420 KB">
+<!ENTITY linux-size "70,428 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d7be63a4e95ddfc80ba3f7852d87016c">
+<!ENTITY linux-md5 "1b1d18f32db48bfaec1881c3487df686">
 <!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,
@@ -433,10 +433,10 @@
 <!ENTITY make-ch6-du "11.3 MB">
 <!ENTITY make-ch6-sbu "0.4 SBU">
 
-<!ENTITY man-db-version "2.6.3">
-<!ENTITY man-db-size "1,356 KB">
+<!ENTITY man-db-version "2.6.4">
+<!ENTITY man-db-size "1,376 KB">
 <!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "a593a095599ae97bcacf8d038659a146">
+<!ENTITY man-db-md5 "66d9274637841a43374744efb83cc716">
 <!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">