August 2016 - tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Don't tail nonexistent files.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 3e227e871cefa8123e38d509d5b4d3e08efa4483 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Aug 18 10:27:15 2016 +0200 Don't tail nonexistent files. --- tools/continuous-builds/build-tbb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index f0ff132..37e912a 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -69,9 +69,9 @@ if [ $status = done ]; then else echo "$0: giving up after $n tries" | tee -a $logfile if [ -n "$LOGRECIPIENTS" ]; then - FILES="$logfile \ - ../../gitian-builder/var/build.log \ - ../../gitian-builder/var/target.log" + FILES="$logfile" + [ -r ../../gitian-builder/var/build.log ] && FILES="$FILES ../../gitian-builder/var/build.log" + [ -r ../../gitian-builder/var/target.log ] && FILES="$FILES ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ $LOGSENDER -- $LOGRECIPIENTS fi

1 0

[torbutton/maint-1.9.5] Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times
by gk＠torproject.org 15 Aug '16

15 Aug '16

commit 6e88f9cd13bd70e1626a912c789b146f07e88f33 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 12 09:44:59 2016 -0400 Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times Do not add another notification if one is already visible. --- src/chrome/content/torbutton.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9f6233c..3256335 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3371,6 +3371,12 @@ var torbutton_resizelistener = if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { + // Do not add another notification if one is already showing. + const kNotificationName = "torbutton-maximize-notification"; + let box = gBrowser.getNotificationBox(); + if (box.getNotificationWithValue(kNotificationName)) + return; + // Rate-limit showing our notification if needed. if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); @@ -3392,7 +3398,6 @@ var torbutton_resizelistener = let bundle = sbSvc. createBundle("chrome://global/locale/commonDialogs.properties"); let button_label = bundle.GetStringFromName("OK"); - let box = gBrowser.getNotificationBox(); let buttons = [{ label: button_label, @@ -3409,9 +3414,8 @@ var torbutton_resizelistener = let message = torbutton_get_property_string("torbutton.maximize_warning"); - box.appendNotification(message, 'new-menu-notification', null, + box.appendNotification(message, kNotificationName, null, priority, buttons); - return; } // This is for some weird OS-specific behavior on start-up where,

1 0

[torbutton/master] Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times
by gk＠torproject.org 15 Aug '16

15 Aug '16

commit 808ed83b2fa89ea7865b5bad6a2f287922e88702 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 12 09:44:59 2016 -0400 Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times Do not add another notification if one is already visible. --- src/chrome/content/torbutton.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7160deb..81f5a23 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3280,6 +3280,12 @@ var torbutton_resizelistener = if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { + // Do not add another notification if one is already showing. + const kNotificationName = "torbutton-maximize-notification"; + let box = gBrowser.getNotificationBox(); + if (box.getNotificationWithValue(kNotificationName)) + return; + // Rate-limit showing our notification if needed. if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); @@ -3301,7 +3307,6 @@ var torbutton_resizelistener = let bundle = sbSvc. createBundle("chrome://global/locale/commonDialogs.properties"); let button_label = bundle.GetStringFromName("OK"); - let box = gBrowser.getNotificationBox(); let buttons = [{ label: button_label, @@ -3318,9 +3323,8 @@ var torbutton_resizelistener = let message = torbutton_get_property_string("torbutton.maximize_warning"); - box.appendNotification(message, 'new-menu-notification', null, + box.appendNotification(message, kNotificationName, null, priority, buttons); - return; } // This is for some weird OS-specific behavior on start-up where,

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 17858: Cannot create incremental MARs for hardened builds.
by gk＠torproject.org 15 Aug '16

15 Aug '16

commit 37e6040d25803771bfe4ef294d90d4e13e4eebb0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 12 13:36:03 2016 -0400 Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. --- .mozconfig-asan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.mozconfig-asan b/.mozconfig-asan index 1a723cf..814362d 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -5,6 +5,13 @@ export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl" +# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff +# (which is part of mar-tools and is not distributed to end-users) with +# ASan. See bug 17858. +export HOST_CFLAGS="-fwrapv" +export HOST_CXXFLAGS="-fwrapv" +export HOST_LDFLAGS="-ldl" + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1

1 0

[tor-browser-bundle/maint-6.0] Update gk's key in torbutton.gpg
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit 371af28389e4546abbb3d86ef6a42c0cd3cf18f9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 12 08:03:58 2016 +0000 Update gk's key in torbutton.gpg --- gitian/gpg/torbutton.gpg | Bin 94114 -> 135369 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index da40f76..17b6c70 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-6.0] Release preparations for 6.0.4
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit c8b7419a32d6e9b7fed38fea60ce51f02f56a496 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 12 07:44:11 2016 +0000 Release preparations for 6.0.4 Versions, changelog and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 7 ++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c4a255d..2bdf3e2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 6.0.4 -- August 16 + * All Platforms + * Update Tor to 0.2.8.6 + * Update NoScript to 2.9.0.14 + * Bug 19890: Disable installation of system addons + Tor Browser 6.0.3 -- August 2 * All Platforms * Update Firefox to 45.3.0esr diff --git a/gitian/versions b/gitian/versions index f6d8648..67c114c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,8 +14,8 @@ FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.7.6 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +TOR_TAG=tor-0.2.8.6 TORLAUNCHER_TAG=0.2.9.3 TORBUTTON_TAG=1.9.5.6 HTTPSE_TAG=5.2.1 @@ -66,7 +66,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -99,7 +99,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ff17d28..f20e9b1 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -16,13 +16,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a2 - release: 6.0.3 + release: 6.0.4 versions: - 6.0.3: + 6.0.4: platformVersion: 45.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-603-released + detailsURL: https://blog.torproject.org/blog/tor-browser-604-released incremental_from: - 6.0.2 + - 6.0.3 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 19890: Disable installation of system addons
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit 8af42ff851bab2d9b17d380c170f06c28b94c74b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:00:24 2016 +0000 Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. --- browser/app/profile/firefox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 1dd964b..6e424cb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -69,8 +69,8 @@ pref("extensions.hotfix.cert.checkAttributes", true); pref("extensions.hotfix.certs.1.sha1Fingerprint", "91:53:98:0C:C1:86:DF:47:8F:35:22:9E:11:C9:A7:31:04:49:A1:AA"); pref("extensions.hotfix.certs.2.sha1Fingerprint", "39:E7:2B:7A:5B:CF:37:78:F9:5D:4A:E0:53:2D:2F:3D:68:53:C5:60"); -// Check AUS for system add-on updates. -pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_…"); +// No AUS check for system add-on updates for Tor Browser users. +pref("extensions.systemAddon.update.url", ""); // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here.

1 0

[tor-browser-bundle/hardened-builds] Bug 19854: fix URLs in downloads.json file
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit ce5edcb55cee57b56ea3577474232e85464ff78e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 12:14:23 2016 +0200 Bug 19854: fix URLs in downloads.json file --- tools/update-responses/config.yml | 4 ++-- tools/update-responses/update_responses | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 191c246..77c8b46 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,6 +3,8 @@ releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg + bundles_url: https://dist.torproject.org/torbrowser + mars_url: https://cdn.torproject.org/aus1/torbrowser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -19,7 +21,6 @@ versions: 6.0.1: platformVersion: 45.2.0 detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 incremental_from: - 4.5.3 migrate_archs: @@ -30,7 +31,6 @@ versions: 6.5a2-hardened: platformVersion: 45.3.0 detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-hardened-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a2-hardened incremental_from: - 6.5a1-hardened migrate_archs: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index cf307da..faa1037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -84,6 +84,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $files = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -91,7 +92,7 @@ sub get_version_files { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -102,7 +103,7 @@ sub get_version_files { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -117,6 +118,7 @@ sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -131,8 +133,8 @@ sub get_version_downloads { next; } $downloads->{$os}{$lang} = { - binary => "$config->{versions}{$version}{download_url}/$file", - sig => "$config->{versions}{$version}{download_url}/$file.asc", + binary => "$download_url/$file", + sig => "$download_url/$file.asc", }; } closedir $d; @@ -175,12 +177,13 @@ sub create_incremental_mar { my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + URL => "$download_url/$mar_file", size => -s $mar_file_path, hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file($mar_file_path), @@ -205,7 +208,7 @@ sub create_incremental_mars_for_version { $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { - $config->{versions}{$from_version} //= { download_url => '' }; + $config->{versions}{$from_version} //= {}; get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) {

1 0

[tor-browser-bundle/maint-6.0] Bug 19854: fix URLs in downloads.json file
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit f9d27acb00da3a44206024a6ee3549173d61e6fa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 12:14:23 2016 +0200 Bug 19854: fix URLs in downloads.json file --- tools/update-responses/config.yml | 14 +++++++------- tools/update-responses/update_responses | 15 +++++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 36192fc..ff17d28 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,6 +3,8 @@ releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg + bundles_url: https://dist.torproject.org/torbrowser + mars_url: https://cdn.torproject.org/aus1/torbrowser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -13,13 +15,12 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a5 + alpha: 6.5a2 release: 6.0.3 versions: 6.0.3: platformVersion: 45.3.0 detailsURL: https://blog.torproject.org/blog/tor-browser-603-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.3 incremental_from: - 6.0.2 migrate_archs: @@ -27,12 +28,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a5: - platformVersion: 45.1.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0a5 + 6.5a2: + platformVersion: 45.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-released incremental_from: - - 6.0a4 + - 6.5a1 migrate_archs: osx32: osx64 osx32: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index cf307da..faa1037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -84,6 +84,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $files = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -91,7 +92,7 @@ sub get_version_files { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -102,7 +103,7 @@ sub get_version_files { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -117,6 +118,7 @@ sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -131,8 +133,8 @@ sub get_version_downloads { next; } $downloads->{$os}{$lang} = { - binary => "$config->{versions}{$version}{download_url}/$file", - sig => "$config->{versions}{$version}{download_url}/$file.asc", + binary => "$download_url/$file", + sig => "$download_url/$file.asc", }; } closedir $d; @@ -175,12 +177,13 @@ sub create_incremental_mar { my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + URL => "$download_url/$mar_file", size => -s $mar_file_path, hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file($mar_file_path), @@ -205,7 +208,7 @@ sub create_incremental_mars_for_version { $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { - $config->{versions}{$from_version} //= { download_url => '' }; + $config->{versions}{$from_version} //= {}; get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) {

1 0

[tor-browser-bundle/master] Bug 19854: fix URLs in downloads.json file
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 858cdf3e315b068277c9e6bda7ef6108498a85b5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 12:14:23 2016 +0200 Bug 19854: fix URLs in downloads.json file --- tools/update-responses/config.yml | 4 ++-- tools/update-responses/update_responses | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 59b9179..050328e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,6 +3,8 @@ releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg + bundles_url: https://dist.torproject.org/torbrowser + mars_url: https://cdn.torproject.org/aus1/torbrowser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -19,7 +21,6 @@ versions: 6.0.1: platformVersion: 45.2.0 detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 incremental_from: - 5.5.5 - 6.0 @@ -31,7 +32,6 @@ versions: 6.5a2: platformVersion: 45.3.0 detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a2 incremental_from: - 6.5a1 migrate_archs: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index cf307da..faa1037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -84,6 +84,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $files = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -91,7 +92,7 @@ sub get_version_files { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -102,7 +103,7 @@ sub get_version_files { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -117,6 +118,7 @@ sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -131,8 +133,8 @@ sub get_version_downloads { next; } $downloads->{$os}{$lang} = { - binary => "$config->{versions}{$version}{download_url}/$file", - sig => "$config->{versions}{$version}{download_url}/$file.asc", + binary => "$download_url/$file", + sig => "$download_url/$file.asc", }; } closedir $d; @@ -175,12 +177,13 @@ sub create_incremental_mar { my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + URL => "$download_url/$mar_file", size => -s $mar_file_path, hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file($mar_file_path), @@ -205,7 +208,7 @@ sub create_incremental_mars_for_version { $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { - $config->{versions}{$from_version} //= { download_url => '' }; + $config->{versions}{$from_version} //= {}; get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) {

1 0