Add patches fixing potential crashes, drop old.

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 117 insertions, 6 deletions

diff --git a/app-accessibility/at-spi2-core/ChangeLog b/app-accessibility/at-spi2-core/ChangeLog
index b227bfffc9a6..558e4c8bf02e 100644
--- a/app-accessibility/at-spi2-core/ChangeLog
+++ b/app-accessibility/at-spi2-core/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/at-spi2-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.23 2012/12/08 21:41:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/ChangeLog,v 1.24 2012/12/09 21:51:42 tetromino Exp $
+
+*at-spi2-core-2.6.2-r1 (09 Dec 2012)
+
+  09 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -at-spi2-core-2.6.1.ebuild, +at-spi2-core-2.6.2-r1.ebuild,
+  +files/at-spi2-core-2.6.2-deregister.patch,
+  +files/at-spi2-core-2.6.2-hung-crash-1.patch,
+  +files/at-spi2-core-2.6.2-hung-crash-2.patch:
+  Add patches fixing potential crashes, drop old.
 
   08 Dec 2012; Agostino Sarubbo <ago@gentoo.org> at-spi2-core-2.4.2.ebuild:
   Stable for ppc, wrt bug #427546
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 32ca82b62327..cdafaa5cd7c8 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 SHA256 5834cf41154379002d3050810fce1da8a41c9bd1cce06593c1e7d5bdee083aef SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753 WHIRLPOOL 912c7cafdaecd93fb6fffec89a581346bf4c199c1e8a122483df4f3d36aca87ab11384380b49353910b70f70b96718133977e9ce7b4e9b02f54136da783cc309
+AUX at-spi2-core-2.6.2-deregister.patch 901 SHA256 43aa423288063f8b6904bf0e0faf4c7ef976d111b14344135867703836eff7a7 SHA512 8f049a91bf59d64cd5bed49cec887d763d7e9a838cb5140391e7dad9ec70505d05543d1861b8c5f860a9454afa0efbc41c3f3c9f6d137288b1186d5f3e370e64 WHIRLPOOL 98db333953c875fe9d23fc7da826df8ed7c2f55db2e82139e29e4047f07ee8bc4f616d880ecec735203e35d31e6352836bc8b73f5a890f46b8d30c6ff2b2f491
+AUX at-spi2-core-2.6.2-hung-crash-1.patch 1025 SHA256 265191650ce2ec43d538171f2ead8490d200446d4953fa536498797dc5f444e3 SHA512 a9a3cc62ae77283972f6b78cd1711fc7dc2fe2f68ccfb7465e325d80550c06bf1bf63658098d37417599087f815794e41258b02cd218a607be84346b722ebf1c WHIRLPOOL dce250d3a4f888fcf4babb51ffdb3ca8588c4b70d777f636e21949a355a4e34616577a112b2adc6fb27dbbec8241992fafadd049c4394c69ffb9eb7c58b5c2d7
+AUX at-spi2-core-2.6.2-hung-crash-2.patch 876 SHA256 8ca2b4db84ad09221d7f3553f1076dae90c467785515c002779588fb4b97cb76 SHA512 c3ad8493b1eb8214ddf8aa81f45f7020db53e8c716f7e6921fe1b3d68f1c86f37cb8c4a69c8fd3b857144fe30fba852198c663b5ce7aef4b463e03a72cde7efd WHIRLPOOL 5d0bc5c42cb4ae980319a96e735748cd32fb4fbe51079d6a07dae2543d1435c8fefc3d33f7f880f7ef645723e4d52944e8d26f60f7420855e9bb97b3989d07b8
 DIST at-spi2-core-2.2.3.tar.xz 429444 SHA256 fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1 SHA512 4ff634339c7aecd90d1ec8b16478aae4da0db319ae1ee1ac5bcecc93098f797dc58359b718b9800bffa6da81afc41fed21eff71456a165aa6428f7a64179d631 WHIRLPOOL a698a217f99af089a9041b7162ebcff66d5d8a38050dd74750c77792380e368f57d91d2b1494a080674fb57560e566cd924cf930a5e7785f9ccdeb12a34504ab
 DIST at-spi2-core-2.4.2.tar.xz 441204 SHA256 61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd SHA512 38968eb9a135b3f7badae2a87e7ba6b3323bfd43f8494ac81fb6696f7056d0e0ab04679173f9f8f595284611327da83fcf5ada3a406080c3faf5ada98a5d6599 WHIRLPOOL aa0902f6992dc38610599d2ccabb7796699ee4ebe0ded3b5123a4c85e290565d0a8812dec82851be69bad4afcf29f2eda120265f1707792c06f36f96cba95e95
-DIST at-spi2-core-2.6.1.tar.xz 443684 SHA256 cb087f0a9191422bc3f44c562a0dbfdf1c2266e45c267070aeb63b874e00f867 SHA512 2954c4c5f2b0328cdd1a0e76f7d9c9aab8ee8e7ed736ed1e15c8f9e6dfa4dd1d0f841d10665190c14e45ef4c492dea164ae728bb2ab9b89ff37a9b325288c677 WHIRLPOOL b9e347e8176d6861ee8c0be6f8561098ee13407daffc51db3490178de2ba0fbd6f494941d9092690d97608de5a9a7bb1d7427b9d38a0d7cf87ee8d6a63b7bb39
 DIST at-spi2-core-2.6.2.tar.xz 443900 SHA256 0d5321ce9fdd7d036b072ef28cba14088394606e1687183ec5d0ae6adea8c87e SHA512 946e46bcba025d298051d99e229dfc5a3ff0b477b9c4e1a97c1ea3cee8a86832e2ee7fe34a986a9fb8e1138389e8f9ad3e27c2638769f1251e12ce4df6ccda9d WHIRLPOOL b01abdaa0f749f113e10a19ce1eab9d7bd120975a738acdf96fa25776258c51749af77f44375800724067b5b9ced253e49cd0c87225e7baee4e522b628657a1c
 EBUILD at-spi2-core-2.2.3.ebuild 1096 SHA256 2e9c2674444e00792f4290b67f4b71636c57bc154c39224cd04c999a17aa755b SHA512 24e98d9a9094fcdf2ab725b68cc5e823c4181898ce2412fd9f6d1526a11d84cbb4ea9c0c5d984b098a9f7fbbe9171e24a3feff6c33066cfc560e0919355adef1 WHIRLPOOL 331ef0a16261e3a1e45a3ab39a31fa700566add9e6225a31002a60d191dc558cfc170022e90a32fea9f0bf164feadb88f771ef440f2bad920b3406f5cf8a7048
 EBUILD at-spi2-core-2.4.2.ebuild 1123 SHA256 c310a2e05bd2c8dd7ceedc71b107edd65906a906c525d3fc25ac87141f13de6d SHA512 6e459cc3693d3e160a30678972ef02bf7bb71eead2cacec00a633fdb0a20f96b8544e2dfe3e1cde6efdad250e06906b795f5b4b4285d792eb57bfeaafaa5db60 WHIRLPOOL ca7a87b872e584cfe045e51884c7219b010dfeca7b27d8cb90024ac59771b0741e5c195065dbb6004fed5c0cf6286ab70ab200000ff01cd5a10d1e4de209b687
-EBUILD at-spi2-core-2.6.1.ebuild 1104 SHA256 6ee5943906fe5a21dab890b4d35012a7ecc60d33cb453fc4f20274d973e2f811 SHA512 29982f917f72adf7a9d6a84392d70c5315a85e91bd3bdcd27654fcd95be794f024ddef741041402abc9795f2dde25d3043076f3111efbb8cb7dff36360b263d0 WHIRLPOOL ff60c6280e9e8fef291a399f1f66c950b9c1329bf2c11fa3b5e64695c6ec387e78a35ddca07f5652b772b0e04b00a55b4130ce87ebe8d5094c65603dd7c219fc
+EBUILD at-spi2-core-2.6.2-r1.ebuild 1235 SHA256 f1da6140152725bc70923b4dffd37ecc44446f7b1411dd327c0da0a69029dc25 SHA512 07079f5999cabe9f622e0f04d8ef3fc0904ff38b506bcef9dc1dd24a7aa15ebf689ace21a94f7daf676bfd885486e7f62bfb251b2f8fa653a63ce97e7e4e4ff2 WHIRLPOOL c90d00eaa9d29664302d43bcce95e5e07304b0ab8832c403ec29954c60a123ff7563c42aee8463ec4478e86a4ab8cbcebc50016b539a50226e3652270f1046e4
 EBUILD at-spi2-core-2.6.2.ebuild 1099 SHA256 e0c35d1eb657c70fcea9b4ea6edd52c319dadee2ae3b8aa35556b229806cc916 SHA512 993ac34f563c33bd7e06eeacefc921c34c4813d5fb260b15e74f80a9d5ee8c08db2ac999eb0807ac4e16e21b11609234a7013047a1541d3902a9a59da2e5c27d WHIRLPOOL 55407254b8978016ac4d284fd1a61ebed2c97eaf2d2859bf04ce4072a4f8fc5ae14508b3d81463cafa483814c51a4665cdf04de2ce707cb60aa6ba35d79490c6
-MISC ChangeLog 3898 SHA256 d4b3db8f4d0674241ae2a7240e0e00fbe19242fea3d639edf4e2275dbaa0f878 SHA512 0c067845a1d015d6563e775d457c1388097dc2233090c5679df80aade9803edb32ae18ecaa4ad8b21d814289648d6a6cbbd0b253021f098cd2277b28d949b704 WHIRLPOOL 4c653b849fa1e1c3ba9475ea00a637e5dd64ffc520b56e34a1ba5c19334f1139fe4acfcf423618f32d69e4d204cd171a92beced01c237ff409030447074c4eb1
+MISC ChangeLog 4255 SHA256 eecf61259aff2a561bb167dc3af6d8bb2d63d595ca97f7e882fa67ea35b93c70 SHA512 b67b239629d4d55e2c827cb58ed16dea76b48fad0c722eb764580f7e4e092f3bc451d2df7bfe708bb0566bc20beace51c58d138dae62aa821b0ef850fb4033e0 WHIRLPOOL 1944ffa584cff9f6ba96e015bc9b68eb329af92d1aeecacde15dc36306fd3223d884027c795108c6325dc571eabaf86b4e75d414c483db8a82e723ef3ceadecb
 MISC metadata.xml 296 SHA256 2e63eb63088116c86450ff230207f5f7a5c5536aabe14d6a0d30376655a23c28 SHA512 104401f92cc9425284f1cdc0a0c1e8c292d02f0b7b7ac223006c291928e5e293d386c3ae585c51881617ddaf8a021c542a7df2ec95b2d38a10ea79917868c440 WHIRLPOOL d5277c202d1079a6c76619b24a9ae9324b5e975ebe65bbcb3910ff39a4978d1c06f05690dbaf8e213ccb8838d30dddbfba5a30408608948f1b50a181fef2c2d3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQxQfvAAoJEJ0WA1zPCt1hW5cIAJT321WXO+Y32c6vLKGKPm7U
+CTNAYo/KrSABrBEZcqOQri9pYNJ1vXbvlu5Wx/O9ju4Th26Uune7GqS2wlYfOt/N
+jq++UEkDut+rlUfEqUSjMM3Ab0guIwmtuJO5J1XYv4srIjPKMVtN3CQAFmJnT4vm
+s+n47rlldIpyuWvtwjNYDJ0LdMR8Jg6D9rZ0OMwUrRav9KhOYAAsdmqm23zbEpBX
+FlIozP092QdsjH0zpXkgm6hYdUCdeBS/JcKsF45QM+l0AB9UZmvJcGjPtGmj/3fv
+V+EXl2/eu9sjzt87sDVo+7OPHkiSLebGD845uxkhDE2Y66X3yz012sYU+FYtPBc=
+=xfCc
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.6.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r1.ebuild
index 1a5bf74b7a9b..7bbd7f4b0f46 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.6.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.6.1.ebuild,v 1.2 2012/11/12 12:40:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r1.ebuild,v 1.1 2012/12/09 21:51:42 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -37,5 +37,9 @@ src_prepare() {
 	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
 	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
 
+	# important patches from 2.6.3
+	epatch "${FILESDIR}/${P}-hung-crash-"{1,2}.patch
+	epatch "${FILESDIR}/${P}-deregister.patch"
+
 	gnome2_src_prepare
 }
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-deregister.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-deregister.patch
new file mode 100644
index 000000000000..c5618b10895c
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-deregister.patch
@@ -0,0 +1,28 @@
+From ca6778ba2a6c4fed24d5468213f8ed918f3dcbe4 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Fri, 7 Dec 2012 11:21:19 -0600
+Subject: [PATCH 3/3] Fix deregistering of applications
+
+---
+ registryd/registry.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/registryd/registry.c b/registryd/registry.c
+index a64e094..e283a90 100644
+--- a/registryd/registry.c
++++ b/registryd/registry.c
+@@ -290,9 +290,10 @@ handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data
+           for (i = 0; i < reg->apps->len; i++)
+             {
+               SpiReference *ref  = g_ptr_array_index (reg->apps, i);
+-              while (!g_strcmp0 (old, ref->name))
++              if (!g_strcmp0 (old, ref->name))
+                 {
+                   remove_application (reg, bus, i);
++                  i--;
+                 }
+             } 
+ 
+-- 
+1.8.0
+
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-1.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-1.patch
new file mode 100644
index 000000000000..46d79ca757ad
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-1.patch
@@ -0,0 +1,28 @@
+From 860ccecf3de3fdca6742060174cab1f90d708fb3 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Thu, 6 Dec 2012 09:50:18 -0600
+Subject: [PATCH 1/3] Remove the correct datum when clearing a hung process
+
+When clearing hung processes, we were passing the wrong variable to
+g_list_remove, meaning that the datum would never be removed from the
+list, even though it had been freed, resulting in a crash.
+---
+ registryd/deviceeventcontroller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
+index b8c1bc7..101dc6f 100644
+--- a/registryd/deviceeventcontroller.c
++++ b/registryd/deviceeventcontroller.c
+@@ -1205,7 +1205,7 @@ reset_hung_process_from_ping (DBusPendingCall *pending, void *data)
+     if (!strcmp (l->data, data))
+     {
+       g_free (l->data);
+-      hung_processes = g_slist_remove (hung_processes, data);
++      hung_processes = g_slist_remove (hung_processes, l->data);
+       break;
+     }
+   }
+-- 
+1.8.0
+
diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-2.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-2.patch
new file mode 100644
index 000000000000..09234ac61578
--- /dev/null
+++ b/app-accessibility/at-spi2-core/files/at-spi2-core-2.6.2-hung-crash-2.patch
@@ -0,0 +1,26 @@
+From 00c94530c0d57808ac1f9e9b1525341654278ba3 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Fri, 7 Dec 2012 10:27:58 -0600
+Subject: [PATCH 2/3] Fix another crash when removing hung processes
+
+There was another instance where we were freeing the wrong data.
+---
+ registryd/deviceeventcontroller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
+index 101dc6f..b14cd1e 100644
+--- a/registryd/deviceeventcontroller.c
++++ b/registryd/deviceeventcontroller.c
+@@ -1179,7 +1179,7 @@ reset_hung_process (DBusPendingCall *pending, void *data)
+     if (!strcmp (l->data, dest))
+     {
+       g_free (l->data);
+-      hung_processes = g_slist_remove (hung_processes, data);
++      hung_processes = g_slist_remove (hung_processes, l->data);
+       break;
+     }
+   }
+-- 
+1.8.0
+