Adding patch to fix security bug #219762

(Portage version: 2.1.5_rc6)

3 files changed, 72 insertions, 2 deletions

diff --git a/x11-terms/wterm/ChangeLog b/x11-terms/wterm/ChangeLog
index b36fddddbcd1..1156be7a1f1b 100644
--- a/x11-terms/wterm/ChangeLog
+++ b/x11-terms/wterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/wterm
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/ChangeLog,v 1.17 2007/07/22 05:55:58 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/ChangeLog,v 1.18 2008/05/03 12:58:43 keytoaster Exp $
+
+*wterm-6.2.9-r3 (03 May 2008)
+
+  03 May 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/wterm-6.2.9-display-security-issue.patch, +wterm-6.2.9-r3.ebuild:
+  Adding patch to fix security bug #219762
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   wterm-6.2.9-r2.ebuild:
diff --git a/x11-terms/wterm/files/wterm-6.2.9-display-security-issue.patch b/x11-terms/wterm/files/wterm-6.2.9-display-security-issue.patch
new file mode 100644
index 000000000000..4b9df42274f5
--- /dev/null
+++ b/x11-terms/wterm/files/wterm-6.2.9-display-security-issue.patch
@@ -0,0 +1,20 @@
+--- wterm-6.2.9/src/main.c	2001-08-17 06:47:41.000000000 +0200
++++ wterm-6.2.9.new/src/main.c	2008-05-03 14:44:43.000000000 +0200
+@@ -1444,14 +1444,13 @@
+ /*
+  * Open display, get options/resources and create the window
+  */
+-    if ((display_name = getenv("DISPLAY")) == NULL)
+-	display_name = ":0";
+-
+     get_options(argc, argv);
+ 
+     Xdisplay = XOpenDisplay(display_name);
+     if (!Xdisplay) {
+-	print_error("can't open display %s", display_name);
++	print_error("can't open display %s", display_name?display_name:
++			getenv("DISPLAY")?getenv("DISPLAY"):
++			"as no -d given and DISPLAY not set");
+ 	exit(EXIT_FAILURE);
+     }
+     extract_resources(Xdisplay, rs_name);
diff --git a/x11-terms/wterm/wterm-6.2.9-r3.ebuild b/x11-terms/wterm/wterm-6.2.9-r3.ebuild
new file mode 100644
index 000000000000..7f5e3e0bbd4e
--- /dev/null
+++ b/x11-terms/wterm/wterm-6.2.9-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/wterm-6.2.9-r3.ebuild,v 1.1 2008/05/03 12:58:43 keytoaster Exp $
+
+inherit eutils
+
+DESCRIPTION="A fork of rxvt patched for fast transparency and a NeXT scrollbar"
+HOMEPAGE="http://wterm.org"
+SRC_URI="mirror://sourceforge/wterm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cjk"
+
+DEPEND="x11-libs/libXpm
+	>=x11-wm/windowmaker-0.80.1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Security bug 219762
+	epatch "${FILESDIR}/${P}-display-security-issue.patch"
+}
+
+src_compile() {
+	local myconf
+
+	myconf="--enable-menubar --enable-graphics --with-term=rxvt \
+		--enable-transparency --enable-next-scroll --enable-xpm-background"
+
+	use cjk && myconf="$myconf --enable-kanji"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	insinto /usr/share/pixmaps
+	doins *.xpm *.tiff
+}