commit: 97c69c36ab7c791eb050317c48967b14d4bbcf99 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> AuthorDate: Tue Dec 22 09:09:01 2015 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Tue Dec 22 09:09:23 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c69c36
dev-lang/mono: do not call paxctl directly paxmark.sh should be used instead which follows XT/PT marks correctly Gentoo-Bug: https://bugs.gentoo.org/532244 Package-Manager: portage-2.2.24 dev-lang/mono/mono-4.2.1.124.ebuild | 5 +++-- dev-lang/mono/mono-4.2.2.10.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-lang/mono/mono-4.2.1.124.ebuild b/dev-lang/mono/mono-4.2.1.124.ebuild index 83b5c4b..ee9aa1d 100644 --- a/dev-lang/mono/mono-4.2.1.124.ebuild +++ b/dev-lang/mono/mono-4.2.1.124.ebuild @@ -51,13 +51,14 @@ pkg_setup() { src_prepare() { # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTEC is enable. #286280 + # get killed in the build proces when MPROTECT is enable. #286280 # RANDMMAP kill the build proces to #347365 + # use paxmark.sh to get PT/XT logic #532244 if use pax_kernel ; then ewarn "We are disabling MPROTECT on the mono binary." # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" + sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" fi # mono build system can fail otherwise diff --git a/dev-lang/mono/mono-4.2.2.10.ebuild b/dev-lang/mono/mono-4.2.2.10.ebuild index 83b5c4b..ee9aa1d 100644 --- a/dev-lang/mono/mono-4.2.2.10.ebuild +++ b/dev-lang/mono/mono-4.2.2.10.ebuild @@ -51,13 +51,14 @@ pkg_setup() { src_prepare() { # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't - # get killed in the build proces when MPROTEC is enable. #286280 + # get killed in the build proces when MPROTECT is enable. #286280 # RANDMMAP kill the build proces to #347365 + # use paxmark.sh to get PT/XT logic #532244 if use pax_kernel ; then ewarn "We are disabling MPROTECT on the mono binary." # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9 - sed '/exec "/ i\paxctl-ng -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" + sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in" fi # mono build system can fail otherwise
