compiz security fix

(Portage version: 2.1.3.18)

4 files changed, 102 insertions, 1 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index ff57e96aac6d..cc4c1738b1b7 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.21 2007/10/31 00:18:53 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.22 2007/11/06 00:53:53 hanno Exp $
+
+*compiz-0.6.2-r1 (06 Nov 2007)
+
+  06 Nov 2007; Hanno Boeck <hanno@gentoo.org>
+  +files/compiz-0.6.2-CVE-2007-3920.patch, +compiz-0.6.2-r1.ebuild:
+  Security fix for CVE-2007-3920.
 
   31 Oct 2007; Hanno Boeck <hanno@gentoo.org> compiz-0.6.2.ebuild:
   Lower libwnck-dep again.
diff --git a/x11-wm/compiz/compiz-0.6.2-r1.ebuild b/x11-wm/compiz/compiz-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..5a7f5745672d
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.6.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.6.2-r1.ebuild,v 1.1 2007/11/06 00:53:53 hanno Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="3D composite- and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.gz"
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus gnome kde svg"
+
+DEPEND=">=media-libs/mesa-6.5.1-r1
+	>=media-libs/glitz-0.5.6
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libXdamage
+	x11-libs/libXrandr
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	media-libs/libpng
+	>=x11-libs/gtk+-2.0
+	x11-libs/pango
+	x11-libs/startup-notification
+	gnome-base/gconf
+	>=x11-libs/libwnck-2.18.3
+	dev-libs/libxslt
+	gnome? ( >=gnome-base/control-center-2.16.1 )
+	svg? ( gnome-base/librsvg )
+	dbus? ( >=sys-apps/dbus-1.0 )
+	kde? (
+		|| ( kde-base/kdebase kde-base/kwin )
+		dev-libs/dbus-qt3-old )"
+
+RDEPEND="${DEPEND}
+	x11-apps/mesa-progs"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/compiz-0.6.2-CVE-2007-3920.patch"
+}
+
+src_compile() {
+	econf --with-default-plugins \
+		--enable-gtk \
+		--enable-gconf \
+		`use_enable gnome` \
+		`use_enable gnome metacity` \
+		`use_enable kde` \
+		`use_enable svg librsvg` \
+		`use_enable dbus` \
+		`use_enable dbus dbus-glib` || die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dobin "${FILESDIR}/0.3.6/compiz-start" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
diff --git a/x11-wm/compiz/files/compiz-0.6.2-CVE-2007-3920.patch b/x11-wm/compiz/files/compiz-0.6.2-CVE-2007-3920.patch
new file mode 100644
index 000000000000..e2de8fd8563f
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.6.2-CVE-2007-3920.patch
@@ -0,0 +1,29 @@
+Index: compiz-0.6.2/src/screen.c
+===================================================================
+--- compiz-0.6.2.orig/src/screen.c
++++ compiz-0.6.2/src/screen.c
+@@ -2244,7 +2244,8 @@ findTopLevelWindowAtScreen (CompScreen *
+ 	    for (w = s->windows; w; w = w->next)
+ 		if (w->frame == id)
+ 		    return w;
+-	}
++	} else if (w->resName && strstr(w->resName,"screensaver"))
++	    return w;
+ 
+ 	return NULL;
+     }
+Index: compiz-0.6.2/src/paint.c
+===================================================================
+--- compiz-0.6.2.orig/src/paint.c
++++ compiz-0.6.2/src/paint.c
+@@ -211,7 +211,9 @@ paintOutputRegion (CompScreen	       *sc
+ 	    if (count == 0					      &&
+ 		!REGION_NOT_EMPTY (tmpRegion)			      &&
+ 		screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b &&
+-		XEqualRegion (w->region, &screen->region))
++		XEqualRegion (w->region, &screen->region)             &&
++		!(w->resName && strcmp(w->resName, "gnome-screensaver") == 0)
++	       )
+ 	    {
+ 		unredirectWindow (w);
+ 		fullscreenWindow = w;
diff --git a/x11-wm/compiz/files/digest-compiz-0.6.2-r1 b/x11-wm/compiz/files/digest-compiz-0.6.2-r1
new file mode 100644
index 000000000000..73ccfd78240d
--- /dev/null
+++ b/x11-wm/compiz/files/digest-compiz-0.6.2-r1
@@ -0,0 +1,3 @@
+MD5 7e6edfdbf0dc46b135313440edae7a53 compiz-0.6.2.tar.gz 1784471
+RMD160 6cc235570c3ac15573050b27198648045a85a804 compiz-0.6.2.tar.gz 1784471
+SHA256 89efc2daefd79d28e2421902a6d890145df29e804bf8508773ea5a6eedb53224 compiz-0.6.2.tar.gz 1784471