Sync Systemd and Development branches.

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

7 files changed, 91 insertions, 28 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6c26c1077..81a2bf85d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,57 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-06-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to Gzip-1.6. Fixes 
+          <ulink url="&lfs-ticket-root;3362">#3362</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-06-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libpipeline-1.2.4. Fixes 
+          <ulink url="&lfs-ticket-root;3360">#3360</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Linux-3.9.5. Fixes
+          <ulink url="&lfs-ticket-root;3361">#3361</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-06-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to Automake-1.13.3. Fixes 
+          <ulink url="&lfs-ticket-root;3358">#3358</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update file program contents.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-06-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to Util-Linux-2.23.1. Fixes 
+          <ulink url="&lfs-ticket-root;3355">#3355</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to GCC-4.8.1. Fixes 
+          <ulink url="&lfs-ticket-root;3356">#3356</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-05-27</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a953cf5f2..f13cea3eb 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -100,9 +100,9 @@
     <!--<listitem>
       <para>GRUB &grub-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gzip &gzip-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>IANA-Etc &iana-etc-version;</para>
     </listitem>-->
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 40bc799ec..777c15043 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -32,14 +32,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.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="psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.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="psmisc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
diff --git a/chapter06/file.xml b/chapter06/file.xml
index c666a5854..004a885b9 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -69,7 +69,7 @@
 
       <seglistitem>
         <seg>file</seg>
-        <seg>libmagic.{a,so}</seg>
+        <seg>libmagic.so</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -91,7 +91,7 @@
       </varlistentry>
 
       <varlistentry id="libmagic">
-        <term><filename class="libraryfile">libmagic</filename></term>
+        <term><filename class="libraryfile">libmagic.so</filename></term>
         <listitem>
           <para>Contains routines for magic number recognition, used by the
           <command>file</command> program</para>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 78bba2fc9..24958c0a2 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -100,7 +100,19 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>If desired, run the test suite as a non-root user:</para>
+
+    <warning><para>Running the test suite as the root user can be harmful to
+    your system.  To run it, the kernel CONFIG_SCSI_DEBUG option for the 
+    kernel must be available in the currently running system.  For complete
+    coverage, other BLFS packages must be installed.  If desired, this
+    test can be run after rebooting into the completed LFS system and running:</para>
+
+    <screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen> 
+    </warning>
+
+    <screen><userinput remap="test">chown -Rv nobody .
+su nobody -s /bin/bash -c "PATH=$PATH make check"</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/general.ent b/general.ent
index b1e5a8eed..cbc050622 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SYSTEMD-20130529">
-<!ENTITY releasedate     "May 29, 2013">
+<!ENTITY version         "SYSTEMD-20130610">
+<!ENTITY releasedate     "June 10, 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 7536c27e5..7d4d13916 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.2">
+<!ENTITY automake-version "1.13.3">
 <!ENTITY am-minor-version "1.13">
-<!ENTITY automake-size "1,408 KB">
+<!ENTITY automake-size "1,416 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "497f3ea7e85504fe5b1b1b6d27cc71f1">
+<!ENTITY automake-md5 "e181a81bb57097a6c8c52cdb91c4b2b9">
 <!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)">
@@ -206,10 +206,10 @@
 <!ENTITY gawk-ch6-du "30 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.8.0">
-<!ENTITY gcc-size "84,633 KB">
+<!ENTITY gcc-version "4.8.1">
+<!ENTITY gcc-size "84,724 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "e6040024eb9e761c3bea348d1fa5abb0">
+<!ENTITY gcc-md5 "3b2386c114cd74185aa3754b58a79304">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "1.4 GB">
 <!ENTITY gcc-ch5p1-sbu "5.5 SBU">
@@ -292,10 +292,10 @@
 <!ENTITY grub-ch6-du "112 MB">
 <!ENTITY grub-ch6-sbu "0.7 SBU">
 
-<!ENTITY gzip-version "1.5">
-<!ENTITY gzip-size "704 KB">
+<!ENTITY gzip-version "1.6">
+<!ENTITY gzip-size "712 KB">
 <!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.xz">
-<!ENTITY gzip-md5 "2a431e169b6f62f7332ef6d47cc53bae">
+<!ENTITY gzip-md5 "da981f86677d58a106496e68de6f8995">
 <!ENTITY gzip-home "&gnu-software;gzip/">
 <!ENTITY gzip-ch5-du "10 MB">
 <!ENTITY gzip-ch5-sbu "0.2 SBU">
@@ -374,10 +374,10 @@
 <!ENTITY libcap-ch6-du "1.3 MB">
 <!ENTITY libcap-ch6-sbu "0.1 SBU">
 
-<!ENTITY libpipeline-version "1.2.3">
-<!ENTITY libpipeline-size "732 KB">
+<!ENTITY libpipeline-version "1.2.4">
+<!ENTITY libpipeline-size "748 KB">
 <!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "f4866aa3a84f2852c78f87ff619dfc60">
+<!ENTITY libpipeline-md5 "a98b07f6f487fa268d1ebd99806b85ff">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-ch6-du "7.4 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
@@ -395,12 +395,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "9">
-<!ENTITY linux-patch-version "4">
+<!ENTITY linux-patch-version "5">
 <!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-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "053095dfe88fbd52e7cc8db302631d99">
+<!ENTITY linux-md5 "d7be63a4e95ddfc80ba3f7852d87016c">
 <!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,
@@ -602,10 +602,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY util-linux-version "2.23">
-<!ENTITY util-linux-size "3,248 KB">
+<!ENTITY util-linux-version "2.23.1">
+<!ENTITY util-linux-size "3,292 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.23/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "cf5e9bb402371beaaffc3a5f276d5783">
+<!ENTITY util-linux-md5 "33ba55ce82f8e3b8d7a38fac0f62779a">
 <!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
 <!ENTITY util-linux-ch6-du "89 MB">
 <!ENTITY util-linux-ch6-sbu "0.6 SBU">