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

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit 01366627cdc8b37efdb928f7bed4fb17739cfb1f
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Tue Sep 7 01:15:33 2010 -0400

    insert missing component of cve-2010-2646 patch

diff --git a/debian/patches/cve-2010-2646.patch b/debian/patches/cve-2010-2646.patch
index 279cff3..4056816 100644
--- a/debian/patches/cve-2010-2646.patch
+++ b/debian/patches/cve-2010-2646.patch
@@ -3,8 +3,8 @@ author: Michael Gilbert <michael.s.gilbert at gmail.com>
 origin: http://trac.webkit.org/changeset/58873
 Index: webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/storage/StorageEventDispatcher.cpp	2010-09-06 23:26:09.000000000 -0400
-+++ webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp	2010-09-06 23:27:09.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/storage/StorageEventDispatcher.cpp	2010-09-07 01:13:45.000000000 -0400
++++ webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp	2010-09-07 01:14:42.000000000 -0400
 @@ -54,8 +54,12 @@
                  frames.append(frame);
          }
@@ -22,8 +22,8 @@ Index: webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp
          const HashSet<Page*>& pages = page->group().pages();
 Index: webkit-1.2.4/WebCore/page/DOMWindow.h
 ===================================================================
---- webkit-1.2.4.orig/WebCore/page/DOMWindow.h	2010-09-06 23:26:09.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/DOMWindow.h	2010-09-06 23:26:41.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/page/DOMWindow.h	2010-09-07 01:13:45.000000000 -0400
++++ webkit-1.2.4/WebCore/page/DOMWindow.h	2010-09-07 01:14:42.000000000 -0400
 @@ -206,7 +206,7 @@
  
  #if ENABLE(DOM_STORAGE)
@@ -35,8 +35,8 @@ Index: webkit-1.2.4/WebCore/page/DOMWindow.h
  
 Index: webkit-1.2.4/WebCore/page/DOMWindow.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/page/DOMWindow.cpp	2010-09-06 23:26:09.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/DOMWindow.cpp	2010-09-06 23:26:41.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/page/DOMWindow.cpp	2010-09-07 01:13:45.000000000 -0400
++++ webkit-1.2.4/WebCore/page/DOMWindow.cpp	2010-09-07 01:14:42.000000000 -0400
 @@ -567,7 +567,7 @@
  }
  
@@ -80,8 +80,8 @@ Index: webkit-1.2.4/WebCore/page/DOMWindow.cpp
          return 0;
 Index: webkit-1.2.4/WebCore/page/SecurityOrigin.h
 ===================================================================
---- webkit-1.2.4.orig/WebCore/page/SecurityOrigin.h	2010-09-06 23:26:09.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/SecurityOrigin.h	2010-09-06 23:26:41.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/page/SecurityOrigin.h	2010-09-07 01:13:45.000000000 -0400
++++ webkit-1.2.4/WebCore/page/SecurityOrigin.h	2010-09-07 01:14:42.000000000 -0400
 @@ -120,6 +120,11 @@
      bool canAccessLocalStorage() const { return !isUnique(); }
      bool canAccessCookies() const { return !isUnique(); }
@@ -94,3 +94,17 @@ Index: webkit-1.2.4/WebCore/page/SecurityOrigin.h
      bool isSecureTransitionTo(const KURL&) const;
  
      // The local SecurityOrigin is the most privileged SecurityOrigin.
+Index: webkit-1.2.4/WebCore/page/DOMWindow.idl
+===================================================================
+--- webkit-1.2.4.orig/WebCore/page/DOMWindow.idl	2010-09-07 01:14:36.000000000 -0400
++++ webkit-1.2.4/WebCore/page/DOMWindow.idl	2010-09-07 01:14:42.000000000 -0400
+@@ -164,7 +164,8 @@
+             raises(DOMException);
+ #endif
+ #if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
+-        readonly attribute [EnabledAtRuntime] Storage sessionStorage;
++        readonly attribute [EnabledAtRuntime] Storage sessionStorage
++            getter raises(DOMException);
+         readonly attribute [EnabledAtRuntime] Storage localStorage
+             getter raises(DOMException);
+ #endif

-- 
WebKit Debian packaging