Adding patch to fix security bug #219754

(Portage version: 2.1.5_rc6)

3 files changed, 83 insertions, 2 deletions

diff --git a/x11-terms/multi-aterm/ChangeLog b/x11-terms/multi-aterm/ChangeLog
index ed0c39f604c6..880695a3a8f9 100644
--- a/x11-terms/multi-aterm/ChangeLog
+++ b/x11-terms/multi-aterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/multi-aterm
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/ChangeLog,v 1.23 2007/04/14 15:49:16 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/ChangeLog,v 1.24 2008/05/03 11:58:56 keytoaster Exp $
+
+*multi-aterm-0.2.1-r1 (03 May 2008)
+
+  03 May 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/multi-aterm-0.2.1-display-security-issue.patch,
+  +multi-aterm-0.2.1-r1.ebuild:
+  Adding patch to fix security bug #219754
 
   14 Apr 2007; Raúl Porcel <armin76@gentoo.org> multi-aterm-0.2.1.ebuild:
   Add libXpm location, remove virtual/x11, thanks to Martin Salzer <stoky at
diff --git a/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
new file mode 100644
index 000000000000..27f56255acdb
--- /dev/null
+++ b/x11-terms/multi-aterm/files/multi-aterm-0.2.1-display-security-issue.patch
@@ -0,0 +1,21 @@
+--- multi-aterm-0.2.1/src/main.c	2004-09-03 20:49:36.000000000 +0200
++++ multi-aterm-0.2.1.new/src/main.c	2008-05-03 13:33:04.000000000 +0200
+@@ -1853,15 +1853,13 @@
+   //get_options(argc, argv);
+   //display_options();
+ 
+-	if (display_name == NULL)
+-		if ((display_name = getenv("DISPLAY")) == NULL)
+-			display_name = ":0";
+-
+ 	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);
+ 	}
+   
diff --git a/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..dffa875be907
--- /dev/null
+++ b/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-aterm/multi-aterm-0.2.1-r1.ebuild,v 1.1 2008/05/03 11:58:56 keytoaster Exp $
+
+inherit eutils
+
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility like aterm, with tab support"
+HOMEPAGE="http://www.nongnu.org/materm/materm.html"
+SRC_URI="http://www.nongnu.org/materm/${P}.tar.gz"
+
+IUSE="cjk debug jpeg png"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libXpm
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-initialize-vars.patch"
+	
+	# Security bug #219754
+	epatch "${FILESDIR}/${P}-display-security-issue.patch"
+}
+
+src_compile() {
+	econf \
+		--enable-transparency \
+		--enable-fading \
+		--enable-xterm-scroll \
+		--enable-half-shadow \
+		--enable-graphics \
+		--enable-mousewheel \
+		--with-x \
+		--with-xpm=/usr \
+		$(use_enable cjk kanji) \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	einstall || die "einstall failed"
+	dodoc NEWS ChangeLog doc/TODO || die "dodoc failed"
+}