Merge r11000 and r11001 from trunk.

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

10 files changed, 57 insertions, 33 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 8d6883cb0..7f14ee784 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1040,7 +1040,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>Pcre, Xorg, and CUPS</seg>
+          <seg>Pcre</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5a7853603..70220637c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,24 @@
 -->
 
     <listitem>
+      <para>2016-02-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Updated to grep-2.23 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to linux-4.1.1 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to binutils-2.26 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to tzdata-2016a - Merged from trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-02-01</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0a6b0de2a..041a33293 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>-->
@@ -100,9 +100,9 @@
     <listitem>
       <para>GMP &gmp-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Gperf-&gperf-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Grep &grep-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c05a7970e..0549579a1 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -34,6 +34,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
+      <term>Binutils Upstream Patch - <token>&binutils-upstream-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-upstream-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-upstream-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 07c155cc2..0ea4f92ef 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -16,13 +16,13 @@
 
   <para>First, backup the <filename class="directory">/tools</filename> linker,
   and replace it with the adjusted linker we made in chapter 5. We'll also create
-  a link to its counterpart in <filename class="directory">/tools/$(gcc
-  -dumpmachine)/bin</filename>:</para>
+  a link to its counterpart in
+  <filename class="directory">/tools/$(uname -m)-pc-linux-gnu/bin</filename>:</para>
 
 <screen><userinput>mv -v /tools/bin/{ld,ld-old}
-mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
 mv -v /tools/bin/{ld-new,ld}
-ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
+ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld</userinput></screen>
 
   <para>Next, amend the GCC specs file so that it points to the new
   dynamic linker. Simply deleting all instances of <quote>/tools</quote> should
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index fb9dc4b31..a33c6cf60 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,15 +56,11 @@
 
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
-<!--
-    <para>Fix some LTO tests in the test suite:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
+    <para>Fix a problem identified upstream:</para>
 
-    <para>Enable binutils to recognize multiple plugins:</para>
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-upstream-patch;</userinput></screen>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
--->
     <para>The Binutils documentation recommends building Binutils 
     in a dedicated build directory:</para>
 
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 94d8204db..58b0db366 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -52,8 +52,6 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>The test-update-copyright.sh failure can be safely ignored.</para>
-
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/general.ent b/general.ent
index 0c3afae46..fbab1bd29 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20160201-systemd">
+<!ENTITY version         "20160206-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "February 1, 2016">
+<!ENTITY releasedate     "February 6, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 3ca44408e..bccc5ba11 100644
--- a/packages.ent
+++ b/packages.ent
@@ -57,10 +57,10 @@
 <!ENTITY bc-ch6-du "3.7 MB">
 <!ENTITY bc-ch6-sbu "0.2 SBU">
 
-<!ENTITY binutils-version "2.25.1">
-<!ENTITY binutils-size "23,598 KB">
+<!ENTITY binutils-version "2.26">
+<!ENTITY binutils-size "24,945 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "ac493a78de4fee895961d025b7905be4">
+<!ENTITY binutils-md5 "64146a0faa3b411ba774f47d41de239f">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-ch5p1-du "489 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
@@ -257,10 +257,10 @@
 <!ENTITY gperf-ch6-du "6.0 MB">
 <!ENTITY gperf-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "2.22">
-<!ENTITY grep-size "1,268 KB">
+<!ENTITY grep-version "2.23">
+<!ENTITY grep-size "1,287 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "e1015e951a49a82b02e38891026ef5df">
+<!ENTITY grep-md5 "f46aa9d0d2577b9212a104348a286787">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "19 MB">
 <!ENTITY grep-ch5-sbu "0.2 SBU">
@@ -375,12 +375,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "0">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
-<!ENTITY linux-size "85,250 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 "85,244 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "9a78fa2eb6c68ca5a40ed5af08142599">
+<!ENTITY linux-md5 "d27b1458acde6369cf9eaf956f402901">
 <!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,
@@ -562,10 +562,10 @@
 <!ENTITY texinfo-ch6-du "106 MB">
 <!ENTITY texinfo-ch6-sbu "0.7 SBU">
 
-<!ENTITY tzdata-version "2015g">
-<!ENTITY tzdata-size "294 KB">
+<!ENTITY tzdata-version "2016a">
+<!ENTITY tzdata-size "296 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "8d46e8b225b9a04c75f5c39636435ad6">
+<!ENTITY tzdata-md5 "0d3123eb1b453ec0620822bd65be4c42">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
 <!ENTITY util-linux-version "2.27.1">
diff --git a/patches.ent b/patches.ent
index e74cd7580..8ee108039 100644
--- a/patches.ent
+++ b/patches.ent
@@ -10,6 +10,10 @@
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
 
+<!ENTITY binutils-upstream-patch "binutils-&binutils-version;-upstream_fix-1.patch">
+<!ENTITY binutils-upstream-patch-md5 "a13223621449e0d6934a608f646f13a9">
+<!ENTITY binutils-upstream-patch-size "3.0 KB">
+
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">