rpms/binutils/devel binutils-2.19.50.0.1-build-id.patch, NONE, 1.1 binutils.spec, 1.147, 1.148

[Nicholas Clifton]

Author: nickc

Update of /cvs/pkgs/rpms/binutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31181

Modified Files:
	binutils.spec 
Added Files:
	binutils-2.19.50.0.1-build-id.patch 
Log Message:
Add patch for BZ 472152 to fix build-id generation.


binutils-2.19.50.0.1-build-id.patch:

--- NEW FILE binutils-2.19.50.0.1-build-id.patch ---
--- ../binutils-2.19.50.0.1.orig/bfd/elfcode.h	2008-11-26 09:29:54.000000000 +0000
+++ ./bfd/elfcode.h	2008-11-26 12:01:37.000000000 +0000
@@ -1170,6 +1170,19 @@ 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)
+		bfd_malloc_and_get_section (abfd, sec, & sec->contents);
+	      if (sec->contents != NULL)
+		(*process) (sec->contents, i_shdr.sh_size, arg);
+	    }
+	}
     }
 
   return TRUE;


Index: binutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- binutils.spec	26 Nov 2008 09:52:43 -0000	1.147
+++ binutils.spec	29 Nov 2008 07:54:12 -0000	1.148
@@ -30,6 +30,7 @@
 Patch05: binutils-2.19.50.0.1-version.patch
 Patch06: binutils-2.19.50.0.1-set-long-long.patch
 Patch07: binutils-2.19.50.0.1-linkonce-r-discard.patch
+Patch08: binutils-2.19.50.0.1-build-id.patch
 
 %if 0%{?_with_debug:1}
 # Define this if you want to skip the strip step and preserve debug info.
@@ -100,6 +101,7 @@
 %patch05 -p0 -b .version~
 %patch06 -p0 -b .set-long-long~
 %patch07 -p0 -b .linkonce-r-discard~
+%patch08 -p0 -b .build-id~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -343,6 +345,10 @@
 %endif # %{isnative}
 
 %changelog
+* Sat Nov 29 2008 Nick Clifton <nickc at redhat.com> 2.19.50.0.1
+- Add build-id patch to ensure that section contents are incorporated
+  into a build id.  (BZ472152)
+
 * Fri Nov 21 2008 Nick Clifton <nickc at redhat.com> 2.19.50.0.1
 - Rebase sources on 2.19.50.0.1 tarball.  Update all patches, trimming
   those that are no longer needed.