fix #61393

5 files changed, 125 insertions, 2 deletions

diff --git a/x11-terms/xvt/ChangeLog b/x11-terms/xvt/ChangeLog
index 8324d71f8bed..f84349fe2dc2 100644
--- a/x11-terms/xvt/ChangeLog
+++ b/x11-terms/xvt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/xvt
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.5 2004/06/28 22:15:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.6 2004/08/24 17:55:40 taviso Exp $
+
+*xvt-2.1-r1 (24 Aug 2004)
+
+  24 Aug 2004; Tavis Ormandy <taviso@gentoo.org>
+  +files/xvt-ttyinit-svr4pty.diff, +xvt-2.1-r1.ebuild:
+  fix #61393
 
   28 Jun 2004; Aron Griffis <agriffis@gentoo.org> xvt-2.1.ebuild:
   add sed-4 dep
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index d40dab554a44..7a1eee9ec69d 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -1,5 +1,8 @@
 MD5 a11ac1faa85a9a8795e2ea6a4fcb1cf5 xvt-2.1.ebuild 1044
-MD5 7e0ce30bbaecffc868915454b73d86c2 ChangeLog 604
+MD5 061fdc82e379a0cf81dc0946b244dd96 xvt-2.1-r1.ebuild 1107
+MD5 9281e280ab40e8aa8ff10d7baad1caf1 ChangeLog 749
 MD5 3ad0818ec98b13c8b0ea5e54fee8ef84 metadata.xml 326
+MD5 ec975dfd47a6346ddfbd5554c88e827c files/digest-xvt-2.1-r1 57
+MD5 58ed6be7fe5214ba8025a652b45df904 files/xvt-ttyinit-svr4pty.diff 1380
 MD5 ec975dfd47a6346ddfbd5554c88e827c files/digest-xvt-2.1 57
 MD5 c9db9dce999411dc4a4183094b0c33d1 files/xvt-2.1.diff.gz 39941
diff --git a/x11-terms/xvt/files/digest-xvt-2.1-r1 b/x11-terms/xvt/files/digest-xvt-2.1-r1
new file mode 100644
index 000000000000..291efc66b24b
--- /dev/null
+++ b/x11-terms/xvt/files/digest-xvt-2.1-r1
@@ -0,0 +1 @@
+MD5 907c07376ea39f411cfddbd149366fef xvt-1.0.tar.Z 59445
diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
new file mode 100644
index 000000000000..a858250c1d8a
--- /dev/null
+++ b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
@@ -0,0 +1,63 @@
+--- ttyinit.c	2004-08-24 18:51:18.510722064 +0100
++++ ttyinit.c.new	2004-08-24 18:50:30.539014872 +0100
+@@ -46,6 +46,7 @@
+ #include <pwd.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stropts.h>
+ #include "xvt.h"
+ #include "token.h"
+ #include "command.h"
+@@ -410,44 +411,6 @@
+ get_pseudo_tty(pmaster,pslave)
+ int *pmaster, *pslave;
+ {
+-#ifdef BSD_PTY
+-	int mfd, sfd;
+-	char *s3, *s4;
+-	static char ptyc3[] = "pqrstuvwxyz";
+-	static char ptyc4[] = "0123456789abcdef";
+-	static char ptynam[] = "/dev/ptyxx";
+-	static char ttynam[] = "/dev/ttyxx";
+-
+-	/*  First find a master pty that we can open.
+-	 */
+-	mfd = -1;
+-	for (s3 = ptyc3; *s3 != 0; s3++) {
+-		for (s4 = ptyc4; *s4 != 0; s4++) {
+-			ptynam[8] = ttynam[8] = *s3;
+-			ptynam[9] = ttynam[9] = *s4;
+-			if ((mfd = open(ptynam,O_RDWR)) >= 0) {
+-				if (geteuid() == 0 || access(ttynam,R_OK|W_OK) == 0)
+-					break;
+-				else {
+-					close(mfd);
+-					mfd = -1;
+-				}
+-			}
+-		}
+-		if (mfd >= 0)
+-			break;
+-	}
+-	if (mfd < 0) {
+-		error("Can't open a pseudo teletype");
+-		return(NULL);
+-	}
+-	if ((sfd = open(ttynam,O_RDWR)) < 0) {
+-		error("could not open slave tty %s",ttynam);
+-		return(NULL);
+-	}
+-#endif /* BSD_PTY */
+-
+-#ifdef SVR4_PTY
+ 	char *ttynam;
+ 	int mfd, sfd;
+ 
+@@ -464,7 +427,6 @@
+ 	}
+ 	ioctl(sfd,I_PUSH,"ptem");
+ 	ioctl(sfd,I_PUSH,"ldterm");
+-#endif /* SVR4_PTY */
+ 
+ 	*pslave = sfd;
+ 	*pmaster = mfd;
diff --git a/x11-terms/xvt/xvt-2.1-r1.ebuild b/x11-terms/xvt/xvt-2.1-r1.ebuild
new file mode 100644
index 000000000000..6420fa5a1b2e
--- /dev/null
+++ b/x11-terms/xvt/xvt-2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r1.ebuild,v 1.1 2004/08/24 17:55:40 taviso Exp $
+
+inherit ccc eutils flag-o-matic
+
+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"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~alpha"
+IUSE=""
+DEPEND="virtual/x11
+	>=sys-apps/sed-4"
+S=${WORKDIR}/${PN}-1.0
+
+src_unpack() {
+	unpack ${A}
+
+	# this brings the distribution upto version 2.1
+	cd ${S}; epatch ${FILESDIR}/xvt-2.1.diff.gz
+
+	# fix #61393
+	epatch ${FILESDIR}/xvt-ttyinit-svr4pty.diff
+
+	# set the makefile options
+	sed -i 's/#\(ARCH=LINUX\)/\1/g' Makefile
+
+	# set CFLAGS
+	sed -i "s^\(CFLAGS=\)-O^\1${CFLAGS}^g" Makefile
+
+	# add search path for X11 libs.
+	append-ldflags -L/usr/X11R6/lib
+
+	# make gcc quiet.
+	sed -i -e 's/^void$/int/' -e 's/^void\( main\)/int\1/g' xvt.c
+
+}
+
+src_compile() {
+	# emake -j1 config
+	emake || die
+}
+
+src_install() {
+	dobin xvt
+	doman xvt.1
+	dodoc README COPYING
+}