mono6: Mark executable not-MPROTECT-safe.

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Mon Aug 5 16:28:25 2019 +0100
Changeset:	35733efd799ed2fce36aff34ed00c145d34daa6f

Modified Files:
	mono6/Makefile
	mono6/distinfo
	mono6/patches/patch-configure.ac
	mono6/patches/patch-runtime_mono-wrapper.in

Log Message:
mono6: Mark executable not-MPROTECT-safe.

Pipe paxctl stderr to /dev/null to avoid spamming the console every
time the mono interpreter is run.

Use X11BASE - this doesn't work yet.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=35733efd799ed2fce36aff34ed00c145d34daa6f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mono6/Makefile                              | 8 ++------
 mono6/distinfo                              | 4 ++--
 mono6/patches/patch-configure.ac            | 9 +++++++++
 mono6/patches/patch-runtime_mono-wrapper.in | 2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diffs:
diff --git a/mono6/Makefile b/mono6/Makefile
index 5d1ac843b6..3a3cd509f0 100644
--- a/mono6/Makefile
+++ b/mono6/Makefile
@@ -111,12 +111,6 @@ SUBST_MESSAGE.fix-prefix=	Fixing relative prefix
 SUBST_FILES.fix-prefix=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.fix-prefix=		-e 's,$${pcfiledir}/../..,\@prefix\@,g'
 
-SUBST_CLASSES+=			fix-mcs
-SUBST_STAGE.fix-mcs=		post-patch
-SUBST_MESSAGE.fix-mcs=		Fixing mcs default prefix
-SUBST_FILES.fix-mcs=		mcs/build/config-default.make
-SUBST_VARS.fix-mcs=		PREFIX PKGMANDIR
-
 SUBST_CLASSES+=			fix-cfgdir
 SUBST_STAGE.fix-cfgdir=		post-patch
 SUBST_MESSAGE.fix-cfgdir=	Fixing configuration files install dir
@@ -166,6 +160,8 @@ GNU_ARCH.i386=		i586
 CFLAGS+=		-march=i586
 .endif
 
+NOT_PAX_MPROTECT_SAFE+=	bin/mono-sgen
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/net_4_5/DefaultWsdlHelpGenerator.aspx \
 		${DESTDIR}${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx
diff --git a/mono6/distinfo b/mono6/distinfo
index 049e714963..841c2972d6 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -4,7 +4,7 @@ SHA1 (mono-6.0.0.313.tar.xz) = c5cccad2cb5be936f23e46b95df7628013e29e3c
 RMD160 (mono-6.0.0.313.tar.xz) = 801e5128561d2e95a6736cdfce040d8850be4e2f
 SHA512 (mono-6.0.0.313.tar.xz) = a1de452eb1c6edba503723217a4b5839563d154ff0c01852b551a41b3c98b5b617637e4e435de87bf275cfdce4066e70bfc763b607882f0b42e14196d7d5c156
 Size (mono-6.0.0.313.tar.xz) = 218124872 bytes
-SHA1 (patch-configure.ac) = cc4f5bf80495c3248a161d1b857e2aa63a437e4e
+SHA1 (patch-configure.ac) = 8639e82f6116f6a2b09d4aacc3e6744a120838bc
 SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
 SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
 SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
@@ -22,4 +22,4 @@ SHA1 (patch-mono_tests_Makefile.am) = a5bf145619a50c8c256c32ffdb5b51f9e04f874c
 SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
 SHA1 (patch-mono_utils_mono-state.c) = 6a6d83e1779a5167e8f22ba1dedce9b3203705c4
 SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953
-SHA1 (patch-runtime_mono-wrapper.in) = 97947a58b93fa50997649c12fcb5b471c2b05c8c
+SHA1 (patch-runtime_mono-wrapper.in) = aedf3d2cdfe2504f021c6dec7992164542db0463
diff --git a/mono6/patches/patch-configure.ac b/mono6/patches/patch-configure.ac
index e916aa0fa7..7683c65f7c 100644
--- a/mono6/patches/patch-configure.ac
+++ b/mono6/patches/patch-configure.ac
@@ -5,6 +5,15 @@ https://github.com/mono/mono/pull/15938
 
 --- configure.ac.orig	2019-07-18 07:52:31.000000000 +0000
 +++ configure.ac
+@@ -4066,7 +4066,7 @@ LIBC="libc.so.6"
+ INTL="libc.so.6"
+ SQLITE="libsqlite.so.0"
+ SQLITE3="libsqlite3.so.0"
+-X11="libX11.so"
++X11="@X11BASE@/lib/libX11.so"
+ GDKX11="libgdk-x11-2.0.so.0"
+ GTKX11="libgtk-x11-2.0.so.0"
+ XINERAMA="libXinerama.so.1"
 @@ -6177,6 +6177,22 @@ elif test x$platform_android = xyes; the
  	MONO_NATIVE_PLATFORM=android
  
diff --git a/mono6/patches/patch-runtime_mono-wrapper.in b/mono6/patches/patch-runtime_mono-wrapper.in
index 3944485167..72a8791a82 100644
--- a/mono6/patches/patch-runtime_mono-wrapper.in
+++ b/mono6/patches/patch-runtime_mono-wrapper.in
@@ -8,5 +8,5 @@ Mark the mono executable as not MPROTECT safe during the build.
  fi
  MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
  export MONO_CFG_DIR PATH
-+paxctl +m $(readlink -f "$MONO_EXECUTABLE")
++paxctl +m $(readlink -f "$MONO_EXECUTABLE") 2>/dev/null
  exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE_WRAPPER}" --config "@mono_cfg_dir@/mono/config" "$@"