Index: BOOK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision 99d1a6adc89c8b6e4281ea1e330a303f9c141cde)
+++ BOOK/final-system/common/gawk.xml	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -28,5 +28,6 @@
     <para os="a">Prepare Gawk for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib \
+  --disable-libsigsegv</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/multilib/gawk.xml
===================================================================
--- BOOK/final-system/multilib/gawk.xml	(revision 99d1a6adc89c8b6e4281ea1e330a303f9c141cde)
+++ BOOK/final-system/multilib/gawk.xml	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -27,5 +27,5 @@
 
 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libexecdir=/usr/lib64</userinput></screen>
+   --libexecdir=/usr/lib64 --disable-libsigsegv</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 99d1a6adc89c8b6e4281ea1e330a303f9c141cde)
+++ BOOK/general.ent	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -46,5 +46,5 @@
 <!ENTITY redhat "ftp://sources.redhat.com/pub/">
 <!ENTITY kernel "http://www.kernel.org/pub/">
-<!ENTITY sourceforge "http://master.dl.sourceforge.net/">
+<!ENTITY sourceforge "http://downloads.sourceforge.net/">
 
 <!ENTITY dependencies "Installation depends on">
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 99d1a6adc89c8b6e4281ea1e330a303f9c141cde)
+++ BOOK/introduction/common/changelog.xml	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -42,4 +42,8 @@
         <listitem>
           <para>[jim] - fsck is now a part of Util-Linux-NG.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Added --disable-libsigsegv to Gawk build. We
+                don't want to add another library to the build.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/temp-system/common/gawk.xml
===================================================================
--- BOOK/temp-system/common/gawk.xml	(revision 99d1a6adc89c8b6e4281ea1e330a303f9c141cde)
+++ BOOK/temp-system/common/gawk.xml	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -26,5 +26,6 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --disable-libsigsegv</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/multilib/gawk.xml
===================================================================
--- BOOK/temp-system/multilib/gawk.xml	(revision 99d1a6adc89c8b6e4281ea1e330a303f9c141cde)
+++ BOOK/temp-system/multilib/gawk.xml	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -28,5 +28,6 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+   --disable-libsigsegv</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: scripts/patch/binutils/2.19.1/25-build_id.patch
===================================================================
--- scripts/patch/binutils/2.19.1/25-build_id.patch	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
+++ scripts/patch/binutils/2.19.1/25-build_id.patch	(revision 33bbc467c79d414ae813c93cc0e3b49a73b13497)
@@ -0,0 +1,43 @@
+Fix build-id patch to avoid memory corruption.  (BZ 501582)
+
+diff -rup ../binutils-2.19.51.0.11.orig/bfd/elfcode.h bfd/elfcode.h
+--- ../binutils-2.19.51.0.11.orig/bfd/elfcode.h	2009-07-14 11:23:27.000000000 +0100
++++ bfd/elfcode.h	2009-07-14 11:33:56.000000000 +0100
+@@ -1170,6 +1170,24 @@ elf_checksum_contents (bfd *abfd,
+ 
+       if (i_shdr.contents)
+ 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
++      else
++	{
++	  asection *sec;
++
++	  sec = bfd_section_from_elf_index (abfd, count);
++	  if (sec != NULL)
++	    {
++	      if (sec->contents == NULL)
++		{
++		  /* Force rereading from file.  */
++		  sec->flags &= ~SEC_IN_MEMORY;
++		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
++		    continue;
++		}
++	      if (sec->contents != NULL)
++		(*process) (sec->contents, i_shdr.sh_size, arg);
++	    }
++	}
+     }
+ 
+   return TRUE;
+diff -rup ../binutils-2.19.51.0.11.orig/bfd/section.c bfd/section.c
+--- ../binutils-2.19.51.0.11.orig/bfd/section.c	2009-07-14 11:23:27.000000000 +0100
++++ bfd/section.c	2009-07-14 11:33:26.000000000 +0100
+@@ -1477,7 +1477,7 @@ bfd_malloc_and_get_section (bfd *abfd, s
+   if (sz == 0)
+     return TRUE;
+ 
+-  p = bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
++  p = bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size);
+   if (p == NULL)
+     return FALSE;
+   *buf = p;
+
