Pullup ticket #5815 - requested by wiz

www/webkit-gtk: security fix

Revisions pulled up:
- www/webkit-gtk/Makefile                                       1.142
- www/webkit-gtk/PLIST                                          1.40
- www/webkit-gtk/distinfo                                       1.104

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Fri Aug 17 10:37:58 UTC 2018

   Modified Files:
   	pkgsrc/www/webkit-gtk: Makefile PLIST distinfo

   Log Message:
   webkit-gtk: update to 2.20.4.

   What's new in WebKitGTK+ 2.20.4?

     - Fix a crash when leaving accelerated compositing mode.
     - Fix non-deterministic build failure due to missing JavaScriptCore/JSContextRef.h.
     - Security fixes: CVE-2018-4261, CVE-2018-4262, CVE-2018-4263, CVE-2018-4264, CVE-2018-4265, CVE-2018-4266,
       CVE-2018-4267, CVE-2018-4270, CVE-2018-4272, CVE-2018-4273, CVE-2018-4278, CVE-2018-4284.

3 files changed, 10 insertions, 10 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 116fc445ae5..7373d5b6f46 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.139 2018/06/17 13:54:39 wiz Exp $
+# $NetBSD: Makefile,v 1.139.2.1 2018/08/24 20:07:26 bsiegert Exp $
 
-DISTNAME=	webkitgtk-2.20.3
+DISTNAME=	webkitgtk-2.20.4
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index df8c833dc08..5afd7017ed4 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2018/06/17 13:54:39 wiz Exp $
+@comment $NetBSD: PLIST,v 1.39.2.1 2018/08/24 20:07:26 bsiegert Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -198,10 +198,10 @@ ${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.7.11
+lib/libjavascriptcoregtk-4.0.so.18.7.12
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.28.3
+lib/libwebkit2gtk-4.0.so.37.28.4
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 6371f804cd0..8e3e6ce1129 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.103 2018/06/17 13:54:39 wiz Exp $
+$NetBSD: distinfo,v 1.103.2.1 2018/08/24 20:07:26 bsiegert Exp $
 
-SHA1 (webkitgtk-2.20.3.tar.xz) = 279a4209ca0c93743aa9cd9c9ccc0b91d5b0354b
-RMD160 (webkitgtk-2.20.3.tar.xz) = 6bc2c007fe00f696c6014d72137280835c117765
-SHA512 (webkitgtk-2.20.3.tar.xz) = 69a7b27e294de6fd43240ce1d314cd1ccdbf29674c97967674459fd02720b31fa53e5412efbd93dc1e805d38e38feb7fe9a12cdd9c472471676b8db3c11734de
-Size (webkitgtk-2.20.3.tar.xz) = 16623456 bytes
+SHA1 (webkitgtk-2.20.4.tar.xz) = ff197ececa5b11eed7695ca3d2c1d34a3acfaa42
+RMD160 (webkitgtk-2.20.4.tar.xz) = 769c7297322c0192cc730cd383882e375203efac
+SHA512 (webkitgtk-2.20.4.tar.xz) = 3e6a370823d9a3521862fea0e7ae9f2455101afee247fda7b6d23ea609a0d1db3aeb86c41f903a89776550c190a2cf0baa903883671eca7222249849adc49090
+Size (webkitgtk-2.20.4.tar.xz) = 16625400 bytes
 SHA1 (patch-CMakeLists.txt) = 684aad9e5bcc25b1afc128a1b5df00f34f1208e9
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4