Grab fix from upstream gnulib for %n crash #213833 by Sergey Dryabzhinsky.

Package-Manager: portage-2.2_pre5

5 files changed, 107 insertions, 8 deletions

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index b67e6ace66d1..22783aa430f2 100644
--- a/sys-devel/m4/ChangeLog
+++ b/sys-devel/m4/ChangeLog
@@ -1,6 +1,13 @@
 # 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.101 2007/10/16 14:12:04 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.102 2008/03/29 17:44:25 vapier Exp $
+
+*m4-1.4.10-r2 (29 Mar 2008)
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/m4-1.4.10-gnulib-vasnprintf.patch, files/m4-1.4.10-seek.patch,
+  +m4-1.4.10-r2.ebuild:
+  Grab fix from upstream gnulib for %n crash #213833 by Sergey Dryabzhinsky.
 
   16 Oct 2007; Christoph Mende <angelos@gentoo.org> m4-1.4.10.ebuild:
   Stable on amd64 wrt bug #195257
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 1991c60b06f0..8c396843d709 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -1,10 +1,18 @@
-AUX m4-1.4.10-seek.patch 464 RMD160 9735fbb77be58aa4a872cd782c92c82fa4b0c088 SHA1 d64fdf5436c5ad9c38ccb1a176831fc78521eb35 SHA256 fca5ca8e40622af682fcd07f9e9195a7971706eb6070f9bf2387706a56e8ec39
-AUX m4-1.4.9-signed-division.patch 909 RMD160 9c8bf8f6f442d9c870906882af553ee8abf8a65d SHA1 2313db3ae6e7e84ed1e72a937d6081f212101522 SHA256 9c3c0c8b3e0e10f8e9d8264a5fd46fbf5bfbacb50d444a053deeeab3b541111b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX m4-1.4.10-gnulib-vasnprintf.patch 1104 RMD160 4a65d2a208b6c0e70ca05c2e526dcfb1b2f68184 SHA1 7f418037b4640f59acbf8f4208d43c3fd695e5c1 SHA256 5175fefd09b0f88d13d7c2b7de737a354c90bbe7324c3509833d04a62ee7cc7e
+AUX m4-1.4.10-seek.patch 507 RMD160 4dc352a173375185571afa76ea8102a60c67d0f8 SHA1 67b2e9b8716a63ab8f963288f1f4a21afa6c3c4c SHA256 1b8f4937e2bddb3dc7ee62d389e55a7db0681e6123a84163f6f953c6043d5886
 DIST m4-1.4.10.tar.bz2 739154 RMD160 db9e91a01104a7543e69527da6d4f059a56ffefb SHA1 df46910c7e711aef1a654b077ef48d86a6a0cc6b SHA256 b2b66e645cd566a95d9714848a5d084427f3130ace5c5a0c6cb5544f11b7cbd7
-DIST m4-1.4.9.tar.bz2 609666 RMD160 5a9b3d5a607f36c02aa818d5ded5b151f2b182e0 SHA1 28b8493688ceb752ee5a96ea8fc3a335cf44beb6 SHA256 a8e29386374ba0eacbd7b339b97f169603d63a736bd87eee85ed2771ed7c3d29
 EBUILD m4-1.4.10-r1.ebuild 1238 RMD160 f63861bd83756e5eca02f697eee5e468b0f586fa SHA1 c04c1ff50f616b2bc3cf2a3143324540dee30e86 SHA256 909f4384f5ada8c7954a069aa136f69c5c3fe4c814fe1f8eaf5f5c56a9ed2770
+EBUILD m4-1.4.10-r2.ebuild 1249 RMD160 ded4f68462ff9e0471f9cc289d335a804ee7e38a SHA1 6f765060e43b3a71d3dce33e1bfedb9d1fc2ce77 SHA256 b0b9ae05da5ea7da050ab6b795e37372ef4de080ce3bc97be3d0335afb3e678e
 EBUILD m4-1.4.10.ebuild 1080 RMD160 0d98e4968bd8f08a5fa072dd6bdabf27ebc2de24 SHA1 6b2e58a41de49c4e149280b9d94f38ae4c021b3f SHA256 9b07bb9321f8c7ff289b49a99130569298d96e4f4cc37ac44498f2e5a19183ae
-EBUILD m4-1.4.9-r1.ebuild 1195 RMD160 afd8efe525e97c114057d8341b20ea957c5a8673 SHA1 820652d1dd97853c272c890523aba68c53b24ba6 SHA256 4134fe212c14fe0e30c06762388c1dbd3d272c031922bdcbbc05b8ad9fb4dbad
-EBUILD m4-1.4.9.ebuild 1079 RMD160 031f4af8532f108479b1f251798a41c4e50607bf SHA1 36ad6b12acf73d217ec91ec459c945b4c7df38f8 SHA256 c28ab0bd5bdbcb37aeaaf0eb92b0d487df334fc451b3ce2d4fc0ef3283783a54
-MISC ChangeLog 11104 RMD160 a55df781c5f8ee39fddd06acb4f30f358472942f SHA1 785162d66f703c79c4f9ddd0ea4b94d5f1700518 SHA256 e8467795d26e0e1accb5da02e3bfab386feb85ed4d8ccfdc51ffb79eee1a3b95
+MISC ChangeLog 11356 RMD160 8a922011d42d6da6f370544570ca961f09f4ba45 SHA1 98f3c87a3bbc490c04f28fee60813fad2123d326 SHA256 1f6ccf5dbf18c7701228c9e2ff571140139ce09cbd6fd9e54c3538d71be0c07c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH7oDLj9hvisErhMIRAjqaAKC9I5C9atrDO1VZE3roiIUPeGaMhACgkeHY
+1shiPTZPUOlxQi7LVQwolsw=
+=ixS8
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/m4/files/m4-1.4.10-gnulib-vasnprintf.patch b/sys-devel/m4/files/m4-1.4.10-gnulib-vasnprintf.patch
new file mode 100644
index 000000000000..7a205c7dcd0a
--- /dev/null
+++ b/sys-devel/m4/files/m4-1.4.10-gnulib-vasnprintf.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/213833
+
+commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8
+Author: Bruno Haible <bruno@clisp.org>
+Date:   Fri Oct 19 01:50:42 2007 +0200
+
+    Don't use %n on glibc >= 2.3 systems.
+
+diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
+index f563823..5d818aa 100644
+--- a/lib/vasnprintf.c
++++ b/lib/vasnprintf.c
+@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
+ #endif
+ 		  *fbp = dp->conversion;
+ #if USE_SNPRINTF
++# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
+ 		fbp[1] = '%';
+ 		fbp[2] = 'n';
+ 		fbp[3] = '\0';
++# else
++		/* On glibc2 systems from glibc >= 2.3 - probably also older
++		   ones - we know that snprintf's returns value conforms to
++		   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
++		   Therefore we can avoid using %n in this situation.
++		   On glibc2 systems from 2004-10-18 or newer, the use of %n
++		   in format strings in writable memory may crash the program
++		   (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
++		   in this situation.  */
++		fbp[1] = '\0';
++# endif
+ #else
+ 		fbp[1] = '\0';
+ #endif
diff --git a/sys-devel/m4/files/m4-1.4.10-seek.patch b/sys-devel/m4/files/m4-1.4.10-seek.patch
index 572d266373f1..9e3d51d0470a 100644
--- a/sys-devel/m4/files/m4-1.4.10-seek.patch
+++ b/sys-devel/m4/files/m4-1.4.10-seek.patch
@@ -1,3 +1,5 @@
+Fix for BSD systems pulled from upstream.
+
 diff -ur a/src/output.c b/src/output.c
 --- a/src/output.c	2007-07-05 04:56:06 +0100
 +++ b/src/output.c	2007-10-15 09:56:23 +0100
diff --git a/sys-devel/m4/m4-1.4.10-r2.ebuild b/sys-devel/m4/m4-1.4.10-r2.ebuild
new file mode 100644
index 000000000000..4efd5ea141dd
--- /dev/null
+++ b/sys-devel/m4/m4-1.4.10-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.10-r2.ebuild,v 1.1 2008/03/29 17:44:25 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-3"
+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}-seek.patch
+	epatch "${FILESDIR}"/${P}-gnulib-vasnprintf.patch #213833
+}
+
+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
+}