- tor-commits - lists.torproject.org

[torbrowser/master] update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 022c82c8b67f2ab63135fcd9368834af3f05dbbf Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 4 17:59:43 2011 +0100 update windows version string to remove nonexistent arch type that causes trailing dash in torbrowser.version (closes: #4160) --- build-scripts/windows.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8bfa747..1d9bd04 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -469,8 +469,8 @@ print-version: @echo $(RELEASE_VER)-$(BUILD_NUM) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

[torbrowser/master] add a recommended-versions file for mike's check.tpo user upgrade warning
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4fe8b9435ddef165a1b09ba7a05bfd83818ee579 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:13:26 2011 +0100 add a recommended-versions file for mike's check.tpo user upgrade warning --- build-scripts/recommended-versions | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions new file mode 100644 index 0000000..d04cab1 --- /dev/null +++ b/build-scripts/recommended-versions @@ -0,0 +1,7 @@ +[ +"2.2.33-3-Linux-i686", +"2.2.33-3-Linux-x86_64", +"2.2.33-3-MacOS-i386", +"2.2.33-3-MacOS-x86_64", +"2.2.32-3-Windows" +]

1 0

[torbrowser/master] bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 637186da1c90fe0f41d724d13bb806124335922e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:15:21 2011 +0100 bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 10 files changed, 48 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 914b537..c6de227 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index dcb3e7e..1fa2a62 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3cc6141..8faa57c 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 7.0.1 \_ Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 090ee8e..76949f5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 5d5dbc1..d131e85 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f36759c..035566b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,14 +6,14 @@ HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0.1 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.8 +NOSCRIPT_VER=2.1.4 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.33 -TORBUTTON_VER=1.4.3 -VIDALIA_VER=0.2.14 +TORBUTTON_VER=1.4.4 +VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1d9bd04..19c433f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 285914c..a6add26 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=linux + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:01:27 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=linux * Update Firefox to 7.0.1 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ad31c2e..e9b6daa 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=osx + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 10 23:26:02 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=osx * Update Firefox to 7.0.1 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f183ae4..4ccd526 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=windows + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:00:57 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=windows * Update Firefox to 7.0.1

1 0

[torbrowser/master] Merge branch 'bug4192' into maint-2.2
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 8b4c144be4445da48d8749c00475a48ce35a48f0 Merge: 022c82c dd8d5dc Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 10 17:32:55 2011 +0100 Merge branch 'bug4192' into maint-2.2 ...owser-exit-when-not-launched-from-Vidalia.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] Fix for 4192.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit dd8d5dcb03ffaf2d15747608178a9d3b2888f559 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Oct 9 22:55:00 2011 -0700 Fix for 4192. It ain't pretty. It just exits if we don't have a TBB profile. --- ...owser-exit-when-not-launched-from-Vidalia.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch new file mode 100644 index 0000000..6659770 --- /dev/null +++ b/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -0,0 +1,46 @@ +From 369d7df54fe13dd69a069a43959bdabcc364e6e4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Sun, 9 Oct 2011 22:50:07 -0700 +Subject: [PATCH] Make Tor Browser exit when not launched from Vidalia + +Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app +for easy relaunch. If they manage to do this, we should fail closed rather +than opened. Hopefully they will get the hint and dock Vidalia instead. + +This is an emergency fix for +https://trac.torproject.org/projects/tor/ticket/4192. We can do a better +localized fix w/ a translated alert menu later, if it seems like this might +actually be common. +--- + browser/base/content/browser.js | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js +index 50f6963..ed2812c 100644 +--- a/browser/base/content/browser.js ++++ b/browser/base/content/browser.js +@@ -1203,6 +1203,21 @@ function BrowserStartup() { + + prepareForStartup(); + ++ // If this is not a TBB profile, exit. ++ // Solves https://trac.torproject.org/projects/tor/ticket/4192 ++ var foundPref = false; ++ try { ++ foundPref = gPrefService.prefHasUserValue("torbrowser.version"); ++ } catch(e) { ++ //dump("No pref: "+e); ++ } ++ if(!foundPref) { ++ var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"] ++ .getService(Components.interfaces.nsIAppStartup); ++ appStartup.quit(3); // Force all windows to close, and then quit. ++ } ++ ++ + if (uriToLoad && !isLoadingBlank) { + if (uriToLoad instanceof Ci.nsISupportsArray) { + let count = uriToLoad.Count(); +-- +1.7.3.4 +

1 0

[torbrowser/master] add script to edit changelogs
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit ad8aa437c15a9a0943d64a9da5d163951d8f41a2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:13:07 2011 +0100 add script to edit changelogs --- build-scripts/edit-changelog.sh | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/build-scripts/edit-changelog.sh b/build-scripts/edit-changelog.sh new file mode 100755 index 0000000..5d269de --- /dev/null +++ b/build-scripts/edit-changelog.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# Create a consistent template for adding changelog entries +# +# To use this script, simply run ./edit-changelog.sh osx (or linux, or windows) +# +# Copyright Erinn Clark 2011 <erinn(a)torproject.org> +# See LICENSE for licensing information + + +VERSION=$(make -f "$PWD"/$1.mk print-version) +TORNAME="Erinn Clark" +TOREMAIL="erinn(a)torproject.org" + +cat > $PWD/../tmp.changelog.$1 <<EOF +Tor Browser Bundle ($VERSION); suite=$1 + + * + * + * + + -- $TORNAME <$TOREMAIL> $(date) + +EOF + +mv ../changelog.$1-2.2 ../changelog.$1-2.2-old +cat ../tmp.changelog.$1 ../changelog.$1-2.2-old >> ../changelog.$1-2.2 +

1 0

[torbrowser/master] change pipelining value to 8 to match the source code
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 7c4f334bb59dd151b4ffc49a0b5bd69f41461f91 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Sep 7 01:19:54 2011 +0100 change pipelining value to 8 to match the source code --- build-scripts/config/no-polipo-4.0.js | 2 +- build-scripts/config/windows-4.0.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 908402d..88374ff 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -100,7 +100,7 @@ user_pref("network.cookie.cookieBehavior", 1); user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.cookie.prefsMigrated", true); user_pref("network.http.pipelining", true); -user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.maxrequests", 8); user_pref("network.http.pipelining.ssl", true); user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", ""); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 3029145..c07b4f7 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -108,7 +108,7 @@ user_pref("network.cookie.cookieBehavior", 1); user_pref("network.cookie.lifetimePolicy", 2); user_pref("network.cookie.prefsMigrated", true); user_pref("network.http.pipelining", true); -user_pref("network.http.pipelining.maxrequests", 10); +user_pref("network.http.pipelining.maxrequests", 8); user_pref("network.http.pipelining.ssl", true); user_pref("network.http.proxy.pipelining", true); user_pref("network.hosts.pop_server", "");

1 0

[torbrowser/master] remove plugin.scan.plid.all from windows prefs.js so flash can be enabled from the addons screen
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9fa04aa627ee34cac4fec2c1b7e35b4aba7fb825 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 8 18:00:37 2011 +0100 remove plugin.scan.plid.all from windows prefs.js so flash can be enabled from the addons screen --- build-scripts/config/windows-4.0.js | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index c07b4f7..da09ab1 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -167,7 +167,6 @@ user_pref("plugin.scan.Acrobat", "99.0"); user_pref("plugin.scan.Quicktime", "99.0"); user_pref("plugin.scan.SunJRE", "99.0"); user_pref("plugin.scan.WindowsMediaPlayer", "99.0"); -user_pref("plugin.scan.plid.all", false); user_pref("privacy.sanitize.migrateFx3Prefs", true); user_pref("security.enable_java", false); user_pref("signon.rememberSignons", false);

1 0

[torbrowser/master] revert automatic port selection for windows tbbs (#3945)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 550edc2fe0267348190f381110163e6b2bae9f93 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Sep 7 03:22:40 2011 +0100 revert automatic port selection for windows tbbs (#3945) --- build-scripts/config/torrc | 2 -- build-scripts/config/vidalia.conf.ff | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 143c71a..2d63da9 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,6 +8,4 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index d66f53f..d03289e 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -7,5 +7,4 @@ LanguageCode=en ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc -AutoControl=true DataDirectory=.\\Data\\Tor

1 0

[torbrowser/master] Two more Firefox patches.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0efc1760fda3acaef28f5d66c62d374614d1a299 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Sep 8 10:16:19 2011 -0700 Two more Firefox patches. First one disables all plugins except flash from loading, second one makes the content-prefs service not write to disk. --- .../0007-Block-all-plugins-except-flash.patch | 85 ++++++++++++++++++++ ...ontent-pref-service-memory-only-clearable.patch | 37 +++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0007-Block-all-plugins-except-flash.patch b/src/current-patches/0007-Block-all-plugins-except-flash.patch new file mode 100644 index 0000000..d2c54dc --- /dev/null +++ b/src/current-patches/0007-Block-all-plugins-except-flash.patch @@ -0,0 +1,85 @@ +From dfabac8eddc37d794e23d25de3f1ef602ad4ad86 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Thu, 8 Sep 2011 08:40:05 -0700 +Subject: [PATCH 7/8] Block all plugins except flash. + +We cannot use the @mozilla.org/extensions/blocklist;1 service, because we +actually want to stop plugins from ever entering the browser's process space +and/or executing code (for example, AV plugins that collect statistics/analyse +urls, magical toolbars that phone home or "help" the user, skype buttons that +ruin our day, and censorship filters). Hence we rolled our own. + +See https://trac.torproject.org/projects/tor/ticket/3547#comment:6 for musings +on a better way. Until then, it is delta-darwinism for us. +--- + dom/plugins/base/nsPluginHost.cpp | 33 +++++++++++++++++++++++++++++++++ + dom/plugins/base/nsPluginHost.h | 2 ++ + 2 files changed, 35 insertions(+), 0 deletions(-) + +diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp +index 93c2413..1dc4ee0 100644 +--- a/dom/plugins/base/nsPluginHost.cpp ++++ b/dom/plugins/base/nsPluginHost.cpp +@@ -2062,6 +2062,35 @@ class nsDefaultComparator<pluginFileinDirectory, pluginFileinDirectory> + + typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); + ++PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) ++{ ++ nsCString leaf; ++ const char *leafStr; ++ nsresult rv; ++ ++ rv = pluginFile->GetNativeLeafName(leaf); ++ if (NS_FAILED(rv)) { ++ return PR_TRUE; // fuck 'em. blacklist. ++ } ++ ++ leafStr = leaf.get(); ++ ++ if (!leafStr) { ++ return PR_TRUE; // fuck 'em. blacklist. ++ } ++ ++ // libgnashplugin.so, libflashplayer.so, Flash Player-10.4-10.5.plugin, ++ // NPSWF32.dll, NPSWF64.dll ++ if (strstr(leafStr, "libgnashplugin") == leafStr || ++ strstr(leafStr, "libflashplayer") == leafStr || ++ strstr(leafStr, "Flash Player") == leafStr || ++ strstr(leafStr, "NPSWF") == leafStr) { ++ return PR_FALSE; ++ } ++ ++ return PR_TRUE; // fuck 'em. blacklist. ++} ++ + nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, + PRBool aCreatePluginList, + PRBool *aPluginsChanged) +@@ -2197,6 +2226,10 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, + continue; + } + ++ if (GhettoBlacklist(file)) { ++ continue; ++ } ++ + // if it is not found in cache info list or has been changed, create a new one + if (!pluginTag) { + nsPluginFile pluginFile(file); +diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h +index b1b8759..d6e237f 100644 +--- a/dom/plugins/base/nsPluginHost.h ++++ b/dom/plugins/base/nsPluginHost.h +@@ -283,6 +283,8 @@ private: + // Loads all cached plugins info into mCachedPlugins + nsresult ReadPluginInfo(); + ++ PRBool GhettoBlacklist(nsIFile *pluginFile); ++ + // Given a file path, returns the plugins info from our cache + // and removes it from the cache. + void RemoveCachedPluginsInfo(const char *filePath, +-- +1.7.3.4 + diff --git a/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch new file mode 100644 index 0000000..75f0c0c --- /dev/null +++ b/src/current-patches/0008-Make-content-pref-service-memory-only-clearable.patch @@ -0,0 +1,37 @@ +From 3964288545a78c28ca4585ac51bd7d9b8ccb3503 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Thu, 8 Sep 2011 08:40:17 -0700 +Subject: [PATCH 8/8] Make content pref service memory-only + clearable + +This prevents random urls from being inserted into content-prefs.sqllite in +the profile directory as content prefs change (includes site-zoom and perhaps +other site prefs?). +--- + .../contentprefs/nsContentPrefService.js | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/toolkit/components/contentprefs/nsContentPrefService.js b/toolkit/components/contentprefs/nsContentPrefService.js +index a5f417f..601f7a3 100644 +--- a/toolkit/components/contentprefs/nsContentPrefService.js ++++ b/toolkit/components/contentprefs/nsContentPrefService.js +@@ -1036,7 +1036,7 @@ ContentPrefService.prototype = { + + var dbConnection; + +- if (!dbFile.exists()) ++ if (true || !dbFile.exists()) + dbConnection = this._dbCreate(dbService, dbFile); + else { + try { +@@ -1084,7 +1084,7 @@ ContentPrefService.prototype = { + }, + + _dbCreate: function ContentPrefService__dbCreate(aDBService, aDBFile) { +- var dbConnection = aDBService.openDatabase(aDBFile); ++ var dbConnection = aDBService.openSpecialDatabase("memory"); + + try { + this._dbCreateSchema(dbConnection); +-- +1.7.3.4 +

1 0