disable High Performance Erlang (HiPE) because it breaks some systems, especially hardened. Also fix an glibc error. Thanks to Alexander Gabert <a.gabert@fh-trier.de>, Kenny Bentley <seriousmoose@yahoo.com>, Chris Carlin <ccarlin@physics.tamu.edu>, Chainsaw and nattfodd. Bugs #119753, #154338 and # 151612

Package-Manager: portage-2.1.1-r1

3 files changed, 29 insertions, 13 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index e3f555fe1435..32e09dcf3a86 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.36 2006/11/08 06:51:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.37 2006/11/08 22:25:25 opfer Exp $
+
+  08 Nov 2006; Christian Faulhammer <opfer@gentoo.org> erlang-11.2.1.ebuild:
+  disable High Performance Erlang (HiPE) because it breaks some systems,
+  especially hardened. Also fix an glibc error. Thanks to Alexander Gabert
+  <a.gabert@fh-trier.de>, Kenny Bentley <seriousmoose@yahoo.com>, Chris Carlin
+  <ccarlin@physics.tamu.edu>, Chainsaw and nattfodd. Bugs #119753, #154338 and
+  # 151612
 
   08 Nov 2006; Christian Faulhammer <opfer@gentoo.org> erlang-11.2.1.ebuild:
   fix compilation on hardened systems by filtering SSP, see bug #154338.
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index c849439737ab..ae6bb3f40ef4 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -62,10 +62,10 @@ EBUILD erlang-11.2.0.ebuild 3233 RMD160 0566cc374c43a0b87068a1dd22986f0beab69fc1
 MD5 649d6e78740af82dc6e4a8f6df6e4ad7 erlang-11.2.0.ebuild 3233
 RMD160 0566cc374c43a0b87068a1dd22986f0beab69fc1 erlang-11.2.0.ebuild 3233
 SHA256 bb41234d677001599b738f56b15b3ae56e15360b5cd019358ee688afd7eda79e erlang-11.2.0.ebuild 3233
-EBUILD erlang-11.2.1.ebuild 3363 RMD160 b6e417d7555a9bd6adeaf9e94ccf4ffb314abb34 SHA1 8486334fa747f59b39d508b96d40978d415a263f SHA256 567b6cbcb7f1a154683a532c562020ecbe74ababba93636780ba80d63952d789
-MD5 16ae321f52c2a3a9a6d3c03c9f73a439 erlang-11.2.1.ebuild 3363
-RMD160 b6e417d7555a9bd6adeaf9e94ccf4ffb314abb34 erlang-11.2.1.ebuild 3363
-SHA256 567b6cbcb7f1a154683a532c562020ecbe74ababba93636780ba80d63952d789 erlang-11.2.1.ebuild 3363
+EBUILD erlang-11.2.1.ebuild 3691 RMD160 b0f238c0763d6c3a07fcfdf55aaa3ff98ef6f0f8 SHA1 22faf67beceee39931f2c11905508b3c8f85d9b1 SHA256 2631c3cf0c1a5b94abf13019b1c5873d86d0ee7c59df3917186e146c51c93342
+MD5 403f0d894e8d797baf8014b8b32408ac erlang-11.2.1.ebuild 3691
+RMD160 b0f238c0763d6c3a07fcfdf55aaa3ff98ef6f0f8 erlang-11.2.1.ebuild 3691
+SHA256 2631c3cf0c1a5b94abf13019b1c5873d86d0ee7c59df3917186e146c51c93342 erlang-11.2.1.ebuild 3691
 EBUILD erlang-8b.ebuild 1156 RMD160 855ecd0626e2ff23974ea805c1142c7e2ef692aa SHA1 e8e54f8e2a1e94e08114d4a28a628c03b24197b6 SHA256 04b5d937a3a8d543c36d41c43353c3c75e707350e4a4446de2c8a3c99a712195
 MD5 683010b6283d166c1ffcf64bab32e6d2 erlang-8b.ebuild 1156
 RMD160 855ecd0626e2ff23974ea805c1142c7e2ef692aa erlang-8b.ebuild 1156
@@ -82,10 +82,10 @@ EBUILD erlang-9c.ebuild 1483 RMD160 2bbe9f2b29faf2a47774ccc57c09aa556e730ab0 SHA
 MD5 b782da2a4fc77372e754ee4f55ebd2c5 erlang-9c.ebuild 1483
 RMD160 2bbe9f2b29faf2a47774ccc57c09aa556e730ab0 erlang-9c.ebuild 1483
 SHA256 765a1170c983ef37cf1e2199fcc9a28c2d544f20bcb27f0eb29294c584975895 erlang-9c.ebuild 1483
-MISC ChangeLog 6889 RMD160 374aa9fb467c9f03d195a2cf1f794e6aa96d6c53 SHA1 13a35bd2da6ad8a187b2f1cd2495b21a6439e65d SHA256 7248ec6ca79c0e598afb0afba6923a33e13d583df393311a48390c474b9724be
-MD5 4387e53a5240f6d7c1096cca74af3536 ChangeLog 6889
-RMD160 374aa9fb467c9f03d195a2cf1f794e6aa96d6c53 ChangeLog 6889
-SHA256 7248ec6ca79c0e598afb0afba6923a33e13d583df393311a48390c474b9724be ChangeLog 6889
+MISC ChangeLog 7284 RMD160 50e2be0a7f86adcdc7bdacdf4dc32a4d9d3f8970 SHA1 906695ff660a7a510a4f6379ba37a911e8764943 SHA256 67ecc72a18826db610878edb67ad838b1a382a66c45b8eee3ba46bf4c732cfbd
+MD5 d15196855337b6430605f307888bd2f5 ChangeLog 7284
+RMD160 50e2be0a7f86adcdc7bdacdf4dc32a4d9d3f8970 ChangeLog 7284
+SHA256 67ecc72a18826db610878edb67ad838b1a382a66c45b8eee3ba46bf4c732cfbd ChangeLog 7284
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
@@ -123,7 +123,7 @@ SHA256 1e4ffb97ef49da9eecdb6affebda54e8e22b9c2707a099edeff382531b3b95c1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUX7INQqtfCuFneMRAkL5AJ9mV5f1Ck/ebcGeKtcuOMYPujouFQCeLvef
-mL2UttD1+5rBODTXfAY9XTE=
-=gLMu
+iD8DBQFFUlltNQqtfCuFneMRAil0AJwJWE0h7V2RGiVKZFISZhbulJ1tPACfYYOV
+SsM8DZvEVYYf1v/MsKZEq5w=
+=F4mw
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.1.ebuild b/dev-lang/erlang/erlang-11.2.1.ebuild
index 50f69e6ae702..e2f1febdcb22 100644
--- a/dev-lang/erlang/erlang-11.2.1.ebuild
+++ b/dev-lang/erlang/erlang-11.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.1.ebuild,v 1.3 2006/11/08 06:51:55 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.1.ebuild,v 1.4 2006/11/08 22:25:25 opfer Exp $
 
 inherit eutils multilib flag-o-matic elisp-common versionator
 
@@ -46,11 +46,20 @@ src_unpack() {
 	epatch "${FILESDIR}/10.2.6-manpage-emacs-gentoo.patch"
 	use odbc || sed -i 's: odbc : :' lib/Makefile
 #	epatch "${DISTDIR}"/otp_src_${MY_PV}_epoll.patch
+
+	# bug 151612
+	einfo "fixing hardcoded GLIBC_MINOR value dependency on signal
+	handling (#151612)"
+	sed -i "s/__GLIBC_MINOR__\ ==\ 3/__GLIBC_MINOR__\ \>=\ 3/g" \
+	    ${S}/erts/emulator/hipe/hipe_x86_signal.c
 }
 
 src_compile() {
 	use java || export JAVAC=false
+	## disable High Performance Erlang (HiPE) to avoid a lot of
+	## problems on hardened, bug #154338
 	econf \
+		--disable-hipe \
 		--enable-threads \
 		$(use_with ssl) \
 		|| die