mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-07 14:27:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/gnash: rebuild against mesa-8.0 and add aslr fix for jemalloc

Browse Source
This commit is contained in:
Natanael Copa 2012-03-01 08:18:59 +00:00
parent b9d2fc8b4f
commit d35474dc7f
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/gnash/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=gnash pkgname=gnash
pkgver=0.8.10 pkgver=0.8.10
pkgrel=0 pkgrel=1
pkgdesc="GNU flash player implementation" pkgdesc="GNU flash player implementation"
url="http://www.gnashdev.org/" url="http://www.gnashdev.org/"
arch="all" arch="all"
@ -17,7 +17,8 @@ install=""
subpackages="$pkgname-doc $pkgname-dev $pkgname-mozilla $pkgname-sdl subpackages="$pkgname-doc $pkgname-dev $pkgname-mozilla $pkgname-sdl
$pkgname-fb $pkgname-lang" $pkgname-fb $pkgname-lang"
source="http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.bz2 source="http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.bz2
gnash-ffmpeg.patch" gnash-ffmpeg.patch
aslr-fix.patch"
_builddir="$srcdir"/gnash-$pkgver _builddir="$srcdir"/gnash-$pkgver
prepare() { prepare() {
@ -69,4 +70,5 @@ mozilla() {
} }
md5sums="63e9f79c41d93d48c5a2fa94856548c4 gnash-0.8.10.tar.bz2 md5sums="63e9f79c41d93d48c5a2fa94856548c4 gnash-0.8.10.tar.bz2
b324b3fee1e017d8fcc4d991146266f8 gnash-ffmpeg.patch" b324b3fee1e017d8fcc4d991146266f8 gnash-ffmpeg.patch
64cea4c0b4963b7fd5308beb1b20fed6 aslr-fix.patch"

52
testing/gnash/aslr-fix.patch Normal file
View File

@ -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.
*/
+#ifndef MOZ_MEMORY_LINUX
#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_LINUX */
+#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 /* ifndef MOZ_MEMORY_LINUX*/
return (ret);
}
#endif