From 9f3584a0f4fae757c9ef1b4be5c2560bbd8e725a Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 17 Jul 2015 21:00:14 +0000
Subject: [PATCH] Update to gcc-5.2.0. Update to gettext-0.19.5.1. Update to
 kbd-2.0.3.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10926 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 18 ++++++++++++++++++
 chapter01/whatsnew.xml  |  8 ++++----
 chapter03/patches.xml   |  4 +++-
 chapter06/gcc.xml       |  4 ++--
 general.ent             |  4 ++--
 packages.ent            | 18 +++++++++---------
 patches.ent             |  2 ++
 7 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8192f9b9e..4b74954fd 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,24 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2015-07-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-5.2.0. Fixes
+          <ulink url="&lfs-ticket-root;3819">*3819</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.19.5.1. Fixes
+          <ulink url="&lfs-ticket-root;3818">*3818</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to kbd-2.0.3. Fixes
+          <ulink url="&lfs-ticket-root;3815">#3815</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2015-07-12</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 733b539ea..c30886198 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -127,9 +127,9 @@
     <listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Kbd &kbd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kmod &kmod-version;</para>
     </listitem>
@@ -247,11 +247,11 @@
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>
-
+<!--
     <listitem>
       <para>&gcc-upstream-patch;</para>
     </listitem>
-
+-->
     <listitem>
       <para>Tcl-core-&tcl-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6eec2bf62..71315293a 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -91,6 +91,8 @@
       </listitem>
     </varlistentry>
 -->
+
+<!--
     <varlistentry>
       <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -98,7 +100,7 @@
         <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>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 406bf26f7..bf381204d 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
+<!--
     <para>First apply some fixes from the upstream repository:</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>
 
diff --git a/general.ent b/general.ent
index 59e1b23fe..3dbbc7ad2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20150712">
+<!ENTITY version         "SVN-20150716">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "July 12, 2015">
+<!ENTITY releasedate     "July 16, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 16411a022..3d40e9284 100644
--- a/packages.ent
+++ b/packages.ent
@@ -196,10 +196,10 @@
 <!ENTITY gawk-ch6-du "39 MB">
 <!ENTITY gawk-ch6-sbu "0.3 SBU">
 
-<!ENTITY gcc-version "5.1.0">
-<!ENTITY gcc-size "92,736 KB">
+<!ENTITY gcc-version "5.2.0">
+<!ENTITY gcc-size "92,990 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "d5525b1127d07d215960e6051c5da35e">
+<!ENTITY gcc-md5 "a51bcfeb3da7dd4c623e27207ed43467">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "2.5 GB">
 <!ENTITY gcc-ch5p1-sbu "7.6 SBU">
@@ -219,10 +219,10 @@
 <!ENTITY gdbm-ch6-du "12.6 MB">
 <!ENTITY gdbm-ch6-sbu "0.1 SBU">
 
-<!ENTITY gettext-version "0.19.5">
-<!ENTITY gettext-size "6,714 KB">
+<!ENTITY gettext-version "0.19.5.1">
+<!ENTITY gettext-size "6,713 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "546a8458f50e146be12c215f83b9bac2">
+<!ENTITY gettext-md5 "9b7c37e410df4bd1bf854e8c897cf937">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-ch5-du "153 MB">
 <!ENTITY gettext-ch5-sbu "1.0 SBU">
@@ -324,10 +324,10 @@
 <!ENTITY iproute2-ch6-du "10.6 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">
 
-<!ENTITY kbd-version "2.0.2">
-<!ENTITY kbd-size "1000 KB">
+<!ENTITY kbd-version "2.0.3">
+<!ENTITY kbd-size "1,013 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
-<!ENTITY kbd-md5 "87475eb78b1d6e6ab06686dd323ad4ba">
+<!ENTITY kbd-md5 "231b46e7142eb41ea3ae06d2ded3c208">
 <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
 <!ENTITY kbd-ch6-du "34 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 449303992..b884504e6 100644
--- a/patches.ent
+++ b/patches.ent
@@ -18,9 +18,11 @@
 <!ENTITY coreutils-i18n-patch-md5 "c6a5ccda1ca61de7c93b09d27a9a26d5">
 <!ENTITY coreutils-i18n-patch-size "141 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">