- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 2 commits: fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 13 Mar '23

13 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 28d2cf6f by Pier Angelo Vendrame at 2023-03-13T08:32:39+01:00 fixup! Base Browser's .mozconfigs. Bug 41677: Fix updater settings for Android - - - - - 505e43a7 by Pier Angelo Vendrame at 2023-03-13T08:33:33+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41677: Fix updater settings for Android - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - browser/config/mozconfigs/tor-browser-android Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -24,6 +24,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-updater +ac_add_options --disable-verify-mar ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-parental-controls ===================================== browser/config/mozconfigs/tor-browser-android ===================================== @@ -2,9 +2,6 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -ac_add_options --disable-tor-browser-update -ac_add_options --disable-verify-mar - if test ! -z "$LOCAL_DEV_BUILD"; then ac_add_options --with-tor-browser-version=dev-build fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cecbd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cecbd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 5 commits: fixup! Bug 13379: Allow using NSS to sign and verify MAR signatures
by Pier Angelo Vendrame (＠pierov) 10 Mar '23

10 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b21932a0 by Pier Angelo Vendrame at 2023-03-10T16:25:54+01:00 fixup! Bug 13379: Allow using NSS to sign and verify MAR signatures Bug 41668: Port some updater patches to Base Browser Avoid using -rpath on macOS. - - - - - 7a1f72b8 by Pier Angelo Vendrame at 2023-03-10T16:26:08+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41668: Port some updater patches to Base Browser Remove TOR_BROWSER_UPDATE to then add BASE_BROWSER_UPDATE with another fixup commit. - - - - - b92ed4fe by Pier Angelo Vendrame at 2023-03-10T16:26:08+01:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 41668: Port some updater patches to Base Browser Rename TOR_BROWSER_UPDATE to BASE_BROWSER_UPDATE. Also, do not change app.update.auto in firefox.js, but add it to 001. - - - - - 70bbb109 by Pier Angelo Vendrame at 2023-03-10T16:26:08+01:00 fixup! Firefox preference overrides. Bug 41668: Port some updater patches to Base Browser Do not change app.update.auto in firefox.js, but add it to 001. - - - - - 8cecbdbb by Pier Angelo Vendrame at 2023-03-10T16:26:09+01:00 fixup! Bug 16940: After update, load local change notes. Bug 41668: Port some updater patches to Base Browser Renamed TOR_BROWSER_UPDATE to BASE_BROWSER_UPDATE. - - - - - 30 changed files: - browser/actors/moz.build - browser/app/Makefile.in - browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/browser.js - browser/base/jar.mn - browser/base/moz.build - browser/components/BrowserContentHandler.jsm - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/moz.build - browser/components/preferences/main.js - browser/config/mozconfigs/base-browser - browser/config/mozconfigs/tor-browser - browser/installer/Makefile.in - browser/installer/package-manifest.in - browser/locales/jar.mn - build/moz.configure/update-programs.configure - modules/libmar/verify/moz.build - moz.configure - mozconfig-linux-x86_64-dev - toolkit/modules/AppConstants.jsm - toolkit/modules/UpdateUtils.jsm - toolkit/modules/moz.build - toolkit/mozapps/update/UpdateService.jsm - toolkit/mozapps/update/UpdateServiceStub.jsm - toolkit/mozapps/update/common/updatehelper.cpp - toolkit/mozapps/update/updater/launchchild_osx.mm The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7caf29… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7caf29… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 6 commits: Bug 41459: WebRTC fails to build under mingw (Part 1)
by Richard Pospesel (＠richard) 10 Mar '23

10 Mar '23

Richard Pospesel pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 346a1b54 by Marco Simonelli at 2023-03-10T16:12:12+00:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 10c94cdc by Marco Simonelli at 2023-03-10T16:12:13+00:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - acfed910 by Marco Simonelli at 2023-03-10T16:12:13+00:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - d6df815f by Marco Simonelli at 2023-03-10T16:12:13+00:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 090c6296 by Marco Simonelli at 2023-03-10T16:12:14+00:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 1d8ac663 by Marco Simonelli at 2023-03-10T16:12:14+00:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 30 changed files: - dom/media/systemservices/video_engine/desktop_device_info.cc - dom/media/webrtc/libwebrtcglue/VideoConduit.cpp - dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp - dom/media/webrtc/transport/nrinterfaceprioritizer.cpp - dom/media/webrtc/transport/sigslot.h - dom/media/webrtc/transport/test/ice_unittest.cpp - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.c - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.h - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c - dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c - dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c - js/src/old-configure.in - netwerk/sctp/src/netinet/sctp_cc_functions.c - netwerk/sctp/src/netinet/sctp_indata.c - netwerk/sctp/src/netinet/sctp_input.c - netwerk/sctp/src/netinet/sctp_output.c - netwerk/sctp/src/netinet/sctp_usrreq.c - netwerk/sctp/src/netinet/sctputil.c - netwerk/sctp/src/user_mbuf.c - netwerk/sctp/src/user_socket.c - old-configure.in - third_party/libwebrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h - third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h - third_party/libwebrtc/modules/video_capture/video_capture_defines.h - third_party/libwebrtc/modules/video_capture/windows/device_info_ds.h - third_party/libwebrtc/rtc_base/platform_thread_types.cc - third_party/libwebrtc/rtc_base/socket.h - third_party/libwebrtc/rtc_base/synchronization/rw_lock_win.h The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd73f2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd73f2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40808: Set update URL for nightly base-browser
by boklm (＠boklm) 10 Mar '23

10 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 08adc57a by Nicolas Vigier at 2023-03-10T15:47:38+01:00 Bug 40808: Set update URL for nightly base-browser - - - - - 2 changed files: - projects/firefox/build - projects/firefox/config Changes: ===================================== projects/firefox/build ===================================== @@ -92,9 +92,9 @@ fi popd [% END %] -[% IF c("var/nightly") && c("var/tor-browser") -%] +[% IF c("var/nightly") && ! c("var/privacy-browser") -%] # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in + sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] ===================================== projects/firefox/config ===================================== @@ -18,7 +18,7 @@ var: browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' - nightly_updates_osname: '[% c("var/osname") %]' + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' deps: @@ -68,6 +68,8 @@ targets: basebrowser: # basebrowser tag always has a -build1 suffix git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1' + var: + nightly_updates_publish_dir_prefix: basebrowser- nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' @@ -122,7 +124,7 @@ targets: macos: var: martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip' - nightly_updates_osname: macos + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]macos' arch_deps: - python3 - python3-distutils View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40809: Remove browser-update options from projects/firefox/mozconfig
by boklm (＠boklm) 10 Mar '23

10 Mar '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e877069e by Nicolas Vigier at 2023-03-10T13:07:14+01:00 Bug 40809: Remove browser-update options from projects/firefox/mozconfig The --enable-tor-browser-update and --enable-verify-mar options are already set by default in tor-browser.git. - - - - - 1 changed file: - projects/firefox/mozconfig Changes: ===================================== projects/firefox/mozconfig ===================================== @@ -66,11 +66,6 @@ [% END -%] [% END -%] -[% IF c("var/tor-browser") %] - ac_add_options --enable-tor-browser-update - ac_add_options --enable-verify-mar -[% END -%] - mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %] export MOZ_INCLUDE_SOURCE_INFO=1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 7 commits: Revert "Bug 13379: Sign our MAR files."
by Pier Angelo Vendrame (＠pierov) 10 Mar '23

10 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: bd011d63 by Pier Angelo Vendrame at 2023-03-10T10:39:17+01:00 Revert "Bug 13379: Sign our MAR files." This reverts commit 778aa6cfc77d6b747bc7be1cd2d421861265d68d. - - - - - 1a81a5cc by Pier Angelo Vendrame at 2023-03-10T10:39:17+01:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 41668: Port some updater patches to Base Browser Move the check on the update package version to this other commit. - - - - - fcf0e668 by Kathy Brade at 2023-03-10T10:39:17+01:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - 6209ee94 by Kathy Brade at 2023-03-10T10:39:18+01:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - 7e05454e by Pier Angelo Vendrame at 2023-03-10T10:39:18+01:00 fixup! Bug 19121: reinstate the update.xml hash check Bug 41668: Port some updater patches to Base Browser Modernize the way to compute the hash digest. - - - - - 5f27ed12 by Pier Angelo Vendrame at 2023-03-10T10:39:19+01:00 fixup! Bug 13379: Allow using NSS to sign and verify MAR signatures Bug 41668: Port some updater patches to Base Browser Use a configure-time flag to force using NSS for MARs signatures. - - - - - 7caf293f by Pier Angelo Vendrame at 2023-03-10T10:39:19+01:00 fixup! Base Browser's .mozconfigs. Bug 41668: Port some updater patches to Base Browser - - - - - 10 changed files: - browser/config/mozconfigs/base-browser - browser/config/mozconfigs/tor-browser - build/moz.configure/update-programs.configure - modules/libmar/tool/moz.build - modules/libmar/verify/moz.build - toolkit/mozapps/update/UpdateService.jsm - toolkit/mozapps/update/updater/updater-common.build - toolkit/mozapps/update/updater/updater.cpp - toolkit/xre/moz.build - toolkit/xre/nsUpdateDriver.cpp Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -14,6 +14,10 @@ export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize ac_add_options --enable-rust-simd +# Bug 13379: Sign our MAR files. +ac_add_options --enable-verify-mar +ac_add_options --enable-nss-mar + ac_add_options --enable-bundled-fonts ac_add_options --disable-tests ===================================== browser/config/mozconfigs/tor-browser ===================================== @@ -11,6 +11,5 @@ ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser # ac_add_options --with-user-appdir=.torproject ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar ac_add_options --with-distribution-id=org.torproject ===================================== build/moz.configure/update-programs.configure ===================================== @@ -32,6 +32,14 @@ set_config( "MOZ_VERIFY_MAR_SIGNATURE", depends_if("--enable-verify-mar")(lambda _: True) ) +# Use NSS for MAR signatures even on platforms where system libraries are +# supported (currently Windows and macOS). +# ============================================================== + +option("--enable-nss-mar", help="Always use NSS for MAR signatures") + +set_config("MOZ_USE_NSS_FOR_MAR", True, when="--enable-nss-mar") + # Maintenance service (Windows only) # ============================================================== ===================================== modules/libmar/tool/moz.build ===================================== @@ -43,7 +43,7 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging": "verifymar", ] - if CONFIG["TOR_BROWSER_UPDATE"]: + if CONFIG["MOZ_USE_NSS_FOR_MAR"]: DEFINES["MAR_NSS"] = True if CONFIG["OS_ARCH"] == "WINNT": @@ -52,12 +52,12 @@ if CONFIG["MOZ_BUILD_APP"] != "tools/update-packaging": OS_LIBS += [ "ws2_32", ] - if not CONFIG["TOR_BROWSER_UPDATE"]: + if not CONFIG["MOZ_USE_NSS_FOR_MAR"]: OS_LIBS += [ "crypt32", "advapi32", ] - elif CONFIG["OS_ARCH"] == "Darwin" and not CONFIG["TOR_BROWSER_UPDATE"]: + elif CONFIG["OS_ARCH"] == "Darwin" and not CONFIG["MOZ_USE_NSS_FOR_MAR"]: OS_LIBS += [ "-framework CoreFoundation", "-framework Security", ===================================== modules/libmar/verify/moz.build ===================================== @@ -15,12 +15,15 @@ FORCE_STATIC_LIB = True if CONFIG["OS_ARCH"] == "WINNT": USE_STATIC_LIBS = True -elif CONFIG["OS_ARCH"] == "Darwin": - USE_LIBS += [ - "nspr", - "nss", - "signmar", + use_nss = CONFIG["MOZ_USE_NSS_FOR_MAR"] +elif CONFIG["OS_ARCH"] == "Darwin" and not CONFIG["MOZ_USE_NSS_FOR_MAR"]: + UNIFIED_SOURCES += [ + "MacVerifyCrypto.cpp", ] + OS_LIBS += [ + "-framework Security", + ] + use_nss = False else: USE_LIBS += [ "nspr", @@ -34,14 +37,16 @@ else: OS_LIBS += [ "-Wl,-rpath=\\$$ORIGIN", ] - -DEFINES["MAR_NSS"] = True -LOCAL_INCLUDES += ["../sign"] + use_nss = True LOCAL_INCLUDES += [ "../src", ] +if use_nss: + LOCAL_INCLUDES += ["../sign"] + DEFINES["MAR_NSS"] = True + # C11 for static_assert c11_flags = ["-std=gnu11"] if CONFIG["CC_TYPE"] == "clang-cl": ===================================== toolkit/mozapps/update/UpdateService.jsm ===================================== @@ -996,21 +996,6 @@ function LOG(string) { } } -/** - * Convert a string containing binary values to hex. - */ -function binaryToHex(input) { - var result = ""; - for (var i = 0; i < input.length; ++i) { - var hex = input.charCodeAt(i).toString(16); - if (hex.length == 1) { - hex = "0" + hex; - } - result += hex; - } - return result; -} - /** * Gets the specified directory at the specified hierarchy under the * update root directory and creates it if it doesn't exist. @@ -5204,7 +5189,13 @@ Downloader.prototype = { // encoded binary (such as what is typically output by programs like // sha1sum). In the future, this may change to base64 depending on how // we choose to compute these hashes. - digest = binaryToHex(hash.finish(false)); + hash = hash.finish(false); + digest = Array.from(hash, (c, i) => + hash + .charCodeAt(i) + .toString(16) + .padStart(2, "0") + ).join(""); } catch (e) { LOG( "Downloader:_verifyDownload - failed to compute hash of the downloaded update archive" ===================================== toolkit/mozapps/update/updater/updater-common.build ===================================== @@ -4,9 +4,11 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEFINES["MAR_NSS"] = True - -link_with_nss = DEFINES["MAR_NSS"] or (CONFIG["OS_ARCH"] == "Linux" and CONFIG["MOZ_VERIFY_MAR_SIGNATURE"]) +link_with_nss = CONFIG["MOZ_USE_NSS_FOR_MAR"] or ( + CONFIG["OS_ARCH"] == "Linux" and CONFIG["MOZ_VERIFY_MAR_SIGNATURE"] +) +if link_with_nss: + DEFINES["MAR_NSS"] = True srcs = [ "archivereader.cpp", ===================================== toolkit/mozapps/update/updater/updater.cpp ===================================== @@ -2809,7 +2809,8 @@ static void UpdateThreadFunc(void* param) { if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK) { rv = UPDATE_SETTINGS_FILE_CHANNEL; } else { -# ifdef TOR_BROWSER_UPDATE +# ifdef BASE_BROWSER_VERSION_QUOTED + // Use the base browser version to prevent downgrade attacks. const char* appVersion = BASE_BROWSER_VERSION_QUOTED; # else const char* appVersion = MOZ_APP_VERSION; ===================================== toolkit/xre/moz.build ===================================== @@ -232,8 +232,8 @@ for var in ("APP_VERSION", "APP_ID"): if CONFIG["MOZ_BUILD_APP"] == "browser": DEFINES["MOZ_BUILD_APP_IS_BROWSER"] = True -if CONFIG['TOR_BROWSER_UPDATE']: - DEFINES['MAR_NSS'] = True +if CONFIG["MOZ_USE_NSS_FOR_MAR"]: + DEFINES["MAR_NSS"] = True LOCAL_INCLUDES += [ "../../other-licenses/nsis/Contrib/CityHash/cityhash", ===================================== toolkit/xre/nsUpdateDriver.cpp ===================================== @@ -342,8 +342,7 @@ static bool IsOlderVersion(nsIFile* versionFile, const char* appVersion) { return mozilla::Version(appVersion) > buf; } -#if defined(TOR_BROWSER_UPDATE) && defined(MOZ_VERIFY_MAR_SIGNATURE) && \ - defined(MAR_NSS) && defined(XP_MACOSX) +#if defined(MOZ_VERIFY_MAR_SIGNATURE) && defined(MAR_NSS) && defined(XP_MACOSX) /** * Ideally we would save and restore the original library path value after * the updater finishes its work (and before firefox is re-launched). @@ -656,8 +655,7 @@ static void ApplyUpdate(nsIFile* greDir, nsIFile* updateDir, nsIFile* appDir, PR_SetEnv("MOZ_SAFE_MODE_RESTART=1"); } -#if defined(TOR_BROWSER_UPDATE) && defined(MOZ_VERIFY_MAR_SIGNATURE) && \ - defined(MAR_NSS) && defined(XP_MACOSX) +#if defined(MOZ_VERIFY_MAR_SIGNATURE) && defined(MAR_NSS) && defined(XP_MACOSX) // On macOS, append the app directory to the shared library search path // so the system can locate the shared libraries that are needed by the // updater, e.g., libnss3.dylib). View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6b8aa1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6b8aa1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 10 Mar '23

10 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: cd73f25b by hackademix at 2023-03-10T11:15:08+00:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -370,6 +370,10 @@ pref("network.http.http2.enable-hpack-dump", false, locked); // (defense in depth measure) pref("network.gio.supported-protocols", ""); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces +// tor-browser#41667 - Defense in depth: use mDNS to avoid local IP leaks on Android too if user enables WebRTC +pref("media.peerconnection.ice.obfuscate_host_addresses", true); +// tor-browser#41671 - Defense in depth: connect using TURN only, to avoid IP leaks if user enables WebRTC +pref("media.peerconnection.ice.relay_only", true); // Disables media devices but only if `media.peerconnection.enabled` is set to // `false` as well. (see bug 16328 for this defense-in-depth measure) pref("media.navigator.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cd73f25… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cd73f25… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 3 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 10 Mar '23

10 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 0ee701d3 by Dan Ballard at 2023-03-10T09:24:17+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection bug 41093: add 'learn more' beside bridge emoji - - - - - 1206e7d0 by Dan Ballard at 2023-03-10T09:24:17+00:00 fixup! Add TorStrings module for localization bug 41093: add 'learn more' beside bridge emoji - - - - - 6b8aa1af by Dan Ballard at 2023-03-10T09:24:17+00:00 fixup! fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection bug 41093: fix css on 'what are these' links to not use .expanded but more precise :not syntax - - - - - 5 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/components/torpreferences/content/torPreferences.css - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -125,6 +125,7 @@ const gConnectionPane = (function() { cardTemplate: "#torPreferences-bridgeCard-template", card: ".torPreferences-bridgeCard", cardId: ".torPreferences-bridgeCard-id", + cardHeadingManualLink: ".torPreferences-bridgeCard-manualLink", cardHeadingAddr: ".torPreferences-bridgeCard-headingAddr", cardConnectedLabel: ".torPreferences-bridgeCard-connectedLabel", cardOptions: ".torPreferences-bridgeCard-options", @@ -458,6 +459,19 @@ const gConnectionPane = (function() { learnMore.setAttribute("useoriginprincipal", "true"); } } + { + const manualLink = bridgeTemplate.querySelector( + selectors.bridges.cardHeadingManualLink + ); + manualLink.setAttribute("value", TorStrings.settings.whatAreThese); + manualLink.setAttribute( + "href", + TorStrings.settings.learnMoreBridgesCardURL + ); + if (TorStrings.settings.learnMoreBridgesCardURL.startsWith("about:")) { + manualLink.setAttribute("useoriginprincipal", "true"); + } + } bridgeTemplate.querySelector( selectors.bridges.cardConnectedLabel ).textContent = TorStrings.settings.statusTorConnected; ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -106,6 +106,7 @@ <vbox id="torPreferences-bridgeCard-template" class="torPreferences-bridgeCard"> <hbox class="torPreferences-bridgeCard-heading"> <html:div class="torPreferences-bridgeCard-id"/> + <label class="torPreferences-bridgeCard-manualLink learnMore text-link stop-click" is="text-link"/> <html:div class="torPreferences-bridgeCard-headingAddr"/> <html:div class="torPreferences-bridgeCard-buttons"> <html:span class="torPreferences-bridgeCard-connectedBadge"> ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -260,6 +260,19 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { background: var(--in-content-box-background-odd); } +#torPreferences-currentBridges-cards:not( + .single-card +) .torPreferences-bridgeCard:not( + .expanded, + .currently-connected +) .torPreferences-bridgeCard-manualLink { + display: none; +} + +.torPreferences-bridgeCard-manualLink { + margin: 0 8px; +} + .torPreferences-bridgeCard-headingAddr { /* flex extends the element when needed, but without setting a width (any) the overflow + ellipses does not work. */ ===================================== browser/modules/TorStrings.jsm ===================================== @@ -86,6 +86,7 @@ const Loader = { statusTorNotConnected: "Not Connected", statusTorBlocked: "Potentially Blocked", learnMore: "Learn more", + whatAreThese: "What are these?", // Quickstart quickstartHeading: "Quickstart", quickstartDescription: ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -40,6 +40,7 @@ settings.bridgeId=%1$S bridge: %2$S settings.remove=Remove settings.bridgeDisableBuiltIn=Disable built-in bridges settings.bridgeShare=Share this bridge using the QR code or by copying its address: +settings.whatAreThese=What are these? settings.bridgeCopy=Copy Bridge Address settings.copied=Copied! settings.bridgeShowAll=Show All Bridges View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f72a9f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f72a9f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 9 commits: fixup! Bug 41149: Re-enable DLL injection protection in all builds not just nightlies
by Pier Angelo Vendrame (＠pierov) 10 Mar '23

10 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ff847912 by Pier Angelo Vendrame at 2023-03-10T09:44:43+01:00 fixup! Bug 41149: Re-enable DLL injection protection in all builds not just nightlies Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed BASE_BROWSER with BASE_BROWSER_VERSION. - - - - - 9b0c427d by Pier Angelo Vendrame at 2023-03-10T09:44:51+01:00 fixup! Bug 41599: Always return an empty string as network ID Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed BASE_BROWSER with BASE_BROWSER_VERSION. - - - - - ed2e2a46 by Pier Angelo Vendrame at 2023-03-10T09:44:52+01:00 fixup! Bug 41108: Remove privileged macOS installation from 102 Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed BASE_BROWSER with BASE_BROWSER_VERSION. - - - - - 09494c9c by Pier Angelo Vendrame at 2023-03-10T09:44:52+01:00 fixup! Base Browser's .mozconfigs. Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Removed the --enable-base-browser flag and the BASE_BROWSER macro and added --with-base-browser-version to the -dev mozconfig. - - - - - 3a9ece68 by Pier Angelo Vendrame at 2023-03-10T09:44:53+01:00 fixup! Bug 25741: TBA: Disable GeckoNetworkManager Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed TOR_BROWSER_VERSION to TOR_BROWSER. - - - - - 8482c229 by Pier Angelo Vendrame at 2023-03-10T09:44:53+01:00 fixup! Bug 31575: Disable Firefox Home (Activity Stream) Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed BASE_BROWSER with BASE_BROWSER_VERSION. - - - - - fcc36dda by Pier Angelo Vendrame at 2023-03-10T09:44:54+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed BASE_BROWSER with BASE_BROWSER_VERSION. - - - - - be67ccc4 by Pier Angelo Vendrame at 2023-03-10T09:44:54+01:00 fixup! Firefox preference overrides. Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed TOR_BROWSER_VERSION with BASE_BROWSER_VERSION. - - - - - 065785a8 by Pier Angelo Vendrame at 2023-03-10T09:44:54+01:00 fixup! Bug 41542: Disable the creation of a default profile Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros Changed TOR_BROWSER_VERSION with BASE_BROWSER_VERSION. - - - - - 18 changed files: - browser/components/about/AboutRedirector.cpp - browser/config/mozconfigs/base-browser - browser/config/mozconfigs/base-browser-android - docshell/base/nsAboutRedirector.cpp - mobile/android/app/mobile.js - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java - moz.configure - mozconfig-linux-x86_64-dev - mozconfig-macos-x86_64 → mozconfig-macos - netwerk/system/android/nsAndroidNetworkLinkService.cpp - netwerk/system/linux/nsNetworkLinkService.cpp - netwerk/system/mac/nsNetworkLinkService.mm - netwerk/system/netlink/NetlinkService.cpp - netwerk/system/win32/nsNotifyAddrListener.cpp - toolkit/modules/AppConstants.jsm - toolkit/profile/nsToolkitProfileService.cpp - toolkit/xre/MacRunFromDmgUtils.mm - toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp Changes: ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -70,7 +70,7 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::IS_SECURE_CHROME_UI}, -#ifndef BASE_BROWSER +#ifndef BASE_BROWSER_VERSION {"firefoxview", "chrome://browser/content/firefoxview.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, @@ -108,7 +108,7 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, -#ifndef BASE_BROWSER +#ifndef BASE_BROWSER_VERSION {"pocket-saved", "chrome://pocket/content/panels/saved.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -36,8 +36,6 @@ ac_add_options --disable-system-policies # See bug #41131 ac_add_options --disable-backgroundtasks -ac_add_options --enable-base-browser - # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -31,8 +31,6 @@ ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-system-policies -ac_add_options --enable-base-browser - # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -165,7 +165,7 @@ static const RedirEntry kRedirMap[] = { #endif {"telemetry", "chrome://global/content/aboutTelemetry.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, -#ifndef BASE_BROWSER +#ifndef BASE_BROWSER_VERSION {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, #endif ===================================== mobile/android/app/mobile.js ===================================== @@ -355,7 +355,7 @@ pref("app.update.timerMinimumDelay", 30); // seconds // used by update service to decide whether or not to // automatically download an update pref("app.update.autodownload", "wifi"); -#ifdef TOR_BROWSER_VERSION +#ifdef BASE_BROWSER_VERSION pref("app.update.url.android", ""); #else pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TAR…"); ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java ===================================== @@ -161,9 +161,12 @@ public final class GeckoRuntime implements Parcelable { mPaused = false; // Monitor network status and send change notifications to Gecko // while active. - if (BuildConfig.TOR_BROWSER_VERSION == "") { + if (!BuildConfig.TOR_BROWSER) { GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + } else { + Log.d(LOGTAG, "Tor Browser: skip GeckoNetworkManager startup"); } + } @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE) @@ -171,7 +174,7 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onPause"); mPaused = true; // Stop monitoring network status while inactive. - if (BuildConfig.TOR_BROWSER_VERSION == "") { + if (!BuildConfig.TOR_BROWSER) { GeckoNetworkManager.getInstance().stop(); } GeckoThread.onPause(); ===================================== moz.configure ===================================== @@ -1016,14 +1016,6 @@ def zlib_in_mozglue(system_zlib, js_shared, linker, os): set_config("ZLIB_IN_MOZGLUE", zlib_in_mozglue) set_define("ZLIB_IN_MOZGLUE", zlib_in_mozglue) -option( - "--enable-base-browser", - help="Enable Base Browser" -) - -set_config("BASE_BROWSER", True, when="--enable-base-browser") -set_define("BASE_BROWSER", True, when="--enable-base-browser") - option( "--with-relative-data-dir", @@ -1044,6 +1036,37 @@ def relative_data_dir(value, target): set_define("RELATIVE_DATA_DIR", relative_data_dir) +option( + "--with-base-browser-version", + nargs=1, + help="Set the Base Browser version, e.g., 7.0a1" +) + + +@depends("--with-base-browser-version") +def base_browser_version(value): + if not value: + die( + "--with-base-browser-version is required for Base Browser and derived browsers." + ) + return value[0] + + +@depends("--with-base-browser-version") +def base_browser_version_quoted(value): + if not value: + die( + "--with-base-browser-version is required for Base Browser and derived browsers." + ) + if '"' in value or "\\" in value: + die("--with-base-browser-version cannot contain \" or \\.") + return '"{}"'.format(value[0]) + + +set_define("BASE_BROWSER_VERSION", base_browser_version) +set_define("BASE_BROWSER_VERSION_QUOTED", base_browser_version_quoted) + + # Please do not add configure checks from here on. # Fallthrough to autoconf-based configure ===================================== mozconfig-linux-x86_64-dev ===================================== @@ -11,3 +11,4 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --disable-strip ac_add_options --disable-install-strip +ac_add_options --with-base-browser-version=dev-build ===================================== mozconfig-macos-x86_64 → mozconfig-macos ===================================== ===================================== netwerk/system/android/nsAndroidNetworkLinkService.cpp ===================================== @@ -123,7 +123,7 @@ nsAndroidNetworkLinkService::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsAndroidNetworkLinkService::GetNetworkID(nsACString& aNetworkID) { -#ifdef BASE_BROWSER +#ifdef BASE_BROWSER_VERSION aNetworkID.Truncate(); #else if (!mNetlinkSvc) { ===================================== netwerk/system/linux/nsNetworkLinkService.cpp ===================================== @@ -50,7 +50,7 @@ nsNetworkLinkService::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) { -#ifdef BASE_BROWSER +#ifdef BASE_BROWSER_VERSION aNetworkID.Truncate(); #else if (!mNetlinkSvc) { ===================================== netwerk/system/mac/nsNetworkLinkService.mm ===================================== @@ -123,7 +123,7 @@ nsNetworkLinkService::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) { -#ifdef BASE_BROWSER +#ifdef BASE_BROWSER_VERSION aNetworkID.Truncate(); #else MutexAutoLock lock(mMutex); ===================================== netwerk/system/netlink/NetlinkService.cpp ===================================== @@ -1875,7 +1875,7 @@ void NetlinkService::CalculateNetworkID() { } void NetlinkService::GetNetworkID(nsACString& aNetworkID) { -#ifdef BASE_BROWSER +#ifdef BASE_BROWSER_VERSION aNetworkID.Truncate(); #else MutexAutoLock lock(mMutex); ===================================== netwerk/system/win32/nsNotifyAddrListener.cpp ===================================== @@ -105,7 +105,7 @@ nsNotifyAddrListener::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsNotifyAddrListener::GetNetworkID(nsACString& aNetworkID) { -#ifdef BASE_BROWSER +#ifdef BASE_BROWSER_VERSION aNetworkID.Truncate(); #else MutexAutoLock lock(mMutex); ===================================== toolkit/modules/AppConstants.jsm ===================================== @@ -354,6 +354,8 @@ this.AppConstants = Object.freeze({ MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@", ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@", + BASE_BROWSER_VERSION: "@BASE_BROWSER_VERSION@", + DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@", MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@", ===================================== toolkit/profile/nsToolkitProfileService.cpp ===================================== @@ -1583,7 +1583,7 @@ nsresult nsToolkitProfileService::SelectStartupProfile( // this behavior through a build-time flag, should Mozilla be interested // in taking it. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174 -#ifndef BASE_BROWSER +#ifndef BASE_BROWSER_VERSION // If there is only one profile and it isn't meant to be the profile that // older versions of Firefox use then we must create a default profile // for older versions of Firefox to avoid the existing profile being ===================================== toolkit/xre/MacRunFromDmgUtils.mm ===================================== @@ -288,7 +288,7 @@ static void StripQuarantineBit(NSString* aBundlePath) { LaunchTask(@"/usr/bin/xattr", arguments); } -#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER) +#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER_VERSION) bool LaunchElevatedDmgInstall(NSString* aBundlePath, NSArray* aArguments) { NSTask* task; if (@available(macOS 10.13, *)) { @@ -332,7 +332,7 @@ static bool InstallFromPath(NSString* aBundlePath, NSString* aDestPath) { bool triedElevatedInstall = false; -#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER) +#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER_VERSION) // The installation may have been unsuccessful if the user did not have the // rights to write to the Applications directory. Check for this situation and // launch an elevated installation if necessary. Rather than creating a new, ===================================== toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp ===================================== @@ -531,7 +531,7 @@ continue_loading: return ret; } -#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER) +#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION) // Map of specific thread proc addresses we should block. In particular, // LoadLibrary* APIs which indicate DLL injection static void* gStartAddressesToBlock[4]; @@ -544,7 +544,7 @@ static bool ShouldBlockThread(void* aStartAddress) { return false; } -#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER) +#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION) for (auto p : gStartAddressesToBlock) { if (p == aStartAddress) { return true; @@ -618,7 +618,7 @@ MFBT_API void DllBlocklist_Initialize(uint32_t aInitFlags) { } } -#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER) +#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION) // Populate a list of thread start addresses to block. HMODULE hKernel = GetModuleHandleW(L"kernel32.dll"); if (hKernel) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/53121e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/53121e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40805: Use the version flag for all our browsers
by Pier Angelo Vendrame (＠pierov) 10 Mar '23

10 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8acfc49a by Pier Angelo Vendrame at 2023-03-10T09:26:28+01:00 Bug 40805: Use the version flag for all our browsers - - - - - 1dbed39a by Pier Angelo Vendrame at 2023-03-10T09:26:44+01:00 Bug 40806: Update the macOS mozconfig name - - - - - 3 changed files: - projects/firefox/build - projects/firefox/mozconfig - projects/geckoview/build Changes: ===================================== projects/firefox/build ===================================== @@ -168,8 +168,8 @@ export LANG=C.UTF-8 ./mach configure \ --with-distribution-id=org.torproject \ + --with-base-browser-version=[% c("var/torbrowser_version") %] \ [% IF c("var/tor-browser") -%] - --with-tor-browser-version=[% c("var/torbrowser_version") %] \ --enable-update-channel=[% c("var/channel") %] \ [% END %] \ [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \ ===================================== projects/firefox/mozconfig ===================================== @@ -1,4 +1,4 @@ -. $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos-x86_64'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %] +. $topsrcdir/mozconfig-[% IF c("var/macos"); GET 'macos'; ELSE; GET c("var/osname"); END; %][% IF c("var/asan") %]-asan[% END %] [% IF c("var/linux") -%] # We want to build with clang now and point to the GCC toolchain until #29041 is ===================================== projects/geckoview/build ===================================== @@ -68,7 +68,7 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" ./mach configure \ - --with-tor-browser-version=[% c("var/torbrowser_version") %] \ + --with-base-browser-version=[% c("var/torbrowser_version") %] \ [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] ./mach build --verbose View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0