merge lfs-svn, pt 2

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

6 files changed, 66 insertions, 41 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b3a6958c7..d685f6389 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,49 @@
     </listitem>
 -->
     <listitem>
+      <para>2013-12-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - Merge LFS SVN-20131216 book.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2013-12-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Update to Coreutils-8.22. Fixes
+          <ulink url="&lfs-ticket-root;3447">#3447</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Man-Pages-3.55. Fixes
+          <ulink url="&lfs-ticket-root;3446">#3446</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Bison-3.0.2. Fixes
+          <ulink url="&lfs-ticket-root;3442">#3442</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Libpipeline-1.2.5. Fixes
+          <ulink url="&lfs-ticket-root;3440">#3440</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Binutils-2.24. Fixes
+          <ulink url="&lfs-ticket-root;3438">#3438</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to File-5.16. Fixes
+          <ulink url="&lfs-ticket-root;3437">#3437</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[matthew] - Update to Linux-3.12.5. Fixes
+          <ulink url="&lfs-ticket-root;3436">#3436</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2013-12-13</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 8a4880b46..6766005fa 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -52,12 +52,6 @@
     linker and assembler to determine which of their own features to
     enable.</para>
 
-    <para>Fix a couple of syntax errors that prevent the documentation from
-    building with Texinfo-&texinfo-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
-       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
-
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 4d661296c..69d0e3ff3 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -43,12 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
 
-    <para>Fix a couple of syntax errors that prevent the documentation from
-    building with Texinfo-&texinfo-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
-       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
-
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v ../binutils-build
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 65f72a8f3..a82f96c5c 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,12 +64,6 @@ Ask your system administrator to create more.</computeroutput></screen>
 <screen><userinput remap="pre">rm -fv etc/standards.info
 sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
-    <para>Fix a couple of syntax errors that prevent the documentation from
-    building with Texinfo-&texinfo-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
-       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
-
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/packages.ent b/packages.ent
index e48a3cc6e..b409b8a3b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bc-ch6-du "3 MB">
 <!ENTITY bc-ch6-sbu "0.1 SBU">
 
-<!ENTITY binutils-version "2.23.2">
-<!ENTITY binutils-size "20,938 KB">
+<!ENTITY binutils-version "2.24">
+<!ENTITY binutils-size "22,184 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "4f8fa651e35ef262edc01d60fb45702e">
+<!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 <!ENTITY binutils-ch5p1-du "404 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -70,10 +70,10 @@
 <!ENTITY binutils-ch6-du "365 MB">
 <!ENTITY binutils-ch6-sbu "2.0 SBU">
 
-<!ENTITY bison-version "3.0.1">
-<!ENTITY bison-size "1,875 KB">
+<!ENTITY bison-version "3.0.2">
+<!ENTITY bison-size "1,882 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "032a7b7b9f1a6e278ccde73f82cec5c2">
+<!ENTITY bison-md5 "146be9ff9fbd27497f0bf2286a5a2082">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!--
 <!ENTITY bison-ch5-du "">
@@ -100,10 +100,10 @@
 <!ENTITY check-ch5-du "6.9 MB">
 <!ENTITY check-ch5-sbu "0.1 SBU">
 
-<!ENTITY coreutils-version "8.21">
-<!ENTITY coreutils-size "5,248 KB">
+<!ENTITY coreutils-version "8.22">
+<!ENTITY coreutils-size "5,210 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "065ba41828644eca5dd8163446de5d64">
+<!ENTITY coreutils-md5 "8fb0ae2267aa6e728958adc38f8163a2">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-ch5-du "133 MB">
 <!ENTITY coreutils-ch5-sbu "0.8 SBU">
@@ -164,10 +164,10 @@
 <!ENTITY expect-ch5-du "4.4 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.15">
-<!ENTITY file-size "641 KB">
+<!ENTITY file-version "5.16">
+<!ENTITY file-size "643 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "3f99565532f548d7540912c4642d1ede">
+<!ENTITY file-md5 "359c0cf41c3d438d17b4d293f3b950dc">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "12.4 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -374,10 +374,10 @@
 <!ENTITY libcap-ch6-du "1.3 MB">
 <!ENTITY libcap-ch6-sbu "0.1 SBU">
 
-<!ENTITY libpipeline-version "1.2.4">
-<!ENTITY libpipeline-size "748 KB">
+<!ENTITY libpipeline-version "1.2.5">
+<!ENTITY libpipeline-size "761 KB">
 <!ENTITY libpipeline-url "http://download.savannah.gnu.org/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "a98b07f6f487fa268d1ebd99806b85ff">
+<!ENTITY libpipeline-md5 "8d159fbd72368526559799f38dd9b4c6">
 <!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 "12">
-<!ENTITY linux-patch-version "1">
+<!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 "74,589 KB">
+<!ENTITY linux-size "74,597 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "f6f34baf553f278ff4637d8eaeff5dcd">
+<!ENTITY linux-md5 "5b5330f657f562f7bef6da100a7133b1">
 <!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,
@@ -441,10 +441,10 @@
 <!ENTITY man-db-ch6-du "27 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-pages-version "3.54">
-<!ENTITY man-pages-size "1,145 KB">
+<!ENTITY man-pages-version "3.55">
+<!ENTITY man-pages-size "1,150 KB">
 <!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "382f83e670ecbe1d97fc58e03da0b026">
+<!ENTITY man-pages-md5 "443b13defb23df578aa11c6c768f2c7d">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "23 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 8e5c6a37b..ddf13bbb8 100644
--- a/patches.ent
+++ b/patches.ent
@@ -15,8 +15,8 @@
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "ada0ea6e1c00c4b7e0d634f49827943e">
-<!ENTITY coreutils-i18n-patch-size "132 KB">
+<!ENTITY coreutils-i18n-patch-md5 "2bca6d512abd69f0f133359839980495">
+<!ENTITY coreutils-i18n-patch-size "137 KB">
 
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">