diff options
| author | kefren <kefren> | 2011-01-08 18:06:00 +0000 |
|---|---|---|
| committer | kefren <kefren> | 2011-01-08 18:06:00 +0000 |
| commit | 6c76086a25bad41614214c825e28f1ec99fa3eed (patch) | |
| tree | d230637e20a14ebee1674223ea61547655f24f9f /lang | |
| parent | 3381b1199d612618d39d4f49bd8533a15a141082 (diff) | |
| download | pkgsrc-6c76086a25bad41614214c825e28f1ec99fa3eed.tar.gz | |
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)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/mono/Makefile | 5 | ||||
| -rw-r--r-- | lang/mono/distinfo | 10 | ||||
| -rw-r--r-- | lang/mono/patches/patch-ah | 23 |
3 files changed, 18 insertions, 20 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 85d9dbd8515..cd4d9bff991 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -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 diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 2f63cd2ced8..e6dd6774941 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -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 diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah index a2866e83469..2f12a10d029 100644 --- a/lang/mono/patches/patch-ah +++ b/lang/mono/patches/patch-ah @@ -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++; } |