From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AB7EE1384B4 for ; Mon, 23 Nov 2015 11:36:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BB1121C064; Mon, 23 Nov 2015 11:36:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C797121C064 for ; Mon, 23 Nov 2015 11:36:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ACBA833FE7D for ; Mon, 23 Nov 2015 11:36:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06C46A7F for ; Mon, 23 Nov 2015 11:36:45 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1448278480.1ed77efedf7b762cea57373c02b299862198ea2f.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mono/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mono/mono-2.10.9-r2.ebuild dev-lang/mono/mono-3.12.1.ebuild dev-lang/mono/mono-4.0.3.20.ebuild X-VCS-Directories: dev-lang/mono/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 1ed77efedf7b762cea57373c02b299862198ea2f X-VCS-Branch: master Date: Mon, 23 Nov 2015 11:36:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 790f2386-60e8-474c-a511-71b1a12d1544 X-Archives-Hash: 0410e0ac6d8b459639f6928f8dbedd10 commit: 1ed77efedf7b762cea57373c02b299862198ea2f Author: Jason Zaman gentoo org> AuthorDate: Mon Nov 23 11:34:12 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 23 11:34:40 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed77efe 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.20.1 dev-lang/mono/mono-2.10.9-r2.ebuild | 3 ++- dev-lang/mono/mono-3.12.1.ebuild | 5 +++-- dev-lang/mono/mono-4.0.3.20.ebuild | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-lang/mono/mono-2.10.9-r2.ebuild b/dev-lang/mono/mono-2.10.9-r2.ebuild index 8f93814..0938c29 100644 --- a/dev-lang/mono/mono-2.10.9-r2.ebuild +++ b/dev-lang/mono/mono-2.10.9-r2.ebuild @@ -64,9 +64,10 @@ src_prepare() { # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it doesn't # get killed in the build process when MPROTECT is enabled. #286280 # RANDMMAP kills the build process 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." - 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 } diff --git a/dev-lang/mono/mono-3.12.1.ebuild b/dev-lang/mono/mono-3.12.1.ebuild index 14544b9..9560282 100644 --- a/dev-lang/mono/mono-3.12.1.ebuild +++ b/dev-lang/mono/mono-3.12.1.ebuild @@ -46,13 +46,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.0.3.20.ebuild b/dev-lang/mono/mono-4.0.3.20.ebuild index 89fcad9..2675538 100644 --- a/dev-lang/mono/mono-4.0.3.20.ebuild +++ b/dev-lang/mono/mono-4.0.3.20.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