Fix from upstream for signed division bug #184200 by Andrew Gaydenko.

Package-Manager: portage-2.1.3_rc6

5 files changed, 110 insertions, 21 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 13467f338953..b31d96baeed3 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/m4
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.90 2007/06/27 06:09:10 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.91 2007/07/07 06:34:10 vapier Exp $
+
+*m4-1.4.9-r1 (07 Jul 2007)
+
+  07 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/m4-1.4.9-signed-division.patch, +m4-1.4.9-r1.ebuild:
+  Fix from upstream for signed division bug #184200 by Andrew Gaydenko.
 
   27 Jun 2007; Markus Rothe <corsair@gentoo.org> m4-1.4.9.ebuild:
   Stable on ppc64; bug #183253
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 1b0f195d5ec9..077497df69f7 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,32 +1,37 @@
-DIST m4-1.4.7.tar.bz2 511803 RMD160 99b3a228435aba3eb7ece9c78d8d5d0897bb518c SHA1 0f45a63ed74c0d156c14c6e82354ecb49eb5d95b SHA256 a88f3ddaa7c89cf4c34284385be41ca85e9135369c333fdfa232f3bf48223213
-DIST m4-1.4.8.tar.bz2 580222 RMD160 7c95b5b16ddc635439da07d25906c1e91043ee68 SHA1 31589415022c2842f62f3b91186bc9e0a9a8e1a1 SHA256 d0e6734743f9eca530ea90c289c0f1770bdf37f846561557f0b0db7f87b7d7cc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX m4-1.4.9-signed-division.patch 909 RMD160 9c8bf8f6f442d9c870906882af553ee8abf8a65d SHA1 2313db3ae6e7e84ed1e72a937d6081f212101522 SHA256 9c3c0c8b3e0e10f8e9d8264a5fd46fbf5bfbacb50d444a053deeeab3b541111b
+MD5 d915231daf11f3c3bd24d4bf9538f2ac files/m4-1.4.9-signed-division.patch 909
+RMD160 9c8bf8f6f442d9c870906882af553ee8abf8a65d files/m4-1.4.9-signed-division.patch 909
+SHA256 9c3c0c8b3e0e10f8e9d8264a5fd46fbf5bfbacb50d444a053deeeab3b541111b files/m4-1.4.9-signed-division.patch 909
 DIST m4-1.4.9.tar.bz2 609666 RMD160 5a9b3d5a607f36c02aa818d5ded5b151f2b182e0 SHA1 28b8493688ceb752ee5a96ea8fc3a335cf44beb6 SHA256 a8e29386374ba0eacbd7b339b97f169603d63a736bd87eee85ed2771ed7c3d29
-EBUILD m4-1.4.7.ebuild 901 RMD160 70e92c24c9b4d190002f2d20b2ffffbafdd40c62 SHA1 777b81e80ea701bd191a1199b459e0888642e7ff SHA256 56e7fb3a45523234d1e8f9b4bcaba376b72552060be0e813c277663d08eec296
-MD5 fc7101b0fa57998ac755b42e99453459 m4-1.4.7.ebuild 901
-RMD160 70e92c24c9b4d190002f2d20b2ffffbafdd40c62 m4-1.4.7.ebuild 901
-SHA256 56e7fb3a45523234d1e8f9b4bcaba376b72552060be0e813c277663d08eec296 m4-1.4.7.ebuild 901
-EBUILD m4-1.4.8.ebuild 905 RMD160 115e845cf8b9ef4dab6c8a11316eac5e09a19d48 SHA1 03e6c7bd56c8c9a1b2514127beb7b5c3a0863db5 SHA256 86287e6ef5556327f8afa301de1ccb7ff04b0ce534a0a68c3502f304cabf42e4
-MD5 205f4c6da9e359e204d19f20b5ae5e9f m4-1.4.8.ebuild 905
-RMD160 115e845cf8b9ef4dab6c8a11316eac5e09a19d48 m4-1.4.8.ebuild 905
-SHA256 86287e6ef5556327f8afa301de1ccb7ff04b0ce534a0a68c3502f304cabf42e4 m4-1.4.8.ebuild 905
+EBUILD m4-1.4.9-r1.ebuild 1195 RMD160 afd8efe525e97c114057d8341b20ea957c5a8673 SHA1 820652d1dd97853c272c890523aba68c53b24ba6 SHA256 4134fe212c14fe0e30c06762388c1dbd3d272c031922bdcbbc05b8ad9fb4dbad
+MD5 65f11a93bf3708519f093cf04064f538 m4-1.4.9-r1.ebuild 1195
+RMD160 afd8efe525e97c114057d8341b20ea957c5a8673 m4-1.4.9-r1.ebuild 1195
+SHA256 4134fe212c14fe0e30c06762388c1dbd3d272c031922bdcbbc05b8ad9fb4dbad m4-1.4.9-r1.ebuild 1195
 EBUILD m4-1.4.9.ebuild 1079 RMD160 031f4af8532f108479b1f251798a41c4e50607bf SHA1 36ad6b12acf73d217ec91ec459c945b4c7df38f8 SHA256 c28ab0bd5bdbcb37aeaaf0eb92b0d487df334fc451b3ce2d4fc0ef3283783a54
 MD5 fd64b0c2760fed6316cee07c6714c2d3 m4-1.4.9.ebuild 1079
 RMD160 031f4af8532f108479b1f251798a41c4e50607bf m4-1.4.9.ebuild 1079
 SHA256 c28ab0bd5bdbcb37aeaaf0eb92b0d487df334fc451b3ce2d4fc0ef3283783a54 m4-1.4.9.ebuild 1079
-MISC ChangeLog 9837 RMD160 6ad626a470d1298c331fc3e5d152e43b4a5a9e73 SHA1 acd061424de12bb1491ca47a897ac6e327725e88 SHA256 ffefe418d7a27745147cced1235f8f3fc3c1f009fd953ea70c2b91fb90195d61
-MD5 1b49f86fa16588a56cccfbef24d427c6 ChangeLog 9837
-RMD160 6ad626a470d1298c331fc3e5d152e43b4a5a9e73 ChangeLog 9837
-SHA256 ffefe418d7a27745147cced1235f8f3fc3c1f009fd953ea70c2b91fb90195d61 ChangeLog 9837
+MISC ChangeLog 10049 RMD160 ce1dd1a498933b46a0402abbec24aa51b07685eb SHA1 51495d209c75062853c41b0d55858ccd7a940f75 SHA256 9cd2f55970b970c256ff6c9a75ec0bd60cf33af5570debd2939e06993f92e598
+MD5 862a33317166745679092ec8e5f7a80b ChangeLog 10049
+RMD160 ce1dd1a498933b46a0402abbec24aa51b07685eb ChangeLog 10049
+SHA256 9cd2f55970b970c256ff6c9a75ec0bd60cf33af5570debd2939e06993f92e598 ChangeLog 10049
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 1a7fea1740771b5a718a1024d07525fa files/digest-m4-1.4.7 229
-RMD160 cfa9ce38bf265d14369c08caf57582f6e1a74f99 files/digest-m4-1.4.7 229
-SHA256 049def4bc27a293e4ab46713d1506ce317a10953f356b18cfc7a2f79f46d179d files/digest-m4-1.4.7 229
-MD5 322bbb5abe12a9d35ecb20d606dc0f78 files/digest-m4-1.4.8 229
-RMD160 edc8e334c56396e4b7841bfc1a175ca73131c96d files/digest-m4-1.4.8 229
-SHA256 ba3f1283ee929704c994ffd4e6c935d4af8ac7a60fb8cf30b485c591d87af90a files/digest-m4-1.4.8 229
 MD5 27a273f2cc1cc1c9fd998b559b90fbc3 files/digest-m4-1.4.9 229
 RMD160 481d2bd633df2a7509799e96761795fdd6b79750 files/digest-m4-1.4.9 229
 SHA256 f8b34c06c50e1667d12b18619d3f5260e6bd116f74343851798cc3650d175597 files/digest-m4-1.4.9 229
+MD5 27a273f2cc1cc1c9fd998b559b90fbc3 files/digest-m4-1.4.9-r1 229
+RMD160 481d2bd633df2a7509799e96761795fdd6b79750 files/digest-m4-1.4.9-r1 229
+SHA256 f8b34c06c50e1667d12b18619d3f5260e6bd116f74343851798cc3650d175597 files/digest-m4-1.4.9-r1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGjzRup/wUKkr7RBoRAq/SAJ45A01V7/mNZu9VmMzli+hZDOkSQwCeMm/y
+Dm1QNQREbJdKZSX3cpYNqtQ=
+=DR/W
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/m4/files/digest-m4-1.4.9-r1 b/sys-devel/m4/files/digest-m4-1.4.9-r1
new file mode 100644
index 000000000000..f065ae6d7817
--- /dev/null
+++ b/sys-devel/m4/files/digest-m4-1.4.9-r1
@@ -0,0 +1,3 @@
+MD5 bcfaf47194491a7a8b8d3c2811570b93 m4-1.4.9.tar.bz2 609666
+RMD160 5a9b3d5a607f36c02aa818d5ded5b151f2b182e0 m4-1.4.9.tar.bz2 609666
+SHA256 a8e29386374ba0eacbd7b339b97f169603d63a736bd87eee85ed2771ed7c3d29 m4-1.4.9.tar.bz2 609666
diff --git a/sys-devel/m4/files/m4-1.4.9-signed-division.patch b/sys-devel/m4/files/m4-1.4.9-signed-division.patch
new file mode 100644
index 000000000000..4725701b6860
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.9-signed-division.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/184200
+
+2007-04-25  Eric Blake  <[EMAIL PROTECTED]>
+
+	Fix negative division within eval, regression of 2007-01-06.
+	* src/eval.c (mult_term): Fix it.
+
+Index: src/eval.c
+===================================================================
+RCS file: /cvsroot/m4/m4/src/Attic/eval.c,v
+retrieving revision 1.1.1.1.2.9
+retrieving revision 1.1.1.1.2.10
+diff -u -p -r1.1.1.1.2.9 -r1.1.1.1.2.10
+--- src/eval.c	9 Jan 2007 16:12:43 -0000	1.1.1.1.2.9
++++ src/eval.c	25 Apr 2007 14:04:13 -0000	1.1.1.1.2.10
+@@ -718,10 +718,10 @@ mult_term (eval_token et, int32_t *v1)
+ 	  if (v2 == 0)
+ 	    return DIVIDE_ZERO;
+ 	  else if (v2 == -1)
+-	    /* Avoid the x86 SIGFPE on INT_MIN / -1.  */
++	    /* Avoid overflow, and the x86 SIGFPE on INT_MIN / -1.  */
+ 	    *v1 = (int32_t) -(uint32_t) *v1;
+ 	  else
+-	    *v1 = (int32_t) ((uint32_t) *v1 / (uint32_t) v2);
++	    *v1 /= v2;
+ 	  break;
+ 
+ 	case MODULO:
diff --git a/sys-devel/m4/m4-1.4.9-r1.ebuild b/sys-devel/m4/m4-1.4.9-r1.ebuild
new file mode 100644
index 000000000000..8b06d6234ffd
--- /dev/null
+++ b/sys-devel/m4/m4-1.4.9-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.9-r1.ebuild,v 1.1 2007/07/07 06:34:10 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="GNU macro processor"
+HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	ftp://ftp.seindal.dk/gnu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="examples nls"
+
+# remember: cannot dep on autoconf since it needs us
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-signed-division.patch #184200
+}
+
+src_compile() {
+	local myconf=""
+	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
+	econf \
+		$(use_enable nls) \
+		--enable-changeword \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+		rm -f "${D}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
+	rm -f "${D}"/usr/lib/charset.alias #172864
+}