Add file descriptor leak fix for bug #153752. (CVE-2006-5397)

(Portage version: 2.1.2_rc1-r3)

4 files changed, 61 insertions, 1 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 493f08a471b5..e7560232653f 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.56 2006/11/03 06:38:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.57 2006/11/04 06:15:56 joshuabaergen Exp $
+
+*libX11-1.0.3-r1 (04 Nov 2006)
+
+  04 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/CVE-2006-5397.patch, +libX11-1.0.3-r1.ebuild:
+  Add file descriptor leak fix for bug #153752.  (CVE-2006-5397)
 
 *libX11-1.0.99.2 (03 Nov 2006)
 
diff --git a/x11-libs/libX11/files/CVE-2006-5397.patch b/x11-libs/libX11/files/CVE-2006-5397.patch
new file mode 100644
index 000000000000..3742665f8fba
--- /dev/null
+++ b/x11-libs/libX11/files/CVE-2006-5397.patch
@@ -0,0 +1,10 @@
+--- modules/im/ximcp/imLcIm.c	2006-06-29 20:41:44.000000000 -0600
++++ modules/im/ximcp/imLcIm.c	2006-11-02 17:32:26.000000000 -0700
+@@ -617,7 +617,6 @@
+     }
+ #endif
+ 
+-    fp = _XFopenFile (name, "r");
+     if (! (fp = _XFopenFile (name, "r"))) {
+ 	if (tmpcachedir)
+ 	    Xfree  (tmpcachedir);
diff --git a/x11-libs/libX11/files/digest-libX11-1.0.3-r1 b/x11-libs/libX11/files/digest-libX11-1.0.3-r1
new file mode 100644
index 000000000000..12c8959efbd3
--- /dev/null
+++ b/x11-libs/libX11/files/digest-libX11-1.0.3-r1
@@ -0,0 +1,3 @@
+MD5 60b787a812c92d33f71860e4e19cb59d libX11-1.0.3.tar.bz2 1449835
+RMD160 285a878a8ec9ecbd86e67897ca15ce96c994f38a libX11-1.0.3.tar.bz2 1449835
+SHA256 fb42f2400c3709a0c2c17f27cc4a902c191ebd6228c70698891bf3a13ea5b3ac libX11-1.0.3.tar.bz2 1449835
diff --git a/x11-libs/libX11/libX11-1.0.3-r1.ebuild b/x11-libs/libX11/libX11-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..91bb284dd49e
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.0.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.0.3-r1.ebuild,v 1.1 2006/11/04 06:15:56 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+RESTRICT="mirror"
+
+RDEPEND=">=x11-libs/xtrans-1.0.1
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-proto/kbproto
+	x11-proto/inputproto
+	>=x11-proto/xproto-7.0.6"
+DEPEND="${RDEPEND}
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto
+	>=x11-misc/util-macros-0.99.0_p20051007"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
+# xorg really doesn't like xlocale disabled.
+# $(use_enable nls xlocale)
+
+PATCHES="${FILESDIR}/CVE-2006-5397.patch"
+
+src_install() {
+	x-modular_src_install
+
+	local ENVD="10libx11"
+	echo "LDPATH=\"/usr/lib\"" > "${T}"/${ENVD}
+	doenvd "${T}"/${ENVD}
+}