Add patch to fix broken jemalloc, bug #405993.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 67 insertions, 4 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index f3a41412b411..cf1c857977e4 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.78 2012/02/27 11:28:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.79 2012/02/29 19:13:22 chithanh Exp $
+
+*gnash-0.8.10-r1 (29 Feb 2012)
+
+  29 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -gnash-0.8.10.ebuild, +gnash-0.8.10-r1.ebuild,
+  +files/gnash-0.8.10-jemalloc-aslr-fix.patch:
+  Add patch to fix broken jemalloc, bug #405993.
 
   27 Feb 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnash-0.8.10.ebuild, +files/gnash-0.8.10-npapi-sdk.patch:
diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index 778ca7684ba7..ad7c02aeb260 100644
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -1,5 +1,6 @@
 AUX gnash-0.8.10-amf-include.patch 1245 RMD160 78108fb568c5ce5055f45fd388944d1e73206295 SHA1 2f82807f003b2f03cbd29e0ed27d14ff1442ebd9 SHA256 81f0cdf8246689614b1deaf36cf9c3e09d3501a55691ef95130d08ab1f6bc2e6
 AUX gnash-0.8.10-gettext-macro.patch 6296 RMD160 3898b588c07ae9786f429cb3d37c717d4783eeae SHA1 7f2fbd108eae2f0af15c5120c15afe31969b6c73 SHA256 ddacc3823ec0b87ceee618f48fbab87a083bf8047b4080bb8872b7bd19b07125
+AUX gnash-0.8.10-jemalloc-aslr-fix.patch 1763 RMD160 4587d9c1763ef69860a6ad44078e0613c819b9dd SHA1 24f49d6637fbe021d913e5c4dd143b87086e9de3 SHA256 00a8a9996ce6648639041309a98fe467419afd19271a557304eb5fffe981fb23
 AUX gnash-0.8.10-npapi-sdk.patch 964 RMD160 c30b2ba443f74985376de40aab287eb9a9599e9b SHA1 0c3e98702db6418a9c11b70b1d11f408645d9240 SHA256 16ad2ce72fc235ccce4de2962cdede30b46f057cce5c530bae2fbd1bbdd7c57c
 AUX gnash-0.8.3-boost-dynamic-link.patch 1474 RMD160 0ce418d9e7a0f4d5b3bc724c65dedc3c675b69ef SHA1 df6ae427a0efda13da822ca65700aebcb25ef504 SHA256 d3ada2ca33083b0b233051f66041eb57c402783b2cc177b126e4dccab2e32b76
 AUX gnash-0.8.5-klash.patch 4219 RMD160 f7d49ca32cf18d3d160ce8f0653fd12e5a278511 SHA1 fc44e119975ecc49d2d64450e0eeb92f6a84f893 SHA256 e1ad6b241bc28892ff9758d55851439b2b61b496dc2e73d96d9a13fdd44a4a08
@@ -27,9 +28,9 @@ AUX gnash-0.8.9-no-deprecated-avformat-metadata.patch 1299 RMD160 a88e744b8886ad
 DIST gnash-0.8.10.tar.gz 6099894 RMD160 72debb3e64853450fe74b7f1d6e9b40b9ae70964 SHA1 4f8ace5af1a327718f353d5294b589f3251f41ae SHA256 61fbeec6826c89e6f3fc520336a152b17901e6d0e9db207d7c4db27eeb5ceb2b
 DIST gnash-0.8.8.tar.bz2 3850383 RMD160 621afbd14180ce770f60a6e158f9fda0b4d5ec02 SHA1 d349e0321e7fe9abcd265d63ce282cd2a7ce59d3 SHA256 dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
 DIST gnash-0.8.9.tar.bz2 3777140 RMD160 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1 SHA1 585c320c98b3304fcbba230f2c4b1fdf2a52aee0 SHA256 f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd
-EBUILD gnash-0.8.10.ebuild 7797 RMD160 46261b8c9786542678d95e6287fd37b5232255fa SHA1 ed51fa9cbe3ff8ecc310ff4430be795f6eded58a SHA256 2087d65fa3b4af32afc64bda3a22debcadd19e7d9af45b478a8327398b9d98cc
+EBUILD gnash-0.8.10-r1.ebuild 7896 RMD160 e87f0c15a18dd7a2e6199e31c213f3959ef6771e SHA1 402bcdbe40b14408bb3ef03f1061151c130a1654 SHA256 d74e4b6b394a1ac871ceb279d0e1bcb345822ca37a6e4b9453a8e51a63b08c6c
 EBUILD gnash-0.8.8.ebuild 9006 RMD160 cd9a10d9b7b121b638bac179c97de26771e66542 SHA1 f6b0ae7862286aabbbd34e99a318021136ae33bc SHA256 594842337ae216fa7a89112298f00e2a1c74609af4a4b48f3e39b4b2dc82b380
 EBUILD gnash-0.8.9-r2.ebuild 9118 RMD160 1d2c163338940197f734f7dfb8adb935ead89a2c SHA1 b4159f25a03280bc60c4562cfbef30973be1bd6c SHA256 52f4250e39beeada4c56d45f8fcd3e1de143287c91249c9c82de5a2c2cb2d720
 EBUILD gnash-0.8.9.ebuild 8830 RMD160 b3e6ab1a6a6ce84c502af1647e4e58b65e110809 SHA1 f6fd90d100132b8658428cf3cafc8cbe6bec1c8d SHA256 8a3c33a3a82619f22863e32fb83e264193cfe94132491535fb919a9ed863478a
-MISC ChangeLog 26928 RMD160 2b44592d80158e37d97286cac4320ba24933bbff SHA1 9c909b3a0fd33975ccd6b2717120a830f93af6b5 SHA256 04356cf9d71d5c3457058a2e103fe3feb64eeea44468ecb8f09e657bb3ac20e0
+MISC ChangeLog 27175 RMD160 4af238f0b770630e8813bac2afb755d1079a8b18 SHA1 4e341ae2cf14194a19d316d8b062d72279a776fc SHA256 869402ead309610f082f8646e888d96f1d9bddf1f16f1d1fabd3764020b190b4
 MISC metadata.xml 1027 RMD160 aa9f8e70f4b29c20af06375e49f072cd47b099b0 SHA1 26fe0b3c8699f8de6038163488e71b82449ee3bd SHA256 071f3c3f214ac2346bbec08cf2a129be0b1edea5e1e0d7401b884ece564de5ce
diff --git a/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch b/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch
new file mode 100644
index 000000000000..413744c4b3c4
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10-jemalloc-aslr-fix.patch
@@ -0,0 +1,52 @@
+diff -Naur gnash-0.8.10.alt/libbase/jemalloc.c gnash-0.8.10/libbase/jemalloc.c
+--- gnash-0.8.10.alt/libbase/jemalloc.c	2012-02-07 09:39:41.000000000 +0100
++++ gnash-0.8.10/libbase/jemalloc.c	2012-02-24 18:36:47.000000000 +0100
+@@ -429,7 +429,7 @@
+ static const bool __isthreaded = true;
+ #endif
+ 
+-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
++#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN) || defined(MOZ_MEMORY_LINUX)
+ #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
+ #endif
+ 
+@@ -2238,6 +2238,7 @@
+ 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
+ 	 * of existing mappings, and we only want to create new mappings.
+ 	 */
++#ifdef MOZ_MEMORY_SOLARIS
+ #ifdef MALLOC_PAGEFILE
+ 	if (pfd != -1) {
+ 		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
+@@ -2252,6 +2253,31 @@
+ 
+ 	if (ret == MAP_FAILED)
+ 		ret = NULL;
++#else /* !MOZ_MEMORY_SOLARIS */
++#ifdef MALLOC_PAGEFILE
++	if (pfd != -1) {
++		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
++		    MAP_NOSYNC, pfd, 0);
++	} else
++#endif
++	       {
++		ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
++		    MAP_NOSYNC | MAP_ANON, -1, 0);
++	}
++	assert(ret != NULL);
++
++	if (ret == MAP_FAILED)
++		return NULL;
++	
++	uintptr_t aligned_ret;
++	size_t extra_size;
++	aligned_ret = (uintptr_t)ret + alignment - 1;
++	aligned_ret &= ~(alignment - 1);
++	extra_size = aligned_ret - (uintptr_t)ret;
++	munmap(ret, extra_size);
++	munmap(ret + extra_size + size, alignment - extra_size);
++	ret = (void*)aligned_ret;
++#endif /* ifdef MOZ_MEMORY_SOLARIS*/
+ 	return (ret);
+ }
+ #endif
diff --git a/www-plugins/gnash/gnash-0.8.10.ebuild b/www-plugins/gnash/gnash-0.8.10-r1.ebuild
index ea1c0c7a4c24..428d6c438f3e 100644
--- a/www-plugins/gnash/gnash-0.8.10.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10.ebuild,v 1.5 2012/02/27 11:28:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r1.ebuild,v 1.1 2012/02/29 19:13:22 chithanh Exp $
 
 EAPI=4
 CMAKE_REQUIRED="never"
@@ -158,6 +158,9 @@ src_prepare() {
 	# Allow building against npapi-sdk, bug #383071
 	epatch "${FILESDIR}"/${PN}-0.8.10-npapi-sdk.patch
 
+	# Fix broken jemalloc, bug #405993
+	epatch "${FILESDIR}"/${PN}-0.8.10-jemalloc-aslr-fix.patch
+
 	eautoreconf
 }
 src_configure() {