Pier Angelo Vendrame pushed to branch mullvad-browser-140.9.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser

Commits:

3 changed files:

Changes:

  • browser/config/mozconfigs/base-browser
    ... ... @@ -30,6 +30,8 @@ ac_add_options --enable-proxy-bypass-protection
    30 30
     # See bugs #30575 and #32418: system policies are harmful either because they
    
    31 31
     # could allow proxy bypass, and override a number of other preferences we set
    
    32 32
     ac_add_options --disable-system-policies
    
    33
    +# tor-browser#44394
    
    34
    +ac_add_options --disable-system-preferences
    
    33 35
     
    
    34 36
     # See bug #41131
    
    35 37
     ac_add_options --disable-backgroundtasks
    

  • modules/libpref/Preferences.cpp
    ... ... @@ -5082,7 +5082,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
    5082 5082
         }
    
    5083 5083
       }
    
    5084 5084
     
    
    5085
    -#if defined(MOZ_WIDGET_GTK)
    
    5085
    +#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)
    
    5086 5086
       // To ensure the system-wide preferences are not overwritten by
    
    5087 5087
       // firefox/browser/defauts/preferences/*.js we need to load
    
    5088 5088
       // the /etc/firefox/defaults/pref/*.js settings as last.
    

  • toolkit/moz.configure
    ... ... @@ -3961,6 +3961,17 @@ option(
    3961 3961
     
    
    3962 3962
     set_config("MOZ_SYSTEM_POLICIES", True, when="--enable-system-policies")
    
    3963 3963
     
    
    3964
    +# System preferences
    
    3965
    +# ==============================================================
    
    3966
    +
    
    3967
    +option(
    
    3968
    +    "--disable-system-preferences",
    
    3969
    +    help="Disable reading preferences from /etc/firefox",
    
    3970
    +)
    
    3971
    +
    
    3972
    +set_config("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")
    
    3973
    +set_define("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")
    
    3974
    +
    
    3964 3975
     # Allow disabling the creation a legacy profile
    
    3965 3976
     # ==============================================================
    
    3966 3977