[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.6-1-26-g13e905d
Michael Gilbert
michael.s.gilbert at gmail.com
Sun Feb 20 20:18:13 UTC 2011
The following commit has been merged in the debian/unstable branch:
commit 13e905df6788fb8b131dbfa178a0a2f3f93a4b3b
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date: Sun Feb 20 15:18:12 2011 -0500
drop patches now in upstream, update changelog
diff --git a/debian/changelog b/debian/changelog
index eb39ea6..bc2ae6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+webkit (1.2.7-1) unstable; urgency=high
+
+ * Import new upstream security release.
+ * Set DM-Upload-Allowed and add myself as an uploader.
+ * Drop patches for cve-2010-2901 and cve-2010-4040 (included upstream now).
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com> Sat, 19 Feb 2011 17:24:56 -0500
+
webkit (1.2.6-1) unstable; urgency=high
[ Michael Gilbert ]
diff --git a/debian/control b/debian/control
index e134781..3cb87cd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: webkit
Priority: optional
Section: web
Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers at lists.alioth.debian.org>
-Uploaders: Mike Hommey <glandium at debian.org>, Gustavo Noronha Silva <kov at debian.org>
+Uploaders: Mike Hommey <glandium at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Michael Gilbert <michael.s.gilbert at gmail.com>
Build-Depends: debhelper (>= 5.0),
chrpath,
libgtk2.0-dev (>= 2.10),
@@ -26,6 +26,7 @@ Build-Depends: debhelper (>= 5.0),
gir-repository-dev (>= 0.6.2),
gobject-introspection (>= 0.6.2)
Standards-Version: 3.8.4
+DM-Upload-Allowed: yes
Homepage: http://webkit.org/
Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
Vcs-Git: git://git.debian.org/git/pkg-webkit/webkit.git
diff --git a/debian/patches/cve-2010-2901.patch b/debian/patches/cve-2010-2901.patch
deleted file mode 100644
index a130342..0000000
--- a/debian/patches/cve-2010-2901.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-description: fix cve-2010-2901
-author: Michael Gilbert <michael.s.gilbert at gmail.com>
-origin: http://trac.webkit.org/changeset/63048
-Index: webkit-1.2.4/WebCore/rendering/RenderObject.cpp
-===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/RenderObject.cpp 2010-09-06 22:55:29.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/RenderObject.cpp 2010-09-06 22:56:03.000000000 -0400
-@@ -560,6 +560,19 @@
- return 0;
- }
-
-+RenderBoxModelObject* RenderObject::enclosingBoxModelObject() const
-+{
-+ RenderObject* curr = const_cast<RenderObject*>(this);
-+ while (curr) {
-+ if (curr->isBoxModelObject())
-+ return toRenderBoxModelObject(curr);
-+ curr = curr->parent();
-+ }
-+
-+ ASSERT_NOT_REACHED();
-+ return 0;
-+}
-+
- RenderBlock* RenderObject::firstLineBlock() const
- {
- return 0;
-Index: webkit-1.2.4/WebCore/rendering/RenderObject.h
-===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/RenderObject.h 2010-09-06 22:55:29.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/RenderObject.h 2010-09-06 22:56:03.000000000 -0400
-@@ -193,7 +193,8 @@
-
- // Convenience function for getting to the nearest enclosing box of a RenderObject.
- RenderBox* enclosingBox() const;
--
-+ RenderBoxModelObject* enclosingBoxModelObject() const;
-+
- virtual bool isEmpty() const { return firstChild() == 0; }
-
- #ifndef NDEBUG
-Index: webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp
-===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/InlineFlowBox.cpp 2010-09-06 22:55:28.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp 2010-09-06 22:56:24.000000000 -0400
-@@ -639,11 +639,24 @@
- // outlines.
- if (renderer()->style()->visibility() == VISIBLE && renderer()->hasOutline() && !isRootInlineBox()) {
- RenderInline* inlineFlow = toRenderInline(renderer());
-- if ((inlineFlow->continuation() || inlineFlow->isInlineContinuation()) && !boxModelObject()->hasSelfPaintingLayer()) {
-+
-+ RenderBlock* cb = 0;
-+ bool containingBlockPaintsContinuationOutline = inlineFlow->continuation() || inlineFlow->isInlineContinuation();
-+ if (containingBlockPaintsContinuationOutline) {
-+ cb = renderer()->containingBlock()->containingBlock();
-+
-+ for (RenderBoxModelObject* box = boxModelObject(); box != cb; box = box->parent()->enclosingBoxModelObject()) {
-+ if (box->hasSelfPaintingLayer()) {
-+ containingBlockPaintsContinuationOutline = false;
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (containingBlockPaintsContinuationOutline) {
- // Add ourselves to the containing block of the entire continuation so that it can
- // paint us atomically.
-- RenderBlock* block = renderer()->containingBlock()->containingBlock();
-- block->addContinuationWithOutline(toRenderInline(renderer()->node()->renderer()));
-+ cb->addContinuationWithOutline(toRenderInline(renderer()->node()->renderer()));
- } else if (!inlineFlow->isInlineContinuation())
- paintInfo.outlineObjects->add(inlineFlow);
- }
-Index: webkit-1.2.4/WebCore/rendering/RenderBlock.cpp
-===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/RenderBlock.cpp 2010-09-06 22:55:28.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/RenderBlock.cpp 2010-09-06 22:56:03.000000000 -0400
-@@ -1766,8 +1766,18 @@
- if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseChildOutlines)) {
- if (inlineContinuation() && inlineContinuation()->hasOutline() && inlineContinuation()->style()->visibility() == VISIBLE) {
- RenderInline* inlineRenderer = toRenderInline(inlineContinuation()->node()->renderer());
-- if (!inlineRenderer->hasSelfPaintingLayer())
-- containingBlock()->addContinuationWithOutline(inlineRenderer);
-+ RenderBlock* cb = containingBlock();
-+
-+ bool inlineEnclosedInSelfPaintingLayer = false;
-+ for (RenderBoxModelObject* box = inlineRenderer; box != cb; box = box->parent()->enclosingBoxModelObject()) {
-+ if (box->hasSelfPaintingLayer()) {
-+ inlineEnclosedInSelfPaintingLayer = true;
-+ break;
-+ }
-+ }
-+
-+ if (!inlineEnclosedInSelfPaintingLayer)
-+ cb->addContinuationWithOutline(inlineRenderer);
- else if (!inlineRenderer->firstLineBox())
- inlineRenderer->paintOutline(paintInfo.context, tx - x() + inlineRenderer->containingBlock()->x(),
- ty - y() + inlineRenderer->containingBlock()->y());
diff --git a/debian/patches/cve-2010-4040.patch b/debian/patches/cve-2010-4040.patch
deleted file mode 100644
index c4266b1..0000000
--- a/debian/patches/cve-2010-4040.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: fix cve-2010-4040
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
-Origin: http://trac.webkit.org/changeset/68446
-Index: webkit/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
-===================================================================
---- webkit.orig/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2010-10-18 20:55:17.000000000 -0400
-+++ webkit/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp 2010-11-14 19:01:51.000000000 -0500
-@@ -343,7 +343,8 @@
-
- if ((prevMethod == RGBA32Buffer::DisposeNotSpecified) || (prevMethod == RGBA32Buffer::DisposeKeep)) {
- // Preserve the last frame as the starting state for this frame.
-- buffer->copyBitmapData(*prevBuffer);
-+ if (!buffer->copyBitmapData(*prevBuffer))
-+ return setFailed();
- } else {
- // We want to clear the previous frame to transparent, without
- // affecting pixels in the image outside of the frame.
-@@ -356,7 +357,8 @@
- return setFailed();
- } else {
- // Copy the whole previous buffer, then clear just its frame.
-- buffer->copyBitmapData(*prevBuffer);
-+ if (!buffer->copyBitmapData(*prevBuffer))
-+ return setFailed();
- for (int y = prevRect.y(); y < prevRect.bottom(); ++y) {
- for (int x = prevRect.x(); x < prevRect.right(); ++x)
- buffer->setRGBA(x, y, 0, 0, 0, 0);
-Index: webkit/WebCore/platform/image-decoders/ImageDecoder.cpp
-===================================================================
---- webkit.orig/WebCore/platform/image-decoders/ImageDecoder.cpp 2010-10-18 20:55:17.000000000 -0400
-+++ webkit/WebCore/platform/image-decoders/ImageDecoder.cpp 2010-11-14 19:01:51.000000000 -0500
-@@ -126,14 +126,15 @@
- m_hasAlpha = true;
- }
-
--void RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
-+bool RGBA32Buffer::copyBitmapData(const RGBA32Buffer& other)
- {
- if (this == &other)
-- return;
-+ return true;
-
- m_bytes = other.m_bytes;
- m_size = other.m_size;
- setHasAlpha(other.m_hasAlpha);
-+ return true;
- }
-
- bool RGBA32Buffer::setSize(int newWidth, int newHeight)
-Index: webkit/WebCore/platform/image-decoders/ImageDecoder.h
-===================================================================
---- webkit.orig/WebCore/platform/image-decoders/ImageDecoder.h 2010-10-18 20:55:17.000000000 -0400
-+++ webkit/WebCore/platform/image-decoders/ImageDecoder.h 2010-11-14 19:01:51.000000000 -0500
-@@ -83,8 +83,8 @@
- void zeroFill();
-
- // Creates a new copy of the image data in |other|, so the two images
-- // can be modified independently.
-- void copyBitmapData(const RGBA32Buffer& other);
-+ // can be modified independently. Returns whether the copy succeeded.
-+ bool copyBitmapData(const RGBA32Buffer& other);
-
- // Copies the pixel data at [(startX, startY), (endX, startY)) to the
- // same X-coordinates on each subsequent row up to but not including
diff --git a/debian/patches/series b/debian/patches/series
index c1c61c8..0f3e020 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,9 +3,7 @@
cve-2010-2646.patch
cve-2010-2651.patch
cve-2010-2900.patch
-cve-2010-2901.patch
cve-2010-3120.patch
cve-2010-1824.patch
cve-2010-3254.patch
-cve-2010-4040.patch
cve-2010-4042.patch
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list