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

[torbrowser/master] give windows an updated prefs.js as well
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0eddd4ad3c37bd8a49030e65bbff0367534b9865 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:22:15 2011 +0100 give windows an updated prefs.js as well --- build-scripts/config/windows-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 13fda1f..a9cbdc8 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -38,7 +38,7 @@ user_pref("browser.places.migratePostDataAnnotations", false); user_pref("browser.places.smartBookmarksVersion", 2); user_pref("browser.places.updateRecentTagsUri", false); user_pref("browser.preferences.advanced.selectedTabIndex", 0); -user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); @@ -50,7 +50,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); -user_pref("browser.urlbar.autocomplete.enabled", false); +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:"); @@ -149,6 +149,7 @@ user_pref("noscript.showTemp", false); user_pref("noscript.showTempAllowPage", false); user_pref("noscript.showTempToPerm", false); user_pref("noscript.showUntrusted", false); +user_pref("noscript.STS.enabled", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", "");

1 0

[torbrowser/master] make tbb write its version into the prefs.js file (closes: #3654)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 017ca6774ee2defa22e93fbbe00f3bf7000c9111 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:37:29 2011 +0100 make tbb write its version into the prefs.js file (closes: #3654) --- build-scripts/osx.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0b07e67..2e8b290 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,9 +351,8 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final touch bundle-localized_$*.stamp - cp extensions/torbutton.xpi . bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -433,5 +432,8 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q;}' $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + final: mv $(BUNDLE) $(BUNDLE).app

1 0

[torbrowser/master] give windows and linux the ability to write their tbb version into prefs.js too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 703a9aa38e53d4d043fe9c8d6c4566eca2ee8693 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:24:58 2011 +0100 give windows and linux the ability to write their tbb version into prefs.js too --- build-scripts/linux.mk | 6 +++++- build-scripts/windows.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 659e3b0..85f8830 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,8 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ + patch-pidgin-language update-extension-pref write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -466,3 +467,6 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 294b2c6..2016242 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -360,7 +360,8 @@ split-bundle_%: LANGCODE=$* make -f windows.mk split-bundle-localized bundle-localized_%.stamp: - make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language + make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ + patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -439,6 +440,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp

1 0

[torbrowser/master] enable auto port choosing (closes: #2264)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 1e3792839c3bdb1f11755a32faa3e122d9c038ba Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:48 2011 +0100 enable auto port choosing (closes: #2264) --- build-scripts/config/torrc-osx | 3 ++- build-scripts/config/vidalia.conf.ff-osx | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx index 9d32985..4c7f0d9 100644 --- a/build-scripts/config/torrc-osx +++ b/build-scripts/config/torrc-osx @@ -8,5 +8,6 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx index b261d9e..2c40be6 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -7,3 +7,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=../../Contents/MacOS/tor Torrc=../../Library/Vidalia/torrc +AutoControl=true +DataDirectory=../../Contents/Resources/Data/Tor

1 0

[torbrowser/master] update prefs.js (closes: #3545, #3818, #3339)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 80578211b0031a47c429105ed2d8c3c4dc92ae65 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:11 2011 +0100 update prefs.js (closes: #3545, #3818, #3339) --- build-scripts/config/no-polipo-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 2437752..bea5d44 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -38,7 +38,7 @@ user_pref("browser.places.migratePostDataAnnotations", false); user_pref("browser.places.smartBookmarksVersion", 2); user_pref("browser.places.updateRecentTagsUri", false); user_pref("browser.preferences.advanced.selectedTabIndex", 0); -user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); @@ -49,7 +49,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); -user_pref("browser.urlbar.autocomplete.enabled", false); +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:"); @@ -136,6 +136,7 @@ user_pref("noscript.showTemp", false); user_pref("noscript.showTempAllowPage", false); user_pref("noscript.showTempToPerm", false); user_pref("noscript.showUntrusted", false); +user_pref("noscript.STS.enabled", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", "");

1 0

[torbrowser/master] add auto port selection to windows config files
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9f30b4174acda826297b0e75c3e25dfabc164250 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:42:52 2011 +0100 add auto port selection to windows config files --- build-scripts/config/torrc | 3 ++- build-scripts/config/vidalia.conf.ff | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 29154fb..143c71a 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,5 +8,6 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +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 03ed00a..d66f53f 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -7,3 +7,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc +AutoControl=true +DataDirectory=.\\Data\\Tor

1 0

[torbrowser/master] use the right paths for adding tbb version in prefs.js on windows and linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 1907b9e7455eaaa1fbd0aed614aeab55b2d6fdae Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:37:03 2011 +0100 use the right paths for adding tbb version in prefs.js on windows and linux --- build-scripts/linux.mk | 3 ++- build-scripts/windows.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 85f8830..904aed7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -468,5 +468,6 @@ update-extension-pref: sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Data/profile/prefs.js diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 2016242..da1384e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -441,7 +441,8 @@ apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

[torbrowser/master] add autoport configuration to linux config files
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f6288fccc8c0275f75d16d2afc5ca5437b6f01ff Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 29 23:41:51 2011 +0100 add autoport configuration to linux config files --- build-scripts/config/torrc-linux | 3 ++- build-scripts/config/vidalia.conf.ff-linux | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-linux b/build-scripts/config/torrc-linux index 9c6cecd..05f5345 100644 --- a/build-scripts/config/torrc-linux +++ b/build-scripts/config/torrc-linux @@ -8,5 +8,6 @@ GeoIPFile ./Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 94c5503..4535b7b 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -8,3 +8,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=./App/tor Torrc=./Data/Tor/torrc +AutoControl=true +DataDirectory=./Data/Tor

1 0

[torbrowser/master] remove spurious running processes check from linux tbbs. they are no longer needed since we have autoport configuration now.
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cb7e4e5f01d2050696efd7687307c5dbb129e4c0 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 29 23:42:15 2011 +0100 remove spurious running processes check from linux tbbs. they are no longer needed since we have autoport configuration now. --- src/RelativeLink/RelativeLink.sh | 49 ++++++------------------------------- 1 files changed, 8 insertions(+), 41 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 1d2f4e3..579612c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -173,48 +173,15 @@ export LD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 export DYLD_PRINT_LIBRARIES -# if any relevant processes are running, inform the user and exit cleanly -RUNNING=0 -RUNNING_MESSAGE="" -for process in tor vidalia - # FIXME pidof isn't POSIX - do pid="`pidof $process`" - if [ -n "$pid" ]; then - RUNNING_MESSAGE="`printf "%s\n%s is already running as PID %s." "$RUNNING_MESSAGE" "$process" "$pid"`" - RUNNING=1 - fi - done - -if [ "$RUNNING" -eq 1 ]; then - complain "`printf "%s\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$RUNNING_MESSAGE"`" - exit 1 -fi - - if [ "${debug}" ]; then - if [ -n "${surveysays}" ]; then - printf "\nSurvey says: $surveysays\n\n" - fi - - # this is likely unportable to Mac OS X or other netstat binaries - for port in "8118" "9050" - do - BOUND="`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT`" - if [ "${BOUND}" ]; then - printf "\nLikely problem detected: It appears that you have something listening on ${port}\n" - printf "\nWe think this because of the following:\n${BOUND}\n" - fi - done - - printf "\nStarting Vidalia now\n" - cd "${HOME}" - printf "\nLaunching Vidalia from: `pwd`\n" - # XXX Someday we should pass whatever command-line arguments we got - # (probably filenames or URLs) to Firefox. - ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ - --datadir Data/Vidalia/ - printf "\nVidalia exited with the following return code: $?\n" - exit + printf "\nStarting Vidalia now\n" + cd "${HOME}" + printf "\nLaunching Vidalia from: `pwd`\n" + # XXX Someday we should pass whatever command-line arguments we got + # (probably filenames or URLs) to Firefox. + ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ + --datadir Data/Vidalia/ + printf "\nVidalia exited with the following return code: $?\n" fi # not in debug mode, run proceed normally

1 0

[torbrowser/master] enable internationlization for osx tbbs
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 652e344133b56639d3707d8d7d24ff05d180c456 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Aug 30 18:09:14 2011 +0100 enable internationlization for osx tbbs --- build-scripts/config/no-polipo-4.0.js | 1 + build-scripts/osx.mk | 3 +-- 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 bea5d44..ae792bd 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -85,6 +85,7 @@ user_pref("extensions.update.notifyUser", false); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)"); user_pref("general.buildID.override", "0"); +user_pref("general.useragent.locale", "SHPONKA"); user_pref("general.oscpu.override", "Windows NT 6.1"); user_pref("general.platform.override", "Win32"); user_pref("general.productSub.override", "20100401"); diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f1f62a6..e421f71 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -431,8 +431,7 @@ patch-firefox-language: ## Fix prefs.js since extensions.checkCompatibility, false doesn't work update-extension-pref: - ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q;}' $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ - sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js 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

1 0