- tbb-commits - lists.torproject.org

[tor-launcher/master] Bump version to designate new localization fixes.
by mikeperry＠torproject.org 22 Apr '14

22 Apr '14

commit ab2d0f767fc5af36f941b3c17f01679e82564c0c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 22 16:56:19 2014 +0200 Bump version to designate new localization fixes. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 0e8614e..7b47f07 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.3</em:version> + <em:version>0.2.5.4pre</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-launcher/master] Add .gitignore.
by mikeperry＠torproject.org 22 Apr '14

22 Apr '14

commit 753bbf3fdce14f4d22e8b1411663cef7029d312f Author: Tails developers <amnesia(a)boum.org> Date: Fri Mar 14 12:06:26 2014 +0100 Add .gitignore. This is convenient for `localization/translations` and `pkg`. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8dafcc6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +localization/translation +pkg

1 0

[tor-launcher/master] Whitespace cleanup.
by mikeperry＠torproject.org 22 Apr '14

22 Apr '14

commit ec4b767bbcd8ce67e61be14d7333774a99edbfac Author: Tails developers <amnesia(a)boum.org> Date: Fri Mar 14 12:36:30 2014 +0100 Whitespace cleanup. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 0e45753..9acbddb 100644 --- a/Makefile +++ b/Makefile @@ -17,11 +17,11 @@ else ZIP=zip -q TAR=tar endif - + help: - @echo "Available targets:"; \ - for t in $(AVAIL_TARGETS); do \ - echo " make $$t"; \ + @echo "Available targets:"; \ + for t in $(AVAIL_TARGETS); do \ + echo " make $$t"; \ done pkg-prepare: clean @@ -86,10 +86,10 @@ clean: "pkg/$(STANDALONE_TARBALL)" zip: - @TMPFILE=/tmp/$(EXT_NAME)-`date '+%Y-%m-%d-%s'`.zip; \ - CURDIR=`pwd`; \ - BASEDIR=`basename $$CURDIR`; \ - cd ..; zip -q -r $$TMPFILE $$BASEDIR -x $$BASEDIR/build/\*; \ + @TMPFILE=/tmp/$(EXT_NAME)-`date '+%Y-%m-%d-%s'`.zip; \ + CURDIR=`pwd`; \ + BASEDIR=`basename $$CURDIR`; \ + cd ..; zip -q -r $$TMPFILE $$BASEDIR -x $$BASEDIR/build/\*; \ rm $$TMPFILE .PHONY: help clean zip

1 0

[tor-launcher/master] Add convenience make rule for importing translations.
by mikeperry＠torproject.org 22 Apr '14

22 Apr '14

commit 66b647c6b0041ea02a570658cc119cbca6ace327 Author: Tails developers <amnesia(a)boum.org> Date: Fri Mar 14 12:05:04 2014 +0100 Add convenience make rule for importing translations. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b698f4e..0e45753 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ STANDALONE_NAME=$(EXT_NAME)-standalone STANDALONE_TARBALL=$(shell echo "$(STANDALONE_NAME)-$(VERSION).tar.gz") REQUIRED_TRANSLATION_FILES=$(shell ls -1 src/chrome/locale/en/) -AVAIL_TARGETS=help package standalone clean +AVAIL_TARGETS=help package standalone import-translations clean ifeq ($(VERBOSE),1) ZIP=zip @@ -78,6 +78,9 @@ standalone: pkg-prepare @rm -rf "$(TMP)" @echo "Created standalone package pkg/$(STANDALONE_TARBALL)" +import-translations: + @( cd localization && ./import-translations.sh ) + clean: @rm -f "pkg/$(XPI_NAME)" \ "pkg/$(STANDALONE_TARBALL)"

1 0

[tor-launcher/master] Improve how we import, bundle and register translations.
by mikeperry＠torproject.org 22 Apr '14

22 Apr '14

commit 951b654f29868d8b52c1c8a0713346678a64fde6 Author: Tails developers <amnesia(a)boum.org> Date: Wed Mar 12 15:10:05 2014 +0100 Improve how we import, bundle and register translations. Previously chrome.manifest defined locales for pretty much every existing locale. Many of these were out-of-date (lacking entities, which results in fatal XUL errors) or completely absent (also fatal). Instead of maintaining a static list of which locales to register we generate it programatically, making sure that only those that seem complete are included. We also make sure to register "en-US" since it's the hardcoded fallback for unregistered locales. Note that it's currently called "en" in the Transifex translation repos. The BUNDLE_LOCALES environment variable can be set to specify a list of which locales to bundle ("en-US" is always implied). If it's empty we optimistically try to include all locales. For this reason import-translations.sh imports all translations from Transifex, and it's important to run it before packaging since up-to-date translations are necessary to avoid the issues mentioned above. --- Makefile | 43 +++++++++-- chrome.manifest.in | 16 +++++ localization/import-translations.sh | 41 +++++------ src/chrome.manifest | 136 ----------------------------------- 4 files changed, 73 insertions(+), 163 deletions(-) diff --git a/Makefile b/Makefile index 3d3a857..b698f4e 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ VERSION:=`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3` XPI_NAME:=$(shell echo "$(EXT_NAME)-$(VERSION).xpi") STANDALONE_NAME=$(EXT_NAME)-standalone STANDALONE_TARBALL=$(shell echo "$(STANDALONE_NAME)-$(VERSION).tar.gz") +REQUIRED_TRANSLATION_FILES=$(shell ls -1 src/chrome/locale/en/) AVAIL_TARGETS=help package standalone clean @@ -25,15 +26,49 @@ help: pkg-prepare: clean @mkdir -p pkg + $(eval TMP="$(shell mktemp -d "/tmp/$(EXT_NAME).XXXXXX")") + @cp -a "src" "$(TMP)/$(EXT_NAME)" + @cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest + @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \ + "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US + @for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \ + if [ "`basename "$${d}"`" = "en-US" ]; then \ + continue; \ + fi; \ + for f in $(REQUIRED_TRANSLATION_FILES); do \ + if [ ! -e "$${d}/$${f}" ] || \ + ( \ + [ -n "$(BUNDLE_LOCALES)" ] && \ + ! echo $(BUNDLE_LOCALES) | grep -qw `basename "$${d}"` \ + ); then \ + rm -rf "$${d}"; \ + break; \ + fi \ + done \ + done + @for l in $(BUNDLE_LOCALES); do \ + if [ ! -d "$(TMP)/$(EXT_NAME)"/chrome/locale/"$${l}" ]; then \ + echo "Requested locale '$${l}' is missing or incomplete" >&2; \ + exit 1; \ + fi \ + done + @for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \ + locale="`basename $${d}`"; \ + echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \ + "$(TMP)/$(EXT_NAME)"/chrome.manifest; \ + done package: pkg-prepare - @(cd src; $(ZIP) -X9r "../pkg/$(XPI_NAME)" ./ -x "*.diff") + @( \ + CURDIR="$(shell pwd)"; \ + cd "$(TMP)/$(EXT_NAME)"; \ + $(ZIP) -X9r "$(CURDIR)/pkg/$(XPI_NAME)" ./ -x "*.diff" \ + ) + @rm -rf "$(TMP)" @echo "Created package pkg/$(XPI_NAME)" standalone: pkg-prepare - $(eval TMP="$(shell mktemp -d "/tmp/$(STANDALONE_NAME).XXXXXX")") - @mkdir -p "$(TMP)/$(STANDALONE_NAME)" - @cp -a "src/"* "$(TMP)/$(STANDALONE_NAME)" + @mv "$(TMP)/$(EXT_NAME)" "$(TMP)/$(STANDALONE_NAME)" @cp application.ini.in "$(TMP)/$(STANDALONE_NAME)/application.ini" @sed -i -e "s/__VERSION__/$(VERSION)/" \ -e "s/__DATE__/`date '+%Y%m%d'`/" \ diff --git a/chrome.manifest.in b/chrome.manifest.in new file mode 100644 index 0000000..a869569 --- /dev/null +++ b/chrome.manifest.in @@ -0,0 +1,16 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +content torlauncher chrome/content/ + +skin torlauncher classic/1.0 chrome/skin/ + +resource torlauncher ./ + +# Firefox 4-style component registration +component {4F476361-23FB-43EF-A427-B36A14D3208E} components/tl-protocol.js +contract @torproject.org/torlauncher-protocol-service;1 {4F476361-23FB-43EF-A427-B36A14D3208E} + +component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} components/tl-process.js +contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} +category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1 diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 32ea177..0c81aa6 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,13 +1,10 @@ #!/bin/sh -BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru tr vi zh-CN" - -# XXX: Basque (eu) by request in #10687. -# This is not used for official builds, but should remain -# so Basque XPIs can be build independently. We can do -# this for other languages too, if anyone requests this -# and translations are available. -BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" +TRANSLATION_BRANCHES=" +tor-launcher-network-settings +tor-launcher-progress +tor-launcher-properties +" if [ -d translation ]; then @@ -19,20 +16,18 @@ else fi cd translation -for i in $BUNDLE_LOCALES +for branch in ${TRANSLATION_BRANCHES} do - UL="`echo $i|tr - _`" - mkdir -p ../../src/chrome/locale/$i/ - - git checkout tor-launcher-network-settings - git merge origin/tor-launcher-network-settings - cp $UL/network-settings.dtd ../../src/chrome/locale/$i/ - - git checkout tor-launcher-progress - git merge origin/tor-launcher-progress - cp $UL/progress.dtd ../../src/chrome/locale/$i/ - - git checkout tor-launcher-properties - git merge origin/tor-launcher-properties - cp $UL/torlauncher.properties ../../src/chrome/locale/$i/ + git checkout ${branch} + git merge origin/${branch} + for locale in * + do + if [ ! -d "${locale}" ] + then + continue + fi + target="../../src/chrome/locale/$(echo "${locale}" | tr _ -)" + mkdir -p "${target}" + cp -f "${locale}"/* "${target}"/ + done done diff --git a/src/chrome.manifest b/src/chrome.manifest deleted file mode 100644 index 786bae8..0000000 --- a/src/chrome.manifest +++ /dev/null @@ -1,136 +0,0 @@ -### Copyright (c) 2013, The Tor Project, Inc. -### See LICENSE for licensing information. - -content torlauncher chrome/content/ - -locale torlauncher af chrome/locale/af/ -locale torlauncher ak chrome/locale/ak/ -locale torlauncher am chrome/locale/am/ -locale torlauncher ar chrome/locale/ar/ -locale torlauncher arn chrome/locale/arn/ -locale torlauncher ast chrome/locale/ast/ -locale torlauncher az chrome/locale/az/ -locale torlauncher be chrome/locale/be/ -locale torlauncher bg chrome/locale/bg/ -locale torlauncher bms chrome/locale/bms/ -locale torlauncher bn chrome/locale/bn/ -locale torlauncher bn-IN chrome/locale/bn-IN/ -locale torlauncher bo chrome/locale/bo/ -locale torlauncher br chrome/locale/br/ -locale torlauncher bs chrome/locale/bs/ -locale torlauncher ca chrome/locale/ca/ -locale torlauncher cs chrome/locale/cs/ -locale torlauncher csb chrome/locale/csb/ -locale torlauncher cy chrome/locale/cy/ -locale torlauncher da chrome/locale/da/ -locale torlauncher de chrome/locale/de/ -locale torlauncher dz chrome/locale/dz/ -locale torlauncher el chrome/locale/el/ -locale torlauncher en chrome/locale/en/ -locale torlauncher eo chrome/locale/eo/ -locale torlauncher es chrome/locale/es/ -locale torlauncher et chrome/locale/et/ -locale torlauncher eu chrome/locale/eu/ -locale torlauncher fa chrome/locale/fa/ -locale torlauncher fi chrome/locale/fi/ -locale torlauncher fil chrome/locale/fil/ -locale torlauncher fo chrome/locale/fo/ -locale torlauncher fr chrome/locale/fr/ -locale torlauncher fur chrome/locale/fur/ -locale torlauncher fy chrome/locale/fy/ -locale torlauncher ga chrome/locale/ga/ -locale torlauncher gl chrome/locale/gl/ -locale torlauncher gu chrome/locale/gu/ -locale torlauncher gun chrome/locale/gun/ -locale torlauncher ha chrome/locale/ha/ -locale torlauncher he chrome/locale/he/ -locale torlauncher hi chrome/locale/hi/ -locale torlauncher hr chrome/locale/hr/ -locale torlauncher ht chrome/locale/ht/ -locale torlauncher hu chrome/locale/hu/ -locale torlauncher hy chrome/locale/hy/ -locale torlauncher id chrome/locale/id/ -locale torlauncher is chrome/locale/is/ -locale torlauncher it chrome/locale/it/ -locale torlauncher ja chrome/locale/ja/ -locale torlauncher jv chrome/locale/jv/ -locale torlauncher ka chrome/locale/ka/ -locale torlauncher km chrome/locale/km/ -locale torlauncher kn chrome/locale/kn/ -locale torlauncher ko chrome/locale/ko/ -locale torlauncher ku chrome/locale/ku/ -locale torlauncher kw chrome/locale/kw/ -locale torlauncher ky chrome/locale/ky/ -locale torlauncher lb chrome/locale/lb/ -locale torlauncher lg chrome/locale/lg/ -locale torlauncher ln chrome/locale/ln/ -locale torlauncher lo chrome/locale/lo/ -locale torlauncher lt chrome/locale/lt/ -locale torlauncher lv chrome/locale/lv/ -locale torlauncher mg chrome/locale/mg/ -locale torlauncher mi chrome/locale/mi/ -locale torlauncher mk chrome/locale/mk/ -locale torlauncher ml chrome/locale/ml/ -locale torlauncher mn chrome/locale/mn/ -locale torlauncher mr chrome/locale/mr/ -locale torlauncher ms chrome/locale/ms/ -locale torlauncher mt chrome/locale/mt/ -locale torlauncher my chrome/locale/my/ -locale torlauncher nah chrome/locale/nah/ -locale torlauncher nap chrome/locale/nap/ -locale torlauncher nb chrome/locale/nb/ -locale torlauncher ne chrome/locale/ne/ -locale torlauncher nl chrome/locale/nl/ -locale torlauncher nn chrome/locale/nn/ -locale torlauncher nso chrome/locale/nso/ -locale torlauncher oc chrome/locale/oc/ -locale torlauncher or chrome/locale/or/ -locale torlauncher pa chrome/locale/pa/ -locale torlauncher pap chrome/locale/pap/ -locale torlauncher pl chrome/locale/pl/ -locale torlauncher pms chrome/locale/pms/ -locale torlauncher ps chrome/locale/ps/ -locale torlauncher pt chrome/locale/pt/ -locale torlauncher pt-BR chrome/locale/pt-BR/ -locale torlauncher ro chrome/locale/ro/ -locale torlauncher ru chrome/locale/ru/ -locale torlauncher sco chrome/locale/sco/ -locale torlauncher sk chrome/locale/sk/ -locale torlauncher sl chrome/locale/sl/ -locale torlauncher so chrome/locale/so/ -locale torlauncher son chrome/locale/son/ -locale torlauncher sq chrome/locale/sq/ -locale torlauncher sr chrome/locale/sr/ -locale torlauncher st chrome/locale/st/ -locale torlauncher su chrome/locale/su/ -locale torlauncher sv chrome/locale/sv/ -locale torlauncher sw chrome/locale/sw/ -locale torlauncher ta chrome/locale/ta/ -locale torlauncher te chrome/locale/te/ -locale torlauncher tg chrome/locale/tg/ -locale torlauncher th chrome/locale/th/ -locale torlauncher ti chrome/locale/ti/ -locale torlauncher tk chrome/locale/tk/ -locale torlauncher tr chrome/locale/tr/ -locale torlauncher uk chrome/locale/uk/ -locale torlauncher ur chrome/locale/ur/ -locale torlauncher ve chrome/locale/ve/ -locale torlauncher vi chrome/locale/vi/ -locale torlauncher wa chrome/locale/wa/ -locale torlauncher wo chrome/locale/wo/ -locale torlauncher zh-CN chrome/locale/zh-CN/ -locale torlauncher zh-HK chrome/locale/zh-HK/ -locale torlauncher zh-TW chrome/locale/zh-TW/ -locale torlauncher zu chrome/locale/zu/ - -skin torlauncher classic/1.0 chrome/skin/ - -resource torlauncher ./ - -# Firefox 4-style component registration -component {4F476361-23FB-43EF-A427-B36A14D3208E} components/tl-protocol.js -contract @torproject.org/torlauncher-protocol-service;1 {4F476361-23FB-43EF-A427-B36A14D3208E} - -component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} components/tl-process.js -contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} -category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1

1 0

[tor-browser-bundle/master] Bug 11552: Back out HTTPS-Everywhere version bump.
by gk＠torproject.org 18 Apr '14

18 Apr '14

commit ef1ac0c2de37bc8e66e078584424492c29f31e7a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 18 20:06:30 2014 +0000 Bug 11552: Back out HTTPS-Everywhere version bump. Testing on Linux as well would be a good idea in the future... --- gitian/versions | 3 ++- gitian/versions.alpha | 3 ++- gitian/versions.beta | 3 ++- gitian/versions.nightly | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index addcb3b..3c82a79 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.5 +# XXX: 3.5 requires python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 56192a8..ae1fcb8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.5 +# XXX: 3.5 requires python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 95e7235..bf2030e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.5 +# XXX: 3.5 requires python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 74455b6..f483670 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=3.5 # XXX: Master and 4.0 require python2.7 +# XXX: Master and 3.5 require python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-launcher/master] Bug #11482: Hide bridge settings prompt if no default bridges.
by brade＠torproject.org 17 Apr '14

17 Apr '14

commit 4776f6c431a06867b8d2a5c6c3f35c4a7f78850e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 17 10:31:40 2014 -0400 Bug #11482: Hide bridge settings prompt if no default bridges. --- src/chrome/content/network-settings-wizard.xul | 3 ++- src/chrome/content/network-settings.js | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index a1d820e..07fcdcd 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -140,7 +140,8 @@ </vbox> <separator /> <vbox> - <label class="question">&torSettings.bridgeSettingsPrompt;</label> + <label id="bridgeSettingsPrompt" + class="question">&torSettings.bridgeSettingsPrompt;</label> <groupbox id="bridgeSpecificSettings" /> </vbox> </wizardpage> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 07526c8..98028e2 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -818,6 +818,10 @@ function initBridgeSettings() if (!canUseDefaultBridges) { + var label = document.getElementById("bridgeSettingsPrompt"); + if (label) + label.setAttribute("hidden", true); + var radioGroup = document.getElementById("bridgeTypeRadioGroup"); if (radioGroup) radioGroup.setAttribute("hidden", true);

1 0

[tor-launcher/master] Bug #11484: Show help button even if no default bridges.
by brade＠torproject.org 17 Apr '14

17 Apr '14

commit c9427b6623deae7d08019f734b56d4b62990a694 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 17 10:06:46 2014 -0400 Bug #11484: Show help button even if no default bridges. --- src/chrome/content/network-settings-overlay.xul | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 4172af5..6422802 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -74,7 +74,7 @@ </groupbox> <groupbox id="bridgeSpecificSettings"> - <hbox pack="end"> + <hbox align="end" pack="end"> <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px" oncommand="onBridgeTypeRadioChange()"> <radio id="bridgeRadioDefault" @@ -91,12 +91,10 @@ </hbox> <spacer style="height: 0.5em" /> - <hbox align="baseline" flex="1"> - <radio align="start" id="bridgeRadioCustom" - label="&torsettings.useBridges.custom;" /> - <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> - </hbox> + <radio align="start" id="bridgeRadioCustom" + label="&torsettings.useBridges.custom;" /> </radiogroup> + <button dlgtype="help" oncommand="onOpenHelp()" /> </hbox> <vbox id="bridgeCustomEntry"> <label id="bridgeListLabel" style="margin-top:0px;"

1 0

[tor-browser-bundle/master] Version bump.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit bc2cb177a16d8e34b359175e0804b133635a0c62 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 14:45:28 2014 +0000 Version bump. HTTPS-Everywhere has a new stable version, 3.5. Adding that to all version files. Additionally, updating the tor, Tor Browser and TorLauncher tag in the alpha version file. --- gitian/versions | 2 +- gitian/versions.alpha | 8 ++++---- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index a1e6384..addcb3b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 650103a..56192a8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -6,11 +6,11 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.4.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 -TOR_TAG=tor-0.2.5.2-alpha -TORLAUNCHER_TAG=0.2.5.1a +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 +TOR_TAG=tor-0.2.5.3-alpha +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9d6a8f0..95e7235 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1869182..74455b6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=3.4.5 # XXX: Master and 4.0 require python2.7 +HTTPSE_TAG=3.5 # XXX: Master and 4.0 require python2.7 NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/master] Set the bundle version in the bundle descriptor.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 62ca5505e07fd86add646b97f82caf136e39b348 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 14:06:38 2014 +0000 Set the bundle version in the bundle descriptor. We used to set the bundle version in the browser descriptor which had the bad side-effect that we needed to rebuild the whole Tor Browser just in order to change the bundle version. We do that now in the bundle descriptor instead. --- gitian/descriptors/linux/gitian-bundle.yml | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 6 +----- gitian/descriptors/mac/gitian-bundle.yml | 5 +++++ gitian/descriptors/mac/gitian-firefox.yml | 4 ---- gitian/descriptors/windows/gitian-bundle.yml | 5 +++++ gitian/descriptors/windows/gitian-firefox.yml | 6 +----- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fa78928..39a7747 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -118,6 +119,10 @@ script: | # pushd tor-browser_en-US/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 282ea49..1f2cf12 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -5,7 +5,7 @@ suites: architectures: - "i386" - "amd64" -packages: +packages: - "faketime" - "unzip" - "zip" @@ -29,7 +29,6 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "torbrowser.version" - "re-dzip.sh" - "dzip.sh" - "python.tar.bz2" @@ -73,9 +72,6 @@ script: | fi # cd tor-browser - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 4928acb..b7ecf3a 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -46,6 +46,7 @@ files: - "versions" - "tbb-docs.zip" - "mac-tor.sh" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -146,6 +147,10 @@ script: | # pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e252888..1832f55 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -17,7 +17,6 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "torbrowser.version" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" @@ -51,9 +50,6 @@ script: | # cd tor-browser mv .mozconfig-mac .mozconfig - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index ac79d58..fddb611 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -39,6 +39,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -115,6 +116,10 @@ script: | # pushd "Tor Browser"/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 1c151ea..fefb677 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -25,7 +25,6 @@ files: - "mingw-w64-svn-snapshot.zip" - "binutils.tar.bz2" - "gcc.tar.bz2" -- "torbrowser.version" - "re-dzip.sh" - "dzip.sh" - "i686-w64-mingw32-gcc" @@ -137,9 +136,6 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git

1 0