From 93631026e53805b6c8804a5a3099bb504a93732d Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Tue, 9 Dec 2014 14:01:44 +0000
Subject: [PATCH] Merged updates from trunk, fix chapter03/patches.xml.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10802 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/acknowledgments.xml |  8 +++++++-
 appendices/dependencies.xml    |  2 +-
 chapter01/changelog.xml        | 14 ++++++++++++++
 chapter03/patches.xml          |  8 ++++++++
 chapter06/creatingdirs.xml     |  2 +-
 chapter06/libtool.xml          |  7 ++++---
 general.ent                    |  4 ++--
 packages.ent                   | 10 +++++-----
 8 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml
index 607bf7bf6..5944fca53 100644
--- a/appendices/acknowledgments.xml
+++ b/appendices/acknowledgments.xml
@@ -90,7 +90,13 @@
     <listitem>
       <para><ulink url="mailto:johan@linuxfromscratch.org">Johan
       Lenglet</ulink> &lt;johan@linuxfromscratch.org&gt; &ndash; French LFS
-      translation project</para>
+      translation project until 2008</para>
+    </listitem>
+
+    <listitem>
+      <para><ulink url="mailto:jmengual@linuxfromscratch.org">Jean-Philippe 
+      Mengual </ulink> &lt;jmengual@linuxfromscratch.org&gt; &ndash; French LFS
+      translation project 2008-present</para>
     </listitem>
 
     <listitem>
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index b97b1bafa..8dc0bcc7e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1489,7 +1489,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Findutils</seg>
+          <seg>Autoconf, Automake, Findutils</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 009403dde..b0cce6119 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,20 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-12-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update acknowledgements. Fixes
+          <ulink url="&lfs-ticket-root;3716">#3716</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libtool-2.4.4. Fixes
+          <ulink url="&lfs-ticket-root;3715">#3715</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-11-28</para>
       <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7ac8ef056..ff6272e63 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -147,6 +147,14 @@
         <para>MD5 sum: <literal>&systemd-compat-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+
+    <varlistentry>
+      <term>Systemd Upstream Fixes Patch - <token>&systemd-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&systemd-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 <!--
     <varlistentry>
       <term>Tar Manpage Patch - <token>&tar-manpage-patch-size;</token>:</term>
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index 2f5da5920..5572a62cc 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -13,7 +13,7 @@
   <para>It is time to create some structure in the LFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt}
+<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib/firmware,mnt,opt}
 mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root
 install -dv -m 1777 /tmp /var/tmp
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 5271dd5be..35f8b5419 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -50,12 +50,13 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results (about 3.0 SBU), issue:</para>
+    <para>To test the results (about 11.0 SBU), issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Five tests are known to fail in the LFS build envronment,
-    but all tests pass if rechecked after Chapter 6 is complete.</para>
+    <para>Five tests are known to fail in the LFS build envronment due
+    to a circular dependency, but all tests pass if rechecked after 
+    automake is installed.</para>
 
     <para>Install the package:</para>
 
diff --git a/general.ent b/general.ent
index 9515905d4..6bebff9a3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20141128-systemd">
+<!ENTITY version         "20141209-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "November 28, 2014">
+<!ENTITY releasedate     "December 9, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 9857dacda..e9c3e0cf0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -365,13 +365,13 @@
 <!ENTITY libpipeline-ch6-du "7.7 MB">
 <!ENTITY libpipeline-ch6-sbu "0.2 SBU">
 
-<!ENTITY libtool-version "2.4.3">
-<!ENTITY libtool-size "1,696 KB">
-<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
-<!ENTITY libtool-md5 "ec4dabd3bc580dc188197d4d5eb95fe3">
+<!ENTITY libtool-version "2.4.4">
+<!ENTITY libtool-size "936 KB">
+<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.xz">
+<!ENTITY libtool-md5 "51bf400de3354687d68dfa2392506b7e">
 <!ENTITY libtool-home "&gnu-software;libtool/">
 <!ENTITY libtool-ch6-du "37 MB">
-<!ENTITY libtool-ch6-sbu "3.0 SBU">
+<!ENTITY libtool-ch6-sbu "11.2 SBU">
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "17">