Imported trunk.

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

12 files changed, 225 insertions, 149 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 31ed47f2f..1897917ce 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,119 @@
 -->
 
     <listitem>
+      <para>2015-06-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2015e. Fixes
+          <ulink url="&lfs-ticket-root;3798">*3798</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mpfr-3.1.3. Fixes
+          <ulink url="&lfs-ticket-root;3800">#3800</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.1. Fixes
+          <ulink url="&lfs-ticket-root;3801">#3801</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-13</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Simplify gcc-pass1 instructions. Thanks to
+          Pierre Labastie for the patch. Fixes 
+          <ulink url="&lfs-ticket-root;3797">#3797</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update standards discussion for FHS 3.0
+          and LSB-5.0.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to inetutils-1.9.4. Fixes 
+          <ulink url="&lfs-ticket-root;3796">#3796</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.23. Fixes 
+          <ulink url="&lfs-ticket-root;3795">#3795</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kmod-21. Fixes 
+          <ulink url="&lfs-ticket-root;3794">#3794</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-07</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.0.5. Fixes 
+          <ulink url="&lfs-ticket-root;3793">#3793</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-06-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.22.0. Fixes 
+          <ulink url="&lfs-ticket-root;3791">#3791</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bash-4.3.30-upstream_fixes-2.patch. 
+          Fixes <ulink url="&lfs-ticket-root;3789">#3789</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-4.0.4. Fixes
+          <ulink url="&lfs-ticket-root;3786">#3786</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.42.13. Fixes
+          <ulink url="&lfs-ticket-root;3787">#3787</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gawk-4.1.3. Fixes
+          <ulink url="&lfs-ticket-root;3788">#3788</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Added a new patch for gcc to fix inline
+          issues and some libgomp problems.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2015-05-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a patch from upstream to fix 
+          some libgomp (gcc) problems.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-05-14</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8da1f3cf2..05db23bb8 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -64,18 +64,18 @@
     <!--<listitem>
       <para>Diffutils &diffutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Expat-&expat-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Expect &expect-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>File &file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils &findutils-version;</para>
     </listitem>-->
@@ -163,18 +163,18 @@
     <listitem>
       <para>MPC &mpc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>MPFR &mpfr-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
     <listitem>
       <para>Patch &patch-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Perl &perl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Pkg-config &pkgconfig-version;</para>
     </listitem>-->
@@ -239,32 +239,20 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <listitem>
-      <para>Tcl-core-&tcl-version;</para>
+      <para>&bash-fixes-patch;</para>
     </listitem>
 
     <listitem>
-      <para>&ncurses-gcc5-buildfixes-patch;</para>
+      <para>&gcc-upstream-patch;</para>
     </listitem>
 
     <listitem>
-      <para>&perl-gcc5-fixes-patch;</para>
+      <para>Tcl-core-&tcl-version;</para>
     </listitem>
 
-    <!--<listitem>
-      <para>&bash-fixes-patch;</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>&mpfr-fixes-patch;</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>&readline-fixes-patch;</para>
-    </listitem>-->
-
-    <!--<listitem>
-      <para>&systemd-compat-patch;</para>
-    </listitem>-->
+    <listitem>
+      <para>&ncurses-gcc5-buildfixes-patch;</para>
+    </listitem>
 
   </itemizedlist>
 
@@ -273,32 +261,21 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
     <listitem>
-      <para>Tcl-8.6.3</para>
+      <para>bash-4.3.30-upstream_fixes-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>-->
+    <listitem>
+      <para>mpfr-3.1.2-upstream_fixes-3.patch</para>
+    </listitem>
 
     <!--<listitem>
-      <para>gcc-4.9.1-upstream_fixes-1.patch</para>
+      <para>systemd-216-compat-1.patch</para>
     </listitem>-->
 
-    <!--<listitem>
-      <para>readline-6.3-upstream_fixes-2.patch</para>
-    </listitem>-->
+    <listitem>
+      <para>Tcl-8.6.3</para>
+    </listitem>
 
-    <!--<listitem>
-      <para>systemd-216-compat-1.patch</para>
-    </listitem>-->
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 0e3a58984..f6b3acdc5 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -91,15 +91,14 @@
       </listitem>
     </varlistentry>
 -->
-<!--
     <varlistentry>
-      <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
+      <term>Gcc Upstream Libgomp Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&gcc-upstream-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
@@ -115,7 +114,7 @@
         <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Mpfr Upstream Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
       <listitem>
@@ -123,7 +122,7 @@
         <para>MD5 sum: <literal>&mpfr-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Ncurses GCC 5 Fixes Patch - <token>&ncurses-gcc5-buildfixes-patch-size;</token>:</term>
       <listitem>
@@ -131,7 +130,7 @@
         <para>MD5 sum: <literal>&ncurses-gcc5-buildfixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Perl GCC 5 Fixes Patch - <token>&perl-gcc5-fixes-patch-size;</token>:</term>
       <listitem>
@@ -139,7 +138,7 @@
         <para>MD5 sum: <literal>&perl-gcc5-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 62b94ebe2..da6ea0743 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -135,13 +135,10 @@ cd ../gcc-build</userinput></screen>
     --disable-threads                              \
     --disable-libatomic                            \
     --disable-libgomp                              \
-    --disable-libitm                               \
     --disable-libquadmath                          \
-    --disable-libsanitizer                         \
     --disable-libssp                               \
     --disable-libvtv                               \
-    --disable-libcilkrts                           \
-    --disable-libstdc++-v3                         \
+    --disable-libstdcxx                            \
     --enable-languages=c,c++</userinput></screen>
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -198,17 +195,14 @@ cd ../gcc-build</userinput></screen>
 
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
-        --disable-libatomic, --disable-libgomp, --disable-libitm,
-        --disable-libquadmath, --disable-libsanitizer,
-        --disable-libssp, --disable-libvtv, --disable-libcilkrts,
-        --disable-libstdc++-v3</parameter></term>
+        --disable-libatomic, --disable-libgomp, --disable-libquadmath,
+        --disable-libssp, --disable-libvtv, --disable-libstdcxx</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
-          extension, threading, libatomic, libgomp, libitm, 
-          libquadmath, libsanitizer, libssp, libvtv, libcilkrts
-          and the C++ standard library respectively. These features will fail
-          to compile when building a cross-compiler and are not necessary for
-          the task of cross-compiling the temporary libc.</para>
+          extension, threading, libatomic, libgomp, libquadmath, libssp,
+          libvtv, and the C++ standard library respectively. These features
+          will fail to compile when building a cross-compiler and are not
+          necessary for the task of cross-compiling the temporary libc.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 7616b30ac..1ecf0a48a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
+    <para>First fix some problems with the libgomp library:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 
@@ -112,7 +116,7 @@ cd ../gcc-build</userinput></screen>
 
     <para>A few unexpected failures cannot always be avoided. The GCC developers
     are usually aware of these issues, but have not resolved them yet.
-    In particular, four tests in the libgomp test suite are known to fail.
+    In particular, one test in the libgomp test suite is known to fail.
     Unless the test results are vastly different from those at the above URL,
     it is safe to continue.</para>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 748d5bef7..464862a87 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -39,12 +39,12 @@
 
   <sect2 role="installation">
     <title>Installation of Inetutils</title>
-
+<!--
     <para>Create a definition to allow the <command>ifconfig</command> program
     to build properly:</para>
 
 <screen><userinput remap="pre">echo '#define PATH_PROCNET_DEV "/proc/net/dev"' &gt;&gt; ifconfig/system/linux.h </userinput></screen>
-
+-->
     <para>Prepare Inetutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr        \
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index ab702f17a..597df4d65 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -40,12 +40,12 @@
 
   <sect2 role="installation">
     <title>Installation of MPFR</title>
-
+<!--
     <para>First, apply the following patch to fix various bugs that have been
     addressed upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&mpfr-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare MPFR for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr        \
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 6ace9d861..9d023e09d 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -55,12 +55,12 @@
 
 <screen><userinput remap="pre">export BUILD_ZLIB=False
 export BUILD_BZIP2=0</userinput></screen>
-
+<!--
     <para>Apply a patch to allow the Errno.pm module and the h2ph
     program to build correctly when building with GCC 5:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-gcc5-fixes-patch;</userinput></screen>
-
+-->
     <para>To have full control over the way Perl is set up, you can remove the
     <quote>-des</quote> options from the following command and hand-pick the way
     this package is built. Alternatively, use the command exactly as below to
diff --git a/general.ent b/general.ent
index 7bb4bf5ea..57101ae40 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20150514-systemd">
+<!ENTITY version         "20150628-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "May 14, 2015">
+<!ENTITY releasedate     "June 28, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 79b5fcbd4..d15561b7f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -134,10 +134,10 @@
 <!-- NOTE: When updating e2fsprogs, remember to check the list
      of acceptable features that can be shown by debugfs in
      chapter02/creatingfilesystem.xml -->
-<!ENTITY e2fsprogs-version "1.42.12">
-<!ENTITY e2fsprogs-size "6,233 KB">
+<!ENTITY e2fsprogs-version "1.42.13">
+<!ENTITY e2fsprogs-size "6,360 KB">
 <!ENTITY e2fsprogs-url "http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "68255f51be017a93f2f6402fab06c2bf">
+<!ENTITY e2fsprogs-md5 "bc759fc62666786f5436e2075beb3265">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "52 MB">
 <!ENTITY e2fsprogs-ch6-sbu "2.7 SBU">
@@ -159,10 +159,10 @@
 <!ENTITY expect-ch5-du "4.6 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 
-<!ENTITY file-version "5.22">
-<!ENTITY file-size "716 KB">
+<!ENTITY file-version "5.23">
+<!ENTITY file-size "721 KB">
 <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "8fb13e5259fe447e02c4a37bc7225add">
+<!ENTITY file-md5 "61db35209ce71a6d576392ce6e1d2f80">
 <!ENTITY file-home "http://www.darwinsys.com/file/">
 <!ENTITY file-ch5-du "16.9 MB">
 <!ENTITY file-ch5-sbu "0.1 SBU">
@@ -187,10 +187,10 @@
 <!ENTITY flex-ch6-du "38 MB">
 <!ENTITY flex-ch6-sbu "0.3 SBU">
 
-<!ENTITY gawk-version "4.1.2">
-<!ENTITY gawk-size "2,226 KB">
+<!ENTITY gawk-version "4.1.3">
+<!ENTITY gawk-size "2,258 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "29555d982b8b678b0091010eb7508e4a">
+<!ENTITY gawk-md5 "97f8f44149ea9b9e94be97f68988be87">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-ch5-du "37 MB">
 <!ENTITY gawk-ch5-sbu "0.2 SBU">
@@ -301,10 +301,10 @@
 <!ENTITY iana-etc-ch6-du "3.0 MB">
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY inetutils-version "1.9.3">
-<!ENTITY inetutils-size "1,332 KB">
+<!ENTITY inetutils-version "1.9.4">
+<!ENTITY inetutils-size "1,333 KB">
 <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz">
-<!ENTITY inetutils-md5 "452ae548aa0421eee0bf2bfa21000e39">
+<!ENTITY inetutils-md5 "87fef1fa3f603aef11c41dcc097af75e">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-ch6-du "34 MB">
 <!ENTITY inetutils-ch6-sbu "0.4 SBU">
@@ -333,10 +333,10 @@
 <!ENTITY kbd-ch6-du "34 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "20">
-<!ENTITY kmod-size "428 KB">
+<!ENTITY kmod-version "21">
+<!ENTITY kmod-size "436 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "d6f4fef718a50bd88080de6a43bc64d8">
+<!ENTITY kmod-md5 "ee246fab2e1cba9fbdcad6a86ec31531">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "37 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
@@ -374,13 +374,13 @@
 <!ENTITY libtool-ch6-sbu "2.0 SBU">
 
 <!ENTITY linux-major-version "4">
-<!ENTITY linux-minor-version "0">
-<!ENTITY linux-patch-version "3">
-<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "80,380 KB">
+<!ENTITY linux-minor-version "1">
+<!ENTITY linux-patch-version "">
+<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">-->
+<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">
+<!ENTITY linux-size "81,073 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "b60eff523b72a59d64884e18b6ce81dd">
+<!ENTITY linux-md5 "fe9dc0f6729f36400ea81aa41d614c37">
 <!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,
@@ -437,10 +437,10 @@
 <!ENTITY mpc-ch6-du "11.2 MB">
 <!ENTITY mpc-ch6-sbu "0.3 SBU">
 
-<!ENTITY mpfr-version "3.1.2">
-<!ENTITY mpfr-size "1,049 KB">
+<!ENTITY mpfr-version "3.1.3">
+<!ENTITY mpfr-size "1,087 KB">
 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
-<!ENTITY mpfr-md5 "e3d203d188b8fe60bb6578dd3152e05c">
+<!ENTITY mpfr-md5 "6969398cd2fbc56a6af570b5273c56a9">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 <!ENTITY mpfr-ch6-du "30 MB">
 <!ENTITY mpfr-ch6-sbu "0.7 SBU">
@@ -465,10 +465,10 @@
 <!ENTITY patch-ch6-du "11.6 MB">
 <!ENTITY patch-ch6-sbu "0.2 SBU">
 
-<!ENTITY perl-version "5.20.2">
-<!ENTITY perl-size "13,396 KB">
+<!ENTITY perl-version "5.22.0">
+<!ENTITY perl-size "13,488 KB">
 <!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "21062666f1c627aeb6dbff3c6952738b">
+<!ENTITY perl-md5 "f67b152160431b3180fb766bdc2d02e2">
 <!ENTITY perl-home "http://www.perl.org/">
 <!ENTITY perl-ch5-du "298 MB">
 <!ENTITY perl-ch5-sbu "1.2 SBU">
@@ -562,10 +562,10 @@
 <!ENTITY texinfo-ch6-du "109 MB">
 <!ENTITY texinfo-ch6-sbu "0.5 SBU">
 
-<!ENTITY tzdata-version "2015d">
+<!ENTITY tzdata-version "2015e">
 <!ENTITY tzdata-size "290 KB">
 <!ENTITY tzdata-url "http://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "b595bdc4474b8fc1a15cffc67c66025b">
+<!ENTITY tzdata-md5 "36f9056efb432ca945c73397acfce0d4">
 <!ENTITY tzdata-home "http://www.iana.org/time-zones">
 
 <!ENTITY util-linux-version "2.26.2">
diff --git a/patches.ent b/patches.ent
index e2548a519..d49ea98b6 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 "e2571929a43fdf76ae1eb683fe86b5c0">
-<!ENTITY bash-fixes-patch-size "8.8 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-2.patch">
+<!ENTITY bash-fixes-patch-md5 "fd2d7ca532f9ea53d678a6bc79354681">
+<!ENTITY bash-fixes-patch-size "13 KB">
 
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
@@ -18,6 +18,10 @@
 <!ENTITY coreutils-i18n-patch-md5 "587051bc411e0da9b3bf8984b49b364e">
 <!ENTITY coreutils-i18n-patch-size "138 KB">
 
+<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
+<!ENTITY gcc-upstream-patch-md5 "f4d9c1a9c73c542a79e24780b1318533">
+<!ENTITY gcc-upstream-patch-size "72 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">
@@ -26,17 +30,21 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!--
 <!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-3.patch">
 <!ENTITY mpfr-fixes-patch-md5 "5ba8bafe42920d6e570567529629bc59">
 <!ENTITY mpfr-fixes-patch-size "38 KB">
+-->
 
 <!ENTITY ncurses-gcc5-buildfixes-patch "ncurses-&ncurses-version;-gcc5_buildfixes-1.patch">
 <!ENTITY ncurses-gcc5-buildfixes-patch-md5 "f9015f670940350a3fc3c2ef347e2b33">
 <!ENTITY ncurses-gcc5-buildfixes-patch-size "4 KB">
 
+<!--
 <!ENTITY perl-gcc5-fixes-patch "perl-&perl-version;-gcc5_fixes-1.patch">
 <!ENTITY perl-gcc5-fixes-patch-md5 "30f4907f63ec3ef7d50fa55e12d2923e">
 <!ENTITY perl-gcc5-fixes-patch-size "8 KB">
+-->
 
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
 <!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">
diff --git a/prologue/standards.xml b/prologue/standards.xml
index 95865bd55..36a7be419 100644
--- a/prologue/standards.xml
+++ b/prologue/standards.xml
@@ -23,18 +23,19 @@
       </listitem>
       <listitem>
         <para><ulink 
-        url="http://www.linuxfoundation.org/collaborate/workgroups/lsb/fhs-30-draft-1">
-        Filesystem Hierarchy Standard version 3.0 Draft 1 (FHS)</ulink></para>
+        url="http://refspecs.linuxfoundation.org/fhs.shtml">
+        Filesystem Hierarchy Standard (FHS) Version 3.0</ulink></para>
 
       </listitem>
       <listitem>
         <para><ulink url="http://refspecs.linuxfoundation.org/lsb.shtml">Linux
-        Standard Base (LSB) Specifications</ulink></para>
+        Standard Base (LSB) Version 5.0</ulink></para>
 
-        <para>The LSB has five separate standards: Core, C++, Desktop,
-        Runtime Languages, and Printing. In addition to generic requirements
-        there are also architecture specific requirements.  LFS attempts to
-        conform to the architectures discussed in the previous section.</para>
+        <para>The LSB has four separate standards: Core, Desktop,
+        Runtime Languages, and Imaging. In addition to generic requirements
+        there are also architecture specific requirements.  There are also two
+        areas for trial use: Gtk3 and Graphics.  LFS attempts to conform to the
+        architectures discussed in the previous section.</para>
 
         <note><para>Many people do not agree with the requirements of the LSB.
         The main purpose of defining it is to ensure that proprietary software
@@ -61,19 +62,12 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
           <para>Bash, Bc, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
-                Grep, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
+                Grep, GTK+2, Gzip, M4, Man-DB, Ncurses, Procps, Psmisc, Sed,
                 Shadow, Tar, Util-linux, Zlib</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB C++:</emphasis></term>
-        <listitem>
-          <para>Gcc</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
           <para>None</para>
@@ -88,14 +82,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Printing:</emphasis></term>
+        <term><emphasis>LSB Imaging:</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Multimeda:</emphasis></term>
+        <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>
@@ -113,44 +107,38 @@
         <term><emphasis>LSB Core:</emphasis></term>
         <listitem>
           <para>At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools,
-          Lsb_release, PAM, Pax, Sendmail (or Postfix or Exim), time </para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><emphasis>LSB C++:</emphasis></term>
-        <listitem>
-          <para>None</para>
+          Lsb_release, NSPR, NSS, PAM, Pax, Sendmail (or Postfix or Exim), time
+          </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
-          <para>ATK, Cairo, Desktop-file-utils, Freetype, Fontconfig,
-                Glib2, GTK+2, Icon-naming-utils, Libjpeg, Libpng, Libxml2,
-                MesaLib, Pango, Qt4, Xorg</para>
+          <para>Alsa, ATK, Cairo, Desktop-file-utils, Freetype, Fontconfig,
+          Gdk-pixbuf, Glib2, Icon-naming-utils, Libjpeg-turbo, Libpng, Libtiff,
+          Libxml2, MesaLib, Pango, Qt4, Xdg-utils, Xorg</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
         <term><emphasis>LSB Runtime Languages:</emphasis></term>
         <listitem>
-          <para>Python</para>
+          <para>Python, Libxml2, Libxslt </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Printing:</emphasis></term>
+        <term><emphasis>LSB Imaging:</emphasis></term>
         <listitem>
-          <para>CUPS</para>
+          <para>CUPS, Cups-filters, Ghostscript, SANE</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Multimeda:</emphasis></term>
+        <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
-          <para>Alsa Libraries, NSPR, NSS, OpenSSL, Java, Xdg-utils</para>
+          <para>GTK+3</para>
         </listitem>
       </varlistentry>
 
@@ -170,16 +158,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB C++:</emphasis></term>
-        <listitem>
-          <para>None</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term><emphasis>LSB Desktop:</emphasis></term>
         <listitem>
-          <para>Qt3</para>
+          <para>None</para>
         </listitem>
       </varlistentry>
 
@@ -191,14 +172,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Printing:</emphasis></term>
+        <term><emphasis>LSB Imaging:</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis>LSB Multimeda:</emphasis></term>
+        <term><emphasis>LSB Gtk3 and LSB Graphics (Trial Use):</emphasis></term>
         <listitem>
           <para>None</para>
         </listitem>