media-libs/clutter: Backport patch to fix segfault due to unrespected array bounds, #469196

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 162 insertions, 12 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 869219222a8c..e6dc402b7bdf 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.71 2013/05/15 07:01:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.72 2013/06/05 14:58:46 jlec Exp $
+
+*clutter-1.12.2-r1 (05 Jun 2013)
+
+  05 Jun 2013; Justin Lecher <jlec@gentoo.org> +clutter-1.12.2-r1.ebuild,
+  +files/clutter-1.12.2-array-bounds.patch, metadata.xml:
+  Backport patch to fix segfault due to unrespected array bounds, #469196
 
 *clutter-1.14.4 (15 May 2013)
 
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 0c54686e5722..8ca6bc681e8a 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX clutter-1.12.2-array-bounds.patch 954 SHA256 3fdcf003b0ea51154eae5c4b9e547059c8265d06b712c3b2b06b0133a67ca410 SHA512 2a27dcc7da0a38a524da475448f2b957509fd39c8ce276e95d53db10a7cd5356055efeae65d6470096c8325978c33fca45c931ea9c7c58b5dbad866f63184508 WHIRLPOOL 95cc9bf3533d390ea3ff2c2c5d5bf8580165d29195af1991d5efd0fe7d22d0ff6da69615639897c9bdce22f0acd1a186bc7a0a36faa7c612f7bc7dceb490c20e
 DIST clutter-1.12.2.tar.xz 4996752 SHA256 27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13 SHA512 4d20a7319cffe5df0052b260879bf6fe75c5eb221306da7268d99925aa8f391ba509aab9df37f080cab7c58c88c6a289c420260dc5ac7abaf7cbceb588fc4997 WHIRLPOOL fee6d14620845e8b8c44b1518ca4b7da204c4fed0c4d6b8b7a6ce1f5640b0ef87f7f0dd482b4cda80bb685fa05b0f3ecee5b1da63df232918bc89fbafbea7798
 DIST clutter-1.14.2.tar.xz 5095288 SHA256 b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8 SHA512 03da92de6974b6e1a4f2182e73053dbe329512ca93ec528437c9d16a1c12370a935a8bb7d468a145d1b82b5bfe5def19a202d4143618bd20c2668ac53509f720 WHIRLPOOL c7f54bc2407d481d73875c716da7681e2fa75fc7ea39ca8a6fe0112f430fda150f215190072ee92af25d13e76eb1e1018777b9d91f95660f60e3fced0a8a3344
 DIST clutter-1.14.4.tar.xz 5095688 SHA256 c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c SHA512 26d2561e0e10b01443d4a5de57f14f397578d8ddd59a2f78dbc20e3948c8a196ea13fe4ab79c60e2f4e4e2b6b840fb9ff29482262d70c51257b07515c28ff59a WHIRLPOOL fb6b884c1f4e7b3f8d072d568bd0fc60d7e93617fdfee1bb66ea5761bed87aaec0dbf0257a7707978beb641e36ba29838f34297a6fe9998eb149a982749875d8
+EBUILD clutter-1.12.2-r1.ebuild 2971 SHA256 82241520909b84cbdde6499ed84d4ec462758e0b098939010d2c09d847dda232 SHA512 8f8a7acbf3b13c41e18fec72c733d86466d4bace5731e2464b031f90b7851806f65d5ebdfbc52962b1b4041acdeab38df2359621f8389668be3942e33b997175 WHIRLPOOL 3a19bfc5e45a9fd591560406940595c4714962ca9cfcb397325f4ab8521fd45e796ea589ebd09d44186612f9cf292bd09c81c68d49f6d45bf3c8e54b39980c9e
 EBUILD clutter-1.12.2.ebuild 2916 SHA256 14d7b4e57487324b57b7e03ec48d30eb9afe8e784fc34bfaa4bd622faf2b4f33 SHA512 0c25f58878f1eb12bbbaf4b7f5f05b9aabfff3cfbd25e6031fdacf3124e3ad21e09c2b5108193491f1ed84a9f855764a1661ca72613ef1d8d9317f4ea0358782 WHIRLPOOL 835491d969cb4449ef1710179d39e925ce1140c81a313f30f6967b42a23b6968699f2e2852dfc78a741ac6f4fea3bdf76c764cda68ccacf97e28b9cffd8918ae
 EBUILD clutter-1.14.2.ebuild 2972 SHA256 151672665144fd2e98ee5dac89343518590bc0fc688218ce429b26ba63b5af61 SHA512 cc5da31efc20654999918aef3cced1505c74af85ba941052dc8dd468dd15cdd9fa46be3d14fbf16a7b1856d1d601041397eb5089470c8cbec29600ebf4455c89 WHIRLPOOL 9c48b81516d9e211bb36cf69e227175eeed638f6f5d2914aa93b6a86a811481a15097145ee92914b76e87c6cd94f6edacdf351efef605595a4176734844f5d54
 EBUILD clutter-1.14.4.ebuild 2972 SHA256 2696543329d174de20d56350f801beab5a6a39a0e17dddd4ad8bc022afee61b8 SHA512 33d42cc12e0c36a8b1ed411312b2249764befcf272877740ecc3676980e264f807d2f165dfd7f71a7fc5f1a645c525706829e2138852f2683bac8b88b9767487 WHIRLPOOL 289fa15f43c13191f86beb44353333c108414f785c42bc8e0b90485f8cf4755b584971e9e8bf5d87cc8a3a8d0ecc2a7df60836e20beae2517bb2dd71729ac9f9
-MISC ChangeLog 11608 SHA256 1a43ac2752f62b36830ffd12d804af0feadf94539c772de960e3a9624c9b4645 SHA512 fe59e9b797b791c7673bee9c15d09fa9280639e5361bc10d89be62dce9cf3ebde4eb5d7ea22ea47b862c184ccb5576ca631a8da36f9dde13eb237a01fdd4d4db WHIRLPOOL cd466791a8747349293d21687de810792b68cac7f529d297482795d33bba81b2fc343c663dcb1484b78cfc30f986dbe5bcd4f6f904cde4a36d42661e855cd2ec
-MISC metadata.xml 268 SHA256 a20cdf9f9acb3fd7400852008b48023362824c22d73fa9b085fe1b5697261c9c SHA512 beae5c1cfe5f31db01301fe3bfa39ee8819b13e77ed4da74879a9c194afb64480e3005c27dd20a2816abf0ac2cdb0dc2fa9f4443f2b85b62ef4cd3f630581d1e WHIRLPOOL 199bba58fd4b89d6cdf1c486ae6a68a9c8511bf120f44e849386c82913ba98dd745162153e2320b234668496e87670f81c297f85346efb999ab5d07e065df84c
+MISC ChangeLog 11848 SHA256 6093f660e917ea30280a91e4e5ef8fe3752f6ecec59069896590cb72b9ba5be1 SHA512 1eae18bdd13d05f1e01db2f88e62de982dbc6c214e3c4baa1cb3ac12c6bc39a8766644c45c8ba26f8390f006de5ac1980a89849ecf3fd1f80e844aeebb54e9fe WHIRLPOOL 598fa8c98ba4dedd8e46c367c68ee607a9e4171bdaab55a51f0899d0b2d36619b7244cf615a4a7fb1f09e3877233306b7b2a3079edad4d55dc1fc16e870448cd
+MISC metadata.xml 277 SHA256 7eb2ab11288fed65f3083eb88772f16ee9be5eb9d955aac3fdec7a22844e23b8 SHA512 b00a33228a347399f5ca4196f8c246663034543aaf2d6a285f33fb7c01ffed1304205e4316656177a28a730640b48b92290f84138cf2631ed8606c4320f3c372 WHIRLPOOL 7673455902c0e45cdc27b25661eecf106d65973590b6b82af90911a60d8f865b03ebb8e0f1292e23027b21f4c78dcc00d4abb9b47dc23785f5d60c9ef0c5ae22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGTMrwACgkQCaWpQKGI+9Sm8QCggLg6a1+Ajhq9Ul2DTpTFzrrL
-+ncAmgMTxQLR5Ikhx43e+EQC6UTY2g86
-=TNHc
+iEYEAREKAAYFAlGvUicACgkQgAnW8HDreRavfQCgwtD+fhBZUQC5LFjfY6IRIvLB
+l+oAoImvQ/S+2iXrPfygJ7fCF5+Z+acG
+=8eLs
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.12.2-r1.ebuild b/media-libs/clutter/clutter-1.12.2-r1.ebuild
new file mode 100644
index 000000000000..28fb97a84cc3
--- /dev/null
+++ b/media-libs/clutter/clutter-1.12.2-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.12.2-r1.ebuild,v 1.1 2013/06/05 14:58:46 jlec Exp $
+
+EAPI="5"
+CLUTTER_LA_PUNT="yes"
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+# since clutter-project.org doesn't provide .xz tarballs
+inherit clutter gnome2 virtualx
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+IUSE="debug doc gtk +introspection test" # evdev tslib
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# XXX: uprof needed for profiling
+# >=libX11-1.3.1 needed for X Generic Event support
+RDEPEND="
+	>=dev-libs/glib-2.31.19:2
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.9.6:1.0=[introspection?,pango]
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.10:=[glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+	>=x11-libs/libX11-1.3.1
+	x11-libs/libXext
+	x11-libs/libXdamage
+	x11-proto/inputproto
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXcomposite-0.4
+
+	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+	doc? (
+		>=dev-util/gtk-doc-1.15
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+	test? ( x11-libs/gdk-pixbuf )"
+
+# Tests fail with both swrast and llvmpipe
+# They pass under r600g or i965, so the bug is in mesa
+RESTRICT="test"
+
+src_prepare() {
+	DOCS="README NEWS ChangeLog*"
+
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# (GLX error blabla)
+	# XXX: Profiling, coverage disabled for now
+	# XXX: What about cex100/egl/osx/wayland/win32 backends?
+	# XXX: evdev/tslib input seem to be experimental?
+	G2CONF="${G2CONF} ${myconf}
+		--enable-xinput
+		--enable-x11-backend=yes
+		--disable-profile
+		--disable-maintainer-flags
+		--disable-gcov
+		--disable-cex100-backend
+		--disable-egl-backend
+		--disable-quartz-backend
+		--disable-wayland-backend
+		--disable-win32-backend
+		--disable-tslib-input
+		--disable-evdev-input
+		$(usex debug --enable-debug=yes --enable-debug=minimum)
+		$(use_enable gtk gdk-backend)
+		$(use_enable introspection)
+		$(use_enable doc docs)
+		$(use_enable test conformance)
+		$(use_enable test gdk-pixbuf)"
+
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	epatch "${FILESDIR}"/${P}-array-bounds.patch
+
+	gnome2_src_prepare
+}
+
+src_compile() {
+	default
+	if use test; then
+		emake -C tests/conform
+	fi
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	clutter_src_install
+}
diff --git a/media-libs/clutter/files/clutter-1.12.2-array-bounds.patch b/media-libs/clutter/files/clutter-1.12.2-array-bounds.patch
new file mode 100644
index 000000000000..cc5928273ae1
--- /dev/null
+++ b/media-libs/clutter/files/clutter-1.12.2-array-bounds.patch
@@ -0,0 +1,33 @@
+From d5604be9e5a148ced73dee2ede49b38f97119baf Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti@declera.com>
+Date: Mon, 28 Jan 2013 15:49:51 +0200
+Subject: [PATCH] xi2: Fix access beyond array boundaries
+
+---
+ clutter/x11/clutter-device-manager-xi2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
+index 616dee7..bd9473e 100644
+--- a/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/x11/clutter-device-manager-xi2.c
+@@ -94,13 +94,13 @@ translate_valuator_class (Display             *xdisplay,
+       atoms_initialized = TRUE;
+     }
+ 
+-  for (i = CLUTTER_INPUT_AXIS_IGNORE;
+-       i < CLUTTER_INPUT_AXIS_LAST;
++  for (i = 0;
++       i < N_AXIS_ATOMS;
+        i += 1)
+     {
+       if (clutter_input_axis_atoms[i] == class->label)
+         {
+-          axis = i;
++          axis = i + 1;
+           break;
+         }
+     }
+-- 
+1.8.1
+
diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index 8fcea51eeef5..029117044a1d 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-	<flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
-</use>
+  <herd>gnome</herd>
+  <use>
+    <flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
+  </use>
 </pkgmetadata>