September 2015 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 10140: Support platform specific langpacks
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 5b34c06405a5524a5bc2b8ba42fd0587086dd52c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Sep 1 10:54:30 2015 +0000 Bug 10140: Support platform specific langpacks This patch allows to fetch Linux/Windows/OSX-specific language packs. Furthermore, it enables Japanese. --- gitian/descriptors/linux/gitian-bundle.yml | 3 ++- gitian/descriptors/mac/gitian-bundle.yml | 3 ++- gitian/descriptors/windows/gitian-bundle.yml | 3 ++- gitian/fetch-inputs.sh | 20 ++++++++++++++++++++ gitian/versions | 4 ++++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 8 files changed, 39 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index f1d0554..afb632e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -182,7 +182,8 @@ script: | # unzip linux-langpacks.zip cd linux-langpacks - for LANG in $BUNDLE_LOCALES + LINUX_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_LINUX" + for LANG in $LINUX_LOCALES do xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a956fa7..dabe619 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -208,7 +208,8 @@ script: | # unzip mac-langpacks.zip cd mac-langpacks - for LANG in $BUNDLE_LOCALES + MAC_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_MAC" + for LANG in $MAC_LOCALES do xpi=$LANG.xpi DEST=$TORBROWSER_APP diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index c674e1b..649ff53 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -173,7 +173,8 @@ script: | # unzip ../win32-langpacks.zip cd win32-langpacks - for LANG in $BUNDLE_LOCALES + WIN32_LOCALES="$BUNDLE_LOCALES $BUNDLE_LOCALES_WIN32" + for LANG in $WIN32_LOCALES do xpi=$LANG.xpi cp $xpi ../"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index a97ff62..42efa33 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -177,6 +177,7 @@ do fi done +# Fetch the common langpacks first, then the platform specific ones if any. mkdir -p langpacks-$FIREFOX_LANG_VER/linux-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/win32-langpacks mkdir -p langpacks-$FIREFOX_LANG_VER/mac-langpacks @@ -196,6 +197,25 @@ do cd .. done +for i in $BUNDLE_LOCALES_LINUX +do + cd linux-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_WIN32 +do + cd win32-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done +for i in $BUNDLE_LOCALES_MAC +do + cd mac-langpacks + wget -U "" -N "https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${FIREFOX_LANG_V…" + cd .. +done + "$WRAPPER_DIR/build-helpers/dzip.sh" ../win32-langpacks.zip win32-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../linux-langpacks.zip linux-langpacks "$WRAPPER_DIR/build-helpers/dzip.sh" ../mac-langpacks.zip mac-langpacks diff --git a/gitian/versions b/gitian/versions index 3df967e..b833342 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,5 +1,9 @@ TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" + BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5005445..f37b98a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 343d4b5..c2143a0 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,5 +1,8 @@ TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index afb82c5..f0551f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -3,6 +3,9 @@ TORBROWSER_VERSION=tbb-nightly TORBROWSER_BUILDDIR=tbb-nightly TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" +BUNDLE_LOCALES_LINUX="ja" +BUNDLE_LOCALES_WIN32="ja" +BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..a371403 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -421,7 +421,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit f3a1676797a35a63ff2e40f89e6aab169b8661b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a371403..a875774 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -329,6 +329,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/master] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 199808ddbe8e9f640bc8cef57e6f09f2f3070d95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 4f6286d..bb285fd 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -423,7 +423,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/master] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 7097c9651a556a314a8265226e2e2c111934a7b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bb285fd..b1b3331 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -331,6 +331,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/maint-5.0] Update Tor Browser key
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit ce86c32d1160983b08775cd154f22dbb3d303947 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 07:28:33 2015 +0000 Update Tor Browser key --- gitian/gpg/torbrowser.gpg | Bin 6015 -> 18844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index 7267d4d..dc44e33 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bug 16948: Download PyCrypto from pypi.python.org
by gk＠torproject.org 02 Sep '15

02 Sep '15

1 0

[tor-browser-bundle/master] Bug 16948: Download PyCrypto from pypi.python.org
by gk＠torproject.org 02 Sep '15

02 Sep '15

1 0

[tor-browser-bundle/master] Update Tor Browser key
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit b5533d49b8dbc8b24ffddae56623bb38e380875f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 07:12:38 2015 +0000 Update Tor Browser key --- gitian/gpg/torbrowser.gpg | Bin 6015 -> 18844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index 7267d4d..dc44e33 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit bc17a40f050335b9dbfaff73ac0233e48ead546e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0