[tor-commits] [tor-browser/tor-browser-17.0.5esr-3] fixup! Tor Browser's Firefox preference overrides.
mikeperry at torproject.org
mikeperry at torproject.org
Fri May 10 19:12:49 UTC 2013
commit 82ffb2e227138ec95c7ae2d1e49acc2b9c503368
Author: Mike Perry <mikeperry-git at torproject.org>
Date: Fri May 10 11:27:27 2013 -0700
fixup! Tor Browser's Firefox preference overrides.
Apparently it's lexicographic order, not archive order that is important.
---
browser/app/Makefile.in | 2 +-
browser/app/profile/000-tor-browser.js | 124 +++++++++++++++++++++++++++++++
browser/app/profile/tor-browser.js | 125 --------------------------------
browser/installer/package-manifest.in | 2 +-
toolkit/mozapps/installer/packager.mk | 3 -
5 files changed, 126 insertions(+), 130 deletions(-)
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index bcd2d20..d8bc784 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -18,7 +18,7 @@ endif
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
$(NULL)
-PREF_JS_EXPORTS += $(srcdir)/profile/tor-browser.js
+PREF_JS_EXPORTS += $(srcdir)/profile/000-tor-browser.js
# hardcode en-US for the moment
diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
new file mode 100644
index 0000000..c9c00f3
--- /dev/null
+++ b/browser/app/profile/000-tor-browser.js
@@ -0,0 +1,124 @@
+# Default Preferences
+# Tor Browser Bundle
+# Do not edit this file.
+
+// Disable browser auto updaters and associated homepage notifications
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("browser.search.update", false);
+pref("browser.rights.3.shown", true);
+pref("browser.startup.homepage_override.mstone", "ignore");
+pref("startup.homepage_welcome_url", "");
+pref("startup.homepage_override_url", "");
+
+// Disk activity: Disable Browsing History Storage
+pref("browser.privatebrowsing.autostart", true);
+pref("browser.cache.disk.enable", false);
+pref("browser.cache.offline.enable", false);
+pref("dom.indexedDB.enabled", false);
+pref("permissions.memory_only", true);
+pref("network.cookie.lifetimePolicy", 2);
+pref("browser.download.manager.retention", 1);
+
+// Disk activity: TBB Directory Isolation
+pref("browser.download.useDownloadDir", false);
+pref("browser.shell.checkDefaultBrowser", false);
+pref("browser.download.manager.addToRecentDocs", false);
+
+// Misc privacy: Disk
+pref("signon.rememberSignons", false);
+pref("browser.formfill.enable", false);
+pref("signon.autofillForms", false);
+pref("browser.sessionstore.privacy_level", 2);
+
+// Misc privacy: Remote
+pref("browser.send_pings", false);
+pref("geo.enabled", false);
+pref("geo.wifi.uri", "");
+pref("browser.search.suggest.enabled", false);
+pref("browser.safebrowsing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
+
+// Fingerprinting
+pref("webgl.min_capability_mode", true);
+pref("webgl.disable-extensions", true);
+pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations
+pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations
+pref("browser.display.max_font_attempts",10);
+pref("browser.display.max_font_count",10);
+pref("gfx.downloadable_fonts.fallback_delay", -1);
+pref("general.appname.override", "Netscape");
+pref("general.appversion.override", "5.0 (Windows)");
+pref("general.buildID.override", "0");
+pref("general.oscpu.override", "Windows NT 6.1");
+pref("general.platform.override", "Win32");
+pref("general.productSub.override", "20100101");
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0");
+pref("general.useragent.vendor", "");
+pref("general.useragent.vendorSub", "");
+pref("dom.enable_performance", false);
+pref("plugin.expose_full_path", false);
+pref("browser.startup.homepage_override.buildID", "20110325121920");
+pref("browser.startup.homepage_override.mstone", "rv:2.0");
+pref("browser.zoom.siteSpecific", false);
+// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton
+// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton
+// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton
+
+// Third party stuff
+pref("network.cookie.cookieBehavior", 1);
+pref("security.enable_tls_session_tickets", false);
+pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable)
+pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case
+pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case
+
+// Proxy and proxy security
+pref("network.proxy.socks", "127.0.0.1");
+pref("network.proxy.socks_port", 9150);
+pref("network.proxy.socks_remote_dns", true);
+pref("network.proxy.type", 1);
+pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151");
+pref("network.dns.disablePrefetch", true);
+pref("network.protocol-handler.external-default", false);
+pref("network.protocol-handler.external.mailto", false);
+pref("network.protocol-handler.external.news", false);
+pref("network.protocol-handler.external.nntp", false);
+pref("network.protocol-handler.external.snews", false);
+pref("network.protocol-handler.warn-external.mailto", true);
+pref("network.protocol-handler.warn-external.news", true);
+pref("network.protocol-handler.warn-external.nntp", true);
+pref("network.protocol-handler.warn-external.snews", true);
+pref("plugins.click_to_play", true);
+
+// Network and performance
+pref("network.http.pipelining", true);
+pref("network.http.pipelining.aggressive", true);
+pref("network.http.pipelining.maxrequests", 12);
+pref("network.http.pipelining.ssl", true);
+pref("network.http.proxy.pipelining", true);
+pref("security.ssl.enable_false_start", true);
+pref("network.http.keep-alive.timeout", 20);
+pref("network.http.connection-retry-timeout", 0);
+pref("network.http.max-persistent-connections-per-proxy", 256);
+pref("network.http.pipelining.reschedule-timeout", 15000);
+pref("network.http.pipelining.read-timeout", 60000);
+// Hacked pref: Now means "Attempt to pipeline at least this many requests together"
+pref("network.http.pipelining.max-optimistic-requests", 3);
+
+// Extension support
+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.enabledItems", "langpack-en-US at 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", 1);
+pref("extensions.pendingOperations", false);
+pref("xpinstall.whitelist.add", "");
+pref("xpinstall.whitelist.add.36", "");
+
+// Omnibox settings
+pref("keyword.URL", "https://startpage.com/do/search?q=");
+
+// Version placeholder
+pref("torbrowser.version", "UNKNOWN");
diff --git a/browser/app/profile/tor-browser.js b/browser/app/profile/tor-browser.js
deleted file mode 100644
index bcc5bad..0000000
--- a/browser/app/profile/tor-browser.js
+++ /dev/null
@@ -1,125 +0,0 @@
-# Default Preferences
-# Tor Browser Bundle
-# Do not edit this file.
-
-// Disable browser auto updaters and associated homepage notifications
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("browser.search.update", false);
-pref("browser.rights.3.shown", true);
-pref("browser.startup.homepage_override.mstone", "ignore");
-pref("startup.homepage_welcome_url", "");
-pref("startup.homepage_override_url", "");
-
-// Disk activity: Disable Browsing History Storage
-pref("browser.privatebrowsing.autostart", true);
-pref("browser.cache.disk.enable", false);
-pref("browser.cache.offline.enable", false);
-pref("dom.indexedDB.enabled", false);
-pref("permissions.memory_only", true);
-pref("network.cookie.lifetimePolicy", 2);
-pref("browser.download.manager.retention", 1);
-
-// Disk activity: TBB Directory Isolation
-pref("browser.download.useDownloadDir", false);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("browser.download.manager.addToRecentDocs", false);
-
-// Misc privacy: Disk
-pref("signon.rememberSignons", false);
-pref("browser.formfill.enable", false);
-pref("signon.autofillForms", false);
-pref("browser.sessionstore.privacy_level", 2);
-
-// Misc privacy: Remote
-pref("browser.send_pings", false);
-pref("geo.enabled", false);
-pref("geo.wifi.uri", "");
-pref("browser.search.suggest.enabled", false);
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// Fingerprinting
-pref("webgl.min_capability_mode", true);
-pref("webgl.disable-extensions", true);
-pref("dom.battery.enabled", false); // fingerprinting due to differing OS implementations
-pref("dom.network.enabled",false); // fingerprinting due to differing OS implementations
-pref("browser.display.max_font_attempts",10);
-pref("browser.display.max_font_count",10);
-pref("gfx.downloadable_fonts.fallback_delay", -1);
-pref("general.appname.override", "Netscape");
-pref("general.appversion.override", "5.0 (Windows)");
-pref("general.buildID.override", "0");
-//pref("general.useragent.locale", "SHPONKA"); // Set by Torbutton
-pref("general.oscpu.override", "Windows NT 6.1");
-pref("general.platform.override", "Win32");
-pref("general.productSub.override", "20100101");
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0");
-pref("general.useragent.vendor", "");
-pref("general.useragent.vendorSub", "");
-pref("dom.enable_performance", false);
-pref("plugin.expose_full_path", false);
-pref("browser.startup.homepage_override.buildID", "20110325121920");
-pref("browser.startup.homepage_override.mstone", "rv:2.0");
-pref("browser.zoom.siteSpecific", false);
-// pref("intl.accept_languages", "en-us, en"); // Set by Torbutton
-// pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton
-// pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton
-
-// Third party stuff
-pref("network.cookie.cookieBehavior", 1);
-pref("security.enable_tls_session_tickets", false);
-pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable)
-pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case
-pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case
-
-// Proxy and proxy security
-pref("network.proxy.socks", "127.0.0.1");
-pref("network.proxy.socks_port", 9150);
-pref("network.proxy.socks_remote_dns", true);
-pref("network.proxy.type", 1);
-pref("network.security.ports.banned", "8118,8123,9050,9051,9150,9151");
-pref("network.dns.disablePrefetch", true);
-pref("network.protocol-handler.external-default", false);
-pref("network.protocol-handler.external.mailto", false);
-pref("network.protocol-handler.external.news", false);
-pref("network.protocol-handler.external.nntp", false);
-pref("network.protocol-handler.external.snews", false);
-pref("network.protocol-handler.warn-external.mailto", true);
-pref("network.protocol-handler.warn-external.news", true);
-pref("network.protocol-handler.warn-external.nntp", true);
-pref("network.protocol-handler.warn-external.snews", true);
-pref("plugins.click_to_play", true);
-
-// Network and performance
-pref("network.http.pipelining", true);
-pref("network.http.pipelining.aggressive", true);
-pref("network.http.pipelining.maxrequests", 12);
-pref("network.http.pipelining.ssl", true);
-pref("network.http.proxy.pipelining", true);
-pref("security.ssl.enable_false_start", true);
-pref("network.http.keep-alive.timeout", 20);
-pref("network.http.connection-retry-timeout", 0);
-pref("network.http.max-persistent-connections-per-proxy", 256);
-pref("network.http.pipelining.reschedule-timeout", 15000);
-pref("network.http.pipelining.read-timeout", 60000);
-// Hacked pref: Now means "Attempt to pipeline at least this many requests together"
-pref("network.http.pipelining.max-optimistic-requests", 3);
-
-// Extension support
-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.enabledItems", "langpack-en-US at 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", 1);
-pref("extensions.pendingOperations", false);
-pref("xpinstall.whitelist.add", "");
-pref("xpinstall.whitelist.add.36", "");
-
-// Omnibox settings
-pref("keyword.URL", "https://startpage.com/do/search?q=");
-
-// Version placeholder
-pref("torbrowser.version", "UNKNOWN");
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 6d58645..753597c 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -570,7 +570,7 @@
@BINPATH@/@PREF_DIR@/channel-prefs.js
#endif
@BINPATH@/defaults/profile/prefs.js
- at BINPATH@/@PREF_DIR@/tor-browser.js
+ at BINPATH@/@PREF_DIR@/000-tor-browser.js
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 01c7b93..6963e8b 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -497,12 +497,10 @@ OMNIJAR_FILES = \
# defaults/pref/channel-prefs.js is handled separate from other prefs due to
# bug 756325.
-# tor-browser.js is also bundled last, because it must override other prefs.
NON_OMNIJAR_FILES += \
chrome/icons/\* \
$(PREF_DIR)/channel-prefs.js \
defaults/pref/channel-prefs.js \
- defaults/preferences/tor-browser.js \
res/cursors/\* \
res/MainMenu.nib/\* \
\*/.mkdir.done \
@@ -516,7 +514,6 @@ PACK_OMNIJAR = \
mv tmp.manifest $$m; \
done; \
$(ZIP) -r9m $(OMNIJAR_NAME) $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \
- $(ZIP) -u $(OMNIJAR_NAME) defaults/preferences/tor-browser.js && \
$(GENERATE_CACHE) && \
$(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) ./ ./ && \
mv binary.manifest components && \
More information about the tor-commits
mailing list