October 2011 - tor-commits - lists.torproject.org

[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

[torbrowser/master] add plugin.scan.plid.all back to windows prefs
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 4321ed0c1fcadd85b61b6373d9cb335e4468ac5e Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 9 17:48:18 2011 +0100 add plugin.scan.plid.all back to windows prefs --- build-scripts/config/windows-4.0.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index ade6fe0..149d5de 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -166,6 +166,7 @@ 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] We no longer need to disable site-specific zoom.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit e3b08bde414155e2a223eaf7605cc6d7f956d398 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Sep 8 10:38:08 2011 -0700 We no longer need to disable site-specific zoom. The patch for bug #3229 makes it memory-only, and torbutton 1.4.2 also clears this memory on "New Identity". --- build-scripts/config/no-polipo-4.0.js | 1 - build-scripts/config/no-polipo.js | 1 - build-scripts/config/prefs.js | 1 - build-scripts/config/windows-4.0.js | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 88374ff..0694a1b 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -50,7 +50,6 @@ user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US& user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); user_pref("browser.urlbar.autocomplete.enabled", true); -user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); user_pref("dom.event.contextmenu.enabled", false); diff --git a/build-scripts/config/no-polipo.js b/build-scripts/config/no-polipo.js index 2514220..b8d7d17 100644 --- a/build-scripts/config/no-polipo.js +++ b/build-scripts/config/no-polipo.js @@ -46,7 +46,6 @@ user_pref("browser.search.suggest.enabled", false); user_pref("browser.search.update", false); user_pref("browser.sessionstore.privacy_level", 2); user_pref("browser.urlbar.autocomplete.enabled", false); -user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); user_pref("dom.event.contextmenu.enabled", false); diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index 5bc03ba..9ab32b3 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -46,7 +46,6 @@ user_pref("browser.search.suggest.enabled", false); user_pref("browser.search.update", false); user_pref("browser.sessionstore.privacy_level", 2); user_pref("browser.urlbar.autocomplete.enabled", false); -user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); user_pref("dom.event.contextmenu.enabled", false); diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index da09ab1..ade6fe0 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -51,7 +51,6 @@ user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US& user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); user_pref("browser.urlbar.autocomplete.enabled", true); -user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); user_pref("dom.event.contextmenu.enabled", false);

1 0

[torbrowser/master] use git archive so I can make signed source tarballs from signed tags
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 550e9e8f7413ccfea8fb461b793d26c17a27efa2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:29:47 2011 +0100 use git archive so I can make signed source tarballs from signed tags --- build-scripts/windows.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7d257d4..09299a2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -481,9 +481,5 @@ SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: - rm -fr $(SRCDESTPATH) - git clone -b maint-2.2 git://git.torproject.org/torbrowser.git \ - $(SRCDESTPATH) - cd $(SRCDEST); tar --exclude src/archived-patches \ - --exclude src/processtest --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME) + git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz

1 0

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

23 Oct '11

commit 9a13d32c69de5b9a2152614ac035689b2d663ef1 Merge: 4321ed0 fe08391 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 9 17:49:36 2011 +0100 Merge branch 'bug2312-v4' into maint-2.2 build-scripts/linux.mk | 15 ++- build-scripts/remove-shared-lib-symlinks | 226 ++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 1 deletions(-)

1 0

[torbrowser/master] bump build versions to 4 and torbutton to 1.4.3
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 69e5c54bc487f16fcfc2625769bc0fd4b185f654 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:27:03 2011 +0100 bump build versions to 4 and torbutton to 1.4.3 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 2 +- build-scripts/linux.mk | 5 ++++- build-scripts/osx.mk | 7 +++++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 5 ++++- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index b1f441c..2f23ecf 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 5358d96..0f63125 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index e054a10..90f8fc7 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,7 +8,7 @@ Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) FirefoxPortable 6.0.2 \_ Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 47fd74b..089218f 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=3 +BUILD_NUM=4 PLATFORM=Linux ## Location of directory for source unpacking @@ -489,6 +489,9 @@ update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Data/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/App/Firefox/defaults/profile/prefs.js +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)/App/Firefox/defaults/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Data/profile/prefs.js diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7d03546..d19576e 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=3 +BUILD_NUM=4 PLATFORM=MacOS ## Location of directory for source unpacking @@ -396,7 +396,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi @@ -443,6 +443,9 @@ update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js +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)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 65d9abc..44a79a4 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.32 -TORBUTTON_VER=1.4.2 +TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index de36634..8014ac4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries @@ -469,6 +469,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +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

1 0

[torbrowser/master] [Mac] Unbreak the --debug option
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit c3f2484f06d3b625d666ebff4634d68b3b5a9d62 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Sep 25 06:22:39 2011 -0700 [Mac] Unbreak the --debug option Previously, it had no effect at all. --- src/RelativeLink/RelativeLinkOSX.sh | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLinkOSX.sh b/src/RelativeLink/RelativeLinkOSX.sh index f448cf1..dbaa84b 100755 --- a/src/RelativeLink/RelativeLinkOSX.sh +++ b/src/RelativeLink/RelativeLinkOSX.sh @@ -5,11 +5,14 @@ # In the future, we may want this to be a C binary with a custom icon but at the moment # it's quite simple to just use a shell script # -# To run in debug mode simply pass --debug +# To run in debug mode, simply pass -debug or --debug on the command line. # # Copyright 2010 The Tor Project. See LICENSE for licensing information. -if [ "$1" == "--debug" ]; then +DEBUG_TBB=0 + +if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then + DEBUG_TBB=1 printf "\nDebug enabled.\n\n" fi @@ -22,7 +25,7 @@ export DYLD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 export DYLD_PRINT_LIBRARIES -if [ "${debug}" ]; then +if [ "$DEBUG_TBB" -eq 1 ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n"

1 0