From: Daniel Black <dragonheart@gentoo.org>
Date: Thu, 29 Sep 2005 21:51:51 +0000 (+0000)
Subject: segv patch added - bug #96619
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a9f90474c15ab5d6699c6e24c50ecb739fe4f529;p=gentoo.git

segv patch added - bug #96619
Package-Manager: portage-2.0.52-r1
---

diff --git a/dev-util/intel2gas/ChangeLog b/dev-util/intel2gas/ChangeLog
index a539989aae8f..35f84147b171 100644
--- a/dev-util/intel2gas/ChangeLog
+++ b/dev-util/intel2gas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/intel2gas
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/ChangeLog,v 1.5 2005/09/28 07:36:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/ChangeLog,v 1.6 2005/09/29 21:51:51 dragonheart Exp $
+
+*intel2gas-1.3.3-r2 (29 Sep 2005)
+
+  29 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/intel2gas-1.3.3-segfault.patch, -intel2gas-1.3.3-r1.ebuild,
+  +intel2gas-1.3.3-r2.ebuild:
+  segv patch thanks to David Frischknecht - bug #96619
 
 *intel2gas-1.3.3-r1 (28 Sep 2005)
 
diff --git a/dev-util/intel2gas/Manifest b/dev-util/intel2gas/Manifest
index 3f53bbfa357d..8e36d0ee22a6 100644
--- a/dev-util/intel2gas/Manifest
+++ b/dev-util/intel2gas/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA1
 
 MD5 639a664c3d7397fbbeef906b45494704 metadata.xml 601
-MD5 1e7970ac2ad1062e3c3a94223fa99ab6 ChangeLog 845
-MD5 1f3dfdd19dc4fb7646e14521befad90a intel2gas-1.3.3-r1.ebuild 690
-MD5 2fdd0ba233684f09414a2d4cdf5151c9 files/digest-intel2gas-1.3.3-r1 66
+MD5 82d7a94d3bef80c73a43759edc3d4b9f ChangeLog 1088
+MD5 1d9d044ea98dc6201b047b67ca9406bb intel2gas-1.3.3-r2.ebuild 777
+MD5 23a01edb4ce3fa57e78b99f3b80b6cd1 files/intel2gas-1.3.3-segfault.patch 787
+MD5 2fdd0ba233684f09414a2d4cdf5151c9 files/digest-intel2gas-1.3.3-r2 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDOkgumdTrptrqvGERAsaAAJwLskO8RJykhzruL1OlwJThl3nNLACeLQYa
-RYYeNAKp+NdQcwujyFdpxXI=
-=dhzZ
+iD8DBQFDPGIFmdTrptrqvGERAqOIAKCC1Mk+bXZ+gVZ2ihmBz6oBpDWeEgCaAqRs
+PauQkObaFs+ap1/d9ysOpqA=
+=6faO
 -----END PGP SIGNATURE-----
diff --git a/dev-util/intel2gas/files/digest-intel2gas-1.3.3-r1 b/dev-util/intel2gas/files/digest-intel2gas-1.3.3-r2
similarity index 100%
rename from dev-util/intel2gas/files/digest-intel2gas-1.3.3-r1
rename to dev-util/intel2gas/files/digest-intel2gas-1.3.3-r2
diff --git a/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch b/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch
new file mode 100644
index 000000000000..d095f8f38c6e
--- /dev/null
+++ b/dev-util/intel2gas/files/intel2gas-1.3.3-segfault.patch
@@ -0,0 +1,34 @@
+--- intel2gas-1.3.3/loaddata.cc	2000-06-20 21:57:28.000000000 +0200
++++ intel2gas-1.3.3-r1/loaddata.cc	2005-09-29 13:29:05.000000000 +0200
+@@ -13,6 +13,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
++#include <errno.h>
+ #ifdef USE_GLOB
+ #include <glob.h>         //  Find files
+ #else
+@@ -155,7 +156,10 @@
+ // where filename is listname.nn.list
+ {
+     FILE *f;
+-    f = fopen(filename,"r");
++	 if((f = fopen(filename,"r")) == NULL) {
++		 perror("fopen");
++		 exit(errno);
++	 }
+     current_line = 0;
+     
+     list_t *l = newList();
+@@ -213,7 +217,10 @@
+ // where filename is syntaxname.syntax
+ {
+     FILE *f;
+-    f = fopen(filename,"r");
++	 if((f = fopen(filename,"r")) == NULL) {
++		 perror("fopen");
++		 exit(errno);
++	 }
+     current_line = 0;
+     
+     char name[STR_LEN+1];
diff --git a/dev-util/intel2gas/intel2gas-1.3.3-r1.ebuild b/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild
similarity index 81%
rename from dev-util/intel2gas/intel2gas-1.3.3-r1.ebuild
rename to dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild
index 363306472427..6eb7b111f7ed 100644
--- a/dev-util/intel2gas/intel2gas-1.3.3-r1.ebuild
+++ b/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/intel2gas-1.3.3-r1.ebuild,v 1.1 2005/09/28 07:36:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/intel2gas/intel2gas-1.3.3-r2.ebuild,v 1.1 2005/09/29 21:51:51 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="Converts assembler source from Intel (NASM), to AT&T (gas)"
 HOMEPAGE="http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/"
@@ -13,6 +15,11 @@ DEPEND="virtual/libc
 	sys-devel/gcc"
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-segfault.patch
+}
+
 src_install() {
 	emake \
 		prefix=${D}/usr \