Fix stack corruption due to incorrect format for argument parser (#463700 by Alphat-PC)

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 49 insertions, 18 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 9cd4078cb520..d10e78bf03a0 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.206 2013/03/29 13:30:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.207 2013/03/31 13:36:16 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/pygobject-3.8.0-stack-corruption.patch, pygobject-3.8.0.ebuild:
+  Fix stack corruption due to incorrect format for argument parser (#463700 by
+  Alphat-PC)
 
   29 Mar 2013; Agostino Sarubbo <ago@gentoo.org> pygobject-2.28.6-r53.ebuild,
   pygobject-3.2.2-r1.ebuild:
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index c67bd4c1b14d..551db7c770d6 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX pygobject-2.28.3-disable-failing-tests.patch 1782 SHA256 4d39b731084002c023faa7c500e83e4f77ad0c65cd2237d6f18025b94ceb8222 SHA512 36ba0f53e4cd83d7eb4ca8d7deaa6533a68ce6f370e10212db3cb092d2647f73daa3f5080f2d4f0c0db25d37fc9bf0164eefa7b8e62bf56763cc7c3268832952 WHIRLPOOL 0723b8be317801272ad95552c7f2e3b3fa5b5eb6b8307172575f1e57c9e23f18c7617c9a642c6761e04638d4b511859e2db04d803b41e5023940ec1daf05ff4c
 AUX pygobject-2.28.3-fix-codegen-location.patch 1948 SHA256 eb16a71a8e3f45e965797ca99cc5d079b13a0f74dafc7976806d09ccd1f30476 SHA512 6f618d3826a505906669bbbe680a514e61884564f2c3025c438a97f192de6c9fd0e7f43c8e9bfff62776a51a56b0eead6ca54a0c157c071cf0f493b8f0d46506 WHIRLPOOL 5107e45f4596c12c92a4d208ce17ed0dc19811036d8acea5f6c393937eebb72de290b5ddc3b5e190edecbcfef2ad48c150e5c9bf53dc9839bc9dc0fcb3ec53d8
@@ -15,6 +15,7 @@ AUX pygobject-3.2.2-cairo-tests.patch 3065 SHA256 095e49137c20cd00a33fa6ce0983fb
 AUX pygobject-3.4.1.1-make_check.patch 2959 SHA256 4d6902f32ff91bc42733da3bb171829a8e5bc041a87eaaaae75e89b5a4c52eed SHA512 bce1c3ca47799f9a3e6173608fa51e646b247cc90c3efb977dd15251b90be2eaa1deb9a13a1a17e88d35b445c23b8b74f43fe9d07ffc49f1fd10a18ce31bc41a WHIRLPOOL c3a9080f53490aab77f093f2efea6f9697163d44d3a5e5c2a8028a11f08393cf34c26a6e369f21a6b848902d56ad86fe02aef83cbef9ca30b7b111057e978a4c
 AUX pygobject-3.4.2-run-tests-with-old-python.patch 5271 SHA256 8718303e488ff2fc374c13a8d2a54409fd2e93de7912185851552037f2781ac1 SHA512 b6f98c53be7bb84000d58a5a0a0009cc6cad1f983b0214efd1be8ed7654208193e6adc876fbb3dd8258e7e203b7598b330171fd8670314db27efad9fc45431fa WHIRLPOOL cae59fe8dc656f22637d09b2fc0be2cacaa5017ea3edf6f9fecbea927d2bbc3c624ebcf99e4be4c684e56e2485d4637c44c131175b4e553b4429e9f70510e177
 AUX pygobject-3.7.90-make_check.patch 3058 SHA256 f810de5e7d4ea8bc8252cc7dd1814a8019c3b95e8fd2a3339c88238d73e22078 SHA512 fec77e125cffa42cbccba781568c1db973d608ebcd507abc907b23b8edfc3442d9358cfa413f5bab6f510d446134e74ea5384333c1b6c8a5df21d98c0ab39859 WHIRLPOOL 4cba4a4a19a17e73e26e397a58d76b07732807b9338560de436256c8b1e9a756149c1e526016f708fd594158adc123821cb0bb1386e342ee7da4534e558a97be
+AUX pygobject-3.8.0-stack-corruption.patch 1164 SHA256 3aaa29a57a2038127ee520338e9e952956b316bcd1fe5ad55739202ba628162c SHA512 d1c12b790f892615029340872b1a2da376b63d0e43cc59a1ca17164c8018adc2ab4b1064864f335352ffdbce21e510f88180cddaa087f176ab7de35b4936ae0c WHIRLPOOL 918f40ba26385772cb71b477bb9c309fb2dbabd73fe8970fb08f91c5e041e9e1ce909500423ef901422b2967a99b75172a5de3dd80d17806d80a0bff4d97de95
 DIST pygobject-2.28.6.tar.xz 747248 SHA256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c WHIRLPOOL 402f764d6ca73f238784738a1e09832858fd95af5a633e825412e9e6a21e89ab6b2090d3995902ed404fc4fde445cf970c76fcd93f8f64cf9def742452776c00
 DIST pygobject-3.2.2.tar.xz 564712 SHA256 4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0 SHA512 b22c8fd4bcff0d110a08d7f0927df086d4e1e11546e3d7aa08f4e5ec66643d1ba88ac199b0354dca145bf06532c8ab8a427ea9450751ee52b914f355a6d7e9e7 WHIRLPOOL f3e4aaafadfeae5e6fafd0e173c856c2f8c937eb097732760c21ccaced6c7c96e36e5b683d729e78b0043302fafa92818ea90fa845fe266caf5e2d0a8ae8ff8f
 DIST pygobject-3.4.2.tar.xz 615032 SHA256 2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad SHA512 ff22d2825896246564230949b93e6d6075f885cbe4c633b8fdd6505287bc167dd50d3c3a3f4ed9ff690c0b70a81fb893a9fbf947ed9ff043ad61a61af192412d WHIRLPOOL df50588c9da9b56b50370530b1b70a10addc1d89e44ede7efbbcc7e9039e35816c105477c9e33caa52bbae9d6bd33b6532e6a0b8df3b8de0aab6f838bf00a10f
@@ -25,23 +26,13 @@ EBUILD pygobject-3.2.2-r1.ebuild 3000 SHA256 fd43612269bd3f1a0a11edcded4ed6edb04
 EBUILD pygobject-3.2.2.ebuild 3164 SHA256 0bf30444acc677b4cff3c20329e431f0e3e3564103379f490c3a9626a8447aa6 SHA512 f3d246ecb25bae944f25b12bd2d0f282f2bae18d8a6a0d5a751c00120790a699624df50612bd48addcf45328fcf3d06a361abeaea056ea2831c6a77081dcfef0 WHIRLPOOL 9eeacd45b83c21efd35528d2335a9823596c090e4d5d59b23bc40ad840fb61030668f63684c5778da2d51daf93cf27890da28f4d06a6e7dd38e213700f5b30bb
 EBUILD pygobject-3.4.2-r1.ebuild 2996 SHA256 12cac2d2ec2c064302df8b73e8231a665d5936ee3118d24be6a4627e57071c9b SHA512 e0fe69d579233309de61a5ba7d936c8d6d10d4481f9c24ca0c62928dad6a563cd2c903e4e929a8827c23602e422273ae3f25e0becdafb4455d688d86806cc1ae WHIRLPOOL 0d7df92a463efd521a1ebfa1c4ba7d408f412d89003a1f2f5882528deb8d23ed3f327846413a8b491db1ebc8687f9907f0f425ebc4268e7e063150aab2b5497b
 EBUILD pygobject-3.4.2.ebuild 3098 SHA256 cb124592bb5f73653ea1e1ee10b9b694dabcbbb31815c9e9c85e520bff55d0d7 SHA512 ad9b850733009e5c980a7a22c7d21ce0347f3b6cd21c74a3028ccff34da9b3d315073e177f17dacfcbb327941fbbd4cb6c04906513f5d06a12e7919203f08f62 WHIRLPOOL 6864f40dda88fa15be121095aac1ab65ec25aa1f7d1c31fe334045a6bad5585ab6260e85557816c5eb6712469bd13991b20697a38729449ad45bafc56698cc09
-EBUILD pygobject-3.8.0.ebuild 2991 SHA256 a865c0e640db88992603835da180e097f9827dfcdf44d57086509f82a6850cd8 SHA512 55e2645e4d18cc19e56d454308eabd93bfad23e3311723847fb9dcdef14034e192a3921bd02061dcfda6bb83dbcf2596ef01874e5d644ebaface474485f009e2 WHIRLPOOL 0033c3e598efbc0941447f8bcea2eee350984a61bde2e930231943da46890c23d7d81fc7c25db156d9e28ba43cf402eb0d6d06e00ff4bba63ec851a0b874c99f
-MISC ChangeLog 33987 SHA256 a67e573375830ae07e99f091f4fdb2db75120bf77b33e52c757b4f364034abff SHA512 b0b12d8a879994465cbeeed5e06f4441197d74b8d58a2ea1a02de8c3b8de382dfeebcc284f0e8b85c10f156b38e4cd5721aa53c1f8c87e24736c6f7c74d833a7 WHIRLPOOL 92e6d1fc3a1a5d264160051ac1b648280ea181cc8db7a42b760bcb0e241334059184d8daa01dd91d9069d537b1472b889e09338b4151ffa9126377701f09c902
+EBUILD pygobject-3.8.0.ebuild 3128 SHA256 104f3b76b4f3269c272d1a663813b1768df30f3b440dd0f635bf6af9e484fd8c SHA512 09037d9f7a3704376aa128201fcc8c0f8373284df63e3a7f73b8faa1a16368d057423f7be19f0f4dd4e15426bab7e5c0f1985d72939fd1f227103b1bc70f8553 WHIRLPOOL ce07e5ffedfab4c11ee65ee3176b7ce0c49cc09e9d942013110cc67e3e78aed3087fbf001d81dedfcd8a90983477268d5083af055c376555156eebb66ce9308c
+MISC ChangeLog 34201 SHA256 cd3fd3826718ac0326b7f85f7daa73811152f334f0120d8154276451e1711be1 SHA512 df97de737647fee59355bdbb1059001a925a83e429fd0bc0c881d211f530ad7f45f4f0db8978e7af187b7e9de89cd2e62b7fbf880922ad3c642dc459131b3d38 WHIRLPOOL e32b4cae3d8c130aafe13709d9c6ef1a74f90c4547356ca2ea93625a340e46cda9aff092efce072b79afd723c1ff087c82413757eada13379d4fceed9e2ebacb
 MISC metadata.xml 178 SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c SHA512 090602f45b8fe37eb4ec23c568d815bd1ea41903eb2ad2592c251915aeb3edd957eae84957d556eb3b4b3fbb5acf6aae7594e1640ee5e04297cb6e2efc6c4c41 WHIRLPOOL 69136c1dbfe808f569ccf5362e9df219ef8ba594cc608893dbf854ee6482111c5c969c2510f2f92b659b3a94e1a669490062815891988e71e76a8d0782b871e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRVZbLAAoJELp701BxlEWfb/4QAKVaje7r4oreK6FIyf+K9JO9
-/R8nZWq18IHqBQJL0AvWAuw0VviMi017hne/tI03C3gYSZ8n6EuGTYSe8rVRINNe
-1nOh6fe8TB7J3HZC983jS9jXQvPiAQtGc7PU5KJDICsyTLMAQBeuhgzrXLouvEyn
-E/FAQzwoc5Op2kXxar9ptvPkqAUL3lBijZ6n8e27i0H78jfzSEhgHIYQ0zrslqmO
-1i+L1Q6kcnZggS7nmFJFqSgVQKI+OTKX1Q9iReSwdbHfIEntV8hJ8sMcczRYcK8j
-isflkrCqCcIGN54hFwuxzbDVZG1Bur6+3JcawrbMQTiFuSIK7oeonZBEiPK3uA/A
-Z+qI6AtgVq/UpEwsdD6drpelU9sh27T441zW5G41Fc7zc7peN2k62hFtXZ6btRDA
-BB9iKs2Ge2QD/f5k9LsAD4u7YI3/hBOrwAAV0pUS0XyYUiW9IyZNEAAh52BOFMRr
-v8NRU6m6TRVlF/EQCaAaUVQn5THzJypXJ3AKNyv14I3mecvp7kVNkHfvySNi+V4i
-hem2+hJsOakigAfdRh4vaInqZNFrbPlVoL46rIu20VblezuhkTzHj8BROqHMR/vt
-e44Or/T+PHqXV2opYkwfrFP/2SQ1ADJcqsBolLpsTNznQo7/sNCSTtq+7UyE/vUN
-nkzv6EsB/qZ1OToAUYV0
-=19qS
+iEYEAREIAAYFAlFYO9IACgkQCaWpQKGI+9TIBQCffHZMvIDNer5DIecO4FqlghA3
+q5QAn04KFfvXT/SCUkU4H5DDIwSFRiFD
+=pi48
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch b/dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch
new file mode 100644
index 000000000000..046ca4ff9806
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-3.8.0-stack-corruption.patch
@@ -0,0 +1,32 @@
+From c1fb6516031d3c32abd640f09a4814ae4363f979 Mon Sep 17 00:00:00 2001
+From: Simon Feltman <sfeltman@src.gnome.org>
+Date: Sun, 31 Mar 2013 08:32:34 +0000
+Subject: Fix stack corruption due to incorrect format for argument parser
+
+Fix call to PyArg_ParseTupleAndKeywords that used a format parser
+of "l" meaning long (8 bytes) in combination with an output pointer
+of guint (4 bytes). Change to use gulong with a format of "k".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696892
+---
+diff --git a/gi/_gobject/pygflags.c b/gi/_gobject/pygflags.c
+index 83aa4dc..bdeaae7 100644
+--- a/gi/_gobject/pygflags.c
++++ b/gi/_gobject/pygflags.c
+@@ -129,12 +129,12 @@ static PyObject *
+ pyg_flags_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
+ {
+     static char *kwlist[] = { "value", NULL };
+-    guint value;
++    gulong value;
+     PyObject *pytc, *values, *ret, *pyint;
+     GType gtype;
+     GFlagsClass *eclass;
+ 
+-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "l", kwlist, &value))
++    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "k", kwlist, &value))
+ 	return NULL;
+ 
+     pytc = PyObject_GetAttrString((PyObject *)type, "__gtype__");
+--
+cgit v0.9.1
diff --git a/dev-python/pygobject/pygobject-3.8.0.ebuild b/dev-python/pygobject/pygobject-3.8.0.ebuild
index 2c6bc62bda39..77bdffb423aa 100644
--- a/dev-python/pygobject/pygobject-3.8.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.8.0.ebuild,v 1.1 2013/03/28 16:57:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.8.0.ebuild,v 1.2 2013/03/31 13:36:16 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -63,6 +63,9 @@ src_prepare() {
 	# Run tests with older python too
 #	epatch "${FILESDIR}/${PN}-3.7.90-run-tests-with-old-python.patch"
 
+	# Fix stack corruption due to incorrect format for argument parser (from 3.8 branch)
+	epatch "${FILESDIR}/${P}-stack-corruption.patch"
+
 	eautoreconf
 	gnome2_src_prepare