[meego-commits] 15417: Changes to MeeGo:1.1:Core:Update:Testing/chromium

[Han Dai]

Hi,
I have made the following changes to chromium in project MeeGo:1.1:Core:Update:Testing. Please review and accept ASAP.

Thank You,
Han Dai

[This message was auto-generated]

---

Request #15417:

  submit:   home:daihan:branches:MeeGo:1.1:Core:Update:Testing/chromium(r4)(cleanup) -> MeeGo:1.1:Core:Update:Testing/chromium


Message:
    Add a patch to fix BMC#7684

State:   new          2011-03-29T00:35:47 daihan
Comment: None



changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Tue Mar 29 2011 Ye Gang <gang.ye at intel.com> - 7.0.542.0
+- Add a patch to fxi CVE-2010-1772(BMC#7684)
+

new:
----
  CVE-2010-1772-chromium-fix.patch

spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -149,6 +149,8 @@
 # STATIC ONLY PATCHES
 Patch35:	chromium-7.0.542.0-system-speex-static.patch
 
+Patch50:	CVE-2010-1772-chromium-fix.patch
+
 # OLD: Use chromium-daily-tarball.sh to generate tarball from svn.
 # New: Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -377,6 +379,9 @@
 %patch208 -p1 
 %patch210 -p1 
 
+# Fix BMC#7684
+%patch50 -p1
+
 pushd third_party/ffmpeg/
 tar xf %{SOURCE8}
 popd

other changes:
--------------

++++++ CVE-2010-1772-chromium-fix.patch (new)
--- CVE-2010-1772-chromium-fix.patch
+++ CVE-2010-1772-chromium-fix.patch
+diff -Nur chromium-7.0.542.0/third_party/WebKit/WebCore/page/Geolocation.cpp new/third_party/WebKit/WebCore/page/Geolocation.cpp
+--- chromium-7.0.542.0/third_party/WebKit/WebCore/page/Geolocation.cpp	2010-10-04 17:49:31.000000000 +0800
++++ new/third_party/WebKit/WebCore/page/Geolocation.cpp	2011-03-29 14:16:39.000000000 +0800
+@@ -236,6 +236,7 @@
+     if (m_frame && m_frame->page() && m_allowGeolocation == InProgress)
+         m_frame->page()->chrome()->cancelGeolocationPermissionRequestForFrame(m_frame, this);
+     cancelAllRequests();
++    stopTimers();
+     stopUpdating();
+     if (m_frame && m_frame->document())
+         m_frame->document()->setUsingGeolocation(false);