Sync to LFS-7.9-rc2

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

8 files changed, 46 insertions, 108 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dd3a5919d..d54b215c7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,10 +36,23 @@
     </listitem>
 -->
     <listitem>
+      <para>2016-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to glibc-2.23 - Merged from trunk.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to linux-4.4.2 - Merged from trunk.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-02-16</para>
       <itemizedlist>
         <listitem>
-          <para>[renodr] - Add patches for mpfr, binutils, gcc, glibc, and bash</para>
+          <para>[renodr] - Add patches for mpfr, binutils, gcc, glibc, and
+          bash</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 93fcaa2c3..f72ffc56c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -94,15 +94,15 @@
     <listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Glibc &glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>GMP &gmp-version;</para>
     </listitem>
-    <listitem>
+    <!--<listitem>
       <para>Gperf-&gperf-version;</para>
-    </listitem>
+    </listitem>-->
     <listitem>
       <para>Grep &grep-version;</para>
     </listitem>
@@ -245,39 +245,15 @@
     <listitem>
       <para>&binutils-upstream-patch;</para>
     </listitem>
-
-<!--    <listitem>
-      <para>&gcc-upstream-patch;</para>
-    </listitem> -->
-
-    <listitem>
-      <para>&glibc-largefile-patch;</para>
-    </listitem>
-
+<!--
     <listitem>
-      <para>&glibc-upstream-patch2;</para>
+      <para>&gcc-upstream-patch;</para>
     </listitem>
-
+-->
     <listitem>
       <para>&mpfr-upstream-patch;</para>
     </listitem>
 
-    <!--<listitem>
-      <para>&glibc-largefile-patch;</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>&glibc-upstream-patch;</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>&mpfr-upstream-patch;</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>Tcl-core-&tcl-version;</para>
-    </listitem>-->
-
   </itemizedlist>
 
   <itemizedlist>
@@ -285,17 +261,13 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <!--<listitem>
-      <para>bash-4.3.30-upstream_fixes-1.patch</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>mpfr-3.1.2-upstream_fixes-3.patch</para>
-    </listitem>-->
-
-    <!--<listitem>
       <para>Tcl-8.6.3</para>
     </listitem>-->
 
+    <listitem>
+      <para>glibc-2.22-upstream_i386_fix-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4ec3464d8..0d5fe9e43 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -72,7 +72,7 @@
         <para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Glibc i386 Patch - <token>&glibc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -80,23 +80,7 @@
         <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Largefile Patch - <token>&glibc-largefile-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-largefile-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-largefile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Upstream Patch - <token>&glibc-upstream-patch2-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch2;"/></para>
-        <para>MD5 sum:  <literal>&glibc-upstream-patch2-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
+-->
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 067ddac9f..15cebd6b0 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -42,11 +42,11 @@
 
   <sect2 role="installation">
     <title>Installation of Glibc</title>
-
+<!--
     <para>First, fix a build problem that affects i386 systems:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
-
+-->
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index e55fcc836..fb219ad87 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -65,8 +65,8 @@
     and linker cannot be adjusted before the Glibc install because the
     Glibc autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
-
-    <para>Now, fix a build problem that affects i386 systems:</para>
+<!--
+    <para>Now fix a build problem that affects i386 systems:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
 
@@ -78,7 +78,7 @@
     <para>Finally, update some recent changes from the upstream repository:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch2;</userinput></screen>
-
+-->
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
 
@@ -113,8 +113,9 @@ cd       build</userinput></screen>
     <itemizedlist>
 
       <listitem>
-        <para><emphasis>posix/tst-getaddrinfo4</emphasis> will always fail 
-        due to not having the necessary network applications when the tests are
+        <para><emphasis>posix/tst-getaddrinfo4</emphasis> and
+        <emphasis>posix/tst-getaddrinfo5</emphasis> will always fail due 
+        to not having the necessary networking applications when the tests are
         run.</para>
       </listitem>
 
@@ -127,30 +128,16 @@ cd       build</userinput></screen>
 
       <listitem>
         <para>The math tests sometimes fail when running on
-        systems where the CPU is not a relatively new genuine Intel or
-        authentic AMD processor.</para>
+        systems where the CPU is not a relatively new Intel or
+        AMD processor.</para>
       </listitem>
 <!--
       <listitem>
-        <para>When running on older and slower hardware or on systems under
-        load, some tests can fail because of test timeouts being exceeded.
-        Modifying the make check command to set a TIMEOUTFACTOR is reported to
-        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
-        make -k check</command>).</para>
-      </listitem>
--->
-<!--
-      <listitem>
-        <para>libio/tst-ftell-partial-wide.out fails because it needs a locale
-        that has not yet been generated.</para>
-      </listitem>
--->
-      <listitem>
         <para>The <emphasis>elf/tst-protected1b</emphasis> and
         <emphasis>elf/tst-protected1b</emphasis> tests are known to
         fail with the current stable version of binutils.</para>
       </listitem>
-
+-->
       <listitem>
         <para>Other tests known to fail on some architectures are
         malloc/tst-malloc-usable and nptl/tst-cleanupx4. </para>
diff --git a/general.ent b/general.ent
index 3a1235c3b..fdcfb724e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20160216-systemd">
+<!ENTITY version         "20160219-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "February 16, 2016">
+<!ENTITY releasedate     "February 19, 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 82d729ecc..545696881 100644
--- a/packages.ent
+++ b/packages.ent
@@ -230,10 +230,10 @@
 <!ENTITY gettext-ch6-du "204 MB">
 <!ENTITY gettext-ch6-sbu "2.6 SBU">
 
-<!ENTITY glibc-version "2.22">
-<!ENTITY glibc-size "12,666 KB">
+<!ENTITY glibc-version "2.23">
+<!ENTITY glibc-size "13,140 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "e51e02bf552a0a1fbbdc948fb2f5e83c">
+<!ENTITY glibc-md5 "456995968f3acadbed39f5eba31678df">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ch5-du "654 MB">
 <!ENTITY glibc-ch5-sbu "4.3 SBU">
@@ -375,12 +375,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "2">
 <!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-size "85,249 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d27b1458acde6369cf9eaf956f402901">
+<!ENTITY linux-md5 "d1b8be99e6c12cbc52b2af0520d550bb">
 <!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,
diff --git a/patches.ent b/patches.ent
index 291cc1a25..f5d8d107d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,28 +22,10 @@
 <!ENTITY coreutils-i18n-patch-md5 "c6334ed5b03062ef7e9649e8ceb2cfc1">
 <!ENTITY coreutils-i18n-patch-size "148 KB">
 
-<!--
-<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
-<!ENTITY gcc-upstream-patch-md5 "56d86c16ea62e024e6eebbdc9dc63700">
-<!ENTITY gcc-upstream-patch-size "251 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">
 
-<!ENTITY glibc-largefile-patch "glibc-&glibc-version;-largefile-1.patch">
-<!ENTITY glibc-largefile-patch-md5 "203fe9133e82f2b59969c116b70fd84e">
-<!ENTITY glibc-largefile-patch-size "2.3 KB">
-
-<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_i386_fix-1.patch">
-<!ENTITY glibc-upstream-patch-md5 "cfb3cb46074a833ac5729be79e4f2592">
-<!ENTITY glibc-upstream-patch-size "1.9 KB">
-
-<!ENTITY glibc-upstream-patch2 "glibc-&glibc-version;-upstream_fixes-1.patch">
-<!ENTITY glibc-upstream-patch2-md5 "2357ae19ff8b1bfc527214d19d328903">
-<!ENTITY glibc-upstream-patch2-size "52 KB">
-
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">