Commit 0c1e13c1 authored by Mike Perry's avatar Mike Perry Committed by Richard Pospesel
Browse files

TB3: Tor Browser's official .mozconfigs. 

Also:
Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24
Changes needed to build Mac in 64bit
Bug 10715: Enable Webgl for mingw-w64 again.
Disable ICU when cross-compiling; clean-up.
Bug 15773: Enable ICU on OS X
Bug 15990: Don't build the sandbox with mingw-w64
Bug 12761: Switch to ESR 38 for OS X
Updating .mozconfig-asan
Bug 12516: Compile hardenend Tor Browser with -fwrapv
Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X
Bug 17858: Cannot create incremental MARs for hardened builds.
Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff
(which is part of mar-tools and is not distributed to end-users) with
ASan.
Bug 13419: Add back ICU for Windows
Bug 21239: Use GTK2 for ESR52 Linux builds
Bug 23025: Add hardening flags for macOS
Bug 24478: Enable debug assertions and tests in our ASan builds
--enable-proxy-bypass-protection
Bug 27597: ASan build option in tor-browser-build is broken

Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds

This fixes a problem where some preferences had the wrong default value.
Also see bug 27472 where we made a similar fix for Android.

Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING

Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds

Add an --enable-tor-browser-data-outside-app-dir configure option

Add --with-tor-browser-version configure option

Bug 21849: Don't allow SSL key logging.

Bug 31457: disable per-installation profiles

The dedicated profiles (per-installation) feature does not interact
well with our bundled profiles on Linux and Windows, and it also causes
multiple profiles to be created on macOS under TorBrowser-Data.

Bug 31935: Disable profile downgrade protection.

Since Tor Browser does not support more than one profile, disable
the prompt and associated code that offers to create one when a
version downgrade situation is detected.

Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT

Bug 25741 - TBA: Disable features at compile-time

MOZ_NATIVE_DEVICES for casting and the media player
MOZ_TELEMETRY_REPORTING for telemetry
MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo)

Bug 25741 - TBA: Add default configure options in dedicated file

Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION

Bug 29859: Disable HLS support for now

Add --disable-tor-launcher build option

Add --enable-tor-browser-update build option

Bug 33734: Set MOZ_NORMANDY to False

Bug 33851: Omit Parental Controls.

Bug 40061: Omit the Windows default browser agent from the build

Bug 40107: Adapt .mozconfig-asan for ESR 78

Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files

Bug 40793: moved Tor configuration options from old-configure.in to moz.configure
parent d389bc2e

browser/app/profile/001-base-profile.js

+3 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ pref("privacy.firstparty.isolate", true); // Always enforce first party isolatio 
pref("privacy.partition.network_state", false); // Disable for now until audit

pref("network.cookie.cookieBehavior", 1);

pref("network.cookie.cookieBehavior.pbmode", 1);

pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127

pref("network.http.http2.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127

pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

// Bug 40177: Make sure tracker cookie purging is disabled

pref("privacy.purge_trackers.enabled", false);
@@ -387,6 +387,8 @@ pref("dom.presentation.receiver.enabled", false); 
pref("dom.audiochannel.audioCompeting", false);

pref("dom.audiochannel.mediaControl", false);



#expand pref("torbrowser.version", __TOR_BROWSER_VERSION_QUOTED__);



// If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection.



#ifdef MOZ_BUNDLED_FONTS

browser/base/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]: 
    # Impacts `/toolkit/content/license.html`.

    DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True



if CONFIG["TOR_BROWSER_UPDATE"]:

    DEFINES["TOR_BROWSER_UPDATE"] = 1



JAR_MANIFESTS += ["jar.mn"]



GeneratedFile(

browser/config/mozconfigs/base-browser

+0 −2
Original line number Diff line number Diff line
@@ -32,5 +32,3 @@ ac_add_options --disable-system-policies 


# Disable telemetry

ac_add_options MOZ_TELEMETRY_REPORTING=
 


ac_add_options --with-relative-profile=BaseBrowser/Data/Browser

browser/config/mozconfigs/tor-browser

0 → 100644
+9 −0
Original line number Diff line number Diff line 
. $topsrcdir/browser/config/mozconfigs/base-browser



mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"



ac_add_options --with-relative-profile=TorBrowser/Data/Browser



ac_add_options --enable-tor-browser-update



ac_add_options --with-distribution-id=org.torproject

browser/installer/Makefile.in

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,14 @@ endif 
endif

endif



ifdef TOR_BROWSER_DISABLE_TOR_LAUNCHER

DEFINES += -DTOR_BROWSER_DISABLE_TOR_LAUNCHER

endif



ifdef TOR_BROWSER_UPDATE

DEFINES += -DTOR_BROWSER_UPDATE

endif



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

DEFINES += -DMOZ_SHARED_MOZGLUE=1

endif