Date: Wed, 14 Aug 2013 14:59:50 +0000 (UTC) From: Romain Tartière <romain@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324730 - in head/lang/mono: . files Message-ID: <201308141459.r7EExoD4096819@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: romain Date: Wed Aug 14 14:59:50 2013 New Revision: 324730 URL: http://svnweb.freebsd.org/changeset/ports/324730 Log: Update to 3.2.1. This update include a patch for sgen which avoids an assertion failure (condition `info->doing_handshake' not met) that will be part of 3.2.2. Because our mono version is unstable due to this, we decided not to wait for 3.2.2 to be out and update to 3.2.1, cherry-picking the appropriate fix. Many thanks to Charles Randall for reporting and helping. Added: head/lang/mono/files/patch-mono_metadata_sgen-os-posix.c (contents, props changed) head/lang/mono/files/patch-mono_tests_Makefile.in (contents, props changed) Deleted: head/lang/mono/files/patch-mono_io-layer_sockets.c Modified: head/lang/mono/Makefile head/lang/mono/distinfo head/lang/mono/pkg-plist Modified: head/lang/mono/Makefile ============================================================================== --- head/lang/mono/Makefile Wed Aug 14 14:58:37 2013 (r324729) +++ head/lang/mono/Makefile Wed Aug 14 14:59:50 2013 (r324730) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mono -PORTVERSION= 3.0.12 +PORTVERSION= 3.2.1 CATEGORIES= lang MASTER_SITES= http://download.mono-project.com/sources/${PORTNAME}/ @@ -21,7 +21,7 @@ USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes # Moonlight is installed as part of www/moonlight -CONFIGURE_ARGS= --with-moonlight=no +CONFIGURE_ARGS= --with-moonlight=no --disable-dtrace CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no Modified: head/lang/mono/distinfo ============================================================================== --- head/lang/mono/distinfo Wed Aug 14 14:58:37 2013 (r324729) +++ head/lang/mono/distinfo Wed Aug 14 14:59:50 2013 (r324730) @@ -1,2 +1,2 @@ -SHA256 (mono-3.0.12.tar.bz2) = 7a1c6d05874b84982f693aff591c350efa2f75c005514b6da17109d551e986b9 -SIZE (mono-3.0.12.tar.bz2) = 81739517 +SHA256 (mono-3.2.1.tar.bz2) = bac136f5d9e3d7c88c215bc81cc7cffe53b02fde15a28c1c8f566176d80c869c +SIZE (mono-3.2.1.tar.bz2) = 81770192 Added: head/lang/mono/files/patch-mono_metadata_sgen-os-posix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/mono/files/patch-mono_metadata_sgen-os-posix.c Wed Aug 14 14:59:50 2013 (r324730) @@ -0,0 +1,24 @@ + +$FreeBSD$ + +https://bugzilla.xamarin.com/show_bug.cgi?id=13604 +https://github.com/mono/mono/commit/2c45af25e2a027d749feef771a83a3c9c731f4aa + +--- mono/metadata/sgen-os-posix.c.orig ++++ mono/metadata/sgen-os-posix.c +@@ -57,7 +57,14 @@ + #endif + gpointer stack_start; + +- g_assert (info->doing_handshake); ++ /* ++ * It's possible that a dying thread is parked via ++ * sgen_park_current_thread_if_doing_handshake(), and, while parked, STW tries to ++ * suspend it again. In that case doing_handshake will not be set anymore, and the ++ * "nested" suspend must be ignored. ++ */ ++ if (!info->doing_handshake) ++ return; + + info->stopped_domain = mono_domain_get (); + info->stopped_ip = context ? (gpointer) ARCH_SIGCTX_IP (context) : NULL; Added: head/lang/mono/files/patch-mono_tests_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/mono/files/patch-mono_tests_Makefile.in Wed Aug 14 14:59:50 2013 (r324730) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- mono/tests/Makefile.in.orig ++++ mono/tests/Makefile.in +@@ -1511,7 +1511,7 @@ + @NACL_CODEGEN_TRUE@test-messages: + @NACL_CODEGEN_FALSE@test-messages: w32message.exe + @NACL_CODEGEN_FALSE@ > test_messages.zero +-@NACL_CODEGEN_FALSE@ $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout ++@NACL_CODEGEN_FALSE@ $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe > w32message.allout 2>&1 && cmp test_messages.zero w32message.allout + + @MOONLIGHT_TRUE@test_2_1 : test-coreclr-security + @MOONLIGHT_FALSE@test_2_1 : Modified: head/lang/mono/pkg-plist ============================================================================== --- head/lang/mono/pkg-plist Wed Aug 14 14:58:37 2013 (r324729) +++ head/lang/mono/pkg-plist Wed Aug 14 14:59:50 2013 (r324730) @@ -37,6 +37,7 @@ bin/mdvalidater bin/mkbundle bin/mod bin/mono +bin/mono-boehm bin/mono-api-info bin/mono-cil-strip bin/mono-configuration-crypto @@ -159,10 +160,14 @@ lib/libmono-profiler-log.a lib/libmono-profiler-log.la lib/libmono-profiler-log.so lib/libmono-profiler-log.so.0 +lib/libmonoboehm-2.0.a +lib/libmonoboehm-2.0.la +lib/libmonoboehm-2.0.so +lib/libmonoboehm-2.0.so.1 lib/libmonosgen-2.0.a lib/libmonosgen-2.0.la lib/libmonosgen-2.0.so -lib/libmonosgen-2.0.so.0 +lib/libmonosgen-2.0.so.1 lib/mono-source-libs/Options.cs lib/mono-source-libs/getline.cs lib/mono/2.0/Accessibility.dll @@ -333,7 +338,6 @@ lib/mono/4.0/Microsoft.CSharp.dll lib/mono/4.0/Microsoft.CSharp.targets lib/mono/4.0/Microsoft.Common.targets lib/mono/4.0/Microsoft.Common.tasks -lib/mono/4.0/Microsoft.Portable.CSharp.targets lib/mono/4.0/Microsoft.VisualBasic.targets lib/mono/4.0/Microsoft.VisualC.dll lib/mono/4.0/Microsoft.Web.Infrastructure.dll @@ -424,89 +428,47 @@ lib/mono/4.5/CustomMarshalers.dll lib/mono/4.5/EntityFramework.SqlServer.dll lib/mono/4.5/EntityFramework.dll lib/mono/4.5/Facades/System.Collections.Concurrent.dll -lib/mono/4.5/Facades/System.Collections.Concurrent.dll.mdb lib/mono/4.5/Facades/System.Collections.dll -lib/mono/4.5/Facades/System.Collections.dll.mdb lib/mono/4.5/Facades/System.ComponentModel.Annotations.dll -lib/mono/4.5/Facades/System.ComponentModel.Annotations.dll.mdb lib/mono/4.5/Facades/System.ComponentModel.EventBasedAsync.dll -lib/mono/4.5/Facades/System.ComponentModel.EventBasedAsync.dll.mdb lib/mono/4.5/Facades/System.ComponentModel.dll -lib/mono/4.5/Facades/System.ComponentModel.dll.mdb lib/mono/4.5/Facades/System.Diagnostics.Contracts.dll -lib/mono/4.5/Facades/System.Diagnostics.Contracts.dll.mdb lib/mono/4.5/Facades/System.Diagnostics.Debug.dll -lib/mono/4.5/Facades/System.Diagnostics.Debug.dll.mdb lib/mono/4.5/Facades/System.Diagnostics.Tools.dll -lib/mono/4.5/Facades/System.Diagnostics.Tools.dll.mdb lib/mono/4.5/Facades/System.Dynamic.Runtime.dll -lib/mono/4.5/Facades/System.Dynamic.Runtime.dll.mdb lib/mono/4.5/Facades/System.Globalization.dll -lib/mono/4.5/Facades/System.Globalization.dll.mdb lib/mono/4.5/Facades/System.IO.dll -lib/mono/4.5/Facades/System.IO.dll.mdb lib/mono/4.5/Facades/System.Linq.Expressions.dll -lib/mono/4.5/Facades/System.Linq.Expressions.dll.mdb lib/mono/4.5/Facades/System.Linq.Parallel.dll -lib/mono/4.5/Facades/System.Linq.Parallel.dll.mdb lib/mono/4.5/Facades/System.Linq.Queryable.dll -lib/mono/4.5/Facades/System.Linq.Queryable.dll.mdb lib/mono/4.5/Facades/System.Linq.dll -lib/mono/4.5/Facades/System.Linq.dll.mdb lib/mono/4.5/Facades/System.Net.NetworkInformation.dll -lib/mono/4.5/Facades/System.Net.NetworkInformation.dll.mdb lib/mono/4.5/Facades/System.Net.Primitives.dll -lib/mono/4.5/Facades/System.Net.Primitives.dll.mdb lib/mono/4.5/Facades/System.Net.Requests.dll -lib/mono/4.5/Facades/System.Net.Requests.dll.mdb lib/mono/4.5/Facades/System.ObjectModel.dll -lib/mono/4.5/Facades/System.ObjectModel.dll.mdb lib/mono/4.5/Facades/System.Reflection.Extensions.dll -lib/mono/4.5/Facades/System.Reflection.Extensions.dll.mdb lib/mono/4.5/Facades/System.Reflection.Primitives.dll -lib/mono/4.5/Facades/System.Reflection.Primitives.dll.mdb lib/mono/4.5/Facades/System.Reflection.dll -lib/mono/4.5/Facades/System.Reflection.dll.mdb lib/mono/4.5/Facades/System.Resources.ResourceManager.dll -lib/mono/4.5/Facades/System.Resources.ResourceManager.dll.mdb lib/mono/4.5/Facades/System.Runtime.Extensions.dll -lib/mono/4.5/Facades/System.Runtime.Extensions.dll.mdb lib/mono/4.5/Facades/System.Runtime.InteropServices.dll -lib/mono/4.5/Facades/System.Runtime.InteropServices.dll.mdb lib/mono/4.5/Facades/System.Runtime.Numerics.dll -lib/mono/4.5/Facades/System.Runtime.Numerics.dll.mdb lib/mono/4.5/Facades/System.Runtime.Serialization.Json.dll -lib/mono/4.5/Facades/System.Runtime.Serialization.Json.dll.mdb lib/mono/4.5/Facades/System.Runtime.Serialization.Primitives.dll -lib/mono/4.5/Facades/System.Runtime.Serialization.Primitives.dll.mdb lib/mono/4.5/Facades/System.Runtime.Serialization.Xml.dll -lib/mono/4.5/Facades/System.Runtime.Serialization.Xml.dll.mdb lib/mono/4.5/Facades/System.Runtime.dll -lib/mono/4.5/Facades/System.Runtime.dll.mdb lib/mono/4.5/Facades/System.Security.Principal.dll -lib/mono/4.5/Facades/System.Security.Principal.dll.mdb lib/mono/4.5/Facades/System.ServiceModel.Http.dll -lib/mono/4.5/Facades/System.ServiceModel.Http.dll.mdb lib/mono/4.5/Facades/System.ServiceModel.Primitives.dll -lib/mono/4.5/Facades/System.ServiceModel.Primitives.dll.mdb lib/mono/4.5/Facades/System.Text.Encoding.Extensions.dll -lib/mono/4.5/Facades/System.Text.Encoding.Extensions.dll.mdb lib/mono/4.5/Facades/System.Text.Encoding.dll -lib/mono/4.5/Facades/System.Text.Encoding.dll.mdb lib/mono/4.5/Facades/System.Text.RegularExpressions.dll -lib/mono/4.5/Facades/System.Text.RegularExpressions.dll.mdb lib/mono/4.5/Facades/System.Threading.Tasks.Parallel.dll -lib/mono/4.5/Facades/System.Threading.Tasks.Parallel.dll.mdb lib/mono/4.5/Facades/System.Threading.Tasks.dll -lib/mono/4.5/Facades/System.Threading.Tasks.dll.mdb lib/mono/4.5/Facades/System.Threading.dll -lib/mono/4.5/Facades/System.Threading.dll.mdb lib/mono/4.5/Facades/System.Xml.ReaderWriter.dll -lib/mono/4.5/Facades/System.Xml.ReaderWriter.dll.mdb lib/mono/4.5/Facades/System.Xml.XDocument.dll -lib/mono/4.5/Facades/System.Xml.XDocument.dll.mdb lib/mono/4.5/Facades/System.Xml.XmlSerializer.dll -lib/mono/4.5/Facades/System.Xml.XmlSerializer.dll.mdb lib/mono/4.5/I18N.CJK.dll lib/mono/4.5/I18N.MidEast.dll lib/mono/4.5/I18N.Other.dll @@ -576,6 +538,7 @@ lib/mono/4.5/System.Json.Microsoft.dll lib/mono/4.5/System.Management.dll lib/mono/4.5/System.Messaging.dll lib/mono/4.5/System.Net.Http.Formatting.dll +lib/mono/4.5/System.Net.Http.WebRequest.dll lib/mono/4.5/System.Net.Http.dll lib/mono/4.5/System.Net.dll lib/mono/4.5/System.Numerics.dll @@ -1026,6 +989,8 @@ lib/mono/gac/System.Messaging/4.0.0.0__b lib/mono/gac/System.Messaging/4.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll.mdb lib/mono/gac/System.Net.Http.Formatting/4.0.0.0__31bf3856ad364e35/System.Net.Http.Formatting.dll lib/mono/gac/System.Net.Http.Formatting/4.0.0.0__31bf3856ad364e35/System.Net.Http.Formatting.dll.mdb +lib/mono/gac/System.Net.Http.WebRequest/4.0.0.0__b03f5f7f11d50a3a/System.Net.Http.WebRequest.dll +lib/mono/gac/System.Net.Http.WebRequest/4.0.0.0__b03f5f7f11d50a3a/System.Net.Http.WebRequest.dll.mdb lib/mono/gac/System.Net.Http/4.0.0.0__b03f5f7f11d50a3a/System.Net.Http.dll lib/mono/gac/System.Net.Http/4.0.0.0__b03f5f7f11d50a3a/System.Net.Http.dll.mdb lib/mono/gac/System.Net/3.5.0.0__b77a5c561934e089/System.Net.dll @@ -1157,7 +1122,6 @@ lib/mono/gac/System.Windows.Forms/2.0.0. lib/mono/gac/System.Windows.Forms/4.0.0.0__b77a5c561934e089/System.Windows.Forms.dll lib/mono/gac/System.Windows.Forms/4.0.0.0__b77a5c561934e089/System.Windows.Forms.dll.mdb lib/mono/gac/System.Windows/4.0.0.0__b03f5f7f11d50a3a/System.Windows.dll -lib/mono/gac/System.Windows/4.0.0.0__b03f5f7f11d50a3a/System.Windows.dll.mdb lib/mono/gac/System.Xaml/4.0.0.0__b77a5c561934e089/System.Xaml.dll lib/mono/gac/System.Xaml/4.0.0.0__b77a5c561934e089/System.Xaml.dll.mdb lib/mono/gac/System.Xml.Linq/3.5.0.0__b77a5c561934e089/System.Xml.Linq.dll @@ -1165,7 +1129,6 @@ lib/mono/gac/System.Xml.Linq/3.5.0.0__b7 lib/mono/gac/System.Xml.Linq/4.0.0.0__b77a5c561934e089/System.Xml.Linq.dll lib/mono/gac/System.Xml.Linq/4.0.0.0__b77a5c561934e089/System.Xml.Linq.dll.mdb lib/mono/gac/System.Xml.Serialization/4.0.0.0__b03f5f7f11d50a3a/System.Xml.Serialization.dll -lib/mono/gac/System.Xml.Serialization/4.0.0.0__b03f5f7f11d50a3a/System.Xml.Serialization.dll.mdb lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll lib/mono/gac/System.Xml/2.0.0.0__b77a5c561934e089/System.Xml.dll.mdb lib/mono/gac/System.Xml/4.0.0.0__b77a5c561934e089/System.Xml.dll @@ -1218,7 +1181,6 @@ lib/mono/xbuild-frameworks/.NETFramework lib/mono/xbuild-frameworks/.NETFramework/v4.0/RedistList/FrameworkList.xml lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml lib/mono/xbuild/Microsoft/Portable/v4.0/Microsoft.Portable.CSharp.targets -lib/mono/xbuild/Microsoft/Portable/v4.5/Microsoft.Portable.CSharp.targets lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.CSharp.targets lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.Common.targets lib/mono/xbuild/Microsoft/Silverlight/v2.0/Microsoft.Silverlight.VisualBasic.targets @@ -1321,7 +1283,6 @@ share/mono-2.0/mono/cil/cil-opcodes.xml @dirrm lib/mono/xbuild/Microsoft/Silverlight/v3.0 @dirrm lib/mono/xbuild/Microsoft/Silverlight/v2.0 @dirrm lib/mono/xbuild/Microsoft/Silverlight -@dirrm lib/mono/xbuild/Microsoft/Portable/v4.5 @dirrm lib/mono/xbuild/Microsoft/Portable/v4.0 @dirrm lib/mono/xbuild/Microsoft/Portable @dirrm lib/mono/xbuild/Microsoft @@ -1491,6 +1452,8 @@ share/mono-2.0/mono/cil/cil-opcodes.xml @dirrm lib/mono/gac/System.Net/4.0.0.0__b77a5c561934e089 @dirrm lib/mono/gac/System.Net/3.5.0.0__b77a5c561934e089 @dirrm lib/mono/gac/System.Net.Http/4.0.0.0__b03f5f7f11d50a3a +@dirrm lib/mono/gac/System.Net.Http.WebRequest/4.0.0.0__b03f5f7f11d50a3a +@dirrm lib/mono/gac/System.Net.Http.WebRequest @dirrm lib/mono/gac/System.Net.Http.Formatting/4.0.0.0__31bf3856ad364e35 @dirrm lib/mono/gac/System.Net.Http.Formatting @dirrm lib/mono/gac/System.Net.Http
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308141459.r7EExoD4096819>