May 2018 - tor-commits - lists.torproject.org

[tor-browser-build/master] Bug 26059: Use signed directory when generating incremental mars
by gk＠torproject.org 23 May '18

23 May '18

commit ae1c8fd96fdb9f3208a84cca6ec9c8d546ada459 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 21 13:14:13 2018 +0200 Bug 26059: Use signed directory when generating incremental mars We update the update_responses script to be able to specify a different $releases_dir for each version. When generating incremental mars, this allows us to set the default releases_dir to {alpha,release}/signed and the current version's releases_dir to {alpha,release}… [View More]/unsigned. --- Makefile | 4 ++-- projects/release/config | 4 ++++ projects/release/update_responses_config.yml | 5 ++++- tools/update-responses/update_responses | 27 ++++++++++++++++----------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 2707d41..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -111,13 +111,13 @@ signtag-alpha: submodule-update $(rbm) build release --step signtag --target alpha incrementals-release: submodule-update - $(rbm) build release --step update_responses_config --target release + $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals tools/update-responses/download_missing_versions release tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update - $(rbm) build release --step update_responses_config --target alpha + $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha diff --git a/projects/release/config b/projects/release/config index e48fb01..2aba446 100644 --- a/projects/release/config +++ b/projects/release/config @@ -73,6 +73,10 @@ targets: var: signed_status: signed + create_unsigned_incrementals: + var: + create_unsigned_incrementals: 1 + input_files: # Release diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 01c6950..1a9b0cf 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -5,7 +5,7 @@ appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win32: torbrowser-install appname_bundle_win64: torbrowser-install-win64 -releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] +releases_dir: [% path(c('output_dir')) %]/signed download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../keyring/torbrowser.gpg @@ -25,6 +25,9 @@ channels: [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %] versions: [% c("var/torbrowser_version") %]: +[% IF c("var/create_unsigned_incrementals") -%] + releases_dir: [% path(c('output_dir')) %]/unsigned +[% END -%] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 658f451..bf2415d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -92,7 +92,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $appname = $config->{appname_marfile}; my $files = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $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) { @@ -126,7 +126,7 @@ sub get_version_files { sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; - my $vdir = "$releases_dir/$version"; + my $vdir = version_dir($config, $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) { @@ -179,15 +179,15 @@ sub extract_mar { } sub mar_filename { - my ($appname, $version, $os, $lang) = @_; - "$releases_dir/$version/$appname-$os-${version}_$lang.mar"; + my ($config, $appname, $version, $os, $lang) = @_; + version_dir($config, $version) . "/$appname-$os-${version}_$lang.mar"; } sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $appname = $config->{appname_marfile}; my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; - my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { print "Skipping $mar_file\n"; return; @@ -207,8 +207,8 @@ sub create_incremental_mar { }; return if $pm->start($finished_file); my $tmpdir = get_tmpdir($config); - extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); - extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); + extract_mar(mar_filename($config, $appname, $from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($config, $appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { @@ -250,6 +250,11 @@ sub get_config { // $config->{$name}; } +sub version_dir { + my ($config, $version) = @_; + return get_config($config, $version, 'any', 'releases_dir') . "/$version"; +} + sub channel_to_version { my ($config, @channels) = @_; return values %{$config->{channels}} unless @channels; @@ -270,7 +275,7 @@ sub get_buildinfos { next unless $files->{$os}{$lang}{complete}; my $tmpdir = get_tmpdir($config); extract_mar( - mar_filename($config->{appname_marfile}, $version, $os, $lang), + mar_filename($config, $config->{appname_marfile}, $version, $os, $lang), "$tmpdir"); my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; $appfile = "$tmpdir/Contents/Resources/application.ini" @@ -423,7 +428,7 @@ my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; my $osname = osname; - my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -523,7 +528,7 @@ sub check_update_responses_channel { sub download_version { my ($config, $version) = @_; my $tmpdir = get_tmpdir($config); - my $destdir = "$releases_dir/$version"; + my $destdir = version_dir($config, $version); my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; foreach my $file (qw(sha256sums-signed-build.txt sha256sums-signed-build.txt.asc)) { @@ -576,7 +581,7 @@ sub download_missing_versions { my $cversion = $config->{channels}{$channel}; next unless $config->{versions}{$cversion}{incremental_from}; foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { - next if -d "$releases_dir/$version"; + next if -d version_dir($config, $version); download_version($config, $version); } } [View Less]

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 23 May '18

23 May '18

commit 2f07bdd9b72fe5de5519013657188a91906bd98e Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 10:16:17 2018 +0000 Update translations for mat-gui_completed --- ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index 704e9849d..dcec0210c 100644 --- a/ar.po +++ b/ar.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" … [View More]

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 23 May '18

23 May '18

commit 448dd11a68f70c81c0c53a292d8017401cbd3766 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 10:16:13 2018 +0000 Update translations for mat-gui --- ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index 704e9849d..dcec0210c 100644 --- a/ar.po +++ b/ar.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-… [View More]

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 23 May '18

23 May '18

commit 54f180e0c0fdbff9df13ab3495bad606c5d5cbbd Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 10:15:57 2018 +0000 Update translations for tails-persistence-setup_completed --- ar/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/ar.po b/ar/ar.po index 98dbd35e8..ec1b55250 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <… [View More]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 May '18

23 May '18

commit 8db05bd5fb2f27894628bf561064828bcc044974 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 10:15:50 2018 +0000 Update translations for tails-persistence-setup --- ar/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/ar.po b/ar/ar.po index 98dbd35e8..ec1b55250 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)… [View More]

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 23 May '18

23 May '18

commit 2e4e8d5248820dfa00c252a7e0df0bbda68c8287 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 09:46:00 2018 +0000 Update translations for tails-persistence-setup_completed --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index bf3338e17..98dbd35e8 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers &… [View More]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 23 May '18

23 May '18

commit 1fead930091afaa1c752072c0cc5a2ee1f553ba4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 09:45:55 2018 +0000 Update translations for tails-persistence-setup --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index bf3338e17..98dbd35e8 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)… [View More]

1 0

[torbutton/master] Bug 24309: Fix identity popup dimensions
by gk＠torproject.org 23 May '18

23 May '18

commit 8057989d2d37edcce8cc3bf04e6a145d19440be6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 22 10:04:37 2018 -0700 Bug 24309: Fix identity popup dimensions On some OSes relay lines are wrapping and the doorhanger is sometimes rendering too small to show everything inside. We avoid the line wrapping and resize the identity popup where needed. --- src/chrome/content/tor-circuit-display.js | 43 +++++++++++++++++++++++++++++++ src/chrome/skin/… [View More]tor-circuit-display.css | 1 + 2 files changed, 44 insertions(+) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index cbea569..5bd02bc 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -392,6 +392,44 @@ let setupGuardNote = function () { learnMoreString]]); }; +// __ensureCorrectPopupDimensions()__. +// Make sure the identity popup always displays with the correct height. +let ensureCorrectPopupDimensions = function () { + let setDimensions = () => { + setTimeout(() => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)) + 10; + let newHeight = stack.clientHeight; + stack.setAttribute("width", newWidth); + view2.style.minWidth = view2.style.maxWidth = newWidth + "px"; + view.setAttribute("width", newWidth); + view.setAttribute("height", newHeight); + } + }, 0); + }; + let removeDimensions = () => { + let view = document.querySelector("#identity-popup-multiView .panel-viewcontainer"); + let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); + let view2 = document.getElementById("identity-popup-mainView"); + if (view && stack && view2) { + view.removeAttribute("width"); + view.removeAttribute("height"); + stack.removeAttribute("width"); + view2.style.minWidth = view2.style.maxWidth = ""; + } + }; + let popupMenu = document.getElementById("identity-popup"); + popupMenu.addEventListener("popupshowing", setDimensions); + popupMenu.addEventListener("popuphiding", removeDimensions); + return () => { + popupMenu.removeEventListener("popupshowing", setDimensions); + popupMenu.removeEventListener("popuphiding", removeDimensions); + }; +}; + // ## Main function // __setupDisplay(ipcFile, host, port, password, enablePrefName)__. @@ -403,6 +441,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, + stopEnsuringCorrectPopupDimensions = null, stop = function() { syncDisplayWithSelectedTab(false); if (myController) { @@ -412,6 +451,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { if (stopCollectingBrowserCredentials) { stopCollectingBrowserCredentials(); } + if (stopEnsuringCorrectPopupDimensions) { + stopEnsuringCorrectPopupDimensions(); + } myController = null; } }, @@ -428,6 +470,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { syncDisplayWithSelectedTab(true); stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); stopCollectingBrowserCredentials = collectBrowserCredentials(); + stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); } }; try { diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 71c283c..640d595 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -62,6 +62,7 @@ ul#circuit-display-nodes li { background-repeat: no-repeat; list-style: none; padding-inline-start: 1.5em; + white-space: nowrap; } ul#circuit-display-nodes li:-moz-locale-dir(rtl) { [View Less]

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 23 May '18

23 May '18

commit cef391c98ba9d09a1a50c2464df8bdf11aed714c Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 06:48:32 2018 +0000 Update translations for tails-greeter-2_completed --- pl/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/pl.po b/pl/pl.po index aad362a60..c243e7c8a 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-… [View More]

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 23 May '18

23 May '18

commit 18525b40183c42be99f956906e1bd94e95755138 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 23 06:48:27 2018 +0000 Update translations for tails-greeter-2 --- pl/pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pl/pl.po b/pl/pl.po index aad362a60..c243e7c8a 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-… [View More]

1 0