tags 598956 + pending thanks Dear maintainer,
I've prepared an NMU for webkit (versioned as 1.2.5-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Pink Floyd: The trial
diff -Nru webkit-1.2.5/debian/changelog webkit-1.2.5/debian/changelog --- webkit-1.2.5/debian/changelog 2010-10-21 00:31:57.000000000 +0200 +++ webkit-1.2.5/debian/changelog 2010-11-10 23:35:01.000000000 +0100 @@ -1,3 +1,12 @@ +webkit (1.2.5-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Add patch 05-fix-jit-on-kfreebsd-i386.patch by Petr Salinger and + Michael Dorrington: Fixes Javascript JIT crashing on kfreebsd-i386 + (closes: #598956). + + -- gregor herrmann <gre...@debian.org> Wed, 10 Nov 2010 23:28:55 +0100 + webkit (1.2.5-2) unstable; urgency=high * Unapply 02-pool-fixup-and-sparc-support.patch and diff -Nru webkit-1.2.5/debian/patches/05-fix-jit-on-kfreebsd-i386.patch webkit-1.2.5/debian/patches/05-fix-jit-on-kfreebsd-i386.patch --- webkit-1.2.5/debian/patches/05-fix-jit-on-kfreebsd-i386.patch 1970-01-01 01:00:00.000000000 +0100 +++ webkit-1.2.5/debian/patches/05-fix-jit-on-kfreebsd-i386.patch 2010-11-10 23:24:28.000000000 +0100 @@ -0,0 +1,51 @@ +Author: Petr Salinger +Tester: Michael Dorrington +Description: Fixes Javascript JIT crashing on kfreebsd-i386. + Fixes Javascript JIT issue that causes webkit to crash on kfreebsd-i386, + see <http://bugs.debian.org/598956>. + + For reasoning of patch see: + "Common practices and problems found when porting to GNU/k*BSD" + <http://glibc-bsd.alioth.debian.org/porting/PORTING> + + On kfreebsd-amd64, this issue does not occur. + + +--- webkit-1.2.4/JavaScriptCore/jit/JITOpcodes.cpp 2010-09-03 20:18:02.000000000 +0100 ++++ webkit-1.2.4-fix_jit_kfreebsd_i386/JavaScriptCore/jit/JITOpcodes.cpp 2010-10-07 06:09:55.000000000 +0100 +@@ -165,7 +165,7 @@ + * stack pointer by the right amount after the call. + */ + +-#if COMPILER(MSVC) || OS(LINUX) ++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__) + #if COMPILER(MSVC) + #pragma pack(push) + #pragma pack(4) +@@ -228,7 +228,7 @@ + storePtr(regT2, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue) + OBJECT_OFFSETOF(JSValue, u.asBits.payload))); + storePtr(regT3, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue) + OBJECT_OFFSETOF(JSValue, u.asBits.tag))); + +-#if COMPILER(MSVC) || OS(LINUX) ++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__) + // ArgList is passed by reference so is stackPointerRegister + 4 * sizeof(Register) + addPtr(Imm32(OBJECT_OFFSETOF(NativeCallFrameStructure, result)), stackPointerRegister, X86Registers::ecx); + +@@ -1689,7 +1689,7 @@ + * not the rest of the callframe so we need a nice way to ensure we increment the + * stack pointer by the right amount after the call. + */ +-#if COMPILER(MSVC) || OS(LINUX) ++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__) + struct NativeCallFrameStructure { + // CallFrame* callFrame; // passed in EDX + JSObject* callee; +@@ -1742,7 +1742,7 @@ + loadPtr(Address(regT1, -(int)sizeof(Register)), regT1); + storePtr(regT1, Address(stackPointerRegister, OBJECT_OFFSETOF(NativeCallFrameStructure, thisValue))); + +-#if COMPILER(MSVC) || OS(LINUX) ++#if COMPILER(MSVC) || OS(LINUX) || defined(__GLIBC__) + // ArgList is passed by reference so is stackPointerRegister + 4 * sizeof(Register) + addPtr(Imm32(OBJECT_OFFSETOF(NativeCallFrameStructure, result)), stackPointerRegister, X86Registers::ecx); + diff -Nru webkit-1.2.5/debian/patches/series webkit-1.2.5/debian/patches/series --- webkit-1.2.5/debian/patches/series 2010-10-21 00:31:57.000000000 +0200 +++ webkit-1.2.5/debian/patches/series 2010-11-10 23:34:11.000000000 +0100 @@ -1,5 +1,6 @@ 02-pool-fixup-and-sparc-support.patch 04-spoof-user-agent-to-google.patch +05-fix-jit-on-kfreebsd-i386.patch cve-2010-2646.patch cve-2010-2651.patch cve-2010-2900.patch
signature.asc
Description: Digital signature
