fixing bug 103257

(Portage version: 2.0.51.19)

5 files changed, 82 insertions, 2 deletions

diff --git a/app-editors/teco/ChangeLog b/app-editors/teco/ChangeLog
index ad8ba4ca7f5f..2a5e188dbd0a 100644
--- a/app-editors/teco/ChangeLog
+++ b/app-editors/teco/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/teco
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/ChangeLog,v 1.11 2005/07/08 17:53:28 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/ChangeLog,v 1.12 2005/08/21 17:41:07 taviso Exp $
+
+  21 Aug 2005; Tavis Ormandy <taviso@gentoo.org> :
+  fixing bug 103257
 
   08 Jul 2005; David Holm <dholm@gentoo.org> teco-1.00-r2.ebuild:
   Added to ~ppc.
diff --git a/app-editors/teco/Manifest b/app-editors/teco/Manifest
index 97d29cf0d5d7..b864317de059 100644
--- a/app-editors/teco/Manifest
+++ b/app-editors/teco/Manifest
@@ -1,4 +1,7 @@
+MD5 dce97fdcfd8fdb270a3958290777e04a teco-1.00-r3.ebuild 1390
+MD5 b79d3992b595f92689c5b7070fc1728c teco-1.00-r2.ebuild 1332
 MD5 46be50696c710a09581b0638a1b99928 ChangeLog 1326
 MD5 7510851e62ed9c830d82a0e6d068052a metadata.xml 1324
-MD5 b79d3992b595f92689c5b7070fc1728c teco-1.00-r2.ebuild 1332
 MD5 cbaebc6d51eb71e4aaaea9737b9d88f6 files/digest-teco-1.00-r2 282
+MD5 cbaebc6d51eb71e4aaaea9737b9d88f6 files/digest-teco-1.00-r3 282
+MD5 3f52e8f0efb734fe78fdd3cad6b31b49 files/teco-double-free.diff 936
diff --git a/app-editors/teco/files/digest-teco-1.00-r3 b/app-editors/teco/files/digest-teco-1.00-r3
new file mode 100644
index 000000000000..74b1289dfae3
--- /dev/null
+++ b/app-editors/teco/files/digest-teco-1.00-r3
@@ -0,0 +1,5 @@
+MD5 b996a43a133f0d636ef3331da2374e6e teco.tar.gz 61305
+MD5 843cb3087703e06bf984b1c82f48b1f8 tecolore.txt.gz 7039
+MD5 cd83ff9d990cba30020647c58cba1fa3 tech.txt.gz 1971
+MD5 37dd19fce3555c89d64b90bdca4d52c8 teco.doc.gz 129896
+MD5 5a805d3e329fc5e99fa7e1ae37e9dcfb tecoprog.doc.gz 15629
diff --git a/app-editors/teco/files/teco-double-free.diff b/app-editors/teco/files/teco-double-free.diff
new file mode 100644
index 000000000000..5a62b23d90be
--- /dev/null
+++ b/app-editors/teco/files/teco-double-free.diff
@@ -0,0 +1,20 @@
+--- te_exec2.c	1993-11-12 21:12:47.000000000 +0000
++++ te_exec2.c.new	2005-08-21 18:31:26.495907720 +0100
+@@ -197,7 +197,7 @@
+ 		{
+ 		if (eisw)       /* if ending a file execute, restore the previous "old command string" */
+ 		    {
+-		    fclose(eisw);               /* return the file descriptor */
++		    fclose(eisw), eisw = NULL;     /* return the file descriptor */
+ 		    dly_free_blist(cbuf.f);     /* return the command string used by the file (after execution done) */
+ 		    cbuf.f = oldcstring.f;
+ 		    cbuf.z = oldcstring.z;
+@@ -214,7 +214,7 @@
+ 		oldcstring.z = cbuf.z;
+ 		cbuf.f = NULL;              /* and make it inaccessible to "rdcmd" */
+ 		}
+-	    if (eisw) fclose(eisw);         /* if a command file had been open, close it */
++	    if (eisw) fclose(eisw), eisw = NULL;  /* if a command file had been open, close it */
+ 	    esp->val1 = (eisw = t_eisw) ? -1 : 0;
+ 	    esp->flag1 = colonflag;
+ 	    colonflag = 0;
diff --git a/app-editors/teco/teco-1.00-r3.ebuild b/app-editors/teco/teco-1.00-r3.ebuild
new file mode 100644
index 000000000000..f44ee3a9e7d9
--- /dev/null
+++ b/app-editors/teco/teco-1.00-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/teco-1.00-r3.ebuild,v 1.1 2005/08/21 17:41:07 taviso Exp $
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
+HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
+SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz
+	doc? ( mirror://gentoo/tecolore.txt.gz
+		mirror://gentoo/tech.txt.gz
+		mirror://gentoo/teco.doc.gz
+		mirror://gentoo/tecoprog.doc.gz )"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/libc"
+DEPEND="${DEPEND}
+	>=sys-apps/sed-4"
+PROVIDE="virtual/editor"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e 's:-ltermcap:-lncurses:' ${S}/Makefile
+	# bug 103257
+	epatch ${FILESDIR}/teco-double-free.diff
+}
+
+src_compile() {
+	append-flags -ansi -D_POSIX_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "compilation failed"
+}
+
+src_install() {
+	dobin te || die
+	doman te.1
+	dodoc sample.tecorc sample.tecorc2 READ.ME MANIFEST
+	use doc && dodoc tecolore.txt tech.txt teco.doc tecoprog.doc
+}
+
+pkg_postinst() {
+	einfo "The TECO binary is called te."
+	einfo "Sample configurations and documentation is available in /usr/share/doc/"
+}