[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-60-g76add97

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit bdb3d91457e965e5f08261daff2855c274a5b436
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Sat Oct 16 17:48:52 2010 -0300

    Revert "fix cve-2010-3116"
    
    This reverts commit 9844a55ec2b4ac0a5d320b398b5869af825bc290.
    
    Conflicts:
    
    	debian/changelog
    	debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 55bea78..79f29b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ webkit (1.2.4-2) unstable; urgency=high
     SKIA library.
   * fix cve-2010-2901: vulnerability in the rendering implementation.
   * fix cve-2010-3115: address bar spoofing (only partially fixed in 1.2.4-1).
-  * fix cve-2010-3116: vulnerability in MIME type handling.
   * fix cve-2010-3120: vulnerability in geolocation feature.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Mon, 06 Sep 2010 21:36:40 -0400
diff --git a/debian/patches/cve-2010-3116.patch b/debian/patches/cve-2010-3116.patch
deleted file mode 100644
index 73639ba..0000000
--- a/debian/patches/cve-2010-3116.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-description: fix cve-2010-3116
-author: Michael Gilbert <michael.s.gilbert at gmail.com>
-origin: http://trac.webkit.org/changeset/64293
-Index: webkit-1.2.4/WebCore/page/Page.cpp
-===================================================================
---- webkit-1.2.4.orig/WebCore/page/Page.cpp	2010-09-03 15:18:06.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/Page.cpp	2010-09-06 22:11:32.000000000 -0400
-@@ -192,6 +192,9 @@
-         frame->pageDestroyed();
- 
-     m_editorClient->pageDestroyed();
-+    if (m_pluginData)
-+        m_pluginData->disconnectPage();
-+
- #if ENABLE(INSPECTOR)
-     m_inspectorController->inspectedPageDestroyed();
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index a2a7dd5..d8bfd88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,4 @@ cve-2010-2651.patch
 cve-2010-2900.patch
 cve-2010-2901.patch
 cve-2010-3115.patch
-cve-2010-3116.patch
 cve-2010-3120.patch

-- 
WebKit Debian packaging