Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 http/firefox/1000_fix_alignment.patch   |   33 
++++++++++++++++++++++++++++++++
 http/firefox/HISTORY                    |    4 +++
 http/firefox/PRE_BUILD                  |    3 +-
 http/xulrunner/1000_fix_alignment.patch |   33 
++++++++++++++++++++++++++++++++
 http/xulrunner/HISTORY                  |    4 +++
 http/xulrunner/PRE_BUILD                |    1 
 6 files changed, 77 insertions(+), 1 deletion(-)

New commits:
commit e4126f5af098770569ac43c058e3caa516424d95
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/xulrunner: added patch to prevent crash

commit 09f639d803dd0d5a01250d41a1a16012db13ca55
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/firefox: added patch to prevent crash

diff --git a/http/firefox/1000_fix_alignment.patch 
b/http/firefox/1000_fix_alignment.patch
new file mode 100644
index 0000000..2ef47c3
--- /dev/null
+++ b/http/firefox/1000_fix_alignment.patch
@@ -0,0 +1,33 @@
+From: David Mandelin <dmandelin AT mozilla.com>
+
+diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
+--- a/memory/jemalloc/jemalloc.c
++++ b/memory/jemalloc/jemalloc.c
+@@ -5792,24 +5792,24 @@ __attribute__((noinline))
+ #else
+ inline
+ #endif
+ void *
+ memalign(size_t alignment, size_t size)
+ {
+       void *ret;
+ 
+-      assert(((alignment - 1) & alignment) == 0 && alignment >=
+-          sizeof(void *));
++      assert(((alignment - 1) & alignment) == 0);
+ 
+       if (malloc_init()) {
+               ret = NULL;
+               goto RETURN;
+       }
+ 
++      alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
+       ret = ipalloc(alignment, size);
+ 
+ RETURN:
+ #ifdef MALLOC_XMALLOC
+       if (opt_xmalloc && ret == NULL) {
+               _malloc_message(_getprogname(),
+               ": (malloc) Error in memalign(): out of memory\n", "", "");
+               abort();
+
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b38e5eb..270ca46 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2010-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, 1000_fix_alignment.patch: added patch to fix
+         crash on start
+
 2010-06-27 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.6.6
 
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 1940e19..e069236 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -4,9 +4,10 @@ unpack_file  ''                   &&
 cd  mozilla*                       &&
 
 patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/1000_fix_alignment.patch &&
 
 cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&
 
 if [[ $FIREFOX_OFFICIAL == y ]]; then
-  sed -i '24iac_add_options --enable-official-branding' .mozconfig
+  sed -i '24iac_add_options --enable-official-branding' .mozconfig || return 
1
 fi
diff --git a/http/xulrunner/1000_fix_alignment.patch 
b/http/xulrunner/1000_fix_alignment.patch
new file mode 100644
index 0000000..2ef47c3
--- /dev/null
+++ b/http/xulrunner/1000_fix_alignment.patch
@@ -0,0 +1,33 @@
+From: David Mandelin <dmandelin AT mozilla.com>
+
+diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
+--- a/memory/jemalloc/jemalloc.c
++++ b/memory/jemalloc/jemalloc.c
+@@ -5792,24 +5792,24 @@ __attribute__((noinline))
+ #else
+ inline
+ #endif
+ void *
+ memalign(size_t alignment, size_t size)
+ {
+       void *ret;
+ 
+-      assert(((alignment - 1) & alignment) == 0 && alignment >=
+-          sizeof(void *));
++      assert(((alignment - 1) & alignment) == 0);
+ 
+       if (malloc_init()) {
+               ret = NULL;
+               goto RETURN;
+       }
+ 
++      alignment = alignment < sizeof(void*) ? sizeof(void*) : alignment;
+       ret = ipalloc(alignment, size);
+ 
+ RETURN:
+ #ifdef MALLOC_XMALLOC
+       if (opt_xmalloc && ret == NULL) {
+               _malloc_message(_getprogname(),
+               ": (malloc) Error in memalign(): out of memory\n", "", "");
+               abort();
+
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index a7820e6..6390251 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2010-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, 1000_fix_alignment.patch: added patch to fix
+         crash on start
+
 2010-06-27 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.9.2.6, FFVERSION=3.6.6
 
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 933f54b..40963c3 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -7,6 +7,7 @@ sed -i 's/^#elif$/#else/' toolkit/xre/nsAppRunner.cpp  &&
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
 
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/1000_fix_alignment.patch &&
 
 # Needed to make things using XUL find NSPR.
 echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&