Fix from upstream for segfault in error reporting #106014 by postmodern.

Package-Manager: portage-2.0.52-r1

4 files changed, 47 insertions, 8 deletions

diff --git a/sys-devel/bison/ChangeLog b/sys-devel/bison/ChangeLog
index 4fd9fb340112..98dd1e7bb4f4 100644
--- a/sys-devel/bison/ChangeLog
+++ b/sys-devel/bison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/bison
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.41 2005/03/04 21:47:59 kito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/ChangeLog,v 1.42 2005/09/15 04:26:00 vapier Exp $
+
+  15 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/bison-2.0-token-name-translate.patch, bison-2.0.ebuild:
+  Fix from upstream for segfault in error reporting #106014 by postmodern.
 
   04 Mar 2005; Kito <kito@gentoo.org> bison-1.875d.ebuild:
   ~ppc-macos keyword. closes Bug 65957
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 0d053c89ba9e..d4104cbf74ce 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -1,10 +1,21 @@
-MD5 80c4445f04c895b7be2237434adcca3f ChangeLog 5873
-MD5 1664f19da640e36a19bcecfb5a81c270 bison-2.0.ebuild 1406
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8daee23ecbd311833a371ff404cde24a bison-1.875d.ebuild 1791
+MD5 2242f1d96824a7a82fcb75e0660f1eb2 bison-2.0.ebuild 1468
 MD5 891a59b63cc7cc11c919095f55a38de3 bison-1.875.ebuild 1796
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 61b224a9eaf1ae7f77c2d1456d8fda87 files/bison-1.32-extfix.patch 1170
-MD5 644a4912da3e5107f509022f173ec146 files/bison-1.875-gccerror.patch 1538
+MD5 d6cc5abcf4554f703e0e91dc3dec18fd ChangeLog 6066
 MD5 4ac198b61c1a87f5070a32369477eda0 files/digest-bison-2.0 62
+MD5 644a4912da3e5107f509022f173ec146 files/bison-1.875-gccerror.patch 1538
 MD5 6af3f9859615301181f6a1536aa56fb1 files/digest-bison-1.875d 65
 MD5 4a875793f3bd808692002c152e5e26c4 files/digest-bison-1.875 64
+MD5 61b224a9eaf1ae7f77c2d1456d8fda87 files/bison-1.32-extfix.patch 1170
+MD5 b0e8983afb264754c539f1eb53116970 files/bison-2.0-token-name-translate.patch 826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKPfxgIKl8Uu19MoRAvOxAJ4g31CGUX5S2TJWjbbB70JucbBJSACfRG7u
+Po5HrjC5jlONyGgslyAGTmc=
+=fzGk
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/bison/bison-2.0.ebuild b/sys-devel/bison/bison-2.0.ebuild
index e5fe34fe89cf..7a5cc3754b1b 100644
--- a/sys-devel/bison/bison-2.0.ebuild
+++ b/sys-devel/bison/bison-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.0.ebuild,v 1.2 2005/03/09 02:12:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bison/bison-2.0.ebuild,v 1.3 2005/09/15 04:26:00 vapier Exp $
 
 inherit toolchain-funcs flag-o-matic eutils gnuconfig
 
@@ -20,6 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.32-extfix.patch
+	epatch "${FILESDIR}"/${P}-token-name-translate.patch #106014
 }
 
 src_compile() {
diff --git a/sys-devel/bison/files/bison-2.0-token-name-translate.patch b/sys-devel/bison/files/bison-2.0-token-name-translate.patch
new file mode 100644
index 000000000000..ec00e0dccdb2
--- /dev/null
+++ b/sys-devel/bison/files/bison-2.0-token-name-translate.patch
@@ -0,0 +1,23 @@
+revision 1.57
+date: 2005/07/25 03:38:41;  author: eggert;  state: Exp;  lines: +1 -1
+Fix core dump reported by Pablo De Napoli in
+<http://lists.gnu.org/archive/html/bug-bison/2005-07/msg00053.html>.
+* tests/regression.at (Invalid inputs with {}): New test.
+* src/parse-gram.y (token_name): Translate type before using
+it as an index.
+
+Index: src/parse-gram.y
+===================================================================
+RCS file: /cvsroot/bison/bison/src/parse-gram.y,v
+retrieving revision 1.56
+retrieving revision 1.57
+diff -u -p -r1.56 -r1.57
+--- src/parse-gram.c	24 Jul 2005 07:24:22 -0000	1.56
++++ src/parse-gram.c	25 Jul 2005 03:38:41 -0000	1.57
+@@ -538,5 +538,5 @@ gram_error (location const *loc, char co
+ char const *
+ token_name (int type)
+ {
+-  return yytname[type];
++  return yytname[YYTRANSLATE (type)];
+ }