Merge webkit 1.2.5-2.1 (main) from Debian unstable (main)

[Artur Rona]

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 <email address hidden> 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
     04-spoof-user-agent-to-google.patch in git. This prevents the
     creation of an unwanted debian-changes patch.

 -- Michael Gilbert <email address hidden> Mon, 18 Oct 2010 22:00:36 -0400
webkit (1.2.5-1) unstable; urgency=high

   [ Gustavo Noronha Silva ]

   * New upstream release
   - fixes the following CVES:

       CVE-2010-1780 CVE-2010-3113 CVE-2010-1814 CVE-2010-1812
       CVE-2010-1815 CVE-2010-3115 CVE-2010-1807 CVE-2010-3114
       CVE-2010-3116 CVE-2010-3257 CVE-2010-3259

   [ Michael Gilbert ]
   * fix cve-2010-2646: security origin bypass using IFRAME elements.
   * fix cve-2010-2651: vulnerability in css style rendering.
   * fix cve-2010-2900: vulnerability with large canvas elements when using the
     SKIA library.
   * fix cve-2010-2901: vulnerability in the rendering implementation.
   * fix cve-2010-3120: vulnerability in geolocation feature.

 -- Gustavo Noronha Silva <email address hidden> Sat, 16 Oct 2010 17:50:56 -0300

[Artur Rona (ari-tczew)]

../WebKit/gtk/webkit/webkitwebdatasource.cpp: In function 'gboolean webkit_web_data_source_is_loading(WebKitWebDataSource*)':
../WebKit/gtk/webkit/webkitwebdatasource.cpp:320:584: warning: converting to non-pointer type 'int' from NULL
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebframe.lo
../WebKit/gtk/webkit/webkitwebframe.cpp: In function 'int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame*, const gchar*, float, float)':
../WebKit/gtk/webkit/webkitwebframe.cpp:858:556: warning: converting to non-pointer type 'int' from NULL
../WebKit/gtk/webkit/webkitwebframe.cpp: In function 'int webkit_web_frame_number_of_pages(WebKitWebFrame*, float, float)':
../WebKit/gtk/webkit/webkitwebframe.cpp:880:556: warning: converting to non-pointer type 'int' from NULL
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebhistoryitem.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebinspector.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebnavigationaction.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebpolicydecision.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitgeolocationpolicydecision.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebresource.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebdatabase.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitsecurityorigin.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebsettings.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebview.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitwebwindowfeatures.lo
  CXX WebKit/gtk/webkit/libwebkit_1_0_la-webkitworkers.lo
  CXX DerivedSources/libwebkit_1_0_la-CSSGrammar.lo
  CXX DerivedSources/libwebkit_1_0_la-HTMLElementFactory.lo
  CC DerivedSources/libwebkit_1_0_la-HTMLEntityNames.lo
  CXX DerivedSources/libwebkit_1_0_la-HTMLNames.lo
  CXX DerivedSources/libwebkit_1_0_la-JSHTMLElementWrapperFactory.lo
  CXX DerivedSources/libwebkit_1_0_la-UserAgentStyleSheetsData.lo
  CXX DerivedSources/libwebkit_1_0_la-XMLNSNames.lo
  CXX DerivedSources/libwebkit_1_0_la-XMLNames.lo
  CXX DerivedSources/libwebkit_1_0_la-XPathGrammar.lo
  CXX DerivedSources/libwebkit_1_0_la-JSSVGElementWrapperFactory.lo
  CXX DerivedSources/libwebkit_1_0_la-SVGElementFactory.lo
  CXX DerivedSources/libwebkit_1_0_la-SVGNames.lo
  CXX DerivedSources/libwebkit_1_0_la-XLinkNames.lo
  CXX DerivedSources/libwebkit_1_0_la-webkitenumtypes.lo
  CXX DerivedSources/libwebkit_1_0_la-webkitmarshal.lo
  CXX JavaScriptCore/API/libJavaScriptCore_la-JSBase.lo
  CXX JavaScriptCore/API/libJavaScriptCore_la-JSCallbackConstructor.lo
  CXX JavaScriptCore/API/libJavaScriptCore_la-JSCallbackFunction.lo
  CXX JavaScriptCore/API/libJavaScriptCore_la-JSCallbackObject.lo
  CXX JavaScriptCore/API/libJavaScriptCore_la-JSClassRef.lo
  CXX JavaScriptCore/API/libJavaScriptCore_la-JSContextRef.lo
make[2]: *** [JavaScriptCore/API/libJavaScriptCore_la-JSContextRef.lo] Error 1
make[2]: Leaving directory `/tmp/buildd/webkit-1.2.5/build'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/tmp/buildd/webkit-1.2.5/build'
make: *** [build-stamp] Error 2
dpkg-buildpackage: error: debian/rules build ga...

[Robert Ancell (robert-ancell)]

Added desktop-upgrade tag so this bug shows on http://people.canonical.com/~platform/desktop/versions.html

[Micah Gersten (micahg)]

Webkit 1.3.9 has been uploaded, so I'm closing this bug.