Fix building on hardened (bug #347365 by onox). Thanks a lot to Anders Hellgren and Magnus Granberg for their help.

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

4 files changed, 20 insertions, 13 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 7aea15eaf82e..49f8023b653f 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # 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.212 2011/02/27 14:52:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.213 2011/03/05 16:35:18 pacho Exp $
+
+  05 Mar 2011; Pacho Ramos <pacho@gentoo.org> mono-2.8.2-r1.ebuild,
+  mono-2.10.1-r1.ebuild:
+  Fix building on hardened (bug #347365 by onox). Thanks a lot to Anders
+  Hellgren and Magnus Granberg for their help.
 
 *mono-2.10.1-r1 (27 Feb 2011)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 18c3a01864fd..ca0dac4c3bcf 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -11,15 +11,15 @@ AUX mono-2.8.1-radegast-crash.patch 554 RMD160 178225b9a8afe118a478752a2d2ce3a35
 DIST mono-2.10.1.tar.bz2 33483937 RMD160 3c9acc54d1df0f63ee546bf47bed3ca53b3f679e SHA1 234ee4eca6c80dda9d8fe955f3aafa25530921a7 SHA256 31a573b114bfb85a4283a7d6252addef5ae9d9431134a623723272b247d3cc76
 DIST mono-2.6.7.tar.bz2 27921963 RMD160 5825ad284e4123e4ddb8933637a3dbf5f57f7f5a SHA1 6528c009d344a21eb0898876369222a7fff76838 SHA256 ae21a997d72e2fb8ea88644c87ab52471e9c97117b937e205ea1835b5a028ce4
 DIST mono-2.8.2.tar.bz2 31292886 RMD160 8536c1c9a481ece2ba254a7c943353f9ade66a84 SHA1 4223a40706b422c44be5eb1c89b4f316026a02a5 SHA256 e33409ea5e8d581b60a2b73587d9d94a283b39c6406f9d348badcbdb253381bb
-EBUILD mono-2.10.1-r1.ebuild 7629 RMD160 6c52ad9d5bd240ef95ec881f5db79e5de667b5ca SHA1 95cc7e80433ea515e35c4923368b0adda25c40a3 SHA256 35ca39f3f0dc77c79e31ba3ee1d3b62f4ca1c6531697be5219220ee3cad603c7
+EBUILD mono-2.10.1-r1.ebuild 7676 RMD160 c5075a4a9bb7381d8e67adbb2420363992d281d3 SHA1 0942fb2645724cc85d0036620191a7445e487b33 SHA256 d4820f1dbdbc795d4dac30361416b9494f6661f9daa393221b5eed9a0fdf6a32
 EBUILD mono-2.6.7.ebuild 7564 RMD160 e83f25ce2d6bb38ecba81d86e96958a5ea7567d7 SHA1 a12f62b9decdc1c6ed93b6c6fbe4659d16e8074f SHA256 e8cbfd812e094cdd45149873461e5618be424219b5a6b7251e6f1d4371a09fed
-EBUILD mono-2.8.2-r1.ebuild 8143 RMD160 f83cbb412d2d91b81a8f5f89a8539072cb7edde0 SHA1 53cf701fd8ba1c58446b0789be06012f9041f123 SHA256 1d153a7fb056f450902411eec2765790f2b08ef47ad632aa671559f1df2e1473
-MISC ChangeLog 45083 RMD160 d6eb98a704c830c55c5e35ef97e1efb96d0af564 SHA1 d7f49adc6831a199a9259851f3a4514efc31eff5 SHA256 6cdaca7a74b0c2b3782d94662ff521ed27ee8a7a45ae82f9d54a58fd146b2939
+EBUILD mono-2.8.2-r1.ebuild 8187 RMD160 39bceb17278f67ebeb4f7b20e4597436c54e1936 SHA1 f43b70a840f2c7addfb87fe405bbb924c722ac5e SHA256 85452792f1fdd0813153c53a85be0a60074fb850e2f9539d0bc51e0ed96e9333
+MISC ChangeLog 45297 RMD160 99db768e9d3272a12b17bf5cb38c3b2e24eddfed SHA1 e0c2ef9e984ee09412006ce4678aacc180d97284 SHA256 4d529a16ac40ac90c0ffadc1a83a3e5e2908aefe67fcc5fe2ea16221d453b447
 MISC metadata.xml 484 RMD160 862882f919ccc94b3fbdcdb6d6218b0969fec187 SHA1 42a61b9a60f03068d6601262f26e5a6fde463022 SHA256 2953e2de5e3ec6d0a69e9b8e145e0b27fb43dc7e3d59ef6a546c15fbc960631d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1qZUYACgkQCaWpQKGI+9SXlwCfQHHT0qyNnyc+u1VbokN9Sye5
-KEAAoIAML1FTBxg8PkHTbWsMZTio4O4e
-=Qm0r
+iEYEARECAAYFAk1yZk4ACgkQCaWpQKGI+9TpmQCdFlpnoOg0wVLAT44aDrJnMZuc
+eIkAn0CD5k1H0/OxEVTV2oXZDyrFwZg/
+=C4Vu
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mono/mono-2.10.1-r1.ebuild b/dev-lang/mono/mono-2.10.1-r1.ebuild
index 813c202fa099..5b004d95fef9 100644
--- a/dev-lang/mono/mono-2.10.1-r1.ebuild
+++ b/dev-lang/mono/mono-2.10.1-r1.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.1-r1.ebuild,v 1.1 2011/02/27 14:52:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.10.1-r1.ebuild,v 1.2 2011/03/05 16:35:18 pacho Exp $
 
 EAPI="2"
 
@@ -68,11 +68,12 @@ src_prepare() {
 		die "Sedding patch file failed"
 	go-mono_src_prepare
 
-	# we need to sed in the paxctl -m in the runtime/mono-wrapper.in so it don't
+	# 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 hardened ; then
 		ewarn "We are disabling MPROTECT on the mono binary."
-		sed '/exec/ i\paxctl -m "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
+		sed '/exec/ i\paxctl -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
 	fi
 }
 
diff --git a/dev-lang/mono/mono-2.8.2-r1.ebuild b/dev-lang/mono/mono-2.8.2-r1.ebuild
index aa8b62ff20ef..756879fd6088 100644
--- a/dev-lang/mono/mono-2.8.2-r1.ebuild
+++ b/dev-lang/mono/mono-2.8.2-r1.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.8.2-r1.ebuild,v 1.4 2011/01/29 17:02:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.8.2-r1.ebuild,v 1.5 2011/03/05 16:35:18 pacho Exp $
 
 EAPI="2"
 
@@ -68,11 +68,12 @@ src_prepare() {
 		die "Sedding patch file failed"
 	go-mono_src_prepare
 
-	# we need to sed in the paxctl -m in the runtime/mono-wrapper.in so it don't
+	# 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 hardened ; then
 		ewarn "We are disabling MPROTECT on the mono binary."
-		sed '/exec/ i\paxctl -m "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
+		sed '/exec/ i\paxctl -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in
 	fi
 }