From 56f3807b9aed308f8fa737d599419c61b687d1d0 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Sat, 10 Sep 2011 14:17:04 +0000
Subject: Use and DEPEND on pax tools only when people wants to use mono on
 hardened kernels (bug #375799 by Anthony Basile).

(Portage version: 2.1.10.14/cvs/Linux x86_64)
---
 dev-lang/mono/ChangeLog          |  6 +++++-
 dev-lang/mono/metadata.xml       |  9 ++++-----
 dev-lang/mono/mono-2.10.5.ebuild | 21 ++++++++++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

(limited to 'dev-lang/mono')

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index c0dc37817ca1..c7f9679823f8 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mono
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.228 2011/09/10 11:42:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.229 2011/09/10 14:17:04 pacho Exp $
+
+  10 Sep 2011; Pacho Ramos <pacho@gentoo.org> mono-2.10.5.ebuild, metadata.xml:
+  Use and DEPEND on pax tools only when people wants to use mono on hardened
+  kernels (bug #375799 by Anthony Basile).
 
 *mono-2.10.5 (10 Sep 2011)
 
diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index 2b22d1154cbb..9529ca592b67 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -2,9 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dotnet</herd>
-	<use>
-		<flag name='xen'>Make mono generate code that is
-		considerably faster on xen VMs but slightly slower on for
-		normal systems.</flag>
-	</use>
+<use>
+	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+	<flag name='xen'>Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-lang/mono/mono-2.10.5.ebuild b/dev-lang/mono/mono-2.10.5.ebuild
index ed5b7f0197e1..6dd0bb1b90e2 100644
--- a/dev-lang/mono/mono-2.10.5.ebuild
+++ b/dev-lang/mono/mono-2.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.5.ebuild,v 1.1 2011/09/10 11:42:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.5.ebuild,v 1.2 2011/09/10 14:17:04 pacho Exp $
 
 EAPI="4"
 
@@ -13,11 +13,10 @@ LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDP
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="minimal xen"
+IUSE="minimal pax_kernel xen"
 
 #Bash requirement is for += operator
-COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
-	!dev-util/monodoc
+COMMONDEPEND="!dev-util/monodoc
 	!minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
 	ia64? (	sys-libs/libunwind )"
 RDEPEND="${COMMONDEPEND}
@@ -26,7 +25,7 @@ RDEPEND="${COMMONDEPEND}
 DEPEND="${COMMONDEPEND}
 	sys-devel/bc
 	>=app-shells/bash-3.2
-	sys-apps/paxctl"
+	pax_kernel? ( sys-apps/paxctl )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -55,6 +54,18 @@ pkg_setup() {
 	PATCHES=( "${FILESDIR}/${PN}-2.10.2-threads-access.patch" )
 }
 
+src_prepare() {
+	go-mono_src_prepare
+
+	# we need to sed in the paxctl -mr in the runtime/mono-wrapper.in so it don't
+	# get killed in the build proces when MPROTEC is enable. #286280
+	# RANDMMAP kill the build proces to #347365
+	if use pax_kernel ; then
+		ewarn "We are disabling MPROTECT on the mono binary."
+		sed '/exec/ i\paxctl -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
+	fi
+}
+
 src_configure() {
 	# mono's build system is finiky, strip the flags
 	strip-flags
-- 
cgit v1.2.3-65-gdbad