Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6b7cb26b683fdbebd5b905139b060fdda35a62af)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6b7cb26b683fdbebd5b905139b060fdda35a62af)
  • Date: Tue, 20 Jul 2010 16:45:11 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

http/firefox/1000_fix_alignment.patch | 33
---------------------------------
http/firefox/DETAILS | 8 ++++----
http/firefox/HISTORY | 4 ++++
http/firefox/PRE_BUILD | 1 -
4 files changed, 8 insertions(+), 38 deletions(-)

New commits:
commit 6b7cb26b683fdbebd5b905139b060fdda35a62af
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

firefox 3.6.7, SECURITY_PATCH=33

diff --git a/http/firefox/1000_fix_alignment.patch
b/http/firefox/1000_fix_alignment.patch
deleted file mode 100644
index 2ef47c3..0000000
--- a/http/firefox/1000_fix_alignment.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/DETAILS b/http/firefox/DETAILS
index d18d0eb..c3702be 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.6.6
+ VERSION=3.6.7
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
#
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=3.6.6
+ VERSION=3.6.7
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -17,9 +17,9 @@ else

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/unix/WWW/browsers/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=32
+ SECURITY_PATCH=33
fi
- PATCHLEVEL=1
+ PATCHLEVEL=0
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/firefox/
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 609e110..9539e02 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2010-07-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.7, SECURITY_PATCH=33
+ * PRE_BUILD, 1000_fix_alignment.patch: removed patch
+
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
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index e069236..e9b2cfb 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -4,7 +4,6 @@ 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 &&




  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (6b7cb26b683fdbebd5b905139b060fdda35a62af), Ladislav Hagara, 07/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page