Update mono to 2.8.2
* Security fix for ASP.NET (XSP / mod_mono) source code disclosure (CVE-2010-4225) * Backport ParallelFx improvements from master (jlaval) * Fix state check for short-circuiting with SupportRecursion in ReaderWriterLockSlim #655361 (jlaval) * Increment Count even on single-processor in SpinWait. Fix #624849. (jlaval) * Update ThreadLocal to use default(T) for initialization with parameterless ctor. Fix #658689. (jlaval)
This commit is contained in:
kefren
parent
2cf4fcb521
commit
a7f016eb96
8 changed files with 34 additions and 33 deletions
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: CHANGES-2011,v 1.16 2011/01/08 13:40:31 obache Exp $
|
||||
$NetBSD: CHANGES-2011,v 1.17 2011/01/08 18:06:00 kefren Exp $
|
||||
|
||||
Changes to the packages collection and infrastructure in 2011:
|
||||
|
||||
|
|
@ -19,3 +19,6 @@ Changes to the packages collection and infrastructure in 2011:
|
|||
Updated lang/php53 to 5.3.5 [taca 2011-01-07]
|
||||
Updated www/contao29-translations to 20110108 [taca 2011-01-08]
|
||||
Updated sysutils/hal to 0.5.14nb1 [obache 2011-01-08]
|
||||
Updated lang/mono to 2.8.2 [kefren 2011-01-08]
|
||||
Updated www/mono-xsp to 2.8.2 [kefren 2011-01-08]
|
||||
Updated www/ap-mono to 2.8.2 [kefren 2011-01-08]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.109 2010/12/17 07:36:13 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.110 2011/01/08 18:06:00 kefren Exp $
|
||||
|
||||
DISTNAME= mono-2.8.1
|
||||
PKGREVISION= 1
|
||||
DISTNAME= mono-2.8.2
|
||||
CATEGORIES= lang
|
||||
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mono/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.74 2010/12/29 10:42:35 obache Exp $
|
||||
$NetBSD: distinfo,v 1.75 2011/01/08 18:06:00 kefren Exp $
|
||||
|
||||
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 (mono-2.8.2.tar.bz2) = 4223a40706b422c44be5eb1c89b4f316026a02a5
|
||||
RMD160 (mono-2.8.2.tar.bz2) = 8536c1c9a481ece2ba254a7c943353f9ade66a84
|
||||
Size (mono-2.8.2.tar.bz2) = 31292886 bytes
|
||||
SHA1 (patch-aa) = f3c88247c143cba6d0475f1dabb653adbc841bdb
|
||||
SHA1 (patch-ab) = ea20eb85d29c36de8f830a5225cd271d75225407
|
||||
SHA1 (patch-ac) = 78f3b0786480e066959cc191e3f45d3f773220e2
|
||||
|
|
@ -10,7 +10,7 @@ SHA1 (patch-ad) = 55ccdedbdf80c24be110dcebc73644e1e68909b3
|
|||
SHA1 (patch-ae) = 0280993f1565ebd6fb552d12cfe12d105421de53
|
||||
SHA1 (patch-af) = c109a9a742cb70d83cf99df0ad6c907c68809d52
|
||||
SHA1 (patch-ag) = 425f470151cc8a60d1ac301b9fd1cc2abb399ea3
|
||||
SHA1 (patch-ah) = 35a76fa725ab507538e37cbf391492614a78507f
|
||||
SHA1 (patch-ah) = 5f90aa60504b9508d21e05b390626788d71d47b4
|
||||
SHA1 (patch-ai) = cd5593a7e95039980b839bdabdf59d9e68fb9f56
|
||||
SHA1 (patch-aj) = a5aab739e01fd969edb85b5b3e08c087554d0a72
|
||||
SHA1 (patch-ak) = 034d260926fb31aa6b94faf5942f6ec7c7b461df
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ah,v 1.12 2010/12/29 05:41:20 obache Exp $
|
||||
--- mono/utils/mono-semaphore.c.orig 2010-10-07 23:41:21.000000000 +0300
|
||||
+++ mono/utils/mono-semaphore.c 2010-10-07 23:44:31.000000000 +0300
|
||||
$NetBSD: patch-ah,v 1.13 2011/01/08 18:06:00 kefren Exp $
|
||||
--- mono/utils/mono-semaphore.c.orig 2011-01-04 19:39:55.000000000 +0200
|
||||
+++ mono/utils/mono-semaphore.c 2011-01-08 18:52:28.000000000 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
# ifdef USE_MACH_SEMA
|
||||
# define TIMESPEC mach_timespec_t
|
||||
|
|
@ -10,7 +10,7 @@ $NetBSD: patch-ah,v 1.12 2010/12/29 05:41:20 obache Exp $
|
|||
# define TIMESPEC struct timespec
|
||||
# define WAIT_BLOCK(a) sem_trywait(a)
|
||||
# else
|
||||
@@ -34,20 +34,34 @@
|
||||
@@ -34,12 +34,13 @@
|
||||
int
|
||||
mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
|
||||
{
|
||||
|
|
@ -27,9 +27,7 @@ $NetBSD: patch-ah,v 1.12 2010/12/29 05:41:20 obache Exp $
|
|||
|
||||
#ifndef USE_MACH_SEMA
|
||||
if (timeout_ms == 0)
|
||||
return (!sem_trywait (sem));
|
||||
#endif
|
||||
+
|
||||
@@ -48,6 +49,19 @@
|
||||
if (timeout_ms == (guint32) 0xFFFFFFFF)
|
||||
return mono_sem_wait (sem, alertable);
|
||||
|
||||
|
|
@ -41,14 +39,15 @@ $NetBSD: patch-ah,v 1.12 2010/12/29 05:41:20 obache Exp $
|
|||
+ break;
|
||||
+ usleep(50000);
|
||||
+ timeout -= 50;
|
||||
+ if (alertable) /* XXX: Not on EINTR */
|
||||
+ if (alertable) /* XXX: Not on EINTR */
|
||||
+ return -1;
|
||||
+ } while (timeout > 50);
|
||||
+#else
|
||||
gettimeofday (&t, NULL);
|
||||
ts.tv_sec = timeout_ms / 1000 + t.tv_sec;
|
||||
ts.tv_nsec = (timeout_ms % 1000) * 1000000 + t.tv_usec * 1000;
|
||||
@@ -55,19 +69,6 @@ mono_sem_timedwait (MonoSemType *sem, gu
|
||||
+
|
||||
#ifdef USE_MACH_SEMA
|
||||
memset (&t, 0, sizeof (TIMESPEC));
|
||||
#else
|
||||
@@ -59,19 +73,6 @@
|
||||
ts.tv_nsec -= NSEC_PER_SEC;
|
||||
ts.tv_sec++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.14 2010/10/16 04:42:46 kefren Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2011/01/08 18:06:01 kefren Exp $
|
||||
|
||||
DISTNAME= mod_mono-2.8
|
||||
DISTNAME= mod_mono-2.8.2
|
||||
PKGNAME= ${APACHE_PKG_PREFIX}-mono-2.8
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/mod_mono/
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.8 2010/10/16 04:42:46 kefren Exp $
|
||||
$NetBSD: distinfo,v 1.9 2011/01/08 18:06:01 kefren Exp $
|
||||
|
||||
SHA1 (mod_mono-2.8.tar.bz2) = 85a9ba01501c371ad888cbaaa1fa45b50d7cff8b
|
||||
RMD160 (mod_mono-2.8.tar.bz2) = 77a288470e448ab84ae995f1d891308193cb7cfb
|
||||
Size (mod_mono-2.8.tar.bz2) = 258749 bytes
|
||||
SHA1 (mod_mono-2.8.2.tar.bz2) = 54e6ee10eedbff11e46b666a2ed1ba68d3545007
|
||||
RMD160 (mod_mono-2.8.2.tar.bz2) = c33551a95144a92964645e6edebed13adacf1e56
|
||||
Size (mod_mono-2.8.2.tar.bz2) = 259216 bytes
|
||||
SHA1 (patch-aa) = b14fbf2752676b0b3ead4e8c3910785cc00ba4cc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.21 2010/12/01 16:53:23 kefren Exp $
|
||||
# $NetBSD: Makefile,v 1.22 2011/01/08 18:06:00 kefren Exp $
|
||||
|
||||
DISTNAME= xsp-2.8.1
|
||||
DISTNAME= xsp-2.8.2
|
||||
PKGNAME= mono-${DISTNAME}
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://ftp.novell.com/pub/mono/sources/xsp/
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.13 2010/12/01 16:53:23 kefren Exp $
|
||||
$NetBSD: distinfo,v 1.14 2011/01/08 18:06:01 kefren Exp $
|
||||
|
||||
SHA1 (xsp-2.8.1.tar.bz2) = 7def6c5b418171ff0e743e1eb08bd7d535088d52
|
||||
RMD160 (xsp-2.8.1.tar.bz2) = f76470c3f81bdf6459d53a28384a208033a4a8eb
|
||||
Size (xsp-2.8.1.tar.bz2) = 267547 bytes
|
||||
SHA1 (xsp-2.8.2.tar.bz2) = c4bbe12c9c30ca0159846f99003d40357e592d7c
|
||||
RMD160 (xsp-2.8.2.tar.bz2) = c4162f23bed710415637c2df883a3672fe2e67ae
|
||||
Size (xsp-2.8.2.tar.bz2) = 267310 bytes
|
||||
SHA1 (patch-aa) = 309ea56b58eed03f7a115b332f9218319751bc4b
|
||||
SHA1 (patch-ab) = 43dbd1c7aeb0ac9565e5e76122c7aa98d77185a4
|
||||
|
|
|
|||
Loading…
Reference in a new issue