200-r2 and 202-r1 are both revision bumps. Arches please mark 200-r2 stable, NOT 202, which still has a bunch of problems. Fix for bug #91453 by Jean-François Brunette <rainbsoft@hotmail.com>. Fix provided by the venerable (not vulnerable) Thomas Dickey

(Portage version: 2.0.51.22-r1)

6 files changed, 193 insertions, 1 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index d28b2a5cb8d5..d117378e3bce 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.86 2005/06/08 14:44:57 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.87 2005/06/10 15:08:19 seemant Exp $
+
+*xterm-202-r1 (10 Jun 2005)
+*xterm-200-r2 (10 Jun 2005)
+
+  10 Jun 2005; Seemant Kulleen <seemant@gentoo.org> +xterm-200-r2.ebuild,
+  +xterm-202-r1.ebuild:
+  200-r2 and 202-r1 are both revision bumps. Arches please mark 200-r2 stable,
+  NOT 202, which still has a bunch of problems. Fix for bug #91453 by
+  Jean-François Brunette <rainbsoft@hotmail.com>. Fix provided by the
+  venerable (not vulnerable) Thomas Dickey
 
   08 Jun 2005; Stephen P. Becker <geoman@gentoo.org> xterm-200-r1.ebuild:
   stable on mips
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index a6bebaf214c6..2b2ea72c5f5a 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,11 @@
 MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
 MD5 0dc185546142fa5513a3a4e345cbb1da xterm-202.ebuild 2298
 MD5 8f9c099f3a13c95bf5eb36e814cf7e3a xterm-200-r1.ebuild 1903
+MD5 0dc185546142fa5513a3a4e345cbb1da xterm-202-r1.ebuild 2298
 MD5 0e832b64a6f64a3b6bc6b4ae006f6d56 ChangeLog 12778
+MD5 8f9c099f3a13c95bf5eb36e814cf7e3a xterm-200-r2.ebuild 1903
 MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r1 58
 MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
 MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202 58
+MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202-r1 58
+MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r2 58
diff --git a/x11-terms/xterm/files/digest-xterm-200-r2 b/x11-terms/xterm/files/digest-xterm-200-r2
new file mode 100644
index 000000000000..5fae437bf624
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-200-r2
@@ -0,0 +1 @@
+MD5 c55b615195aebda12ea2422ea4bd718a xterm-200.tgz 697480
diff --git a/x11-terms/xterm/files/digest-xterm-202-r1 b/x11-terms/xterm/files/digest-xterm-202-r1
new file mode 100644
index 000000000000..89e44ec17165
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-202-r1
@@ -0,0 +1 @@
+MD5 a43b794f357adffd6ca0d05453dd2c80 xterm-202.tgz 707480
diff --git a/x11-terms/xterm/xterm-200-r2.ebuild b/x11-terms/xterm/xterm-200-r2.ebuild
new file mode 100644
index 000000000000..6ed860e7044f
--- /dev/null
+++ b/x11-terms/xterm/xterm-200-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-200-r2.ebuild,v 1.1 2005/06/10 15:08:19 seemant Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://dickey.his.com/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+IUSE="truetype Xaw3d unicode toolbar"
+
+DEPEND="virtual/x11
+	virtual/utempter
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+src_compile() {
+
+	filter-flags "-fstack-protector"
+
+	econf \
+		--libdir=/etc \
+		--with-x \
+		--with-utempter \
+		--disable-setuid \
+		--disable-full-tgetent \
+		--disable-imake \
+		--enable-ansi-color \
+		--enable-88-color \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-load-vt-fonts \
+		--enable-i18n \
+		--enable-wide-chars \
+		--enable-doublechars \
+		--enable-warnings \
+		--enable-tcap-query \
+		--enable-logging \
+		--enable-dabbrev \
+		`use_enable truetype freetype` \
+		`use_enable unicode luit` `use_enable unicode mini-luit` \
+		`use_with Xaw3d` \
+		`use_enable toolbar` || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install    || die
+	dodoc README* INSTALL*
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i "s:blue2$:blue:" ${D}/etc/X11/app-defaults/XTerm-color
+
+	# Fix for bug #91453 at Thomas Dickey's suggestion:
+	echo "*allowWindowOps: 	false" > ${D}/etc/X11/app-defaults/XTerm
+	echo "*allowWindowOps: 	false" > ${D}/etc/X11/app-defaults/UXTerm
+}
+
+pkg_preinst() {
+	# Prevent the terminfo files from being removed.  These collide with ncurses
+	# provided terminfo files.  So, now no more package collisions, yay!
+	touch ${ROOT}/usr/share/terminfo/v/vs100
+	touch ${ROOT}/usr/share/terminfo/x/x*
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Please make SURE to run etc-update, as that is where the latest"
+	ewarn "security fix is made"
+	echo
+	epause 5
+	ebeep
+}
diff --git a/x11-terms/xterm/xterm-202-r1.ebuild b/x11-terms/xterm/xterm-202-r1.ebuild
new file mode 100644
index 000000000000..4557645af0d8
--- /dev/null
+++ b/x11-terms/xterm/xterm-202-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-202-r1.ebuild,v 1.1 2005/06/10 15:08:19 seemant Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://dickey.his.com/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="truetype Xaw3d unicode toolbar"
+
+DEPEND="virtual/x11
+	virtual/utempter
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+#	epatch ${FILESDIR}/${PN}-no-toolbar-by-default.patch
+}
+
+src_compile() {
+
+	filter-flags "-fstack-protector"
+
+	econf \
+		--libdir=/etc \
+		--with-x \
+		--with-utempter \
+		--disable-setuid \
+		--disable-full-tgetent \
+		--disable-imake \
+		--enable-ansi-color \
+		--enable-88-color \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-load-vt-fonts \
+		--enable-i18n \
+		--enable-wide-chars \
+		--enable-doublechars \
+		--enable-warnings \
+		--enable-tcap-query \
+		--enable-logging \
+		--enable-dabbrev \
+		`use_enable toolbar` \
+		`use_enable truetype freetype` \
+		`use_enable unicode luit` `use_enable unicode mini-luit` \
+		`use_with Xaw3d` \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install    || die
+	dodoc README* INSTALL*
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i "s:blue2$:blue:" ${D}/etc/X11/app-defaults/XTerm-color
+
+	# Fix for bug #91453 at Thomas Dickey's suggestion:
+	echo "*allowWindowOps: 	false" > ${D}/etc/X11/app-defaults/XTerm
+	echo "*allowWindowOps: 	false" > ${D}/etc/X11/app-defaults/UXTerm
+	
+}
+
+pkg_preinst() {
+	# Prevent the terminfo files from being removed.  These collide with ncurses
+	# provided terminfo files.  So, now no more package collisions, yay!
+	touch ${ROOT}/usr/share/terminfo/v/vs100
+	touch ${ROOT}/usr/share/terminfo/x/x*
+}
+
+
+pkg_postinst() {
+	echo
+	ewarn "Please make SURE to run etc-update, as that is where the latest"
+	ewarn "security fix is made"
+	echo
+	epause 5
+	ebeep
+}