From 5632647099d1f54d62410df9bc6f2ac03e74842e Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 25 Dec 2014 04:36:44 +0000
Subject: [PATCH] Update to linix-3.18.1. Update to xz-5.2.0. Update to
 binutils-2.25. Update comments for sysklogd boot script.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10808 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 bootscripts/ChangeLog           |  3 +++
 bootscripts/lfs/init.d/sysklogd |  7 ++++--
 chapter01/changelog.xml         | 22 +++++++++++++++++
 chapter01/whatsnew.xml          | 16 +++++++++++--
 chapter03/patches.xml           |  4 ++--
 chapter06/binutils.xml          | 16 ++-----------
 chapter06/glibc.xml             |  5 ++--
 general.ent                     |  4 ++--
 packages.ent                    | 24 +++++++++----------
 patches.ent                     | 42 ---------------------------------
 10 files changed, 65 insertions(+), 78 deletions(-)

diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 5ada5559b..39465e6c9 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,6 @@
+2014-12-24 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Clarify rationale for sysklog run levels
+
 2014-11-10 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Make /run/lock have 1777 permissions
 
diff --git a/bootscripts/lfs/init.d/sysklogd b/bootscripts/lfs/init.d/sysklogd
index eb76dfc13..2c2a9dd06 100644
--- a/bootscripts/lfs/init.d/sysklogd
+++ b/bootscripts/lfs/init.d/sysklogd
@@ -18,14 +18,17 @@
 # Should-Start:
 # Required-Stop:       $local_fs sendsignals
 # Should-Stop:
-# Default-Start:       2 3 4 5
-# Default-Stop:        0 1 6
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
 # Short-Description:   Starts kernel and system log daemons.
 # Description:         Starts kernel and system log daemons.
 #                      /etc/fstab.
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
+# Note: sysklogd is not started in runlevel 2 due to possible
+# remote logging configurations
+
 . /lib/lsb/init-functions
 
 case "${1}" in
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5adce2f86..ef66756b4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,28 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2014-12-24</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linix-3.18.1. Fixes 
+          <ulink url="&lfs-ticket-root;3721">#3721</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.2.0. Fixes 
+          <ulink url="&lfs-ticket-root;3723">#3723</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.25. Fixes 
+          <ulink url="&lfs-ticket-root;3724">#3724</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update comments for sysklogd boot script. Fixes 
+          <ulink url="&lfs-ticket-root;3722">#3722</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2014-12-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8237b59f5..94cb105da 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -40,9 +40,9 @@
     <listitem>
       <para>Bash &bash-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils &binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison &bison-version;</para>
     </listitem>-->
@@ -265,6 +265,18 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <listitem>
+      <para>binutils-2.24-load_gcc_lto_plugin_by_default-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>binutils-2.24-lto_testsuite-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>binutils-2.24-multiple_plugins-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>bash-4.3-upstream_fixes-3.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1bcb57599..45e750d88 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -33,7 +33,7 @@
         <para>MD5 sum: <literal>&bc-memory-leak-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Binutils LTO Patch - <token>&binutils-lto-patch-size;</token>:</term>
       <listitem>
@@ -57,7 +57,7 @@
         <para>MD5 sum: <literal>&binutils-multiple-plugins-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index c98d56c1e..ae2e6f828 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,19 +56,7 @@
 
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
-
-    <para>Suppress the installation of an outdated
-    <filename>standards.info</filename> file as a newer one is installed later
-    on in the Autoconf instructions:</para>
-
-<screen><userinput remap="pre">rm -fv etc/standards.info
-sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
-
-    <para>Add an upstream patch to use GCC's link time optimization (LTO) 
-    by default:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
-
+<!--
     <para>Fix some LTO tests in the test suite:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
@@ -76,7 +64,7 @@ sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
     <para>Enable binutils to recognize multiple plugins:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
-
+-->
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index a91f95b94..52066dc1c 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -117,9 +117,10 @@ cd ../glibc-build</userinput></screen>
     <itemizedlist>
 
       <listitem>
-        <para>The <emphasis>tst/tst-cputimer1</emphasis> test has been known to
+        <para>The <emphasis>tst/tst-cputimer1</emphasis> and 
+        <emphasis>rt/tst-cpuclock2</emphasis> tests have been known to
         fail.  The reason is not completely understood, but indications are
-        that minor timing issues can trigger this failure.</para>
+        that minor timing issues can trigger these failures.</para>
       </listitem>
 
       <listitem>
diff --git a/general.ent b/general.ent
index 3bf8f324e..33d34f61d 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "SVN-20141213">
+<!ENTITY version         "SVN-20141224">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "December 13, 2014">
+<!ENTITY releasedate     "December 24, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 325875e39..175980959 100644
--- a/packages.ent
+++ b/packages.ent
@@ -57,10 +57,10 @@
 <!ENTITY bc-ch6-du "3.6 MB">
 <!ENTITY bc-ch6-sbu "0.2 SBU">
 
-<!ENTITY binutils-version "2.24">
-<!ENTITY binutils-size "22,184 KB">
+<!ENTITY binutils-version "2.25">
+<!ENTITY binutils-size "23,486 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
+<!ENTITY binutils-md5 "d9f3303f802a5b6b0bb73a335ab89d66">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-ch5p1-du "445 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -352,7 +352,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20141113">              <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20141224">              <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -386,12 +386,12 @@
 
 <!ENTITY linux-major-version "3">
 <!ENTITY linux-minor-version "18">
-<!ENTITY linux-patch-version "x">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "79,038 KB">
+<!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 "79,040 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "9e854df51ca3fef8bfe566dbd7b89241">
+<!ENTITY linux-md5 "79c9b73a01e1dce0a4c28828496ef02c">
 <!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,
@@ -620,10 +620,10 @@
 <!ENTITY xml-parser-ch6-du "2.0 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.0.7">
-<!ENTITY xz-size "917 KB">
+<!ENTITY xz-version "5.2.0">
+<!ENTITY xz-size "984 KB">
 <!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "d0456c2c3ea3c356369807eef1e2ae65">
+<!ENTITY xz-md5 "d87c242778fcf5ce4598de80a55ded28">
 <!ENTITY xz-home "http://tukaani.org/xz">
 <!ENTITY xz-ch5-du "15.9 MB">
 <!ENTITY xz-ch5-sbu "0.2 SBU">
diff --git a/patches.ent b/patches.ent
index 0d7e4e80d..07c027538 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,24 +2,6 @@
 
 <!-- Start of Common Patches -->
 
-<!--
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-7.patch">
-<!ENTITY bash-fixes-patch-md5 "ccf2f526dda9405a6a9fc9b8ceff11c4">
-<!ENTITY bash-fixes-patch-size "88 KB">
--->
-
-<!ENTITY binutils-lto-patch "binutils-&binutils-version;-load_gcc_lto_plugin_by_default-1.patch">
-<!ENTITY binutils-lto-patch-md5 "48e4e96a60bfed41804aaecf4944f5d9">
-<!ENTITY binutils-lto-patch-size "2.0 KB">
-
-<!ENTITY binutils-lto-testsuite-patch "binutils-&binutils-version;-lto_testsuite-1.patch">
-<!ENTITY binutils-lto-testsuite-patch-md5 "a6647fdb3cca512962bb1433bb6b4f9f">
-<!ENTITY binutils-lto-testsuite-patch-size "3.0 KB">
-
-<!ENTITY binutils-multiple-plugins-patch "binutils-&binutils-version;-multiple_plugins-1.patch">
-<!ENTITY binutils-multiple-plugins-patch-md5 "d01a4d846ba7539ab7fa306c048e1357">
-<!ENTITY binutils-multiple-plugins-patch-size "3.6 KB">
-
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
@@ -32,23 +14,6 @@
 <!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
 <!ENTITY coreutils-i18n-patch-size "138 KB">
 
-<!--
-<!ENTITY coreutils-shuf-segfault-patch "coreutils-&coreutils-version;-shuf_segfault-1.patch">
-<!ENTITY coreutils-shuf-segfault-patch-md5 "f1b5b35392914e327b1b6bbbb454d256">
-<!ENTITY coreutils-shuf-segfault-patch-size "4 KB">
--->
-<!--
-<!ENTITY e2fsprogs-fix-test-patch "e2fsprogs-&e2fsprogs-version;-fix_test-1.patch">
-<!ENTITY e2fsprogs-fix-test-patch-md5 "7c20605628536db298bb3bb4666047bf">
-<!ENTITY e2fsprogs-fix-test-patch-size "0.7 KB">
--->
-
-<!--
-<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
-<!ENTITY gcc-upstream-patch-md5 "015e026dff5052cd65906ee0bb8f25e8">
-<!ENTITY gcc-upstream-patch-size "8.6 KB">
--->
-
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
@@ -72,10 +37,3 @@
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "0b7b5ea568a878fdcc4057b2bf36e5cb">
 <!ENTITY sysvinit-consolidated-patch-size "3.9 KB">
-
-<!--
-<!ENTITY tar-manpage-patch "tar-&tar-version;-manpage-1.patch">
-<!ENTITY tar-manpage-patch-md5 "321f85ec32733b1a9399e788714a5156">
-<!ENTITY tar-manpage-patch-size "7.8 KB">
--->
-