Add fix for DISPLAY security issue #216833.

Package-Manager: portage-2.2_pre5

4 files changed, 129 insertions, 5 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 6e91a732ba7f..66ef585cbbc4 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.53 2008/04/08 17:47:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.54 2008/04/16 03:26:28 vapier Exp $
+
+*eterm-0.9.4-r1 (16 Apr 2008)
+
+  16 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/eterm-0.9.4-no-default-DISPLAY.patch, +eterm-0.9.4-r1.ebuild:
+  Add fix for DISPLAY security issue #216833.
 
   08 Apr 2008; Mike Frysinger <vapier@gentoo.org> eterm-0.9.4.ebuild,
   eterm-9999.ebuild:
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index bbb73f33c6ba..a82eb2d377ba 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX eterm-0.9.4-no-default-DISPLAY.patch 897 RMD160 62fa2e83df328b9d32ffaaee35e5f32101e9d2e0 SHA1 7cb5938a1c0798caee1da50e2e208b6dfbff2b75 SHA256 d71ad8f0e740dcc66dfc1853a5f54fbcf777b15e92566cef40c24278260dd7f9
 DIST Eterm-0.9.4.tar.gz 814823 RMD160 ce5d7ba74b19e3c8992d104d00f10302c3e8150e SHA1 d63628098b3aa08c8f2bc1bd756683e5fd227995 SHA256 0eaeba125781276fe7300b320cd7c180f41ccd47d4dcbdb214ad89dd3fc5420a
 DIST Eterm-bg-0.9.4.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
+EBUILD eterm-0.9.4-r1.ebuild 2277 RMD160 d839cf14fe4a407c8dac8949a1b50295c31bd608 SHA1 53bd523e3bc009912c59f6e533d53e0944896325 SHA256 3da213c03f2d23cd6d37a27cbf1ad44ccfb228b92bd0a1a97e391006b628a3fd
 EBUILD eterm-0.9.4.ebuild 2197 RMD160 ac30155855c345a03132a7cbb2dede7c8c2e7092 SHA1 7bb2c5a268743061fa3e35010c5f92ee6698f4e5 SHA256 3e0043fec87dbd268adcf199b47ec09533e5fa51a8adc4a20b798f732ae62b52
 EBUILD eterm-9999.ebuild 2132 RMD160 3967881806279c44aed8039586f0dad344c76b90 SHA1 49c2a9148cd109cd3f86ec0c34c420917883f8d6 SHA256 366eefe69acaa0b23ece7279c0d411e4f12af97000cdd5e874c04549a6d6674b
-MISC ChangeLog 7836 RMD160 b10b15965b51cf028c849563d0a8b4345db3a5f0 SHA1 0a34a99a97db82112de8d9423e5fde38b01d4a23 SHA256 d320eca40b846bca1da1a45359372033fa858bc23d1e103431f3ac080af12206
+MISC ChangeLog 8035 RMD160 895a0f7e14627f8b9fbe697e4c6d54e12b1c95d7 SHA1 81e9eb98bc688571672144918495bce057894c24 SHA256 1a8221a4360fd44c984a0e8315d73133885e6db8d21b8b9d59136cc912bde51a
 MISC metadata.xml 631 RMD160 dd452ed952bf8af5be6f558ef0180fbf64b49a06 SHA1 0c2dd0db46804766fbde9091354837b125525d9a SHA256 04cc5c3f1f4f78e06665c63d960af3349d1aa80760294b106e098c0b396af871
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH+6/Ej9hvisErhMIRAsmbAJ43JYBMVQKbi/2Vxj7bOPX1sSkfxQCg3iJc
-h+nXTxeKHrTB4qZtLbu57OY=
-=ZBSZ
+iD8DBQFIBXHpj9hvisErhMIRAgKnAKCEJoWH4kFYdv/bpX198L+LkE5nkwCgoc6L
+mQBgVy4dEz5pNSjXtJO4l4E=
+=3GQE
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/eterm/eterm-0.9.4-r1.ebuild b/x11-terms/eterm/eterm-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..e4ddbbdae6da
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.4-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.4-r1.ebuild,v 1.1 2008/04/16 03:26:28 vapier Exp $
+
+inherit eutils
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
+	ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
+	ECVS_MODULE="eterm/Eterm"
+	inherit cvs
+fi
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
+		mirror://sourceforge/eterm/${MY_P}.tar.gz
+		!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="escreen etwin minimal mmx sse2 unicode"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xproto
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2
+	etwin? ( app-misc/twin )
+	escreen? ( app-misc/screen )"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${MY_P}
+fi
+
+pkg_setup() {
+	if ! built_with_use media-libs/imlib2 X ; then
+		eerror "media-libs/imlib2 was built without X support."
+		eerror "Please add emerge it with USE=X."
+		die "imlib2 needs USE=X"
+	fi
+}
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		cvs_src_unpack
+		cd "${S}"
+		NOCONFIGURE=yes ./autogen.sh || die "autogen failed"
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}"
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+		epatch "${FILESDIR}"/eterm-0.9.4-no-default-DISPLAY.patch #216833
+	fi
+}
+
+src_compile() {
+	export TIC="true"
+	econf \
+		$(use_enable escreen) \
+		$(use_enable etwin) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable mmx) \
+		$(use_enable sse2) \
+		$(use_enable unicode multi-charset) \
+		--with-delete=execute \
+		--with-backspace=auto \
+		|| die "conf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/files/eterm-0.9.4-no-default-DISPLAY.patch b/x11-terms/eterm/files/eterm-0.9.4-no-default-DISPLAY.patch
new file mode 100644
index 000000000000..3dc50202a0e5
--- /dev/null
+++ b/x11-terms/eterm/files/eterm-0.9.4-no-default-DISPLAY.patch
@@ -0,0 +1,25 @@
+fix from upstream
+
+http://bugs.gentoo.org/216833
+
+Index: src/startup.c
+===================================================================
+RCS file: /cvs/e/eterm/Eterm/src/startup.c,v
+retrieving revision 1.58
+retrieving revision 1.59
+diff -u -p -r1.58 -r1.59
+--- src/startup.c	30 Oct 2006 21:12:12 -0000	1.58
++++ src/startup.c	16 Apr 2008 03:23:27 -0000	1.59
+@@ -96,7 +96,11 @@ eterm_bootstrap(int argc, char *argv[])
+ 
+     /* Open display, get options/resources and create the window */
+     if (getenv("DISPLAY") == NULL) {
+-        display_name = STRDUP(":0");
++        /* do not default to any display due to security issues -- vapier
++         * http://article.gmane.org/gmane.comp.security.oss.general/122
++         */
++        libast_print_error("can't open display: DISPLAY not set\n");
++        exit(EXIT_FAILURE);
+     } else {
+         display_name = STRDUP(getenv("DISPLAY"));
+     }