Pullup ticket 2102 - requested by martti

security update for binutils

Revisions pulled up:
- pkgsrc/devel/binutils/Makefile			1.33
- pkgsrc/devel/binutils/PLIST.common			1.13
- pkgsrc/devel/binutils/builtin.mk			1.5
- pkgsrc/devel/binutils/distinfo			1.8
- pkgsrc/devel/binutils/patches/patch-aa		1.4
- pkgsrc/devel/binutils/patches/patch-ab		1.2
- pkgsrc/devel/binutils/patches/patch-ac		1.2
- pkgsrc/devel/binutils/patches/patch-ad		1.2
- pkgsrc/devel/binutils/patches/patch-ae		1.2

   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Tue May 29 12:25:04 UTC 2007

   Modified Files:
   	pkgsrc/devel/binutils: Makefile PLIST.common builtin.mk distinfo
   	pkgsrc/devel/binutils/patches: patch-aa patch-ab patch-ac patch-ad
   	    patch-ae

   Log Message:
   Updated devel/binutils to 2.17

   List of changes unknown. Should fix CVE-2006-2362.

9 files changed, 68 insertions, 53 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 352d89baacf..b684318c868 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2006/10/04 21:35:58 wiz Exp $
+# $NetBSD: Makefile,v 1.32.4.1 2007/05/31 11:26:46 salo Exp $
 
-DISTNAME=	binutils-2.16.1
+DISTNAME=	binutils-2.17
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 
@@ -42,16 +42,16 @@ PLIST_SUBST+=	NO_GPROF=""
 # the need for perl as build dependency.
 #
 post-configure:
-.for _file_ in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi gas/doc/as.1
-	if [ -f ${WRKSRC}/${_file_} ]; then				\
-		${TOUCH} ${WRKSRC}/${_file_};				\
+.for f in ld/ldver.texi ld/ld.1 gas/doc/gasver.texi gas/doc/as.1
+	if [ -f ${WRKSRC}/${f} ]; then					\
+		touch ${WRKSRC}/${f};					\
 	fi
 .endfor
 
 post-install:
-	${FIND} ${BINUTILS_PREFIX}/lib/ldscripts -type f -print		\
-		| ${SORT} -r						\
-		| ${SED} 's;${PREFIX}/;;g'				\
+	find ${BINUTILS_PREFIX}/lib/ldscripts -type f -print		\
+		| sort -r						\
+		| sed 's;${PREFIX}/;;g'					\
 		> ${WRKDIR}/PLIST_DYNAMIC
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index a56de4f26fa..d19345e9aa9 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2006/04/17 07:07:15 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.12.8.1 2007/05/31 11:26:46 salo Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
@@ -63,12 +63,16 @@ share/locale/es/LC_MESSAGES/gas.mo
 ${NO_GPROF}share/locale/es/LC_MESSAGES/gprof.mo
 share/locale/es/LC_MESSAGES/ld.mo
 share/locale/es/LC_MESSAGES/opcodes.mo
+share/locale/fi/LC_MESSAGES/binutils.mo
+share/locale/fi/LC_MESSAGES/opcodes.mo
 share/locale/fr/LC_MESSAGES/bfd.mo
 share/locale/fr/LC_MESSAGES/binutils.mo
 share/locale/fr/LC_MESSAGES/gas.mo
 ${NO_GPROF}share/locale/fr/LC_MESSAGES/gprof.mo
 share/locale/fr/LC_MESSAGES/ld.mo
 share/locale/fr/LC_MESSAGES/opcodes.mo
+${NO_GPROF}share/locale/ga/LC_MESSAGES/gprof.mo
+share/locale/ga/LC_MESSAGES/opcodes.mo
 ${NO_GPROF}share/locale/id/LC_MESSAGES/gprof.mo
 share/locale/id/LC_MESSAGES/opcodes.mo
 share/locale/ja/LC_MESSAGES/bfd.mo
@@ -80,6 +84,10 @@ share/locale/ro/LC_MESSAGES/bfd.mo
 share/locale/ro/LC_MESSAGES/binutils.mo
 share/locale/ro/LC_MESSAGES/opcodes.mo
 share/locale/ru/LC_MESSAGES/binutils.mo
+share/locale/rw/LC_MESSAGES/bfd.mo
+share/locale/rw/LC_MESSAGES/binutils.mo
+share/locale/rw/LC_MESSAGES/gas.mo
+${NO_GPROF}share/locale/rw/LC_MESSAGES/gprof.mo
 share/locale/sv/LC_MESSAGES/bfd.mo
 share/locale/sv/LC_MESSAGES/binutils.mo
 ${NO_GPROF}share/locale/sv/LC_MESSAGES/gprof.mo
@@ -91,6 +99,13 @@ share/locale/tr/LC_MESSAGES/gas.mo
 ${NO_GPROF}share/locale/tr/LC_MESSAGES/gprof.mo
 share/locale/tr/LC_MESSAGES/ld.mo
 share/locale/tr/LC_MESSAGES/opcodes.mo
+share/locale/vi/LC_MESSAGES/bfd.mo
+share/locale/vi/LC_MESSAGES/binutils.mo
+share/locale/vi/LC_MESSAGES/ld.mo
+share/locale/vi/LC_MESSAGES/opcodes.mo
 share/locale/zh_CN/LC_MESSAGES/bfd.mo
 share/locale/zh_CN/LC_MESSAGES/binutils.mo
+share/locale/zh_CN/LC_MESSAGES/ld.mo
+share/locale/zh_CN/LC_MESSAGES/opcodes.mo
 ${NO_GPROF}share/locale/vi/LC_MESSAGES/gprof.mo
+share/locale/zh_TW/LC_MESSAGES/binutils.mo
diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index 82926dfc012..28efebc8ab4 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:21:44 reed Exp $
+# $NetBSD: builtin.mk,v 1.4.8.1 2007/05/31 11:26:46 salo Exp $
 
 BUILTIN_PKG:=	binutils
 .include "../../mk/buildlink3/bsd.builtin.mk"
@@ -22,10 +22,10 @@ USE_BUILTIN.binutils=	${IS_BUILTIN.binutils}
 .    if defined(BUILTIN_PKG.binutils) && \
         !empty(IS_BUILTIN.binutils:M[yY][eE][sS])
 USE_BUILTIN.binutils=	yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.binutils}
+.      for dep in ${BUILDLINK_API_DEPENDS.binutils}
 .        if !empty(USE_BUILTIN.binutils:M[yY][eE][sS])
 USE_BUILTIN.binutils!=							\
-	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.binutils:Q}; then \
+	if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.binutils:Q}; then	\
 		${ECHO} yes;						\
 	else								\
 		${ECHO} no;						\
@@ -38,8 +38,8 @@ USE_BUILTIN.binutils!=							\
 #
 _INCOMPAT_BINUTILS=	NetBSD-0.*-* NetBSD-1.[01234]*-*		\
 			NetBSD-1.5.*-* NetBSD-1.5[A-X]-*
-.    for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
+.    for pattern in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
+.      if !empty(MACHINE_PLATFORM:M${pattern})
 USE_BUILTIN.binutils=	no
 .      endif
 .    endfor
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index 7e57ca756aa..812f87d62d6 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2006/02/26 23:59:41 joerg Exp $
+$NetBSD: distinfo,v 1.7.10.1 2007/05/31 11:26:47 salo Exp $
 
-SHA1 (binutils-2.16.1.tar.gz) = df79ed47b4388a205adf3089d4e36ce47724c940
-RMD160 (binutils-2.16.1.tar.gz) = 304b2b53f9aa15794962af842f4f93b71308c495
-Size (binutils-2.16.1.tar.gz) = 16378360 bytes
-SHA1 (patch-aa) = 3f0b6cc9c0aff0dd2e400334f08da4a22cfc443e
-SHA1 (patch-ab) = a96b886f9ff5360f1883b3f8ad05b7211b897a91
-SHA1 (patch-ac) = d57f7d81d34dff39efcf17d5c22fe36343eea073
-SHA1 (patch-ad) = d27f82f27865bce2c0150d10f44a0b8a09f0ec83
-SHA1 (patch-ae) = a48a0769445b3dd3cbc4f86cb968d934621328a9
+SHA1 (binutils-2.17.tar.gz) = a9ac9ac4e918568b297033cdc44a38beef8f9f6a
+RMD160 (binutils-2.17.tar.gz) = bc5e8b23457f0e2e91f70b93eff00134e2d50434
+Size (binutils-2.17.tar.gz) = 18196360 bytes
+SHA1 (patch-aa) = dd97a5afea4b5ae07863301426b71acc61b9a4b6
+SHA1 (patch-ab) = 9d8a52de59f73cce90a1e8fff5d20849724ceb26
+SHA1 (patch-ac) = 8165e2adb19eca4ec9b6e7fd3b52c6614910fa65
+SHA1 (patch-ad) = 4aa005a473d1c4af052eaee84b98b1c0aff90bf1
+SHA1 (patch-ae) = 8aa22782397a59c17801c791dddaefdf757d824e
diff --git a/devel/binutils/patches/patch-aa b/devel/binutils/patches/patch-aa
index 3f6af3930d0..1763f0490e4 100644
--- a/devel/binutils/patches/patch-aa
+++ b/devel/binutils/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2006/01/07 23:59:46 wiz Exp $
+$NetBSD: patch-aa,v 1.3.10.1 2007/05/31 11:26:47 salo Exp $
 
---- configure.orig	Mon Feb 28 15:06:59 2005
-+++ configure
-@@ -914,7 +914,7 @@ host_libs="intl mmalloc libiberty opcode
+--- configure.orig	2006-04-07 00:49:25.000000000 +0300
++++ configure	2007-05-29 14:25:14.000000000 +0300
+@@ -899,7 +899,7 @@
  # know that we are building the simulator.
  # binutils, gas and ld appear in that order because it makes sense to run
  # "make check" in that particular order.
diff --git a/devel/binutils/patches/patch-ab b/devel/binutils/patches/patch-ab
index 4e6add41014..c38b6bbc1b1 100644
--- a/devel/binutils/patches/patch-ab
+++ b/devel/binutils/patches/patch-ab
@@ -1,25 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2006/02/26 23:59:41 joerg Exp $
+$NetBSD: patch-ab,v 1.1.10.1 2007/05/31 11:26:47 salo Exp $
 
---- bfd/configure.orig	2006-02-26 23:20:22.000000000 +0000
-+++ bfd/configure
-@@ -9960,7 +9960,7 @@ if test "${target}" = "${host}"; then
+--- bfd/configure.orig	2006-06-23 21:17:03.000000000 +0300
++++ bfd/configure	2007-05-29 14:36:21.000000000 +0300
+@@ -11499,7 +11499,7 @@
  	COREFILE=trad-core.lo
  	TRAD_HEADER='"hosts/i386bsd.h"'
  	;;
 -  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
-+  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-freebsd*)
++  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
  	COREFILE=''
  	TRAD_HEADER='"hosts/i386bsd.h"'
  	;;
-@@ -11555,6 +11555,7 @@ do
+@@ -13097,6 +13097,7 @@
      bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
      bfd_elf32_i370_vec)		tb="$tb elf32-i370.lo elf32.lo $elf" ;;
-     bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf32.lo $elf" ;;
-+    bfd_elf32_i386_dragonfly_vec)	tb="$tb elf32-i386.lo elf32.lo $elf" ;;
-     bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf32.lo $elf" ;;
+     bfd_elf32_i386_freebsd_vec)	tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
++    bfd_elf32_i386_dragonfly_vec) tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
+     bfd_elf32_i386_vxworks_vec)	tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
+     bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf-vxworks.lo elf32.lo $elf" ;;
      bfd_elf32_i860_little_vec)	tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-     bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-@@ -11668,6 +11669,7 @@ do
+@@ -13218,6 +13219,7 @@
      i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
      i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
      i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
diff --git a/devel/binutils/patches/patch-ac b/devel/binutils/patches/patch-ac
index 5ba2b0a2a1b..7ccb8f25908 100644
--- a/devel/binutils/patches/patch-ac
+++ b/devel/binutils/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/02/26 23:59:41 joerg Exp $
+$NetBSD: patch-ac,v 1.1.10.1 2007/05/31 11:26:47 salo Exp $
 
---- bfd/config.bfd.orig	2006-02-26 23:39:27.000000000 +0000
-+++ bfd/config.bfd
-@@ -492,7 +492,7 @@ case "${targ}" in
+--- bfd/config.bfd.orig	2006-04-05 15:41:57.000000000 +0300
++++ bfd/config.bfd	2007-05-29 14:31:45.000000000 +0300
+@@ -503,7 +503,7 @@
      targ_selvecs=i386bsd_vec
      targ_underscore=yes
      ;;
diff --git a/devel/binutils/patches/patch-ad b/devel/binutils/patches/patch-ad
index f2e21495e5e..7ab7e40fff8 100644
--- a/devel/binutils/patches/patch-ad
+++ b/devel/binutils/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/02/26 23:59:41 joerg Exp $
+$NetBSD: patch-ad,v 1.1.10.1 2007/05/31 11:26:47 salo Exp $
 
---- gas/configure.tgt.orig	2006-02-26 23:44:39.000000000 +0000
-+++ gas/configure.tgt
-@@ -199,7 +199,7 @@ case ${generic_target} in
+--- gas/configure.tgt.orig	2006-04-05 15:41:57.000000000 +0300
++++ gas/configure.tgt	2007-05-29 14:42:07.000000000 +0300
+@@ -191,7 +191,7 @@
    i386-*-freebsdaout*)			fmt=aout em=386bsd ;;
    i386-*-freebsd[12].*)			fmt=aout em=386bsd ;;
    i386-*-freebsd[12])			fmt=aout em=386bsd ;;
@@ -11,11 +11,11 @@ $NetBSD: patch-ad,v 1.1 2006/02/26 23:59:41 joerg Exp $
  				    	fmt=elf em=freebsd ;;
    i386-*-sysv*)				fmt=coff ;;
    i386-*-sco3.2v5*coff)			fmt=coff ;;
-@@ -413,6 +413,7 @@ case ${generic_target} in
+@@ -382,6 +382,7 @@
  
    *-*-aout | *-*-scout)			fmt=aout ;;
    *-*-freebsd* | *-*-kfreebsd*-gnu)	fmt=elf em=freebsd ;;
 +  *-*-dragonfly*)			fmt=elf em=freebsd ;;
-   *-*-nindy*)				fmt=bout ;;
    *-*-bsd*)				fmt=aout em=sun3 ;;
    *-*-generic)				fmt=generic ;;
+   *-*-xray | *-*-hms)			fmt=coff ;;
diff --git a/devel/binutils/patches/patch-ae b/devel/binutils/patches/patch-ae
index 7d4b4059d08..bcf180c707a 100644
--- a/devel/binutils/patches/patch-ae
+++ b/devel/binutils/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2006/02/26 23:59:41 joerg Exp $
+$NetBSD: patch-ae,v 1.1.10.1 2007/05/31 11:26:48 salo Exp $
 
---- ld/configure.tgt.orig	2006-02-26 23:48:51.000000000 +0000
-+++ ld/configure.tgt
-@@ -205,7 +205,7 @@ i[3-7]86-*-elf*)	targ_emul=elf_i386 ;;
+--- ld/configure.tgt.orig	2006-04-05 15:41:57.000000000 +0300
++++ ld/configure.tgt	2007-05-29 14:32:32.000000000 +0300
+@@ -194,7 +194,7 @@
  i[3-7]86-*-kaos*)	targ_emul=elf_i386 ;;
  i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
  			targ_emul=i386bsd ;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2006/02/26 23:59:41 joerg Exp $
  		        targ_emul=elf_i386_fbsd
  			targ_extra_emuls="elf_i386 i386bsd" ;;
  x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
-@@ -592,6 +592,10 @@ case "${target}" in
+@@ -585,6 +585,10 @@
    NATIVE_LIB_DIRS='/lib /usr/lib /usr/local/lib'
    ;;