Fix segfault on amd64, see bug #112567.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 83 insertions, 12 deletions

diff --git a/x11-misc/xstroke/ChangeLog b/x11-misc/xstroke/ChangeLog
index f63e71d81f36..5c26b5326643 100644
--- a/x11-misc/xstroke/ChangeLog
+++ b/x11-misc/xstroke/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xstroke
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/ChangeLog,v 1.22 2006/01/22 02:06:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/ChangeLog,v 1.23 2006/02/11 13:33:29 nelchael Exp $
+
+*xstroke-0.6-r1 (11 Feb 2006)
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xstroke-0.6-sigsegv_sprintf.patch, +xstroke-0.6-r1.ebuild:
+  Fix segfault on amd64, see bug #112567.
 
   22 Jan 2006; Bryan Østergaard <kloeri@gentoo.org
   -xstroke-0.5.12-r1.ebuild, xstroke-0.6.ebuild:
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
index 45f607ede161..69822b3c6289 100644
--- a/x11-misc/xstroke/Manifest
+++ b/x11-misc/xstroke/Manifest
@@ -1,14 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 11c76b7ab02b919c109532d9aa7508c4 ChangeLog 3002
+MD5 3424cbb827b36208857d9ddf07ce1847 ChangeLog 3199
+RMD160 95c79ae1b08c3fc019f36556a65a20b31b4288ee ChangeLog 3199
+SHA256 93fa5620bd1b2d7bf8a8364b0a8a7322c7086a779042478bf7877e844759714c ChangeLog 3199
 MD5 0bff6fe5c7b5973932081ba82302166d files/digest-xstroke-0.6 64
+RMD160 1c4080c3005aba78203dc7798f1e247812673fe4 files/digest-xstroke-0.6 64
+SHA256 fa99c1982f9e617db86d4344a8fca2aff432be28c11678eaf457fb5b6c6eb77d files/digest-xstroke-0.6 64
+MD5 90228eed14629ca7a947b20c302f1639 files/digest-xstroke-0.6-r1 238
+RMD160 168746aae8b97bfef885baf801385ac689c0c2c3 files/digest-xstroke-0.6-r1 238
+SHA256 cee05aac221875aa683aac424caf4932c390261270b8478f9904f2cb65151d2f files/digest-xstroke-0.6-r1 238
+MD5 76562ba25791586cd928104aee494702 files/xstroke-0.6-sigsegv_sprintf.patch 438
+RMD160 d5e4f2d4fb427c0087cf3648d4967998aef170e4 files/xstroke-0.6-sigsegv_sprintf.patch 438
+SHA256 d0acd3dac33f2e4bfc03c3b8a73bd04fd5525bdc5a407d04e1ed180284a8c98a files/xstroke-0.6-sigsegv_sprintf.patch 438
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
+SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166
+MD5 fc3173e48410bf0559a086c877560d8e xstroke-0.6-r1.ebuild 960
+RMD160 b7aef95afdb88103194f0a81cdc9070b92308c07 xstroke-0.6-r1.ebuild 960
+SHA256 96fb417b820c8878beea1f5ad092486924c20209f7ff13b3647c46d90f21454b xstroke-0.6-r1.ebuild 960
 MD5 c846e902c3c4ee28b965001757e110a1 xstroke-0.6.ebuild 855
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0ujnugEuf3OQ0akRAqBdAJ96z5BcAeiSkP88TUOkc1jEU9CeEACfeNzg
-NTR6ORG91Lh2fF+NnrB3FtU=
-=hGjd
------END PGP SIGNATURE-----
+RMD160 851c70448daadc8b138f221db0f96fbfaddd2379 xstroke-0.6.ebuild 855
+SHA256 1c34856d1d2e2eb6e559023efa00a2019ff947dc11d01639e3a581d33f34ca3b xstroke-0.6.ebuild 855
diff --git a/x11-misc/xstroke/files/digest-xstroke-0.6-r1 b/x11-misc/xstroke/files/digest-xstroke-0.6-r1
new file mode 100644
index 000000000000..8ff254ab2d1e
--- /dev/null
+++ b/x11-misc/xstroke/files/digest-xstroke-0.6-r1
@@ -0,0 +1,3 @@
+MD5 fe4cb132369e25afc6703fc5dc0b45c2 xstroke-0.6.tar.bz2 140237
+RMD160 0872e73b4f28d09943195fce1dc2fd4756a607cf xstroke-0.6.tar.bz2 140237
+SHA256 814a38ec6dada26a7bda5439fe34995d5ac812bf2e8c008f8b297ab08b42fb5f xstroke-0.6.tar.bz2 140237
diff --git a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
new file mode 100644
index 000000000000..b36958849f53
--- /dev/null
+++ b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
@@ -0,0 +1,13 @@
+diff -Nru xstroke-0.6.vanilla/sprintf_alloc.c xstroke-0.6/sprintf_alloc.c
+--- xstroke-0.6.vanilla/sprintf_alloc.c	2005-11-26 01:55:32.000000000 +0100
++++ xstroke-0.6/sprintf_alloc.c	2005-11-26 01:55:55.000000000 +0100
+@@ -74,7 +74,8 @@
+ {
+     char *new_str;
+     /* Guess we need no more than 100 bytes. */
+-    int n, size = 100;
++	/* yeah... right... */
++    int n, size = 512;
+  
+     if ((*str = malloc (size)) == NULL)
+ 	return -1;
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
new file mode 100644
index 000000000000..a0f9a74280f5
--- /dev/null
+++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/xstroke-0.6-r1.ebuild,v 1.1 2006/02/11 13:33:29 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Gesture/Handwriting recognition engine for X"
+HOMEPAGE="http://www.xstroke.org/"
+SRC_URI="http://www.xstroke.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha hppa ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="|| ( (
+		x11-libs/libXtst
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXft )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	media-libs/freetype
+	media-libs/fontconfig
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
+
+src_unpack() {
+
+	unpack "${A}"
+	epatch "${FILESDIR}/${P}-sigsegv_sprintf.patch"
+
+}
+
+src_install() {
+	make DESTDIR="${D}" BINDIR=/usr/bin install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}