CVS commit: pkgsrc/security/tor-browser

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun 18 12:56:41 UTC 2020

Modified Files:
        pkgsrc/security/tor-browser: Makefile distinfo
        pkgsrc/security/tor-browser/patches:
            patch-browser_app_profile_firefox.js
Added Files:
        pkgsrc/security/tor-browser/patches: patch-gfx_thebes_gfxPlatform.cpp
Removed Files:
        pkgsrc/security/tor-browser/patches:
            patch-ipc_glue_CrossProcessSemaphore.h
            patch-ipc_glue_CrossProcessSemaphore__posix.cpp

Log Message:
tor-browser: merge multiprocess changes from firefox68

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/tor-browser/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.67 pkgsrc/security/tor-browser/Makefile:1.68
--- pkgsrc/security/tor-browser/Makefile:1.67   Wed Jun 17 18:02:53 2020
+++ pkgsrc/security/tor-browser/Makefile        Thu Jun 18 12:56:40 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2020/06/17 18:02:53 nia Exp $
+# $NetBSD: Makefile,v 1.68 2020/06/18 12:56:40 wiz Exp $
 
 DISTNAME=      src-firefox-tor-browser-68.9.0esr-9.5-1-build2
 PKGNAME=       tor-browser-9.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security www
 MASTER_SITES=  https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/security/tor-browser/distinfo
diff -u pkgsrc/security/tor-browser/distinfo:1.22 pkgsrc/security/tor-browser/distinfo:1.23
--- pkgsrc/security/tor-browser/distinfo:1.22   Wed Jun 17 18:02:53 2020
+++ pkgsrc/security/tor-browser/distinfo        Thu Jun 18 12:56:40 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2020/06/17 18:02:53 nia Exp $
+$NetBSD: distinfo,v 1.23 2020/06/18 12:56:40 wiz Exp $
 
 SHA1 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 27b3e18e92341557b9c8b18afd114d458dd2e403
 RMD160 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = db61ef7788f1b6c4111e7a4c6df56c7bd51e6777
@@ -11,7 +11,7 @@ Size (tor-browser-linux64-9.5_en-US.tar.
 SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8
 SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
 SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
-SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
+SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8
 SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
@@ -19,11 +19,10 @@ SHA1 (patch-gfx_angle_checkout_src_commo
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
+SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = e4a25e4a96055b1c42ec018b02d1828257a571de
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
-SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
 SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
 SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35

Index: pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js
diff -u pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js:1.2 pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js:1.3
--- pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js:1.2        Fri Mar 13 17:59:27 2020
+++ pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js    Thu Jun 18 12:56:40 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-browser_app_profile_firefox.js,v 1.2 2020/03/13 17:59:27 wiz Exp $
+$NetBSD: patch-browser_app_profile_firefox.js,v 1.3 2020/06/18 12:56:40 wiz Exp $
 
---- browser/app/profile/firefox.js.orig        2019-07-06 01:48:29.000000000 +0000
+--- browser/app/profile/firefox.js.orig        2020-05-28 00:01:33.000000000 +0000
 +++ browser/app/profile/firefox.js
-@@ -1865,6 +1865,15 @@ pref("prio.publicKeyB", "26E6674E65425B8
+@@ -1862,6 +1862,12 @@ pref("prio.publicKeyB", "26E6674E65425B8
  pref("toolkit.coverage.enabled", false);
  pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org";);
  
@@ -12,9 +12,6 @@ $NetBSD: patch-browser_app_profile_firef
 +// Enable system addons, for example langpacks from www/firefox-l10n
 +pref("extensions.autoDisableScopes", 11);
 +
-+// Disable multiprocess window support. Workaround for PR 53273.
-+pref("browser.tabs.remote.autostart", false);
-+
  // Discovery prefs
  pref("browser.discovery.enabled", true);
  pref("browser.discovery.containers.enabled", true);

Added files:

Index: pkgsrc/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp
diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp:1.1
--- /dev/null   Thu Jun 18 12:56:41 2020
+++ pkgsrc/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp        Thu Jun 18 12:56:40 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2020/06/18 12:56:40 wiz Exp $
+
+Don't rely on CrossProcessSemaphore on NetBSD. It has some implementation
+issues that cause issues (kern/55386, not available on NetBSD<9)
+
+This idea is borrowed from macOS which has the same limitation.
+
+--- gfx/thebes/gfxPlatform.cpp.orig    2020-05-28 00:01:45.000000000 +0000
++++ gfx/thebes/gfxPlatform.cpp
+@@ -2991,6 +2991,10 @@ bool gfxPlatform::UsesOffMainThreadCompo
+ }
+ 
+ bool gfxPlatform::UsesTiling() const {
++#ifdef __NetBSD__
++  // Avoid relying on CrossProcessSemaphore
++  return true;
++#else
+   bool usesSkia = GetDefaultContentBackend() == BackendType::SKIA;
+ 
+   // We can't just test whether the PaintThread is initialized here because
+@@ -3002,6 +3006,7 @@ bool gfxPlatform::UsesTiling() const {
+ 
+   return gfxPrefs::LayersTilesEnabled() ||
+          (gfxPrefs::LayersTilesEnabledIfSkiaPOMTP() && usesSkia && usesPOMTP);
++#endif
+ }
+ 
+ bool gfxPlatform::ContentUsesTiling() const {