[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 ab6dd20c3e94e51970305a6b7b99e6c11eb1ce2b
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Sat Oct 16 17:49:39 2010 -0300

    Revert "fix cve-2010-3115"
    
    This reverts commit bc3ef7bff97017e8e8d90df08c617b1693ed19d2.
    
    Conflicts:
    
    	debian/changelog
    	debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 79f29b0..33adc6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ webkit (1.2.4-2) unstable; urgency=high
   * 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-3115: address bar spoofing (only partially fixed in 1.2.4-1).
   * 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-3115.patch b/debian/patches/cve-2010-3115.patch
deleted file mode 100644
index 8466176..0000000
--- a/debian/patches/cve-2010-3115.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-description: fix cve-2010-3115
-author: Michael Gilbert <michael.s.gilbert at gmail.com>
-origin: http://trac.webkit.org/changeset/63925
-Index: webkit-1.2.4/WebCore/page/History.cpp
-===================================================================
---- webkit-1.2.4.orig/WebCore/page/History.cpp	2010-09-03 16:12:23.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/History.cpp	2010-09-06 22:08:52.000000000 -0400
-@@ -82,7 +82,7 @@
- 
- KURL History::urlForState(const String& urlString)
- {
--    KURL baseURL = m_frame->loader()->baseURL();
-+    KURL baseURL = m_frame->document()->url();
-     if (urlString.isEmpty())
-         return baseURL;
-         
diff --git a/debian/patches/series b/debian/patches/series
index d8bfd88..52778d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ cve-2010-2646.patch
 cve-2010-2651.patch
 cve-2010-2900.patch
 cve-2010-2901.patch
-cve-2010-3115.patch
 cve-2010-3120.patch

-- 
WebKit Debian packaging