Commit 64860a36 authored by Kathleen Brade's avatar Kathleen Brade Committed by Matthew Finkel
Browse files

Bug 28044: Integrate Tor Launcher into tor-browser 

Build and package Tor Launcher as part of the browser (similar to
how pdfjs is handled).

The --disable-tor-launcher build option may be used to omit Tor Launcher.

If a Tor Launcher extension is present in the user's profile, it is
removed.
parent 10aaaccb

browser/app/profile/000-tor-browser.js

+2 −2
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ pref("extensions.autoDisableScopes", 0); 
pref("extensions.bootstrappedAddons", "{}");

pref("extensions.checkCompatibility.4.*", false);

pref("extensions.databaseSchema", 3);

pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5");

pref("extensions.enabledAddons", "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5");

pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");

pref("extensions.enabledScopes", 5); // AddonManager.SCOPE_PROFILE=1 | AddonManager.SCOPE_APPLICATION=4

pref("extensions.pendingOperations", false);
@@ -231,7 +231,7 @@ pref("extensions.getAddons.showPane", false); 
pref("extensions.htmlaboutaddons.recommendations.enabled", false);

// Show our legacy extensions directly on about:addons and get rid of the

// warning for the default theme.

pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org");

pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org");

// Bug 26114: Allow NoScript to access addons.mozilla.org etc.

pref("extensions.webextensions.restrictedDomains", "");

// Bug 31396: Disable indexedDB WebExtension storage backend.

browser/extensions/moz.build

+5 −0
Original line number Diff line number Diff line
@@ -12,3 +12,8 @@ DIRS += [ 
    'webcompat',

    'report-site-issue'

]



if not CONFIG['TOR_BROWSER_DISABLE_TOR_LAUNCHER']:

    DIRS += [

        'tor-launcher',

    ]

browser/installer/Makefile.in

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ endif 
endif

endif



ifdef TOR_BROWSER_DISABLE_TOR_LAUNCHER

DEFINES += -DTOR_BROWSER_DISABLE_TOR_LAUNCHER

endif



ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))

DEFINES += -DMOZ_SHARED_MOZGLUE=1

endif

browser/installer/package-manifest.in

+5 −0
Original line number Diff line number Diff line
@@ -244,6 +244,11 @@ 
@RESPATH@/browser/chrome/browser.manifest

@RESPATH@/browser/chrome/pdfjs.manifest

@RESPATH@/browser/chrome/pdfjs/*

#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER

@RESPATH@/browser/chrome/torlauncher.manifest

@RESPATH@/browser/chrome/torlauncher/*

@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js

#endif

@RESPATH@/chrome/toolkit@JAREXT@

@RESPATH@/chrome/toolkit.manifest

@RESPATH@/chrome/recording.manifest

build/moz.configure/old.configure

+3 −0
Original line number Diff line number Diff line
@@ -261,6 +261,9 @@ def old_configure_options(*options): 
    '--with-user-appdir',

    '--x-includes',

    '--x-libraries',



    # Tor additions.

    '--enable-tor-launcher',

)

def prepare_configure_options(extra_old_configure_args, all_options, *options):

    # old-configure only supports the options listed in @old_configure_options