Make haddock usable on hardened. Disabled enforced memory protection (bug #299709). Haddock uses ghc runtime linker to parse TemplateHaskell so requires mmap('rwx') too.

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

5 files changed, 28 insertions, 11 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 069caa5a0788..ce1f5f9660c8 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.75 2010/08/01 09:40:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.76 2010/09/19 17:01:23 slyfox Exp $
+
+  19 Sep 2010; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.4.1.ebuild,
+  haddock-2.4.2.ebuild, haddock-2.6.1.ebuild:
+  Make haddock usable on hardened. Disabled enforced memory protection (bug
+  #299709).
 
   01 Aug 2010; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.6.1.ebuild:
   Marked ~ppc. Thanks to Michael Mounteney (monty) for testing.
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index ea3e764d8b1a..435ef1b081a8 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -8,8 +8,8 @@ DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c
 DIST haddock-2.6.1.tar.gz 128158 RMD160 32be5206f0caab3e6aa7582b9ad23a22581082ab SHA1 f088795826a155f0a207219a45ad643dcaeccf65 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a
 EBUILD haddock-0.8.ebuild 1681 RMD160 7ef1b6e514db604b05c32d090225a037a96e771a SHA1 9bccb980d2685622a74a21ab1b5aad739fe178e6 SHA256 72141630ea3149cc35f4706c844a1b500ca1cdb7e1d5bf824cd95c16e881be56
 EBUILD haddock-0.9.ebuild 1149 RMD160 36f127a66683fdb3a5ee2e01e35c6815ae326927 SHA1 9ff2f36d2ad904ea094a8d8de53d04d6b498a052 SHA256 3a0ac49c89dd6bad1a8c19ed68456a5757db719f2f5b40ecbb2b0c277b2e08e7
-EBUILD haddock-2.4.1.ebuild 2641 RMD160 1d9622f17e41703c8c0ccf3a4a31c9b41b9b616b SHA1 0cd57808e9e249d41a059711911fbcb1bbe97f5d SHA256 df0b785bf888d3b3ffd587999fda8d74c9c70cb1b9cc010b620d530b76be5e13
-EBUILD haddock-2.4.2.ebuild 2275 RMD160 bf776b82b22cc8a05d05c7d42e488774ed2a03e3 SHA1 26c17c6d5ed0a4da4d802093dfac76dba64e7f87 SHA256 9a8257f005cd0c5636043330f0f99d5722de6f724fe4844864179b58dc7ff39c
-EBUILD haddock-2.6.1.ebuild 2320 RMD160 ef041ad44e4619ebf8d9841b3c038924a5b6e645 SHA1 fa825413855b4c2019eb3c7e4587539732933133 SHA256 beff1ad5060ead22a8be2e1deb2cdb3ffbf1161319e570973f19a23c67af7fe7
-MISC ChangeLog 10422 RMD160 442e3906e5c27b63e66c8e4c5ec239c28aba7150 SHA1 4412da65574b4325aa798e1ebe132b891c2100b6 SHA256 2a9064b210da918eda692abce4575e9e13fad2316a7320e775b8fa6ad3d63e0e
+EBUILD haddock-2.4.1.ebuild 2793 RMD160 fb60f50c801e5c0340432a5737da2f7727c6fca0 SHA1 89a0aa428e91b916d3f3d7e63beccec7e65a7577 SHA256 803e7019215e6b32f5a1d949f4406db7b0ec94b941d46b8b580a2b724aa0df26
+EBUILD haddock-2.4.2.ebuild 2425 RMD160 4bc2d79fe5a71cba14c06cf1c5a9d9e467db1379 SHA1 a65439584d366164200a16ab485841b4d12d7579 SHA256 d77ea400a62ccead9e4060c70b2c63d51ed04598d3c4c36ce861c1addc0b05d2
+EBUILD haddock-2.6.1.ebuild 2469 RMD160 8b34baa74e2eac2f693db74cc46f8732ed89dec2 SHA1 26e1dafe95a5eb2afbab2f20f87e0c76387084e4 SHA256 0a54c512162429ecd4635da9d88f6f39ef20d55bf568b7049fe40545d3e28e76
+MISC ChangeLog 10633 RMD160 dc190dceeded176a530ca6538fc34970f8e355fd SHA1 31e8cd933509909e014812bd3baa03cb057a2b1d SHA256 6682fc8f4ec8353568cae9d35aabbb1cd3b05ccc86f26d6eb2b889fcaa803bd3
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild
index 7640fe8cdb99..8ed1842a89b6 100644
--- a/dev-haskell/haddock/haddock-2.4.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.8 2010/07/01 19:24:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.9 2010/09/19 17:01:23 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools
+inherit haskell-cabal autotools pax-utils
 
 GHCPATHS_PN="ghc-paths"
 GHCPATHS_PV="0.1.0.5"
@@ -78,6 +78,10 @@ src_compile () {
 
 src_install () {
 	cabal_src_install
+	# haddock uses GHC-api to process TH source.
+	# TH requires GHCi which needs mmap('rwx') (bug #299709)
+	pax-mark -m "${D}/usr/bin/${PN}"
+
 	if use doc; then
 		dohtml -r "${S}/doc/haddock/"*
 	fi
diff --git a/dev-haskell/haddock/haddock-2.4.2.ebuild b/dev-haskell/haddock/haddock-2.4.2.ebuild
index 893c75ec6df9..f7fdb27c101c 100644
--- a/dev-haskell/haddock/haddock-2.4.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.9 2010/05/31 18:19:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.10 2010/09/19 17:01:23 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools
+inherit haskell-cabal autotools pax-utils
 
 GHCPATHS_PN="ghc-paths"
 GHCPATHS_PV="0.1.0.5"
@@ -69,6 +69,10 @@ src_compile () {
 
 src_install () {
 	cabal_src_install
+	# haddock uses GHC-api to process TH source.
+	# TH requires GHCi which needs mmap('rwx') (bug #299709)
+	pax-mark -m "${D}/usr/bin/${PN}"
+
 	if use doc; then
 		dohtml -r "${S}/doc/haddock/"*
 	fi
diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild
index 13c9f6e0c47c..4de9424fba35 100644
--- a/dev-haskell/haddock/haddock-2.6.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.4 2010/08/01 09:40:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.5 2010/09/19 17:01:23 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools
+inherit haskell-cabal autotools pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
 HOMEPAGE="http://www.haskell.org/haddock/"
@@ -70,6 +70,10 @@ src_compile () {
 
 src_install () {
 	cabal_src_install
+	# haddock uses GHC-api to process TH source.
+	# TH requires GHCi which needs mmap('rwx') (bug #299709)
+	pax-mark -m "${D}/usr/bin/${PN}"
+
 	if use doc; then
 		dohtml -r "${S}/doc/haddock/"*
 	fi