Merged trunk.

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

8 files changed, 98 insertions, 41 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index a78c4be66..695a5727f 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -297,7 +297,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc,
-         Grep, M4, Make, and Sed</seg>
+         Grep, M4, Make, Perl, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ef4c694f0..f20e03cb4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,74 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-08-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merged LFS SVN-20140814.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-08-14</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata2014f.  Fixes 
+          <ulink url="&lfs-ticket-root;3653">#3653</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-3.16.1.  Fixes 
+          <ulink url="&lfs-ticket-root;3643">#3643</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-3.16.0.  Fixes 
+          <ulink url="&lfs-ticket-root;3651">#3651</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update bison dependencies.  Fixes 
+          <ulink url="&lfs-ticket-root;3652">#3652</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-08-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update patches for bash, readline, and mpfr.  Fixes 
+          <ulink url="&lfs-ticket-root;3648">#3648</ulink>, 
+          <ulink url="&lfs-ticket-root;3649">#3649</ulink>, and
+          <ulink url="&lfs-ticket-root;3650">#3650</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-08-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Remove --enable-multibyte from vim, it is the
+          default. Addresses part of
+          <ulink url="&lfs-ticket-root;3647">#3647</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Util-Linux-2.25 needs a filename in ADJTIME_PATH,
+          fixes <ulink url="&lfs-ticket-root;3656">#3656</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2014-08-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Install Util-linux documentation in a versioned
+          directory.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-08-07</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a184c73c7..96cc63f3c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -271,6 +271,10 @@
     </listitem>
 
     <listitem>
+      <para>mpfr-3.1.2-upstream_fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>perl-5.18.2-libc-1.patch</para>
     </listitem>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 87f70f0ea..dbcea0791 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -57,7 +57,8 @@
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock</userinput></screen>
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
+    --docdir=/usr/share/doc/util-linx-&util-linux-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -110,7 +111,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
         <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
 
         <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, 
-        /usr/include/uuid, /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
+        /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, /var/lib/hwclock</seg>
       </seglistitem>
     </segmentedlist>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 5d1e512fc..c0df3dcb3 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -50,23 +50,7 @@
 
     <para>Prepare Vim for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --enable-multibyte</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-multibyte</parameter></term>
-        <listitem>
-          <para>This switch enables support for editing files in multibyte
-          character encodings. This is needed if using a locale with a
-          multibyte character set. This switch is also helpful to be able
-          to edit text files initially created in Linux distributions like
-          Fedora that use UTF-8 as a default character set.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/general.ent b/general.ent
index 629e100ec..9b4db837e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20140808-systemd">
+<!ENTITY version         "20140815-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "August 08, 2014">
+<!ENTITY releasedate     "August 15, 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}]" -->
diff --git a/packages.ent b/packages.ent
index a4a119159..a93a3e27d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -327,10 +327,10 @@
 <!ENTITY intltool-ch6-du "1.4 MB">
 <!ENTITY intltool-ch6-sbu "0.1 SBU">
 
-<!ENTITY iproute2-version "3.15.0">
-<!ENTITY iproute2-size "428 KB">
+<!ENTITY iproute2-version "3.16.0">
+<!ENTITY iproute2-size "429 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "5b1711c9d16071959052e369a2682d77">
+<!ENTITY iproute2-md5 "6c823b40fdcfa7b8120743349a52ac18">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
@@ -387,13 +387,13 @@
 <!ENTITY libtool-ch6-sbu "3.0 SBU">
 
 <!ENTITY linux-major-version "3">
-<!ENTITY linux-minor-version "15">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-minor-version "16">
+<!ENTITY linux-patch-version "1">
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "77,822 KB">
+<!ENTITY linux-size "78,602 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "739272475e2e3981974e1f083d0eba47">
+<!ENTITY linux-md5 "e7a985a243b7941b6bc6240fcbc797fc">
 <!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,
@@ -579,10 +579,10 @@
 <!ENTITY texinfo-ch6-du "101 MB">
 <!ENTITY texinfo-ch6-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2014e">
-<!ENTITY tzdata-size "217 KB">
+<!ENTITY tzdata-version "2014f">
+<!ENTITY tzdata-size "226 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "8a49fdedd4e832da8e85f7f9bcaedc33">
+<!ENTITY tzdata-md5 "f333b2e8f876221a97871cae0c188aa5">
 <!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">
diff --git a/patches.ent b/patches.ent
index 21ccaf01e..7f452e5e9 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,9 +2,9 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
-<!ENTITY bash-fixes-patch-md5 "749b4b520708300b64f8166ba2b1b4a0">
-<!ENTITY bash-fixes-patch-size "14 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-2.patch">
+<!ENTITY bash-fixes-patch-md5 "bfe39ee2c6cae6e01f5f7873e7a1949f">
+<!ENTITY bash-fixes-patch-size "28 KB">
 
 <!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
 <!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
@@ -51,13 +51,13 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-1.patch">
-<!ENTITY mpfr-fixes-patch-md5 "aaf52416b309dd0b8c5eb92ae9c210c1">
-<!ENTITY mpfr-fixes-patch-size "43 KB">
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-2.patch">
+<!ENTITY mpfr-fixes-patch-md5 "2b2aa4371a4e848411639356fd82becf">
+<!ENTITY mpfr-fixes-patch-size "40 KB">
 
-<!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-1.patch">
-<!ENTITY readline-fixes-patch-md5 "bbee7fad08474328b807e6828c26a961">
-<!ENTITY readline-fixes-patch-size "3.1 KB">
+<!ENTITY readline-fixes-patch "readline-6.3-upstream_fixes-2.patch">
+<!ENTITY readline-fixes-patch-md5 "97f74f1c3c83008f268b32d36e9fd376">
+<!ENTITY readline-fixes-patch-size "4 KB">
 
 <!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
 <!ENTITY systemd-compat-patch-md5 "657a996c67d4a9fbad394ee5aa1b1f34">