Bump to 2.24.0-r2. Fix a leak misused gslist function, bug #258301. Fix a string leak, bug #258302.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 112 insertions, 5 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index b8eaf28bb2bc..24994d5d01c4 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.222 2009/02/08 21:31:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.223 2009/02/09 22:38:51 eva Exp $
+
+*metacity-2.24.0-r2 (09 Feb 2009)
+
+  09 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/metacity-2.24.0-gslist-leak.patch,
+  +files/metacity-2.24.0-string-leak.patch, +metacity-2.24.0-r2.ebuild:
+  Bump to 2.24.0-r2. Fix a leak misused gslist function, bug #258301. Fix a
+  string leak, bug #258302.
 
 *metacity-2.24.0-r1 (08 Feb 2009)
 
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 78c08b690595..642c86d65d46 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -3,19 +3,22 @@ Hash: SHA1
 
 AUX metacity-2.24.0-crash-login.patch 1381 RMD160 43f4622195e22971a2b806d9f4e4bb042479d818 SHA1 1c1e722322f18735b95b31fad9d02186f939ecb6 SHA256 c1d2ae0e5e425dd8daca501da654db0e979421a0502441d69b5ce0318b863254
 AUX metacity-2.24.0-fbsd.patch 454 RMD160 b105d90b271710930ba56adb0d26a881e808265f SHA1 bfd3101b865ee4d0ad1d425a50141b498df0a8df SHA256 4bb15fd9b0a9db418dd50dedd99a1cb1ec75a39a0608c8c39ccad9b8bbcd6e74
+AUX metacity-2.24.0-gslist-leak.patch 760 RMD160 18264a62e94ce8528c7b34b8c859207fdd3159e1 SHA1 81d0f88e3d43166b0962142fe9a9ecab5aa86203 SHA256 56bdf2afeadda49d38b0c99c903ba7dc543e627921995c3565314e074ee0c820
+AUX metacity-2.24.0-string-leak.patch 573 RMD160 fb139a74e26f75a1ecfa44c34efd791841a2f550 SHA1 30c8a1d76196c4708175932527b1a6059d26dec0 SHA256 e2ebb8487f275461a28acdb9004d69dd6869bfe234b749b4093a024a8a6abad4
 DIST metacity-2.20.1.tar.bz2 1880151 RMD160 dc1ba08bbe13249073766c02746d94d26ceadfb8 SHA1 55756426a69ea35a4c6b53180ed41fd583f20341 SHA256 11ab50586b2d89d00c1da2d35d1d8cbedfa73e2e500439d6f51d058e9c483a74
 DIST metacity-2.22.0.tar.bz2 2071931 RMD160 9432a4a809b70e1088d3eb5a54be1044ee4e5ccc SHA1 18e7761152d033b31b13a455be459d986f55a8ba SHA256 3c670b41a214311006dc05f9a005696b9d3fdcb5c80f1275367416600103b3bf
 DIST metacity-2.24.0.tar.bz2 2160557 RMD160 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5 SHA1 0b2e37e372498e26a6926fbb68e96556c6db6497 SHA256 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076
 EBUILD metacity-2.20.1.ebuild 908 RMD160 435491cabdb08e47c7f32a45c73ff72dc00df30f SHA1 fa9a91c059bdc1cc50c126b53f460ba68f851d62 SHA256 cdc2ce0bb01b75208ba2808ac133a3a5af4fb785802cda90d1644bfce60b5a6e
 EBUILD metacity-2.22.0.ebuild 839 RMD160 e5b9317da9663fa37da5cce81217b4c861d9d3e5 SHA1 19337b4ef762c837a1f372875dd3fd7b81d11035 SHA256 c8d1887158f031ebfec23c53752a9f02794e4441fc4db162c954920eeb6da7dd
 EBUILD metacity-2.24.0-r1.ebuild 1341 RMD160 1a2752dfb808453f4ccb04b6ca10a1aea112af9b SHA1 ebe45a0dc5e4336f2645184793bcecb588c802fd SHA256 bc22e03031044e2ac01b0f4ef63c97f1cbe6c6ba470170d4e754601695e350ad
+EBUILD metacity-2.24.0-r2.ebuild 1518 RMD160 28dfe5cf1b019182a077acf0e151a94f51f8bd54 SHA1 7e3f3be784b587bf8cdc2bebea172c092f160c0f SHA256 db39aa47c15b9757be661e177c9d3e3ae5a0727511e524320c6bc14d31dc2b40
 EBUILD metacity-2.24.0.ebuild 1248 RMD160 85fdb5187412fb4dc683129a653ff0776bb0058e SHA1 0dfcb0967d8b9991510e7cc0ce36097d999e602a SHA256 d6a51c89860ae2d30604c6aaf47960d5be528c84362c06dcbbb4b2d77aa6887f
-MISC ChangeLog 25988 RMD160 361bc7393c7a9418a6b5300392e4642ec004cb48 SHA1 12c71107958c646221df4de31bf5c10646209c5c SHA256 b359aa43e28a53dc4185894e9581a259d6cc1a10acfc5a0319754316a5328cc8
+MISC ChangeLog 26298 RMD160 355182493329c438dccd7b507f3805faa6f07369 SHA1 3eebc7e3f837b39c289e28282eea133e4d381093 SHA256 02e12653d1c46d5a6785eaed3cc3f11a57d050ccd9a4bb8d28376df35bee5806
 MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmPT1MACgkQ1fmVwcYIWAZ/FQCgnAEogMFz2RJe2zA5bHLlyeME
-lrkAnigq5Zn+XyLtqOHhxH7WLvx2CD1q
-=Rhwf
+iEYEARECAAYFAkmQsIEACgkQ1fmVwcYIWAbx0gCggANWMlUdMA7rx5PIxaJIc/Uz
+AOgAoNXmIqZHm7PSl6l6jC7EM0OzbIPD
+=MZVx
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch b/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch
new file mode 100644
index 000000000000..39c35087e4c7
--- /dev/null
+++ b/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch
@@ -0,0 +1,15 @@
+# https://bugs.gentoo.org/attachment.cgi?id=181415
+diff -up a/src/core/edge-resistance.c b/src/core/edge-resistance.c
+--- a/src/core/edge-resistance.c	2008-09-14 22:39:38.000000000 -0400
++++ b/src/core/edge-resistance.c	2008-09-14 22:43:28.000000000 -0400
+@@ -985,8 +985,8 @@ meta_display_compute_resistance_and_snap
+       cur_window_iter = cur_window_iter->next;
+     }
+   /* Put 'em in bottom to top order */
+-  rem_windows       = g_slist_reverse (obscuring_windows);
+-  rem_win_stacking  = g_slist_reverse (window_stacking);
++  rem_windows = obscuring_windows = g_slist_reverse (obscuring_windows);
++  rem_win_stacking = window_stacking = g_slist_reverse (window_stacking);
+ 
+   /*
+    * 3rd: loop over the windows again, this time getting the edges from
diff --git a/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch b/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch
new file mode 100644
index 000000000000..e2cd71771377
--- /dev/null
+++ b/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch
@@ -0,0 +1,21 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=258302
+diff -up a/src/ui/ui.c b/src/ui/ui.c
+--- a/src/ui/ui.c	2008-08-18 08:29:07.000000000 -0400
++++ b/src/ui/ui.c	2008-09-15 18:05:20.000000000 -0400
+@@ -657,10 +657,12 @@ meta_text_property_to_utf8 (Display     
+                                           &list);
+ 
+   if (count == 0)
+-    return NULL;
+-
+-  retval = list[0];
+-  list[0] = g_strdup (""); /* something to free */
++    retval = NULL;
++  else
++    {
++      retval = list[0];
++      list[0] = g_strdup (""); /* something to free */
++    }
+   
+   g_strfreev (list);
+ 
diff --git a/x11-wm/metacity/metacity-2.24.0-r2.ebuild b/x11-wm/metacity/metacity-2.24.0-r2.ebuild
new file mode 100644
index 000000000000..139b855a2ade
--- /dev/null
+++ b/x11-wm/metacity/metacity-2.24.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.24.0-r2.ebuild,v 1.1 2009/02/09 22:38:51 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME default window manager"
+HOMEPAGE="http://blogs.gnome.org/metacity/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=x11-libs/pango-1.2
+	>=gnome-base/gconf-2
+	>=dev-libs/glib-2.6
+	>=x11-libs/startup-notification-0.7
+	>=x11-libs/libXcomposite-0.2
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXcursor
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libSM
+	x11-libs/libICE
+	!x11-misc/expocity"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable xinerama)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix compilation on *bsd, bug #256224
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+
+	# Fix crash on login, upstream bug #553980
+	epatch "${FILESDIR}/${P}-crash-login.patch"
+
+	# Fix a leak misused gslist function, bug #258301
+	epatch "${FILESDIR}/${P}-gslist-leak.patch"
+
+	# Fix a string leak, bug #258302
+	epatch "${FILESDIR}/${P}-string-leak.patch"
+}