fix bug 23888

5 files changed, 75 insertions, 4 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 84b87b1f322a..74b409a07ee2 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.14 2003/10/16 05:54:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.15 2003/10/31 04:20:57 agriffis Exp $
+
+*nvi-1.81.5-r2 (30 Oct 2003)
+
+  30 Oct 2003; Aron Griffis <agriffis@gentoo.org> nvi-1.81.5-r2.ebuild,
+  files/nvi-1.81-5-tcsetattr.patch:
+  Fix bug 23888 to prevent crash when window is resized. Thanks to Andy Wang who
+  hunted down the patch for us.
 
   15 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> nvi-1.81.5-r1.ebuild:
   lock db version required, and bump to x86, alpha, hppa as per original ebuild
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index e9b67a5262ea..90be0ee8524a 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -1,10 +1,10 @@
-MD5 b32331c37008a99bfd9d78448581a606 nvi-1.81.5-r2.ebuild 1091
+MD5 8cc772fbac7378fc47126597ccb3fd5c nvi-1.81.5-r2.ebuild 1092
 MD5 22992e21a8790247d8a0d83bfeaffca9 nvi-1.81.5.ebuild 705
 MD5 1ac5944342982bec4d256fe351d77f1c nvi-1.81.5-r1.ebuild 989
-MD5 be987da2815e3b9fe25618de45d5e4b4 ChangeLog 2110
+MD5 2bfd906ee0cae418847b8a562caeb6cf ChangeLog 2363
 MD5 48d2721a7694e9eb15e0de2865e6faee nvi-1.81.4.ebuild 675
 MD5 47f5a61b93feb15280fbaf8deae78ea5 files/digest-nvi-1.81.4 63
 MD5 9c126ee8e4a3070016e51438d8ad45b9 files/digest-nvi-1.81.5 63
-MD5 e4c11bab15aaee62f61cbe103c890cb9 files/nvi-1.81-5-tcsetattr.patch 565
 MD5 9c126ee8e4a3070016e51438d8ad45b9 files/digest-nvi-1.81.5-r1 63
 MD5 9c126ee8e4a3070016e51438d8ad45b9 files/digest-nvi-1.81.5-r2 63
+MD5 e4c11bab15aaee62f61cbe103c890cb9 files/nvi-1.81.5-tcsetattr.patch 565
diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r2 b/app-editors/nvi/files/digest-nvi-1.81.5-r2
new file mode 100644
index 000000000000..38945f51da60
--- /dev/null
+++ b/app-editors/nvi/files/digest-nvi-1.81.5-r2
@@ -0,0 +1 @@
+MD5 5cc674f049054f3e8f7600df8d8d5cf4 nvi-1.81.5.tar.gz 1628555
diff --git a/app-editors/nvi/files/nvi-1.81.5-tcsetattr.patch b/app-editors/nvi/files/nvi-1.81.5-tcsetattr.patch
new file mode 100644
index 000000000000..b22dfa0f4f6f
--- /dev/null
+++ b/app-editors/nvi/files/nvi-1.81.5-tcsetattr.patch
@@ -0,0 +1,20 @@
+--- cl/cl_screen.c.orig	2001-06-25 10:19:06.000000000 -0500
++++ cl/cl_screen.c	2003-07-02 18:28:29.000000000 -0500
+@@ -369,6 +369,8 @@
+ 
+ fast:	/* Set the terminal modes. */
+ 	if (tcsetattr(STDIN_FILENO, TCSASOFT | TCSADRAIN, &clp->vi_enter)) {
++		if (EINTR == errno)
++			goto fast;
+ 		msgq(sp, M_SYSERR, "tcsetattr");
+ err:		(void)cl_vi_end(sp->gp);
+ 		return (1);
+@@ -485,6 +487,8 @@
+ #endif
+ 
+ fast:	if (tcsetattr(STDIN_FILENO, TCSADRAIN | TCSASOFT, &clp->ex_enter)) {
++		if (EINTR == errno)
++			goto fast;
+ 		msgq(sp, M_SYSERR, "tcsetattr");
+ 		return (1);
+ 	}
diff --git a/app-editors/nvi/nvi-1.81.5-r2.ebuild b/app-editors/nvi/nvi-1.81.5-r2.ebuild
new file mode 100644
index 000000000000..ffc0197b9a7a
--- /dev/null
+++ b/app-editors/nvi/nvi-1.81.5-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r2.ebuild,v 1.1 2003/10/31 04:20:58 agriffis Exp $
+
+DESCRIPTION="Vi clone"
+SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
+HOMEPAGE="http://www.bostic.com/vi/"
+SLOT="0"
+LICENSE="Sleepycat"
+KEYWORDS="x86 ~ppc ~sparc hppa alpha ~mips"
+DEPEND="virtual/glibc
+		=sys-libs/db-3.2*"
+PROVIDE="virtual/editor"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's|-ldb|-ldb-3.2|g' -e 's|libdb-3|libdb-3.2|g' dist/configure \
+		|| die "sed failed"
+	# Fix bug 23888
+	epatch ${FILESDIR}/${P}-tcsetattr.patch || die "epatch failed"
+}
+
+src_compile() {
+	local myconf=""
+	export LIBS="-lpthread"
+	export ADDCPPFLAGS="-I/usr/include/db3"
+	cd build.unix
+	../dist/configure \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--prefix=/usr \
+		--host=${CHOST} \
+		${myconf} || die "configure failed"
+	einfo "Doing make now"
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd ${S}/build.unix
+	einstall
+}