From 67fd1a9e4c49c45a3d6b160911f423cfb4816e89 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 28 Mar 2013 17:41:36 +0000
Subject: Upgrade to Binutils-2.23.2. Fixes #3318.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10225 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 8 ++++++--
 chapter03/patches.xml   | 8 --------
 chapter06/binutils.xml  | 6 ++++--
 packages.ent            | 6 +++---
 patches.ent             | 4 ----
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 789d07aef..10c17218b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2013-03-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Binutils-2.23.2. Fixes
+          <ulink url="&lfs-ticket-root;3318">#3318</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Systemd-199. Fixes
           <ulink url="&lfs-ticket-root;3317">#3317</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0f26c9a85..588c4e244 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -37,9 +37,9 @@
     <!--<listitem>
       <para>Berkeley DB &db-version;</para>
     </listitem> -->
-    <!--<listitem>
+    <listitem>
       <para>Binutils &binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison &bison-version;</para>
     </listitem>-->
@@ -247,6 +247,10 @@
       <para>bash-4.2-fixes-11.patch</para>
     </listitem>
 
+    <listitem>
+      <para>binutils-2.23.1-testsuite_fix-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>perl-5.16.2-libc-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 9007b10eb..d5cb55391 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -26,14 +26,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Binutils Test Suite Patch - <token>&binutils-testsuite-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&binutils-testsuite-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-testsuite-fixes-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 0cca873ef..e7194d81c 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,9 +64,11 @@ Ask your system administrator to create more.</computeroutput></screen>
 <screen><userinput remap="pre">rm -fv etc/standards.info
 sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 
-    <para>Fix some test suite scripts so all tests pass:</para>
+    <para>Fix a couple of syntax errors that prevent the documentation from
+    building with Texinfo-&texinfo-version;:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-testsuite-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i -e 's/@colophon/@@colophon/' \
+       -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
 
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
diff --git a/packages.ent b/packages.ent
index 2c1353070..a29bdcbd8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -34,10 +34,10 @@
 <!ENTITY bash-ch6-du "45 MB">
 <!ENTITY bash-ch6-sbu "1.7 SBU">
 
-<!ENTITY binutils-version "2.23.1">
-<!ENTITY binutils-size "20,953 KB">
+<!ENTITY binutils-version "2.23.2">
+<!ENTITY binutils-size "20,938 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "33adb18c3048d057ac58d07a3f1adb38">
+<!ENTITY binutils-md5 "4f8fa651e35ef262edc01d60fb45702e">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 <!ENTITY binutils-ch5p1-du "391 MB">
 <!ENTITY binutils-ch5p1-sbu "1 SBU">
diff --git a/patches.ent b/patches.ent
index 0b5277c4d..5ad0d7bc3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -6,10 +6,6 @@
 <!ENTITY bash-fixes-patch-md5 "419f95c173596aea47a23d922598977a">
 <!ENTITY bash-fixes-patch-size "56 KB">
 
-<!ENTITY binutils-testsuite-fixes-patch "binutils-&binutils-version;-testsuite_fix-1.patch">
-<!ENTITY binutils-testsuite-fixes-patch-md5 "cb47fae1bc572d45f4b0cff8ae8ecba8">
-<!ENTITY binutils-testsuite-fixes-patch-size "2.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">
-- 
cgit v1.2.3-54-g00ecf