Pullup ticket #6388 - requested by wiz

security/tor-browser: security fix

Revisions pulled up:
- security/tor-browser/Makefile                                 1.83
- security/tor-browser/distinfo                                 1.34
- security/tor-browser/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Sun Jan  3 19:00:38 UTC 2021

   Modified Files:
   	pkgsrc/security/tor-browser: Makefile distinfo
   Added Files:
   	pkgsrc/security/tor-browser/patches:
   	    patch-dom_webgpu_ipc_WebGPUParent.cpp

   Log Message:
   tor-browser: update to 10.0.7.

   This release updates Firefox for desktops to 78.6.0esr and Firefox
   for Android to 84.1.0. This release includes important security
   updates to Firefox for Desktop, and similar important security
   updates to Firefox for Android.

   The full changelog since Desktop and Android Tor Browser 10.0.6 is:

       All Platforms
           Update HTTPS Everywhere to 2020.11.17
           Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
           Bug 40176: Update openssl to 1.1.1i
       Windows + OS X + Linux
           Update Firefox to 78.6.0esr
       Android
           Update Firefox to 84.1.0
           Update NoScript to 11.1.6
       Linux
           Bug 40226: Crash on Fedora Workstation Rawhide GNOME
       Build System
           All Platforms
               Bug 40139: Pick up rbm commit for bug 40008
               Bug 40161: Update Go compiler to 1.14.13
           Android
               Bug 40128: Allow updating Fenix allowed_addons.json
               Bug 40140: Create own Gradle project
               Bug 40155: Update toolchain for Fenix 84
               Bug 40156: Update Fenix and dependencies to 84.0.0-beta2
               Bug 40163: Avoid checking hash of .pom files
               Bug 40171: Include all uniffi-rs artifacts into application-services
               Bug 40184: Update Fenix and deps to 84.1.0

   10.0.6

   All Platforms

       Bug 40175: Update obfs4proxy's TLS certificate public key pinning

3 files changed, 41 insertions, 12 deletions

diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile
index 3b1137fb4bf..3cc8fc4221e 100644
--- a/security/tor-browser/Makefile
+++ b/security/tor-browser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2020/11/18 11:43:19 wiz Exp $
+# $NetBSD: Makefile,v 1.81.2.1 2021/01/04 17:22:33 bsiegert Exp $
 #
 # How to update this package:
 #
@@ -15,8 +15,8 @@
 # when packaged up, read MESSAGE and test by visiting https://check.torproject.org
 # and https://panopticlick.eff.org
 
-DISTNAME=	src-firefox-tor-browser-78.5.0esr-10.0-1-build1
-PKGNAME=	tor-browser-10.0.5
+DISTNAME=	src-firefox-tor-browser-78.6.0esr-10.0-1-build1
+PKGNAME=	tor-browser-10.0.7
 CATEGORIES=	security www
 MASTER_SITES=	https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo
index 3ef63f28dac..66d9088e309 100644
--- a/security/tor-browser/distinfo
+++ b/security/tor-browser/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.33 2020/11/18 11:43:19 wiz Exp $
+$NetBSD: distinfo,v 1.33.2.1 2021/01/04 17:22:33 bsiegert Exp $
 
-SHA1 (src-firefox-tor-browser-78.5.0esr-10.0-1-build1.tar.xz) = 9420c7e042af4da1ef98ce278ea6dec8f74ef4ca
-RMD160 (src-firefox-tor-browser-78.5.0esr-10.0-1-build1.tar.xz) = 9ec2d8297f9223e8e4bd1ead3d89dffd3228ca43
-SHA512 (src-firefox-tor-browser-78.5.0esr-10.0-1-build1.tar.xz) = 36896078a7d64a129f17809dbdd49b946f2fbcd61a03d85cc59e89937d784147bf8523eef6f01a323a28046a5a8bf182fe30af30131d345b4a60bb62c156728e
-Size (src-firefox-tor-browser-78.5.0esr-10.0-1-build1.tar.xz) = 364081276 bytes
-SHA1 (tor-browser-linux64-10.0.5_en-US.tar.xz) = 61c70bd1840741d9d5cd0cb91a9ba9978724f6ab
-RMD160 (tor-browser-linux64-10.0.5_en-US.tar.xz) = 9211fe721362c4b4bd88ebbcb4a374c58faddf23
-SHA512 (tor-browser-linux64-10.0.5_en-US.tar.xz) = 3028a8d61fe1e94e56645918e9eb81f89c87227d25834844dfbfaacafa3fe3a30118c2caeae9c36e7b3dc8d264c8fbecb259a20a94032e65a32e3c316bd59b92
-Size (tor-browser-linux64-10.0.5_en-US.tar.xz) = 85932512 bytes
+SHA1 (src-firefox-tor-browser-78.6.0esr-10.0-1-build1.tar.xz) = 42e3a3cc237b6342e6caf681e7d220e99c4ca1e0
+RMD160 (src-firefox-tor-browser-78.6.0esr-10.0-1-build1.tar.xz) = 8c98a6dc820046c2d98911ca6679c67df76b09ef
+SHA512 (src-firefox-tor-browser-78.6.0esr-10.0-1-build1.tar.xz) = 6cec444202e3809cf96d39c3c026a224edc295f76cffcab6d43344c7d75e6a37ba155ed9efa5774f5c2fab092061b621e4025e581e69fccd2ce4bfe1450a9019
+Size (src-firefox-tor-browser-78.6.0esr-10.0-1-build1.tar.xz) = 364785260 bytes
+SHA1 (tor-browser-linux64-10.0.7_en-US.tar.xz) = 3ca1953cd8266ddbb2b0508d91cd3e22a54e2d74
+RMD160 (tor-browser-linux64-10.0.7_en-US.tar.xz) = 1f4f3116aa8416ffebea87c6961b21f821f29651
+SHA512 (tor-browser-linux64-10.0.7_en-US.tar.xz) = fb51e096dff18b5ace323d58ae4f18586de9a7e2caaa7819f0e6fc399815d12d92752b001273df5f6a05664a67832adc2f7131e67ad7d7371c0fc0f3c4c2d5c6
+Size (tor-browser-linux64-10.0.7_en-US.tar.xz) = 85897204 bytes
 SHA1 (patch-.mozconfig) = 949472d011d40b02146c06e90ed07673667d192b
 SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
@@ -18,6 +18,7 @@ SHA1 (patch-config_makefiles_rust.mk) = 8637cd3f56774648fd586c7ad8dd49e269b9eb2a
 SHA1 (patch-configure.in) = b40651b008dcecc49664660ac376df2bd7c2c6be
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
+SHA1 (patch-dom_webgpu_ipc_WebGPUParent.cpp) = 236743c74610812bb7bdd577112092401dc1e587
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
 SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c
diff --git a/security/tor-browser/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp b/security/tor-browser/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp
new file mode 100644
index 00000000000..75a58127f34
--- /dev/null
+++ b/security/tor-browser/patches/patch-dom_webgpu_ipc_WebGPUParent.cpp
@@ -0,0 +1,28 @@
+$NetBSD: patch-dom_webgpu_ipc_WebGPUParent.cpp,v 1.1.2.2 2021/01/04 17:22:33 bsiegert Exp $
+
+* Fix build with devel/cbindgen-0.16.0.
+  From https://bugzilla.mozilla.org/show_bug.cgi?id=1684180
+
+--- dom/webgpu/ipc/WebGPUParent.cpp.orig	2020-12-08 01:14:39.000000000 +0000
++++ dom/webgpu/ipc/WebGPUParent.cpp
+@@ -423,17 +423,15 @@ ipc::IPCResult WebGPUParent::RecvDeviceC
+     switch (entry.mType) {
+       case SerialBindGroupEntryType::Buffer:
+         bgb.resource.tag = ffi::WGPUBindingResource_Buffer;
+-        bgb.resource.buffer._0.buffer = entry.mValue;
+-        bgb.resource.buffer._0.offset = entry.mBufferOffset;
+-        bgb.resource.buffer._0.size = entry.mBufferSize;
++        bgb.resource.buffer = {entry.mValue, entry.mBufferOffset, entry.mBufferSize};
+         break;
+       case SerialBindGroupEntryType::Texture:
+         bgb.resource.tag = ffi::WGPUBindingResource_TextureView;
+-        bgb.resource.texture_view._0 = entry.mValue;
++        bgb.resource.texture_view = {entry.mValue};
+         break;
+       case SerialBindGroupEntryType::Sampler:
+         bgb.resource.tag = ffi::WGPUBindingResource_Sampler;
+-        bgb.resource.sampler._0 = entry.mValue;
++        bgb.resource.sampler = {entry.mValue};
+         break;
+       default:
+         MOZ_CRASH("unreachable");