From 6bc4b9307cc4729650754089a06097b06cd7ebbb Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Tue, 3 May 2005 17:59:39 +0000
Subject: [PATCH] upgrading package: binutils 2.15 -> 2.16

---
 binutils/binutils.patch | 40 +++++++---------------------------------
 binutils/binutils.spec  |  4 ++--
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/binutils/binutils.patch b/binutils/binutils.patch
index 9cdf35cba7..615a3f86aa 100644
--- a/binutils/binutils.patch
+++ b/binutils/binutils.patch
@@ -2,9 +2,9 @@ Use the platform specific ELF branding expected under FreeBSD.
 This is similar to what the vendor ld(1) does on this platform.
 
 Index: bfd/elf.c
---- bfd/elf.c.orig	2004-05-17 21:35:57 +0200
-+++ bfd/elf.c	2004-11-24 13:21:56 +0100
-@@ -4327,6 +4327,12 @@
+--- bfd/elf.c.orig	2005-03-06 03:02:15 +0100
++++ bfd/elf.c	2005-05-03 19:48:25 +0200
+@@ -4621,6 +4621,12 @@
    else
      i_ehdrp->e_type = ET_REL;
  
@@ -23,9 +23,9 @@ Index: bfd/elf.c
 Support FreeBSD >= 4.10 by fixing platform detection.
 
 Index: bfd/configure
---- bfd/configure.orig	2004-05-17 21:35:57 +0200
-+++ bfd/configure	2004-11-24 15:14:05 +0100
-@@ -5312,6 +5312,10 @@
+--- bfd/configure.orig	2005-05-02 21:43:54 +0200
++++ bfd/configure	2005-05-03 19:49:53 +0200
+@@ -9956,6 +9956,10 @@
    i[3-7]86-*-bsdi)
  	COREFILE=
  	;;
@@ -33,32 +33,6 @@ Index: bfd/configure
 +	COREFILE=''
 +	TRAD_HEADER='"hosts/i386bsd.h"'
 +	;;
-   i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234]* | i[3-7]86-*-freebsd*aout*)
+   i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/i386bsd.h"'
-
------------------------------------------------------------------------------
-
-Compare section id, not pointers
-
---- bfd/elflink.c.orig	2004-05-17 21:36:02.000000000 +0200
-+++ bfd/elflink.c	2005-01-07 15:39:43.000000000 +0100
-@@ -2700,7 +2700,7 @@
-     return vdiff > 0 ? 1 : -1;
-   else
-     {
--      long sdiff = h1->root.u.def.section - h2->root.u.def.section;
-+      long sdiff = h1->root.u.def.section->id - h2->root.u.def.section->id;
-       if (sdiff != 0)
- 	return sdiff > 0 ? 1 : -1;
-     }
-@@ -3954,7 +3954,7 @@
- 		i = idx + 1;
- 	      else
- 		{
--		  long sdiff = slook - h->root.u.def.section;
-+		  long sdiff = slook->id - h->root.u.def.section->id;
- 		  if (sdiff < 0)
- 		    j = idx;
- 		  else if (sdiff > 0)
-
diff --git a/binutils/binutils.spec b/binutils/binutils.spec
index 399a6e1527..edc2ef7dc9 100644
--- a/binutils/binutils.spec
+++ b/binutils/binutils.spec
@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        CORE
 Group:        Utility
 License:      GPL
-Version:      2.15
-Release:      20050202
+Version:      2.16
+Release:      20050503
 
 #   list of sources
 Source0:      ftp://sources.redhat.com/pub/binutils/releases/binutils-%{version}.tar.bz2