Disable mprotect for mini-mono. Disable pthread key delete since the key

is still often used during thread destruction. Bump revision.

4 files changed, 33 insertions, 8 deletions

diff --git a/lang/mono2/Makefile b/lang/mono2/Makefile
index c88641bf153..f3d1f9ca03a 100644
--- a/lang/mono2/Makefile
+++ b/lang/mono2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2016/12/04 05:17:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2017/02/17 17:07:32 joerg Exp $
 
 DISTNAME=	mono-2.10.9
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	lang
 MASTER_SITES=	http://download.mono-project.com/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--disable-dtrace
 
 .include "options.mk"
 
-MAKE_FLAGS+=		PERL=${PERL5:Q}
+MAKE_FLAGS+=		PERL=${PERL5:Q} PAXCTL=${PAXCTL:Utrue}
 MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
 UNLIMIT_RESOURCES=	datasize
 UNLIMIT_RESOURCES+=	stacksize
diff --git a/lang/mono2/distinfo b/lang/mono2/distinfo
index 14496d23b08..102ae415f9d 100644
--- a/lang/mono2/distinfo
+++ b/lang/mono2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/08/15 10:24:31 richard Exp $
+$NetBSD: distinfo,v 1.11 2017/02/17 17:07:32 joerg Exp $
 
 SHA1 (mono-2.10.9.tar.bz2) = 1a6e8c5a0c3d88d87982259aa04402e028a283de
 RMD160 (mono-2.10.9.tar.bz2) = ac9784c413eb2cdb490750a86a96cce5c11ad5bd
@@ -22,7 +22,7 @@ SHA1 (patch-aq) = a356e520eeb95a8c3bb1485cb460710703882e39
 SHA1 (patch-ar) = 7a2a916f3362da087b2dcfe6b91ba47339151e5b
 SHA1 (patch-as) = 9f434c84f57e985d4734872e2dbce1079c87fcfa
 SHA1 (patch-ba) = 872ca1579a5a3e4003b17d3406abe9c5d3a935cf
-SHA1 (patch-bc) = bbf1a903cf7fee1dbd3a070b0ef0d5aecbdf67e2
+SHA1 (patch-bc) = 39b34f40176ea34362e82637ad8de90fb2eb11db
 SHA1 (patch-bd) = 15c803bf85ad36ad08bcaaf7dbc371a6473ae5f2
 SHA1 (patch-be) = d7a6232690ecd15c32ed44dcc498e596c248f332
 SHA1 (patch-bf) = e945b13fbffc1239a4c459a2c6be543e67e883f9
@@ -52,3 +52,4 @@ SHA1 (patch-mcs_class_System.Web_System.Web.dll.sources) = 751139d6dc4bf8f2cda76
 SHA1 (patch-mcs_class_System.Web_System.Web_WebROCollection.cs) = ff95c3898df3aa4809d1222c29f9bf81e87e9af1
 SHA1 (patch-mono_profiler_proflog.c) = 2f7826873ab7fdb858db3d39606028ee87a34a46
 SHA1 (patch-mono_utils_mono-compiler.h) = 0dce7994bdb350f7080464f416b725cbe3e7e293
+SHA1 (patch-mono_utils_mono-tls.h) = 6230428437c77123227c2f9b5fd859c09b9fb471
diff --git a/lang/mono2/patches/patch-bc b/lang/mono2/patches/patch-bc
index 1861563fd71..9219a09941d 100644
--- a/lang/mono2/patches/patch-bc
+++ b/lang/mono2/patches/patch-bc
@@ -1,8 +1,16 @@
-$NetBSD: patch-bc,v 1.1 2013/06/17 12:43:28 wiz Exp $
+$NetBSD: patch-bc,v 1.2 2017/02/17 17:07:32 joerg Exp $
 
---- mono/mini/Makefile.in.orig	2005-12-22 18:35:16.000000000 +0100
+--- mono/mini/Makefile.in.orig	2012-02-01 20:48:03.000000000 +0000
 +++ mono/mini/Makefile.in
-@@ -1200,15 +1200,15 @@ mbench: test.exe
+@@ -1570,6 +1570,7 @@ genmdesc$(EXEEXT): $(genmdesc_OBJECTS) $
+ mono$(EXEEXT): $(mono_OBJECTS) $(mono_DEPENDENCIES) 
+ 	@rm -f mono$(EXEEXT)
+ 	$(mono_LINK) $(mono_OBJECTS) $(mono_LDADD) $(LIBS)
++	${PAXCTL} +m mono$(EXEEXT)
+ mono-sgen$(EXEEXT): $(mono_sgen_OBJECTS) $(mono_sgen_DEPENDENCIES) 
+ 	@rm -f mono-sgen$(EXEEXT)
+ 	$(mono_sgen_LINK) $(mono_sgen_OBJECTS) $(mono_sgen_LDADD) $(LIBS)
+@@ -5035,15 +5036,15 @@ mbench: test.exe
  
  stat1: mono bench.exe
  	$(RUNTIME) --verbose --statfile stats.pl --regression bench.exe
diff --git a/lang/mono2/patches/patch-mono_utils_mono-tls.h b/lang/mono2/patches/patch-mono_utils_mono-tls.h
new file mode 100644
index 00000000000..880a48ee41c
--- /dev/null
+++ b/lang/mono2/patches/patch-mono_utils_mono-tls.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-mono_utils_mono-tls.h,v 1.1 2017/02/17 17:07:32 joerg Exp $
+
+Thread destructor will still try to update the key, even after destructor.
+Prefer leaking memory to crashes.
+
+--- mono/utils/mono-tls.h.orig	2017-02-16 23:12:51.591610250 +0000
++++ mono/utils/mono-tls.h
+@@ -38,7 +38,7 @@ mono_native_tls_alloc (MonoNativeTlsKey 
+ static inline void
+ mono_native_tls_free (MonoNativeTlsKey key)
+ {
+-	pthread_key_delete (key);
++	//pthread_key_delete (key);
+ }
+ 
+ static inline int