Thu Jun 18 12:56:41 2020 UTC ()
tor-browser: merge multiprocess changes from firefox68

Bump PKGREVISION.


(wiz)
diff -r1.67 -r1.68 pkgsrc/security/tor-browser/Makefile
diff -r1.22 -r1.23 pkgsrc/security/tor-browser/distinfo
diff -r1.2 -r1.3 pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js
diff -r0 -r1.1 pkgsrc/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp
diff -r1.2 -r0 pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore.h
diff -r1.3 -r0 pkgsrc/security/tor-browser/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
cvs diff -r1.67 -r1.68 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2020/06/17 18:02:53 1.67
+++ pkgsrc/security/tor-browser/Makefile 2020/06/18 12:56:40 1.68
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.67 2020/06/17 18:02:53 nia Exp $ 1# $NetBSD: Makefile,v 1.68 2020/06/18 12:56:40 wiz Exp $
2 2
3DISTNAME= src-firefox-tor-browser-68.9.0esr-9.5-1-build2 3DISTNAME= src-firefox-tor-browser-68.9.0esr-9.5-1-build2
4PKGNAME= tor-browser-9.5 4PKGNAME= tor-browser-9.5
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= security www 6CATEGORIES= security www
7MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/ 7MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX} 10DISTFILES+= tor-browser-linux64-${PKGVERSION_NOREV}_en-US${EXTRACT_SUFX}
11#DISTFILES+= src-tor-launcher-0.2.21.8${EXTRACT_SUFX} 11#DISTFILES+= src-tor-launcher-0.2.21.8${EXTRACT_SUFX}
12 12
13MAINTAINER= wiz@NetBSD.org 13MAINTAINER= wiz@NetBSD.org
14HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 14HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
15COMMENT= Tor Browser based on Firefox 15COMMENT= Tor Browser based on Firefox
16LICENSE= mpl-1.1 16LICENSE= mpl-1.1
17 17
18WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} 18WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
cvs diff -r1.22 -r1.23 pkgsrc/security/tor-browser/distinfo (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/distinfo 2020/06/17 18:02:53 1.22
+++ pkgsrc/security/tor-browser/distinfo 2020/06/18 12:56:40 1.23
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1$NetBSD: distinfo,v 1.22 2020/06/17 18:02:53 nia Exp $ 1$NetBSD: distinfo,v 1.23 2020/06/18 12:56:40 wiz Exp $
2 2
3SHA1 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 27b3e18e92341557b9c8b18afd114d458dd2e403 3SHA1 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 27b3e18e92341557b9c8b18afd114d458dd2e403
4RMD160 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = db61ef7788f1b6c4111e7a4c6df56c7bd51e6777 4RMD160 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = db61ef7788f1b6c4111e7a4c6df56c7bd51e6777
5SHA512 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 5a8db89e2bd60980bd00d779c23433014b2d4e29bd55cc81ec83115fb62d79246e73b36cee765b285cadd9306b57f737264549936431898e78717be01200a435 5SHA512 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 5a8db89e2bd60980bd00d779c23433014b2d4e29bd55cc81ec83115fb62d79246e73b36cee765b285cadd9306b57f737264549936431898e78717be01200a435
6Size (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 348699028 bytes 6Size (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 348699028 bytes
7SHA1 (tor-browser-linux64-9.5_en-US.tar.xz) = 3f84ce557b01fe22157f52d7387f979ee2824da6 7SHA1 (tor-browser-linux64-9.5_en-US.tar.xz) = 3f84ce557b01fe22157f52d7387f979ee2824da6
8RMD160 (tor-browser-linux64-9.5_en-US.tar.xz) = df45b10a19916d79f65d99f87505d0ecce55a8fe 8RMD160 (tor-browser-linux64-9.5_en-US.tar.xz) = df45b10a19916d79f65d99f87505d0ecce55a8fe
9SHA512 (tor-browser-linux64-9.5_en-US.tar.xz) = 7534711c12192e937c3a71ea5d3f1d3786d0cb5da6c3f9f8db5c5950c9c342a60fbcc9c4bded2fcea1e5342de3c09b41641154c4fa757734afa21c81f223b5b2 9SHA512 (tor-browser-linux64-9.5_en-US.tar.xz) = 7534711c12192e937c3a71ea5d3f1d3786d0cb5da6c3f9f8db5c5950c9c342a60fbcc9c4bded2fcea1e5342de3c09b41641154c4fa757734afa21c81f223b5b2
10Size (tor-browser-linux64-9.5_en-US.tar.xz) = 79022648 bytes 10Size (tor-browser-linux64-9.5_en-US.tar.xz) = 79022648 bytes
11SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8 11SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8
12SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c 12SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
13SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280 13SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
14SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e 14SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8
15SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317 15SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
16SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 16SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
17SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24 17SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
18SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 18SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
19SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 19SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
20SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba 20SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
21SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 21SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
 22SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = e4a25e4a96055b1c42ec018b02d1828257a571de
22SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c 23SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
23SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 24SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
24SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29 25SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
25SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 25e24743060acf10c776c6b3b3660f52a2e9fbe8 
26SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6a889327543b89e0bb 
27SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 26SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
28SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa 27SHA1 (patch-js_src_threading_posix_Thread.cpp) = 47e612a676e614fd6dd43b8a3140218a3fbdc7fa
29SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35 28SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
30SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a 29SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
31SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4 30SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
32SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e 31SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e
33SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a 32SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
34SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a 33SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a
35SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9 34SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9
36SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc 35SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
37SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512 36SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512
38SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf 37SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
39SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e 38SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e
cvs diff -r1.2 -r1.3 pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js 2020/03/13 17:59:27 1.2
+++ pkgsrc/security/tor-browser/patches/patch-browser_app_profile_firefox.js 2020/06/18 12:56:40 1.3
@@ -1,20 +1,17 @@ @@ -1,20 +1,17 @@
1$NetBSD: patch-browser_app_profile_firefox.js,v 1.2 2020/03/13 17:59:27 wiz Exp $ 1$NetBSD: patch-browser_app_profile_firefox.js,v 1.3 2020/06/18 12:56:40 wiz Exp $
2 2
3--- browser/app/profile/firefox.js.orig 2019-07-06 01:48:29.000000000 +0000 3--- browser/app/profile/firefox.js.orig 2020-05-28 00:01:33.000000000 +0000
4+++ browser/app/profile/firefox.js 4+++ browser/app/profile/firefox.js
5@@ -1865,6 +1865,15 @@ pref("prio.publicKeyB", "26E6674E65425B8 5@@ -1862,6 +1862,12 @@ pref("prio.publicKeyB", "26E6674E65425B8
6 pref("toolkit.coverage.enabled", false); 6 pref("toolkit.coverage.enabled", false);
7 pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); 7 pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
8  8
9+// Select UI locale from LANG/LC_MESSAGE environmental variables 9+// Select UI locale from LANG/LC_MESSAGE environmental variables
10+pref("intl.locale.requested", ""); 10+pref("intl.locale.requested", "");
11+ 11+
12+// Enable system addons, for example langpacks from www/firefox-l10n 12+// Enable system addons, for example langpacks from www/firefox-l10n
13+pref("extensions.autoDisableScopes", 11); 13+pref("extensions.autoDisableScopes", 11);
14+ 14+
15+// Disable multiprocess window support. Workaround for PR 53273. 
16+pref("browser.tabs.remote.autostart", false); 
17+ 
18 // Discovery prefs 15 // Discovery prefs
19 pref("browser.discovery.enabled", true); 16 pref("browser.discovery.enabled", true);
20 pref("browser.discovery.containers.enabled", true); 17 pref("browser.discovery.containers.enabled", true);
File Added: pkgsrc/security/tor-browser/patches/patch-gfx_thebes_gfxPlatform.cpp
$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 {
File Deleted: pkgsrc/security/tor-browser/patches/Attic/patch-ipc_glue_CrossProcessSemaphore.h
File Deleted: pkgsrc/security/tor-browser/patches/Attic/patch-ipc_glue_CrossProcessSemaphore__posix.cpp