From: Pacho Ramos <pacho@gentoo.org>
Date: Sat, 10 Sep 2011 14:17:04 +0000 (+0000)
Subject: Use and DEPEND on pax tools only when people wants to use mono on hardened kernels... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7a92367211a6ca8879709640debd05d35a17fdda;p=gentoo.git

Use and DEPEND on pax tools only when people wants to use mono on hardened kernels (bug #375799 by Anthony Basile).

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64
---

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/Manifest b/dev-lang/mono/Manifest
index 267aa48dfc9e..7307a85be35d 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -6,13 +6,13 @@ AUX mono-2.10.2-threads-access.patch 1156 RMD160 46d2de409d374502f614c048ced9c37
 DIST mono-2.10.2.tar.bz2 33737282 RMD160 bac1ecb7e94c77341ae5f15f8d59141f9eb4aa38 SHA1 7b673255c6b17c5a41c15059e5f068d6a970d2ea SHA256 9614472aa131e61bcdbf2fc48ab7a123ea57a10e736def5136a478465afa06b4
 DIST mono-2.10.5.tar.bz2 33940775 RMD160 7bbd83acc1ad1967a2f4ffad637f3a72711bd74c SHA1 68b991ea1727a44d1e6a4ffb161b9ca2e48ef83a SHA256 a80c644862541f403f8d51a3b7c71c47b6567614884639c2d890e27fa9efaf16
 EBUILD mono-2.10.2-r1.ebuild 7527 RMD160 5fb90b297ef85469659281d5fcee518519fceda6 SHA1 2300b61818c78ef0373b6000ce16e5f97a6d69b8 SHA256 504cde55e4352bc2246e62cf0c94df8460778a85c3027189b2a66e413f651ad5
-EBUILD mono-2.10.5.ebuild 7102 RMD160 26709f494071a6183cc6707ad709dc4223dd371d SHA1 3200cb299d2dbd0d0e413217db35736afad8dfe2 SHA256 fbc0aee474af8f7fbef283bbffd400414b0a7bbdb23597565a6ad90c6586d252
-MISC ChangeLog 47664 RMD160 64e2be7bb8d5db09d3ffbbfe464f9c7284fe8bb9 SHA1 dd4ae304c75dc131c9e9876644273700d7d7fd24 SHA256 c81dfd09b29e598b0233c793218545818e35e89aeb414f0da48c1c4b6586787b
-MISC metadata.xml 310 RMD160 590f8d057a532f9fdb31d9aa99cf78bc5525f42b SHA1 0d5324433bbfa0be649100139a3bd63507d34d83 SHA256 e393ea4330ca0007ea9612933a869a7df743b15df3f4223b94d38348ac274805
+EBUILD mono-2.10.5.ebuild 7502 RMD160 3d053bb290f838bc059f370e6bc01ae2e037c16d SHA1 4b551438113eac83bd109dc5577fa80d2180f83a SHA256 265e9854c4a10531db12b439ed8cde24ef6c21e208f52ae20b4e7bc6f02de106
+MISC ChangeLog 47865 RMD160 3ad2ed9d272d2bdcc7dd3044314f565b5f4b61a8 SHA1 0546415e52720a1cc60b23b00ec3c4aac74743fa SHA256 e9316ce6700b0a87bb6b9c05b5345073f1633e27663c31298bf328884c4914b7
+MISC metadata.xml 415 RMD160 a8cedd7103ec31148de0d6a315a347bf58bc9082 SHA1 cf18285c94f4325cd2243be294c60ed403a7f98f SHA256 43871c3a2a27121e41dcc79f262b0d921cce7aaea5e7df2435ecaf36591ca07a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5rTREACgkQCaWpQKGI+9QBwwCfeZqzHqXHuDkhflON54qwPXln
-m5UAn2FOLe+/Ul1BSNQ372hmNYMj+ON6
-=VngQ
+iEYEARECAAYFAk5rcWcACgkQCaWpQKGI+9S9OwCdGhZdfjo8NSPRvdBJXuCedEbu
+vS8AnAqcTOLuX5k3iTESOnFC4i5UG7jR
+=TYcm
 -----END PGP SIGNATURE-----
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