From 31922740692d5f0c0e4850d315ba0089428258be Mon Sep 17 00:00:00 2001 From: kefren Date: Wed, 1 Dec 2010 16:49:13 +0000 Subject: Update to 2.8.1, a bug fix release on 2.8 branch. Full Changelog: http://www.mono-project.com/Release_Notes_Mono_2.8.1 --- lang/mono/Makefile | 5 ++--- lang/mono/PLIST.common | 7 ++++--- lang/mono/distinfo | 13 ++++++------ lang/mono/patches/patch-ad | 8 ++++---- lang/mono/patches/patch-al | 8 ++++---- lang/mono/patches/patch-at | 50 ---------------------------------------------- 6 files changed, 20 insertions(+), 71 deletions(-) delete mode 100644 lang/mono/patches/patch-at (limited to 'lang/mono') diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 3d0720b47a8..cc2dbeea5cd 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.107 2010/11/23 16:33:03 kefren Exp $ +# $NetBSD: Makefile,v 1.108 2010/12/01 16:49:13 kefren Exp $ -DISTNAME= mono-2.8 -PKGREVISION= 1 +DISTNAME= mono-2.8.1 CATEGORIES= lang MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/ EXTRACT_SUFX= .tar.bz2 diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common index b0b13d0bf2e..650f62fe6a3 100644 --- a/lang/mono/PLIST.common +++ b/lang/mono/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.12 2010/10/16 04:32:18 kefren Exp $ +@comment $NetBSD: PLIST.common,v 1.13 2010/12/01 16:49:13 kefren Exp $ bin/al bin/al2 bin/caspol @@ -103,6 +103,7 @@ include/mono-2.0/mono/metadata/row-indexes.h include/mono-2.0/mono/metadata/threads.h include/mono-2.0/mono/metadata/tokentype.h include/mono-2.0/mono/metadata/verify.h +include/mono-2.0/mono/utils/mono-dl-fallback.h include/mono-2.0/mono/utils/mono-error.h include/mono-2.0/mono/utils/mono-logger.h include/mono-2.0/mono/utils/mono-publib.h @@ -521,8 +522,8 @@ lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll lib/mono/gac/IBM.Data.DB2/1.0.0.0__7c307b91aa13d208/IBM.Data.DB2.dll.mdb lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll lib/mono/gac/ICSharpCode.SharpZipLib/2.6.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb -lib/mono/gac/ICSharpCode.SharpZipLib/${PKGVERSION}4.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll -lib/mono/gac/ICSharpCode.SharpZipLib/${PKGVERSION}4.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb +lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll +lib/mono/gac/ICSharpCode.SharpZipLib/2.84.0.0__1b03e6acf1164f73/ICSharpCode.SharpZipLib.dll.mdb lib/mono/gac/Microsoft.Build.Engine/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll lib/mono/gac/Microsoft.Build.Engine/2.0.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll.mdb lib/mono/gac/Microsoft.Build.Engine/3.5.0.0__b03f5f7f11d50a3a/Microsoft.Build.Engine.dll diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 81f358b55ac..c799686de1a 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.69 2010/11/23 16:33:03 kefren Exp $ +$NetBSD: distinfo,v 1.70 2010/12/01 16:49:13 kefren Exp $ -SHA1 (mono-2.8.tar.bz2) = a724de68dccb583b54d2e08c5a1e5760c18225ab -RMD160 (mono-2.8.tar.bz2) = e2f78f8128a94dd983b380a2408c7a648e8e0864 -Size (mono-2.8.tar.bz2) = 31279224 bytes +SHA1 (mono-2.8.1.tar.bz2) = c46f9d8282803e8fd137acdb126e34421762b13c +RMD160 (mono-2.8.1.tar.bz2) = 1d3c2a71fa46fcb93f201cdce2a19407cb1cd2ef +Size (mono-2.8.1.tar.bz2) = 31181201 bytes SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb SHA1 (patch-ab) = ea20eb85d29c36de8f830a5225cd271d75225407 SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2 -SHA1 (patch-ad) = e2a7a65f1729113f7c1d8a9c3997afbaa78d2151 +SHA1 (patch-ad) = 0e3dd3a5fccae70025e32ee92c8b6023030db177 SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53 SHA1 (patch-af) = c109a9a742cb70d83cf99df0ad6c907c68809d52 SHA1 (patch-ag) = c9563d5870c7adc44c241f08b89fb73a98fa018a @@ -14,12 +14,11 @@ SHA1 (patch-ah) = 5e38b9d7eadb65da697d9bdd1ebbd053f56c0f5b SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56 SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72 SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df -SHA1 (patch-al) = 95dab1ad159b41f9e4f8ab6077bf2e2d2d9f1f03 +SHA1 (patch-al) = 2603dee45ca6e91df1a321015428677875a29b03 SHA1 (patch-ap) = 9da5c76e34f1f61da411ab4e0c884c23cc320bb9 SHA1 (patch-aq) = a356e520eeb95a8c3bb1485cb460710703882e39 SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b SHA1 (patch-as) = 9f434c84f57e985d4734872e2dbce1079c87fcfa -SHA1 (patch-at) = ddcfcde40e9e77c76d3537d01a77c607768c3875 SHA1 (patch-ba) = b5d7f5832ea53dd00af67ac94b5289d71f0d2152 SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2 SHA1 (patch-bd) = 15c803bf85ad36ad08bcaaf7dbc371a6473ae5f2 diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad index fe9dc66c8b8..cd428c166e2 100644 --- a/lang/mono/patches/patch-ad +++ b/lang/mono/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.19 2010/10/16 04:32:18 kefren Exp $ ---- mono/utils/mono-sigcontext.h.orig 2010-10-07 19:02:08.000000000 +0300 -+++ mono/utils/mono-sigcontext.h 2010-10-07 19:02:31.000000000 +0300 +$NetBSD: patch-ad,v 1.20 2010/12/01 16:49:13 kefren Exp $ +--- mono/utils/mono-sigcontext.h.orig 2010-11-12 12:24:41.000000000 +0200 ++++ mono/utils/mono-sigcontext.h 2010-12-01 18:02:44.000000000 +0200 @@ -101,6 +101,20 @@ #define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r15) #elif defined(__FreeBSD__) @@ -21,4 +21,4 @@ $NetBSD: patch-ad,v 1.19 2010/10/16 04:32:18 kefren Exp $ + #define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext.__gregs [_REG_R15]) #elif defined(__OpenBSD__) /* OpenBSD/amd64 has no gregs array, ucontext_t == sigcontext */ - #define UCONTEXT_REG_RAX(ctx) ((ctx)->sc_rax) + #define UCONTEXT_REG_RAX(ctx) (((ucontext_t*)(ctx))->sc_rax) diff --git a/lang/mono/patches/patch-al b/lang/mono/patches/patch-al index 9098259b211..6afadab98b4 100644 --- a/lang/mono/patches/patch-al +++ b/lang/mono/patches/patch-al @@ -1,12 +1,12 @@ -$NetBSD: patch-al,v 1.3 2010/10/16 04:32:18 kefren Exp $ ---- data/config.in.orig 2010-10-15 08:31:08.000000000 +0300 -+++ data/config.in 2010-10-15 08:31:36.000000000 +0300 +$NetBSD: patch-al,v 1.4 2010/12/01 16:49:13 kefren Exp $ +--- data/config.in.orig 2010-11-12 12:24:41.000000000 +0200 ++++ data/config.in 2010-12-01 18:00:19.000000000 +0200 @@ -17,7 +17,7 @@ - + + - diff --git a/lang/mono/patches/patch-at b/lang/mono/patches/patch-at deleted file mode 100644 index 167bda42ce5..00000000000 --- a/lang/mono/patches/patch-at +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-at,v 1.1 2010/11/23 16:33:04 kefren Exp $ - -Fix for CVE-2010-4159 from git repository: -https://github.com/mono/mono/commit/8e890a3bf80a4620e417814dc14886b1bbd17625 - ---- mono/metadata/loader.c.orig 2010-11-23 17:54:39.000000000 +0200 -+++ mono/metadata/loader.c 2010-11-23 17:54:50.000000000 +0200 -@@ -1340,32 +1340,34 @@ - - if (!module) { - void *iter = NULL; -- while ((full_name = mono_dl_build_path (NULL, file_name, &iter))) { -+ char *mdirname = g_path_get_dirname (image->name); -+ while ((full_name = mono_dl_build_path (mdirname, file_name, &iter))) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, -- "DllImport loading location: '%s'.", full_name); -+ "DllImport loading library: '%s'.", full_name); - module = cached_module_load (full_name, MONO_DL_LAZY, &error_msg); - if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, -- "DllImport error loading library: '%s'.", -- error_msg); -+ "DllImport error loading library '%s'.", -+ error_msg); - g_free (error_msg); - } - g_free (full_name); - if (module) - break; - } -+ g_free (mdirname); - } - - if (!module) { - void *iter = NULL; -- while ((full_name = mono_dl_build_path (".", file_name, &iter))) { -+ while ((full_name = mono_dl_build_path (NULL, file_name, &iter))) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, -- "DllImport loading library: '%s'.", full_name); -+ "DllImport loading location: '%s'.", full_name); - module = cached_module_load (full_name, MONO_DL_LAZY, &error_msg); - if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, -- "DllImport error loading library '%s'.", -- error_msg); -+ "DllImport error loading library: '%s'.", -+ error_msg); - g_free (error_msg); - } - g_free (full_name); -- cgit v1.2.3