svn commit: r408024 - in head/www: webkit-gtk2 webkit-gtk2/files webkit-gtk3 webkit-gtk3/files

[Koop Mast]

Author: kwm
Date: Thu Feb  4 11:09:49 2016
New Revision: 408024
URL: https://svnweb.freebsd.org/changeset/ports/408024

Log:
  Fix CVE-2014-1748.
  
  PR:		205683
  Security:	1091d2d1-cb2e-11e5-b14b-bcaec565249c

Added:
  head/www/webkit-gtk2/files/patch-CVE-2014-1748   (contents, props changed)
  head/www/webkit-gtk3/files/patch-CVE-2014-1748   (contents, props changed)
Modified:
  head/www/webkit-gtk2/Makefile
  head/www/webkit-gtk3/Makefile

Modified: head/www/webkit-gtk2/Makefile
==============================================================================
--- head/www/webkit-gtk2/Makefile	Thu Feb  4 11:03:33 2016	(r408023)
+++ head/www/webkit-gtk2/Makefile	Thu Feb  4 11:09:49 2016	(r408024)
@@ -3,6 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.4.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk2

Added: head/www/webkit-gtk2/files/patch-CVE-2014-1748
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-CVE-2014-1748	Thu Feb  4 11:09:49 2016	(r408024)
@@ -0,0 +1,10 @@
+--- ./Source/WebCore/platform/ScrollView.cpp.orig	2016-01-05 21:53:38.202759000 +0100
++++ ./Source/WebCore/platform/ScrollView.cpp	2016-01-05 21:55:50.429266000 +0100
+@@ -1177,6 +1177,7 @@ void ScrollView::paint(GraphicsContext* 
+         scrollViewDirtyRect.intersect(visibleAreaWithScrollbars);
+         context->translate(x(), y());
+         scrollViewDirtyRect.moveBy(-location());
++        context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size()));
+ 
+         paintScrollbars(context, scrollViewDirtyRect);
+     }

Modified: head/www/webkit-gtk3/Makefile
==============================================================================
--- head/www/webkit-gtk3/Makefile	Thu Feb  4 11:03:33 2016	(r408023)
+++ head/www/webkit-gtk3/Makefile	Thu Feb  4 11:09:49 2016	(r408024)
@@ -3,6 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.4.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3

Added: head/www/webkit-gtk3/files/patch-CVE-2014-1748
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit-gtk3/files/patch-CVE-2014-1748	Thu Feb  4 11:09:49 2016	(r408024)
@@ -0,0 +1,10 @@
+--- ./Source/WebCore/platform/ScrollView.cpp.orig	2016-01-05 21:53:38.202759000 +0100
++++ ./Source/WebCore/platform/ScrollView.cpp	2016-01-05 21:55:50.429266000 +0100
+@@ -1177,6 +1177,7 @@ void ScrollView::paint(GraphicsContext* 
+         scrollViewDirtyRect.intersect(visibleAreaWithScrollbars);
+         context->translate(x(), y());
+         scrollViewDirtyRect.moveBy(-location());
++        context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size()));
+ 
+         paintScrollbars(context, scrollViewDirtyRect);
+     }