Verified Commit 1b0c70f5 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41668: Tweaks to the Base Browser updater for Tor Browser 

This commit was once part of "Bug 4234: Use the Firefox Update Process
for Tor Browser.".
However, some parts of it were not needed for Base Browser and some
derivative browsers.
Therefore, we extracted from that commit the parts for Tor Browser
legacy, and we add them back to the patch set with this commit.
parent 64597639

browser/components/BrowserContentHandler.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ XPCOMUtils.defineLazyGetter(lazy, "gWindowsAlertsService", () => { 
});



const FORK_VERSION_PREF =

  "browser.startup.homepage_override.basebrowser.version";

  "browser.startup.homepage_override.torbrowser.version";



// One-time startup homepage override configurations

const ONCE_DOMAINS = ["mozilla.org", "firefox.com"];

browser/confvars.sh

+6 −6
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} 
# of values.

# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "

if test "$MOZ_UPDATE_CHANNEL" = "alpha"; then

  ACCEPTED_MAR_CHANNEL_IDS=basebrowser-torproject-alpha

  MAR_CHANNEL_ID=basebrowser-torproject-alpha

  ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha

  MAR_CHANNEL_ID=torbrowser-torproject-alpha

elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then

  ACCEPTED_MAR_CHANNEL_IDS=basebrowser-torproject-nightly

  MAR_CHANNEL_ID=basebrowser-torproject-nightly

  ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-nightly

  MAR_CHANNEL_ID=torbrowser-torproject-nightly

else

  ACCEPTED_MAR_CHANNEL_IDS=basebrowser-torproject-release

  MAR_CHANNEL_ID=basebrowser-torproject-release

  ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-release

  MAR_CHANNEL_ID=torbrowser-torproject-release

fi



# Include the DevTools client, not just the server (which is the default)

build/application.ini.in

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO 


#if MOZ_UPDATER

[AppUpdate]

URL=https://aus1.torproject.org/basebrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL

URL=https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL

#endif

config/createprecomplete.py

+12 −0
Original line number Diff line number Diff line
@@ -10,9 +10,17 @@ import io 
import os





# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms,

# we should remove all lines in this file that contain:

#      TorBrowser/Data



def get_build_entries(root_path):

    """Iterates through the root_path, creating a list for each file and

    directory. Excludes any file paths ending with channel-prefs.js.

    To support Tor Browser updates, excludes:

      TorBrowser/Data/Browser/profiles.ini

      TorBrowser/Data/Browser/profile.default/bookmarks.html

      TorBrowser/Data/Tor/torrc

    """

    rel_file_path_set = set()

    rel_dir_path_set = set()
@@ -24,6 +32,10 @@ def get_build_entries(root_path): 
            if not (

                rel_path_file.endswith("channel-prefs.js")

                or rel_path_file.endswith("update-settings.ini")

                or rel_path_file == "TorBrowser/Data/Browser/profiles.ini"

                or rel_path_file

                == "TorBrowser/Data/Browser/profile.default/bookmarks.html"

                or rel_path_file == "TorBrowser/Data/Tor/torrc"

                or rel_path_file.find("distribution/") != -1

            ):

                rel_file_path_set.add(rel_path_file)

toolkit/mozapps/extensions/AddonManager.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ const PREF_EM_STRICT_COMPATIBILITY = "extensions.strictCompatibility"; 
const PREF_EM_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";

const PREF_SYS_ADDON_UPDATE_ENABLED = "extensions.systemAddon.update.enabled";

const PREF_REMOTESETTINGS_DISABLED = "extensions.remoteSettings.disabled";

const PREF_EM_LAST_FORK_VERSION = "extensions.lastBaseBrowserVersion";

const PREF_EM_LAST_FORK_VERSION = "extensions.lastTorBrowserVersion";



const PREF_MIN_WEBEXT_PLATFORM_VERSION =

  "extensions.webExtensionsMinPlatformVersion";