compiz security fix

Package-Manager: portage-2.1.3.18

5 files changed, 120 insertions, 8 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/Manifest b/x11-wm/compiz/Manifest
index 79e4bce656f6..3cfd28c407fe 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -5,6 +5,10 @@ AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1
 MD5 68a063607644539218be79330a4e332f files/0.3.6/compiz-start 1122
 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 files/0.3.6/compiz-start 1122
 SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4 files/0.3.6/compiz-start 1122
+AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
+MD5 6d9951d53c6dfddef2d466ae6d57ca52 files/compiz-0.6.2-CVE-2007-3920.patch 1019
+RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f files/compiz-0.6.2-CVE-2007-3920.patch 1019
+SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee files/compiz-0.6.2-CVE-2007-3920.patch 1019
 DIST compiz-0.5.0.tar.bz2 926090 RMD160 c9b38ea1184e9b897d878c499c883dd388af17bd SHA1 453b4e8423b39d4ec3539817f2846d7ea485749e SHA256 4191745d86bec37de4cdc79bf0031afde1d28079eac2e3fc29aed18cd7a2a4e6
 DIST compiz-0.5.2.tar.gz 1778046 RMD160 9b307090af4717796e092095e7c293350292e30b SHA1 0d0a4a39bfbe0ada770d9206b7a1b6b443c53c29 SHA256 e1cc3f3bd144d32d0ebd1e505a7ea7727fb0246f36e5fcea53b808e27adf197c
 DIST compiz-0.6.2.tar.gz 1784471 RMD160 6cc235570c3ac15573050b27198648045a85a804 SHA1 ab5ecad856049a12a803fe6c94c3e55cdfcb5f68 SHA256 89efc2daefd79d28e2421902a6d890145df29e804bf8508773ea5a6eedb53224
@@ -16,14 +20,18 @@ EBUILD compiz-0.5.2.ebuild 1451 RMD160 4e87a412403c5884d53ce3236d7e649dbb3d5894
 MD5 6f73ede4e56f77b9498208e3b2b4fceb compiz-0.5.2.ebuild 1451
 RMD160 4e87a412403c5884d53ce3236d7e649dbb3d5894 compiz-0.5.2.ebuild 1451
 SHA256 f50bf6c6f2ec20df4d837359174470ad205f17d52e1ecd7c9f0fa93908e1ed66 compiz-0.5.2.ebuild 1451
+EBUILD compiz-0.6.2-r1.ebuild 1559 RMD160 78801e991fff785880c862a3ca09647dc9f84b03 SHA1 af054ea8137bbccfd3ec60212ff45240eb5f7695 SHA256 a3cc3a91fd27fa08f6b68ff7e1c982365128d3f33f9621568f3427454889406b
+MD5 75ecb9259585a59941127fd89d7fc4f6 compiz-0.6.2-r1.ebuild 1559
+RMD160 78801e991fff785880c862a3ca09647dc9f84b03 compiz-0.6.2-r1.ebuild 1559
+SHA256 a3cc3a91fd27fa08f6b68ff7e1c982365128d3f33f9621568f3427454889406b compiz-0.6.2-r1.ebuild 1559
 EBUILD compiz-0.6.2.ebuild 1450 RMD160 f84e89b7244815c307dd78b4b285a7bd0574057f SHA1 8a2ea71190db32b1ffc97be77410212a12fd1747 SHA256 4d09330d307f5d774531a5424968eab844ea1da3cdfd50e3e3823b8472dcf993
 MD5 4ea764b56db2582d96ce7dd341cc0dd0 compiz-0.6.2.ebuild 1450
 RMD160 f84e89b7244815c307dd78b4b285a7bd0574057f compiz-0.6.2.ebuild 1450
 SHA256 4d09330d307f5d774531a5424968eab844ea1da3cdfd50e3e3823b8472dcf993 compiz-0.6.2.ebuild 1450
-MISC ChangeLog 3250 RMD160 237c576ea7e454f888e20d6244dd728c75fccec1 SHA1 7e1377dd910cee0748d527e5a23e69e7577bf46b SHA256 d0103371b26191b4dfa9f69f9ec86cd56587a6933cb5c69b0f30ccda6984d847
-MD5 1ed60d8213662a7afcaa9ec8bf6f883f ChangeLog 3250
-RMD160 237c576ea7e454f888e20d6244dd728c75fccec1 ChangeLog 3250
-SHA256 d0103371b26191b4dfa9f69f9ec86cd56587a6933cb5c69b0f30ccda6984d847 ChangeLog 3250
+MISC ChangeLog 3431 RMD160 a397834cd7b0025303173dea9c8ad72546e5349c SHA1 a1be35fc2d7d8afdf20cd7457fb695bd6e4153d0 SHA256 b7678e82e01f453fc3abcb9784e417ea7a0a2f4ac4020c177473306d5d9d07c2
+MD5 71b47d321411f5c0827825361102b87f ChangeLog 3431
+RMD160 a397834cd7b0025303173dea9c8ad72546e5349c ChangeLog 3431
+SHA256 b7678e82e01f453fc3abcb9784e417ea7a0a2f4ac4020c177473306d5d9d07c2 ChangeLog 3431
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -37,10 +45,13 @@ SHA256 1e73ab80eca31b8c2c91c86abe8264063e4e7fe040d1ce71750d0a3f05ff82cc files/di
 MD5 50ee18b34c4287e5fdec028376336650 files/digest-compiz-0.6.2 241
 RMD160 c8f3571aa634efa9f11fc8ea2e3a3d3137975712 files/digest-compiz-0.6.2 241
 SHA256 9364c4539f85f9110236c7a1a15bd577c8c2a5444e9bcb53a98033a6f89e5fce files/digest-compiz-0.6.2 241
+MD5 50ee18b34c4287e5fdec028376336650 files/digest-compiz-0.6.2-r1 241
+RMD160 c8f3571aa634efa9f11fc8ea2e3a3d3137975712 files/digest-compiz-0.6.2-r1 241
+SHA256 9364c4539f85f9110236c7a1a15bd577c8c2a5444e9bcb53a98033a6f89e5fce files/digest-compiz-0.6.2-r1 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHJ8oNr2QksT29OyARAlhEAKCYUb82YLH5AwoOEEs38p+vO5wPfgCfYwko
-N3pA3d/QmjMojBPqOnoRpG4=
-=n3Zx
+iD8DBQFHL7uFr2QksT29OyARAmJzAJ9V9V554A0qzIbIXCk75tY24FgubACfYqxR
+PInw+002DWBnjXtzWT/aCJs=
+=ayHu
 -----END PGP SIGNATURE-----
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