Adding patch to fix security bug #219746

(Portage version: 2.1.5_rc6)

3 files changed, 112 insertions, 1 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 9a51308dc9f8..a1b7faced72e 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.100 2008/03/27 20:13:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.101 2008/05/03 12:26:58 keytoaster Exp $
+
+*aterm-1.0.1-r1 (03 May 2008)
+
+  03 May 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/aterm-1.0.1-display-security-issue.patch, +aterm-1.0.1-r1.ebuild:
+  Adding patch to fix security bug #219746
 
   27 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   -files/aterm-0.4.2-borderless.patch, -files/aterm-0.4.2-copynpaste.patch,
diff --git a/x11-terms/aterm/aterm-1.0.1-r1.ebuild b/x11-terms/aterm/aterm-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..f861748df5a0
--- /dev/null
+++ b/x11-terms/aterm/aterm-1.0.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.1-r1.ebuild,v 1.1 2008/05/03 12:26:58 keytoaster Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+HOMEPAGE="http://aterm.sourceforge.net"
+SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="background cjk xgetdefault"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	background? ( x11-wm/afterstep )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libICE"
+
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Security bug #219746
+	epatch "${FILESDIR}/${P}-display-security-issue.patch"
+}
+
+src_compile() {
+	local myconf
+
+	append-ldflags $(bindnow-flags)
+
+	use cjk && myconf="$myconf
+		--enable-kanji
+		--enable-thai
+		--enable-big5"
+
+	econf \
+		$(use_enable xgetdefault) \
+		$(use_enable background background-image) \
+		--with-terminfo=/usr/share/terminfo \
+		--enable-transparency \
+		--enable-fading \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--enable-utmp \
+		--enable-wtmp \
+		--with-x \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	fowners root:utmp /usr/bin/aterm
+	fperms g+s /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog doc/BUGS doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
+
+pkg_postinst() {
+	echo
+	ewarn "The transparent background will only work if you have the 'real' root wallpaper"
+	ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are"
+	ewarn "experiencing problems with transparency in aterm."
+	echo
+}
diff --git a/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
new file mode 100644
index 000000000000..e44c0b360d21
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-1.0.1-display-security-issue.patch
@@ -0,0 +1,24 @@
+--- aterm-1.0.1/src/main.c	2007-08-01 16:08:29.000000000 +0200
++++ aterm-1.0.1.new/src/main.c	2008-05-03 14:06:52.000000000 +0200
+@@ -2057,10 +2057,6 @@
+  */
+     get_options(argc, argv);
+ 
+-	if( display_name == NULL )
+-    	if ((display_name = getenv("DISPLAY")) == NULL)
+-			display_name = ":0";
+-
+ #ifdef HAVE_AFTERSTEP
+ #ifdef MyArgs_IS_MACRO	
+     MyArgsPtr = safecalloc(1, sizeof(ASProgArgs) );
+@@ -2102,7 +2098,9 @@
+ 	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);
+     }
+   /* changed from _MOTIF_WM_INFO - Vaevictus - gentoo bug #139554 */