Fix segfault by Vikraman (bug #363883).

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

4 files changed, 78 insertions, 3 deletions

diff --git a/x11-terms/xvt/ChangeLog b/x11-terms/xvt/ChangeLog
index ad1ce7d94b10..899ee5a9b8f3 100644
--- a/x11-terms/xvt/ChangeLog
+++ b/x11-terms/xvt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/xvt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.16 2010/01/11 17:58:34 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.17 2011/04/18 04:21:09 jer Exp $
+
+*xvt-2.1-r3 (18 Apr 2011)
+
+  18 Apr 2011; Jeroen Roovers <jer@gentoo.org> +xvt-2.1-r3.ebuild,
+  +files/xvt-pts.patch:
+  Fix segfault by Vikraman (bug #363883).
 
   11 Jan 2010; Raúl Porcel <armin76@gentoo.org> xvt-2.1-r1.ebuild,
   xvt-2.1-r2.ebuild:
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index e876f430fa11..e9de9c09012b 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xvt-int-main.patch 458 RMD160 c2aa72f01a03e7be5d4ce0f2514233870c78b95c SHA1 249cba335d1924cc9faf61f0a9c2e221eb617b02 SHA256 11e20ebf19b334ae4e1237147c56298ce6b6995a30de0dcd5695c435fc75d716
 AUX xvt-makefile.patch 583 RMD160 644f7260a4705711eb9b75cb69096c385923ba9e SHA1 f95497f9f532551357026aaaa5d170a4779e5177 SHA256 b5dcc3f2806d85085e215a844624b099bbf3f94b8bc8ba5defbf1c61f4e82992
+AUX xvt-pts.patch 211 RMD160 cf1d9eba209ff049c0e46ed3f357d9351212acd4 SHA1 2b463ffadf6b2eab9418a4053fe557657427965b SHA256 77d7dbfd2a2ed6d1341234b859337a4696ebea557a182c605dcd31f35b70efce
 AUX xvt-ttyinit-svr4pty.diff 1380 RMD160 b120ebf9fe518596af5ac13c1e89f629e4d69b95 SHA1 c168c17923048300ceec7b362c815d2ba1de443f SHA256 9723dce5d6609a8fddaed166bf6143faeb1b84765bdd7818b4eec33bb8d2371c
 DIST xvt-1.0.tar.Z 59445 RMD160 56fa0c779d178eccb222cd2d138d6fc4a18b800b SHA1 e8f616963f415c78a702938c9b03352714f4261a SHA256 399013beff538467a307d8a5f132e47ea4f5e18d60aba62c4d438f3ae1f086a1
 DIST xvt-2.1.diff.gz 39941 RMD160 57c54e0fd200739c8c7bcfadc34cac5884b62606 SHA1 97bbf9d0ae61f36e508dc43d59f791d9f852b994 SHA256 c51e0b1ea281ce83138d6a3f724c21b65c6257cf5438d8d0d5c34a8006348607
 EBUILD xvt-2.1-r1.ebuild 1138 RMD160 ced0f2d22c321a4543f68ccef56c065f8dc09ae8 SHA1 63b3d859038eeadf3d1443100c8ca73c18ae722e SHA256 6d23e15af66e36a7576b8a8a05e9da90085da4d9c0c394c92687ebb11af321da
 EBUILD xvt-2.1-r2.ebuild 1050 RMD160 d405c4a1bc959149882ab64a6d8912314c53e38d SHA1 804e7ddf3bccc6cf92d3bc68ac02b221ac3aa88e SHA256 72c9eaee20ceabfe9d08af47f758cc271a3c34066c484a14200d12fea6c62630
-MISC ChangeLog 1971 RMD160 dd51988eba94c7439d88caec40431463d5bf8822 SHA1 ce406e71608312f0cda8ac5986a7b0af50cb35ad SHA256 da55cfc6746ee9f7e7f40f7595115390f9fae5f0c35a40da9ab4ba21934fe2a5
+EBUILD xvt-2.1-r3.ebuild 1071 RMD160 4b8a74eddbb41fc2cbe326464075039f3b179670 SHA1 43117eedff9715c8f71d9b5fb0002c85cb1300c2 SHA256 5b21a0c4e067591cf205bfb742a3eb5888f5db79d0e82da18d51022241dc5881
+MISC ChangeLog 2128 RMD160 a9c229e14840b1452bdc535d573c0e5f913f0433 SHA1 14dd6c1b634554980696a5dea0cb8ddd87229a01 SHA256 f0ca940d9038b789387c07fe7fc90b7b71c6df131bf3850955ecb8519bf9dec5
 MISC metadata.xml 325 RMD160 210904d177e857b01ffa14d22c3e216163ce318e SHA1 e536a746094f69fb71c3a250a17846def97d77d2 SHA256 5db01b64ca4dbd394bc67d429a52d73f7ea87a925eda971bb6e9ea8bbc86db16
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2rvD8ACgkQVWmRsqeSphOr4wCdGhBEO3CtsP/6yC/zWywMyLSU
+DEQAn13pKVVHxD6nG0Cwiw1F0zm9U1gm
+=TGgS
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/xvt/files/xvt-pts.patch b/x11-terms/xvt/files/xvt-pts.patch
new file mode 100644
index 000000000000..a86504ad29e5
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-pts.patch
@@ -0,0 +1,12 @@
+--- a/ttyinit.c
++++ b/ttyinit.c
+@@ -25,6 +25,9 @@ 
+ 
+ char xvt_ttyinit_c_sccsid[] = "@(#)ttyinit.c	1.3 11/1/94 (UKC)";
+ 
++#ifdef LINUX
++#define _XOPEN_SOURCE
++#endif
+ #ifdef __STDC__
+ #include <stdarg.h>
+ #else
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
new file mode 100644
index 000000000000..9979f382b3d5
--- /dev/null
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r3.ebuild,v 1.1 2011/04/18 04:21:09 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A tiny vt100 terminal emulator for X"
+HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
+SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
+		mirror://gentoo/xvt-2.1.diff.gz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+S=${WORKDIR}/${PN}-1.0
+
+src_prepare() {
+	# this brings the distribution upto version 2.1
+	epatch "${WORKDIR}"/${P}.diff
+
+	# fix #61393
+	epatch "${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
+
+	# CFLAGS, CC #241554
+	epatch "${FILESDIR}/${PN}-makefile.patch"
+
+	# int main, not void main
+	epatch "${FILESDIR}/${PN}-int-main.patch"
+
+	# fix segfault (bug #363883)
+	epatch "${FILESDIR}/${PN}-pts.patch"
+
+	tc-export CC
+}
+
+src_install() {
+	dobin xvt || die "dobin failed"
+	doman xvt.1
+	dodoc README
+}