Add fix for bug 256153, bless crash upstream bug 469213

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

4 files changed, 44 insertions, 4 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 5a64e0f0abcb..6530a651fd42 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.151 2009/01/20 13:51:44 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.152 2009/01/25 13:23:40 loki_val Exp $
+
+*mono-2.2-r3 (25 Jan 2009)
+
+  25 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mono-2.2-r123987-bless-crash.patch, -mono-2.2-r2.ebuild,
+  +mono-2.2-r3.ebuild:
+  Add fix for bug 256153, bless crash upstream bug 469213
 
 *mono-2.2-r2 (20 Jan 2009)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 53304c142312..23fd7a3b025a 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -9,6 +9,7 @@ AUX mono-2.0.1-fix_implicit_pointer_conversions.patch 681 RMD160 cd207884e32f991
 AUX mono-2.2-libdir126.patch 2788 RMD160 931e034c90accc2058596714d7ec07d138a77575 SHA1 7807f1d3e28c82ac0292cec2f49e063898a5d0cb SHA256 2d3de73c7aa6fdc90ddec67fc814910f40d6d8ed52ec918397ca9f5ac219c6a1
 AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec70951d38 SHA1 3dda8a39085fddec0b0e25e31743d49762575605 SHA256 b2a708fc4ec8b886bf095c0d5eacbfdb8c08e1bc58442cfb6fd116f93de466a7
 AUX mono-2.2-r121596-work-around-runtime-crash.patch 767 RMD160 a1b7ef12e28a3c14f1beff5f490523efbc474d26 SHA1 be9eb136478b61ff0f365fc9c6f51f082df50c61 SHA256 302df7e285fdc6dc44729d85b6784c3a2abd365b6915f8e00323b611fd12c5b1
+AUX mono-2.2-r123987-bless-crash.patch 1543 RMD160 5c56cc0b69e09c2dee150bd6c34d0e1abbe3c82c SHA1 81709d2196530b7e15f96aa6ec325510bff7cda2 SHA256 3125ecbe26798ad4e009b04845e3eb8895d537bd8e1a7fd67267491403c8010e
 AUX mono-2.2-uselibdir.patch 714 RMD160 fb0478a9923c5de30b6f71fa1c1cad9703e3dc8c SHA1 790e357aaccb87cb76f08a1c12e16a8804e23b58 SHA256 0d97639d48e9a40847f1053799d00827323df0af615fdf26254a03f069123b03
 AUX mono-biginteger_overflow.diff 848 RMD160 1f2cb38e577102943399459e2ef0f511dcad5209 SHA1 15203be56015aed4a9b63ca3ade01d3a22f4bae3 SHA256 adc10b8a97cbcb6b4758f7de041eee757259d55e1e2cbaf84a89e5ef83e46806
 DIST mono-1.2.5.1.tar.bz2 17492757 RMD160 8000374d9aaa3149599ba83079959303a6bae014 SHA1 c5f843cfdbb1d0114059c7d2d9ba2477529d22a8 SHA256 434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
@@ -18,6 +19,6 @@ DIST mono-2.2.tar.bz2 24360722 RMD160 664f09ccd8822b62d94d242871b956b00adae7b6 S
 EBUILD mono-1.2.5.1-r1.ebuild 3636 RMD160 329054cd7c5f9ac414229c479670eedc65542d5b SHA1 f248f71b77f1582a7a1e58c316cb2039595927b1 SHA256 85bdc359b2997ef55a9741e92a3423ccea7236befa88b34a7dd2cedab7811d3f
 EBUILD mono-1.2.6-r3.ebuild 3917 RMD160 6c680c414a4741fbfe2e20dd5b6120561de8c46d SHA1 8b32f6ca403becc675713fe84fad202255988e24 SHA256 915c05b51344c249c821191adb48568d4516689eff4937e4b4992088f8dfc0eb
 EBUILD mono-2.0.1-r1.ebuild 2675 RMD160 06947c986d67eaa4651f419fd07bec00743fc6ce SHA1 5a814657e6c6e700958e7a2927c74c51e5b516f3 SHA256 50c032373a88ae6b5e323ae259661e178bf6af1b0e67da01b8a022be648ad8aa
-EBUILD mono-2.2-r2.ebuild 6083 RMD160 4e10382613b1b6b886c1f810fb187b08ec4799c9 SHA1 0b95c1874d893333c32de52d11dc709b545322d2 SHA256 0cff50e7557caa470b709c02b8d5d902b5debcdae523673a9601345606c14256
-MISC ChangeLog 33487 RMD160 d01c374f14dc7e37114e14ffd6b1e6c83705d115 SHA1 f48d6906c28063afb7c2dd395b68eceb22fa78e7 SHA256 8b7406c7d1f17c3a9b63ebc32a49ba610ad90ee53ee341f8b4ccb3cdeb3a7048
+EBUILD mono-2.2-r3.ebuild 6132 RMD160 8785b58c8fcd45082ba6152d74265c4e78bfb14e SHA1 120b9e9752e39a0c19da9d4881d91d670ecc3170 SHA256 930b6f7a5a946d35d2b77b9dea62fed7ecedc97dcbf4c95b3211073e3bc16b12
+MISC ChangeLog 33716 RMD160 b0b5f1f3ed685395404dbce9b96dbeab39f59517 SHA1 dd3647adb9c0c055a29d88599c60e65b9c8af35c SHA256 947fca397e4f09fc5e3fe3f398f1da1d1a9c569f8bbef2af41b4ccd9356d7e94
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/files/mono-2.2-r123987-bless-crash.patch b/dev-lang/mono/files/mono-2.2-r123987-bless-crash.patch
new file mode 100644
index 000000000000..1be03542a375
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.2-r123987-bless-crash.patch
@@ -0,0 +1,31 @@
+# http://gna.org/bugs/?12900
+# https://bugzilla.novell.com/show_bug.cgi?id=469213
+# http://bugs.gentoo.org/show_bug.cgi?id=256153
+
+Index: mono/mono/mini/method-to-ir.c
+===================================================================
+--- mono/mono/mini/method-to-ir.c	(revision 123986)
++++ mono/mono/mini/method-to-ir.c	(revision 123987)
+@@ -5839,7 +5839,21 @@
+ 					cmethod =  (MonoMethod *)mono_method_get_wrapper_data (method, token);
+ 					cil_method = cmethod;
+ 				} else if (constrained_call) {
+-					cmethod = mono_get_method_constrained (image, token, constrained_call, generic_context, &cil_method);
++					if ((constrained_call->byval_arg.type == MONO_TYPE_VAR || constrained_call->byval_arg.type == MONO_TYPE_MVAR) && cfg->generic_sharing_context) {
++						/* This is needed when using aot + generic sharing, since 
++						 * the AOT code allows generic sharing for methods with 
++						 * type parameters having constraints, and 
++						 * get_method_constrained can't find the method in klass 
++						 * representing a type var.
++						 * The type var is guaranteed to be a reference type in this
++						 * case.
++						 */
++						cmethod = mini_get_method (cfg, method, token, NULL, generic_context);
++						cil_method = cmethod;
++						g_assert (!cmethod->klass->valuetype);
++					} else {
++						cmethod = mono_get_method_constrained (image, token, constrained_call, generic_context, &cil_method);
++					}
+ 				} else {
+ 					cmethod = mini_get_method (cfg, method, token, NULL, generic_context);
+ 					cil_method = cmethod;
diff --git a/dev-lang/mono/mono-2.2-r2.ebuild b/dev-lang/mono/mono-2.2-r3.ebuild
index 58d0d2f9b936..3518f0ec35be 100644
--- a/dev-lang/mono/mono-2.2-r2.ebuild
+++ b/dev-lang/mono/mono-2.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r2.ebuild,v 1.2 2009/01/20 22:44:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r3.ebuild,v 1.1 2009/01/25 13:23:40 loki_val Exp $
 
 EAPI=2
 
@@ -40,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}/mono-2.2-ppc-threading.patch"
 	"${FILESDIR}/mono-2.2-uselibdir.patch"
 	"${FILESDIR}/mono-2.2-r121596-work-around-runtime-crash.patch"
+	"${FILESDIR}/mono-2.2-r123987-bless-crash.patch"
 )
 
 pkg_setup() {