--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package webkit2gtk
This package contains fixes for two bugs:
http://bugs.debian.org/768341
The Flash plugin (and possibly others) can cause a stack buffer
overflow. Although the GCC stack protector can detect it, it
renders the plugin completely unusable. The fix is trivial and has
already been applied upstream.
http://bugs.debian.org/767598
This fixes a FTBFS on mips64el. It simply adds support for this
platform by adding the __mips64 pre-processor macro to a list of
supported machines. It has no effect on other architectures.
unblock webkit2gtk/2.6.2+dfsg1-2
-- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru webkit2gtk-2.6.2+dfsg1/debian/changelog webkit2gtk-2.6.2+dfsg1/debian/changelog
--- webkit2gtk-2.6.2+dfsg1/debian/changelog 2014-10-23 09:18:28.000000000 +0000
+++ webkit2gtk-2.6.2+dfsg1/debian/changelog 2014-11-10 09:45:07.000000000 +0000
@@ -1,3 +1,12 @@
+webkit2gtk (2.6.2+dfsg1-2) unstable; urgency=medium
+
+ * debian/patches/fix-mips64-build.patch:
+ + Fix mips64el build (Closes: #767598).
+ * debian/patches/flash-crash.patch:
+ + Fix crash in the Flash player (Closes: #768341).
+
+ -- Alberto Garcia <berto@igalia.com> Mon, 10 Nov 2014 11:44:56 +0200
+
webkit2gtk (2.6.2+dfsg1-1) unstable; urgency=medium
* New upstream release.
diff -Nru webkit2gtk-2.6.2+dfsg1/debian/patches/fix-mips64-build.patch webkit2gtk-2.6.2+dfsg1/debian/patches/fix-mips64-build.patch
--- webkit2gtk-2.6.2+dfsg1/debian/patches/fix-mips64-build.patch 1970-01-01 00:00:00.000000000 +0000
+++ webkit2gtk-2.6.2+dfsg1/debian/patches/fix-mips64-build.patch 2014-11-10 09:45:07.000000000 +0000
@@ -0,0 +1,55 @@
+From: YunQiang Su <wzssyqa@gmail.com>
+Subject: Fix build in MIPS64EL
+Bug-Debian: http://bugs.debian.org/767598
+Bug: https://bugs.webkit.org/show_bug.cgi?id=124370
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -80,16 +80,20 @@
+ #endif
+ #endif
+
+-/* CPU(MIPS) - MIPS 32-bit */
+-/* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
+-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
+- && defined(_ABIO32)
++/* CPU(MIPS) - MIPS 32-bit and 64-bit */
++#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
++ || defined(__mips64))
++#if defined(__mips64)
++#define WTF_CPU_MIPS64 1
++#define WTF_MIPS_ARCH __mips64
++#else
+ #define WTF_CPU_MIPS 1
++#define WTF_MIPS_ARCH __mips
++#endif
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ #define WTF_MIPS_PIC (defined __PIC__)
+-#define WTF_MIPS_ARCH __mips
+ #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
+ #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
+ #define WTF_MIPS_ARCH_REV __mips_isa_rev
+@@ -662,6 +666,7 @@
+ || CPU(ARM64) \
+ || CPU(SPARC64) \
+ || CPU(S390X) \
++ || CPU(MIPS64) \
+ || CPU(PPC64) \
+ || CPU(PPC64LE)
+ #define WTF_USE_JSVALUE64 1
+Index: webkitgtk/Source/WTF/wtf/dtoa/utils.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/dtoa/utils.h
++++ webkitgtk/Source/WTF/wtf/dtoa/utils.h
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff -Nru webkit2gtk-2.6.2+dfsg1/debian/patches/flash-crash.patch webkit2gtk-2.6.2+dfsg1/debian/patches/flash-crash.patch
--- webkit2gtk-2.6.2+dfsg1/debian/patches/flash-crash.patch 1970-01-01 00:00:00.000000000 +0000
+++ webkit2gtk-2.6.2+dfsg1/debian/patches/flash-crash.patch 2014-11-10 09:45:07.000000000 +0000
@@ -0,0 +1,19 @@
+From: Alberto Garcia <berto@igalia.com>
+Subject: Fix crash in the Flash plugin
+Bug: https://bugs.webkit.org/show_bug.cgi?id=137849
+Bug-Debian: http://bugs.debian.org/768341
+Index: webkitgtk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+===================================================================
+--- webkitgtk.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
++++ webkitgtk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+@@ -202,7 +202,9 @@ void NetscapePlugin::platformPreInitiali
+ bool NetscapePlugin::platformPostInitialize()
+ {
+ uint64_t windowID = 0;
+- bool needsXEmbed = false;
++ // NPPVpluginNeedsXEmbed is a boolean value, but at least the
++ // Flash player plugin is using an 'int' instead.
++ int needsXEmbed = 0;
+ if (m_isWindowed) {
+ NPP_GetValue(NPPVpluginNeedsXEmbed, &needsXEmbed);
+ if (needsXEmbed) {
diff -Nru webkit2gtk-2.6.2+dfsg1/debian/patches/series webkit2gtk-2.6.2+dfsg1/debian/patches/series
--- webkit2gtk-2.6.2+dfsg1/debian/patches/series 2014-10-23 09:18:28.000000000 +0000
+++ webkit2gtk-2.6.2+dfsg1/debian/patches/series 2014-11-10 09:45:07.000000000 +0000
@@ -4,3 +4,5 @@
local-label-string-hurd.patch
atomic_build_fix.patch
css-image-set.patch
+fix-mips64-build.patch
+flash-crash.patch
--- End Message ---