- tbb-commits - lists.torproject.org

[torbutton/master] Bug 20375: Warn users after entering fullscreen mode.
by gk＠torproject.org 23 Aug '17

23 Aug '17

commit f6b52b8d7f26277569211946248307996d12099c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Aug 22 12:06:21 2017 -0700 Bug 20375: Warn users after entering fullscreen mode. When the browser window is maximized, we show users a notification warning that maximizing the screen is fingerprintable. We should show this warning when the window enters fullscreen mode as well. This change is especially important for macOS, which uses window.STATE_FULLSCREEN instead of window.STATE_MAXIMIZED when the user clicks the "maximize" button on the window title bar. --- src/chrome/content/torbutton.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 11f4b61..db6b694 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2126,7 +2126,8 @@ var torbutton_resizelistener = m_tb_resize_handler = async function() { // Wait for end of execution queue to ensure we have correct windowState. await new Promise(resolve => setTimeout(resolve, 0)); - if (window.windowState === 1) { + if (window.windowState === window.STATE_MAXIMIZED || + window.windowState === window.STATE_FULLSCREEN) { if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {

1 0

[torbutton/maint-1.9.7] Bug 22989: Fix dimensions of new windows on macOS.
by gk＠torproject.org 23 Aug '17

23 Aug '17

commit 6aa6d6ef1355179d7198f0eb09405ac0968ba4e7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 14 15:56:00 2017 -0700 Bug 22989: Fix dimensions of new windows on macOS. Before this patch, a new Tor Browser window, non-maximized, was showing a "don't maximize this window" notification briefly as soon as it was first displayed. Worse, the notification box that appears causes the window height to increase by 10 or 11 pixels and thus breaks our desired window dimension rounding. Our intended behavior is that this notification only be shown when the window is maximized by the user. I discovered that, on macOS, windowState === window.STATE_MAXIMIZED for a short time when the window is first created. Then it rapidly changes to windowState === window.STATE_NORMAL. So I added a `setTimeout` promise to postpone checking the window size until after window creation "settles" and that seems to be enough to ensure we avoid showing the spurious notification box at window creation. Also fixes Bug 22543, "Tor Browser 7.0 shows window resize warning on every new window for a few seconds". And fixes issues raised in comments 2 and 3 in that ticket as well. --- src/chrome/content/torbutton.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0c297aa..11f4b61 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2123,7 +2123,9 @@ var torbutton_resizelistener = onLocationChange: function(aProgress, aRequest, aURI) {}, onStateChange: function(aProgress, aRequest, aFlag, aStatus) { if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { - m_tb_resize_handler = function() { + m_tb_resize_handler = async function() { + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => setTimeout(resolve, 0)); if (window.windowState === 1) { if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {

1 0

[torbutton/master] Bug 22989: Fix dimensions of new windows on macOS.
by gk＠torproject.org 23 Aug '17

23 Aug '17

commit 97380447e4ab66a44abed4ec0aeb5eeabf86404e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 14 15:56:00 2017 -0700 Bug 22989: Fix dimensions of new windows on macOS. Before this patch, a new Tor Browser window, non-maximized, was showing a "don't maximize this window" notification briefly as soon as it was first displayed. Worse, the notification box that appears causes the window height to increase by 10 or 11 pixels and thus breaks our desired window dimension rounding. Our intended behavior is that this notification only be shown when the window is maximized by the user. I discovered that, on macOS, windowState === window.STATE_MAXIMIZED for a short time when the window is first created. Then it rapidly changes to windowState === window.STATE_NORMAL. So I added a `setTimeout` promise to postpone checking the window size until after window creation "settles" and that seems to be enough to ensure we avoid showing the spurious notification box at window creation. Also fixes Bug 22543, "Tor Browser 7.0 shows window resize warning on every new window for a few seconds". And fixes issues raised in comments 2 and 3 in that ticket as well. --- src/chrome/content/torbutton.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0c297aa..11f4b61 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2123,7 +2123,9 @@ var torbutton_resizelistener = onLocationChange: function(aProgress, aRequest, aURI) {}, onStateChange: function(aProgress, aRequest, aFlag, aStatus) { if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { - m_tb_resize_handler = function() { + m_tb_resize_handler = async function() { + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => setTimeout(resolve, 0)); if (window.windowState === 1) { if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 23230: Fix build error on Windows 64
by gk＠torproject.org 22 Aug '17

22 Aug '17

commit f36d2a2dd30368c97594923092a43dd74c61846c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Aug 12 20:42:59 2017 +0200 Bug 23230: Fix build error on Windows 64 Fix the following build error we have when building for Windows 64: /var/tmp/build/firefox-af0ca6a886c7/media/libcubeb/src/cubeb_wasapi.cpp:1596:46: error: cast from cubeb_devid {aka void*} to int loses precision [-fpermissive] We fix that by using %p instead of %x to remove the need for a cast. --- media/libcubeb/src/cubeb_wasapi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/libcubeb/src/cubeb_wasapi.cpp b/media/libcubeb/src/cubeb_wasapi.cpp index e88d6becd861..212cc263c0b6 100644 --- a/media/libcubeb/src/cubeb_wasapi.cpp +++ b/media/libcubeb/src/cubeb_wasapi.cpp @@ -1575,7 +1575,7 @@ int setup_wasapi_stream(cubeb_stream * stm) XASSERT((!stm->output_client || !stm->input_client) && "WASAPI stream already setup, close it first."); if (has_input(stm)) { - LOG("Setup capture: device=%x", (int)stm->input_device); + LOG("Setup capture: device=%p", stm->input_device); rv = setup_wasapi_stream_one_side(stm, &stm->input_stream_params, stm->input_device, @@ -1593,7 +1593,7 @@ int setup_wasapi_stream(cubeb_stream * stm) } if (has_output(stm)) { - LOG("Setup render: device=%x", (int)stm->output_device); + LOG("Setup render: device=%p", stm->output_device); rv = setup_wasapi_stream_one_side(stm, &stm->output_stream_params, stm->output_device,

1 0

[tor-browser-build/master] Include mar-tools zip in the output files
by boklm＠torproject.org 21 Aug '17

21 Aug '17

commit f3fed13feabaead01099d009f099120a8677c650 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 21 18:10:03 2017 +0200 Include mar-tools zip in the output files --- projects/tor-browser/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 77a02ea..31c2d6d 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -275,6 +275,8 @@ cd $distdir [% END %] rm -rf $distdir/${PKG_DIR} +cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ + # If we did not create a multi-lingual package above, create a package for # each locale. [% IF ! c("var/multi_lingual") %]

1 0

[tor-browser-build/master] Bug 17381: create tar containing update responses xml files
by boklm＠torproject.org 21 Aug '17

21 Aug '17

commit 93bb526421830f185c431d9064043e54c38d6bab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 21 19:01:16 2017 +0200 Bug 17381: create tar containing update responses xml files Create a tar file in directory {alpha,release}/update-responses/, to make it a little easier to copy them to the host where they will be deployed. --- Makefile | 4 ++-- README.MAKEFILE | 3 ++- projects/release/config | 5 +++++ projects/release/create_update_responses_tar | 9 +++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1229cfa..ce63e54 100644 --- a/Makefile +++ b/Makefile @@ -97,11 +97,11 @@ incrementals-alpha: submodule-update update_responses-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - tools/update-responses/update_responses release + $(rbm) build release --step create_update_responses_tar --target release --target signed update_responses-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed - tools/update-responses/update_responses alpha + $(rbm) build release --step create_update_responses_tar --target alpha --target signed dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed diff --git a/README.MAKEFILE b/README.MAKEFILE index 9e28864..cd4bf2f 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -91,5 +91,6 @@ signing the OSX dmg files. update_responses-{release,alpha} -------------------------------- Create update responses xml files for a signed build in the release or -alpha channel. +alpha channel. The files can be found in a tar in the directory +{release,alpha}/update-responses. diff --git a/projects/release/config b/projects/release/config index 0a4276a..4ecbc0a 100644 --- a/projects/release/config +++ b/projects/release/config @@ -122,6 +122,11 @@ steps: debug: 0 input_files: [] update_responses_config: '[% INCLUDE update_responses_config %]' + create_update_responses_tar: + build_log: '-' + debug: 0 + input_files: [] + create_update_responses_tar: '[% INCLUDE create_update_responses_tar %]' hash_incrementals: build_log: '-' debug: 0 diff --git a/projects/release/create_update_responses_tar b/projects/release/create_update_responses_tar new file mode 100644 index 0000000..ee1180f --- /dev/null +++ b/projects/release/create_update_responses_tar @@ -0,0 +1,9 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +[% shell_quote(c("basedir")) %]/tools/update-responses/update_responses +mkdir -p [% shell_quote(path(dest_dir)) %]/update-responses +[% SET channel = pc('firefox', 'var/torbrowser_update_channel') -%] +mv [% shell_quote(c("basedir")) %]/tools/update-responses/htdocs/[% channel %] [% channel %] +chmod 775 [% channel %] +chmod 664 [% channel %]/.htaccess [% channel %]/* +tar cf [% shell_quote(path(dest_dir)) %]/update-responses/update-responses-[% channel %]-[% c("version") %].tar [% channel %]

1 0

[tor-browser-build/master] Bug 17381: add and adapt the update_responses script
by boklm＠torproject.org 21 Aug '17

21 Aug '17

commit de3f97f325df5465fa49b7c8ca2ff229b670b207 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 17 13:32:46 2017 +0200 Bug 17381: add and adapt the update_responses script Add the update_responses and incrementals makefile rules. The update_responses script is identical to what we have in tor-browser-bundle.git, however the config.yml file it is using is now generated using the infos from rbm. --- Makefile | 20 + README.MAKEFILE | 10 + keyring/torbrowser.gpg | Bin 0 -> 49267 bytes projects/firefox/config | 3 +- projects/release/config | 21 +- projects/release/hash_incrementals | 4 + projects/release/update_responses_config | 11 + projects/release/update_responses_config.yml | 40 ++ rbm.conf | 3 + tools/update-responses/.gitignore | 2 + tools/update-responses/README.md | 50 ++ .../check_update_responses_deployement | 1 + tools/update-responses/download_missing_versions | 1 + tools/update-responses/gen_incrementals | 1 + tools/update-responses/get_channel_version | 1 + tools/update-responses/update_responses | 643 +++++++++++++++++++++ 16 files changed, 807 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c45b0a1..d49d670 100644 --- a/Makefile +++ b/Makefile @@ -83,6 +83,26 @@ signtag-release: submodule-update signtag-alpha: submodule-update $(rbm) build release --step signtag --target alpha +incrementals-release: submodule-update + $(rbm) build release --step update_responses_config --target release + 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 + tools/update-responses/download_missing_versions alpha + tools/update-responses/gen_incrementals alpha + $(rbm) build release --step hash_incrementals --target alpha + +update_responses-release: submodule-update + $(rbm) build release --step update_responses_config --target release --target signed + tools/update-responses/update_responses release + +update_responses-alpha: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target signed + tools/update-responses/update_responses alpha + submodule-update: git submodule update --init diff --git a/README.MAKEFILE b/README.MAKEFILE index ef33904..167f5d5 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -77,3 +77,13 @@ signtag-{release,alpha} Create a git signed tag for the selected channel, using the version and build number defined as var/torbrowser_version and var/torbrowser_build. +incrementals-{release,alpha} +---------------------------- +Create incremental mar files for an unsigned build in the release or +alpha channel. + +update_responses-{release,alpha} +-------------------------------- +Create update responses xml files for a signed build in the release or +alpha channel. + diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg new file mode 100644 index 0000000..dfdee06 Binary files /dev/null and b/keyring/torbrowser.gpg differ diff --git a/projects/firefox/config b/projects/firefox/config index 1360772..034d40f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,8 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_version: 52.3.0esr + firefox_platform_version: 52.3.0 + firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' diff --git a/projects/release/config b/projects/release/config index b785878..3c771bf 100644 --- a/projects/release/config +++ b/projects/release/config @@ -1,10 +1,11 @@ # vim: filetype=yaml sw=2 version: '[% c("var/torbrowser_version") %]' -output_dir: 'release/unsigned' +output_dir: release var: + signed_status: unsigned today: '[% USE date; date.format(format = "%Y-%m-%d") %]' - publish_dir: '[% c("version") %]-[% c("var/torbrowser_build") %]' + publish_dir: '[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %]' targets: torbrowser-all: @@ -50,7 +51,7 @@ targets: publish_dir: '[% c("var/today") %]' alpha: - output_dir: 'alpha/unsigned' + output_dir: alpha var: build_target: alpha @@ -60,6 +61,10 @@ targets: build_target: torbrowser-testbuild publish_dir: '' + signed: + var: + signed_status: signed + input_files: # Release @@ -112,3 +117,13 @@ steps: debug: 0 input_files: [] signtag: '[% INCLUDE signtag %]' + update_responses_config: + build_log: '-' + debug: 0 + input_files: [] + update_responses_config: '[% INCLUDE update_responses_config %]' + hash_incrementals: + build_log: '-' + debug: 0 + input_files: [] + hash_incrementals: '[% INCLUDE hash_incrementals %]' diff --git a/projects/release/hash_incrementals b/projects/release/hash_incrementals new file mode 100644 index 0000000..9cf1b27 --- /dev/null +++ b/projects/release/hash_incrementals @@ -0,0 +1,4 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %]-[% c("var/torbrowser_build") %] +sha256sum `ls -1 | grep '\.incremental\.mar$' | sort` > sha256sums-[% c("var/signed_status") %]-build.incrementals.txt diff --git a/projects/release/update_responses_config b/projects/release/update_responses_config new file mode 100644 index 0000000..4ff470d --- /dev/null +++ b/projects/release/update_responses_config @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +cat > [% shell_quote(c("basedir")) %]/tools/update-responses/config.yml << 'EOF' +[% INCLUDE update_responses_config.yml -%] +EOF + +# Update / create symlink $torbrowser_version -> $torbrowser_version-buildN +versiondir=[% shell_quote(path(dest_dir)) _ '/' _ c("var/signed_status") _ '/' _ c("version") %] +test -L "$versiondir" && rm -f "$versiondir" +test -d "$versiondir" || ln -s [% shell_quote(c("version")) %]-[% shell_quote(c("var/torbrowser_build")) %] "$versiondir" + diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml new file mode 100644 index 0000000..f0d9dbf --- /dev/null +++ b/projects/release/update_responses_config.yml @@ -0,0 +1,40 @@ +--- +appname_marfile: tor-browser +appname_bundle_osx: TorBrowser +appname_bundle_linux: tor-browser +appname_bundle_win: torbrowser-install +releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] +download: + archive_url: https://archive.torproject.org/tor-package-archive/torbrowser + gpg_keyring: ../../keyring/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 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 + osx32: Darwin_x86-gcc3 + osx64: Darwin_x86_64-gcc3 +channels: + [% pc('firefox', 'var/torbrowser_update_channel') %]: [% c("var/torbrowser_version") %] +versions: + [% c("var/torbrowser_version") %]: + platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] + detailsURL: https://blog.torproject.org/blog/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released + incremental_from: +[% FOREACH v IN c("var/torbrowser_incremental_from") -%] + - [% v %] +[% END -%] + migrate_archs: + osx32: osx64 + migrate_langs: + pt-PT: pt-BR + win32: + minSupportedInstructionSet: SSE2 + osx32: + minSupportedOSVersion: 13.0.0 + osx64: + minSupportedOSVersion: 13.0.0 diff --git a/rbm.conf b/rbm.conf index 5e1e66d..44fc9f5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,6 +16,9 @@ buildconf: var: torbrowser_version: '7.5a4' torbrowser_build: 'build2' + torbrowser_incremental_from: + - 7.5a2 + - 7.5a3 project_name: tor-browser multi_lingual: 0 build_mar: 1 diff --git a/tools/update-responses/.gitignore b/tools/update-responses/.gitignore new file mode 100644 index 0000000..5947fca --- /dev/null +++ b/tools/update-responses/.gitignore @@ -0,0 +1,2 @@ +/htdocs +/config.yml diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md new file mode 100644 index 0000000..5209ed5 --- /dev/null +++ b/tools/update-responses/README.md @@ -0,0 +1,50 @@ +Tor Browser Update Responses script +=================================== + +This repository contains a script to generate responses for Tor Browser +updater. + +See ticket [#12622](https://trac.torproject.org/projects/tor/ticket/12622) +for details. + + +Dependencies +------------ + +The following perl modules need to be installed to run the script: + FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp + IO::CaptureOutput Parallel::ForkManager XML::LibXML LWP JSON + +On Debian / Ubuntu you can install them with: + +``` + # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ + libdigest-sha-perl libxml-writer-perl \ + libio-captureoutput-perl libparallel-forkmanager-perl \ + libxml-libxml-perl libwww-perl libjson-perl +``` + +On Red Hat / Fedora you can install them with: + +``` + # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ + File::Temp IO::CaptureOutput Parallel::ForkManager \ + XML::LibXML LWP JSON + do yum install "perl($module)"; done +``` + + +URL Format +---------- + +The URL format is: + https://something/$channel/$build_target/$tb_version/$lang?force=1 + +'build_target' is the OS for which the browser was built. The correspo +ndance between the build target and the OS name that we use in archive +files is defined in the config.yml file. + +'tb_version' is the Tor Browser version. + +'lang' is the locale. + diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/download_missing_versions b/tools/update-responses/download_missing_versions new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/download_missing_versions @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/get_channel_version b/tools/update-responses/get_channel_version new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/get_channel_version @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses new file mode 100755 index 0000000..0ed19c1 --- /dev/null +++ b/tools/update-responses/update_responses @@ -0,0 +1,643 @@ +#!/usr/bin/perl -w + +use strict; +use feature "state"; +use English; +use FindBin; +use YAML qw(LoadFile); +use File::Slurp; +use Digest::SHA qw(sha256_hex); +use XML::Writer; +use Cwd; +use File::Copy; +use File::Temp; +use File::Find; +use POSIX qw(setlocale LC_ALL); +use IO::CaptureOutput qw(capture_exec); +use Parallel::ForkManager; +use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; +use JSON; + +# Set umask and locale to provide a consistent environment for MAR file +# generation, etc. +umask(0022); +$ENV{"LC_ALL"} = "C"; +setlocale(LC_ALL, "C"); + +my $htdocsdir = "$FindBin::Bin/htdocs"; +my $config = LoadFile("$FindBin::Bin/config.yml"); +my %htdocsfiles; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; +my @check_errors; +my $initPATH = $ENV{PATH}; +my $initLD_LIBRARY_PATH = $ENV{LD_LIBRARY_PATH}; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); +} + +sub get_nbprocs { + return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; + if (-f '/proc/cpuinfo') { + return scalar grep { m/^processor\s+:\s/ } read_file '/proc/cpuinfo'; + } + return 4; +} + +sub write_htdocs { + my ($channel, $file, $content) = @_; + mkdir $htdocsdir unless -d $htdocsdir; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; +} + +sub clean_htdocs { + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } +} + +sub get_sha512_hex_of_file { + my ($file) = @_; + my $sha = Digest::SHA->new("512"); + $sha->addfile($file); + return $sha->hexdigest; +} + +sub get_version_files { + my ($config, $version) = @_; + return if $config->{versions}{$version}{files}; + my $appname = $config->{appname_marfile}; + 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"; + if ($file =~ m/^$appname-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $lang) = ($1, $2); + $files->{$os}{$lang}{complete} = { + type => 'complete', + URL => "$download_url/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + }; + next; + } + if ($file =~ m/^$appname-([^-]+)-(.+)-${version}_(.+)\.incremental\.mar$/) { + my ($os, $from_version, $lang) = ($1, $2, $3); + $files->{$os}{$lang}{partial}{$from_version} = { + type => 'partial', + URL => "$download_url/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + } + } + } + closedir $d; + $config->{versions}{$version}{files} = $files; +} + +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"; + my ($os, $lang); + if ($file =~ m/^$config->{appname_bundle_osx}-$version-osx64_(.+).dmg$/) { + ($os, $lang) = ('osx64', $1); + } elsif ($file =~ m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) { + ($os, $lang) = ($1, $2); + } elsif ($file =~ m/^$config->{appname_bundle_win}-${version}_(.+).exe$/) { + ($os, $lang) = ('win32', $1); + } else { + next; + } + $downloads->{$os}{$lang} = { + binary => "$download_url/$file", + sig => "$download_url/$file.asc", + }; + } + closedir $d; + $config->{versions}{$version}{downloads} = $downloads; +} + +sub extract_mar { + my ($mar_file, $dest_dir) = @_; + my $old_cwd = getcwd; + mkdir $dest_dir; + chdir $dest_dir or exit_error "Cannot enter $dest_dir"; + my $res = system('mar', '-x', $mar_file); + exit_error "Error extracting $mar_file" if $res; + my $bunzip_file = sub { + return unless -f $File::Find::name; + rename $File::Find::name, "$File::Find::name.bz2"; + system('bunzip2', "$File::Find::name.bz2") == 0 + || exit_error "Error decompressing $File::Find::name"; + }; + find($bunzip_file, $dest_dir); + my $manifest = -f 'updatev3.manifest' ? 'updatev3.manifest' + : 'updatev2.manifest'; + my @lines = read_file($manifest) if -f $manifest; + foreach my $line (@lines) { + if ($line =~ m/^addsymlink "(.+)" "(.+)"$/) { + exit_error "$mar_file: Could not create symlink $1 -> $2" + unless symlink $2, $1; + } + } + chdir $old_cwd; +} + +sub mar_filename { + my ($appname, $version, $os, $lang) = @_; + "$releases_dir/$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"; + if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { + print "Skipping $mar_file\n"; + return; + } + print "Starting $mar_file\n"; + 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 => "$download_url/$mar_file", + size => -s $mar_file_path, + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file($mar_file_path), + }; + }; + return if $pm->start($finished_file); + my $tmpdir = File::Temp->newdir(); + extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); + extract_mar(mar_filename($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") { + exit_error "Missing code signature while creating $mar_file"; + } + } + my ($out, $err, $success) = capture_exec('make_incremental_update.sh', + $mar_file_path, "$tmpdir/A", "$tmpdir/B"); + if (!$success) { + unlink $mar_file_path if -f $mar_file_path; + exit_error "making incremental mar:\n" . $err; + } + $pm->finish; +} + +sub create_incremental_mars_for_version { + my ($config, $version) = @_; + my $pm = Parallel::ForkManager->new(get_nbprocs); + $pm->run_on_finish(sub { $_[2]->(@_) }); + my $v = $config->{versions}{$version}; + foreach my $from_version (@{$v->{incremental_from}}) { + $config->{versions}{$from_version} //= {}; + get_version_files($config, $from_version); + my $from_v = $config->{versions}{$from_version}; + foreach my $os (keys %{$v->{files}}) { + foreach my $lang (keys %{$v->{files}{$os}}) { + next unless defined $from_v->{files}{$os}{$lang}{complete}; + create_incremental_mar($config, $pm, $from_version, $version, $os, $lang); + } + } + } + $pm->wait_all_children; +} + +sub get_config { + my ($config, $version, $os, $name) = @_; + return $config->{versions}{$version}{$os}{$name} + // $config->{versions}{$version}{$name} + // $config->{$name}; +} + +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + +sub get_buildinfos { + my ($config, $version) = @_; + return if exists $config->{versions}{$version}{buildID}; + extract_martools($version); + my $files = $config->{versions}{$version}{files}; + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + next unless $files->{$os}{$lang}{complete}; + my $tmpdir = File::Temp->newdir(); + extract_mar( + mar_filename($config->{appname_marfile}, $version, $os, $lang), + "$tmpdir"); + my $appfile = "$tmpdir/application.ini" if -f "$tmpdir/application.ini"; + $appfile = "$tmpdir/Contents/Resources/application.ini" + if -f "$tmpdir/Contents/Resources/application.ini"; + exit_error "Could not find application.ini" unless $appfile; + foreach my $line (read_file($appfile)) { + if ($line =~ m/^BuildID=(.*)$/) { + $config->{versions}{$version}{buildID} = $1; + return; + } + } + exit_error "Could not extract buildID from application.ini"; + } + } +} + +sub get_response { + my ($config, $version, $os, @patches) = @_; + my $res; + my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); + $writer->xmlDecl; + $writer->startTag('updates'); + if (get_config($config, $version, $os, 'unsupported')) { + $writer->startTag('update', + unsupported => 'true', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + ); + goto CLOSETAGS; + } + my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + my $mininstruc = get_config($config, $version, $os, 'minSupportedInstructionSet'); + $writer->startTag('update', + type => 'minor', + displayVersion => $version, + appVersion => $version, + platformVersion => get_config($config, $version, $os, 'platformVersion'), + buildID => get_config($config, $version, $os, 'buildID'), + detailsURL => get_config($config, $version, $os, 'detailsURL'), + actions => 'showURL', + openURL => get_config($config, $version, $os, 'detailsURL'), + defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), + ); + foreach my $patch (@patches) { + my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch; + $writer->startTag('patch', @sorted_patch); + $writer->endTag('patch'); + } + CLOSETAGS: + $writer->endTag('update'); + $writer->endTag('updates'); + $writer->end; + return $res; +} + +sub write_responses { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; + get_version_files($config, $version); + get_buildinfos($config, $version); + my $files = $config->{versions}{$version}{files}; + my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; + foreach my $old_os (keys %$migrate_archs) { + my $new_os = $migrate_archs->{$old_os}; + foreach my $lang (keys %{$files->{$new_os}}) { + $files->{$old_os}{$lang}{complete} = + $files->{$new_os}{$lang}{complete}; + } + } + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + my $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}, + $files->{$os}{$lang}{partial}{$from_version}); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); + } + } + } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); + } +} + +sub write_htaccess { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + my $flags = "[last]"; + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; + my $version = $config->{channels}{$channel}; + my $migrate_langs = $config->{versions}{$version}{migrate_langs} // {}; + my $files = $config->{versions}{$version}{files}; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; + foreach my $os (sort keys %$files) { + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; + } + foreach my $lang (sort keys %$migrate_langs) { + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$migrate_langs->{$lang}.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; + } + } + write_htdocs($channel, '.htaccess', $htaccess); + } +} + +sub write_downloads_json { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; + my $data = { + version => $version, + downloads => get_version_downloads($config, $version), + }; + write_htdocs($channel, 'downloads.json', + JSON->new->utf8->canonical->encode($data)); + } +} + +sub osname { + my ($osname) = capture_exec('uname', '-s'); + my ($arch) = capture_exec('uname', '-m'); + chomp($osname, $arch); + if ($osname eq 'Linux' && $arch eq 'x86_64') { + return 'linux64'; + } + if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { + return 'linux32'; + } + exit_error 'Unknown OS'; +} + +my $martools_tmpdir; +sub extract_martools { + my ($version) = @_; + my $osname = osname; + my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; + $martools_tmpdir = File::Temp->newdir(); + my $old_cwd = getcwd; + chdir $martools_tmpdir; + my (undef, undef, $success) = capture_exec('unzip', $marzip); + chdir $old_cwd; + exit_error "Error extracting $marzip" unless $success; + $ENV{PATH} = "$martools_tmpdir/mar-tools:$initPATH"; + if ($initLD_LIBRARY_PATH) { + $ENV{LD_LIBRARY_PATH} = "$initLD_LIBRARY_PATH:$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } +} + +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (build_targets_list()) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub download_version { + my ($config, $version) = @_; + my $tmpdir = File::Temp->newdir(); + my $destdir = "$releases_dir/$version"; + my $urldir = "$config->{download}{archive_url}/$version"; + print "Downloading version $version\n"; + foreach my $file (qw(sha256sums-unsigned-build.txt sha256sums-unsigned-build.txt.asc)) { + if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { + exit_error "Error downloading $urldir/$file"; + } + } + if (system('gpg', '--no-default-keyring', '--keyring', + "$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"; + } + mkdir $destdir; + move "$tmpdir/sha256sums-unsigned-build.txt.asc", "$destdir/sha256sums-unsigned-build.txt.asc"; + move "$tmpdir/sha256sums-unsigned-build.txt", "$destdir/sha256sums-unsigned-build.txt"; + my %sums = map { chomp; reverse split ' ', $_ } + read_file "$destdir/sha256sums-unsigned-build.txt"; + + my $martools = 'mar-tools-' . osname . '.zip'; + exit_error "Error downloading $urldir/$martools\n" + unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; + exit_error "Error downloading $urldir/$martools.asc\n" + unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; + if (system('gpg', '--no-default-keyring', '--keyring', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', + "$tmpdir/$martools.asc", "$tmpdir/$martools")) { + exit_error "Error checking gpg signature for $version/$martools"; + } + exit_error "Wrong checksum for $version/$martools" + unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); + move "$tmpdir/$martools", "$destdir/$martools"; + move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; + extract_martools($version); + + foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { + print "Downloading $file\n"; + exit_error "Error downloading $urldir/$file\n" + unless getstore("$urldir/$file", "$tmpdir/$file") == 200; + if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { + exit_error "Error unsigning $file" + if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); + move "$tmpdir/$file.u", "$tmpdir/$file"; + } + move "$tmpdir/$file", "$destdir/$file"; + } +} + +sub download_missing_versions { + my ($config, @channels) = @_; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + 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"; + download_version($config, $version); + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + +my %actions = ( + update_responses => sub { + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + write_downloads_json($config, @channels); + clean_htdocs(@channels); + }, + gen_incrementals => sub { + my ($config) = @_; + foreach my $version (channel_to_version($config, @ARGV)) { + extract_martools($version); + get_version_files($config, $version); + create_incremental_mars_for_version($config, $version); + } + }, + download_missing_versions => sub { + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + download_missing_versions($config, @channels); + }, + check_update_responses_deployement => \&check_update_responses, + get_channel_version => sub { + my ($config) = @_; + exit_error "Wrong arguments" unless @ARGV == 1; + exit_error "Unknown channel" unless $config->{channels}{$ARGV[0]}; + print $config->{channels}{$ARGV[0]}, "\n"; + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser-build/master] Bug 17381: add dmg2mar
by boklm＠torproject.org 21 Aug '17

21 Aug '17

commit a510614a08cedcb99a03329acb8fa0bd165314e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 21 14:41:34 2017 +0200 Bug 17381: add dmg2mar Add the dmg2mar makefile rules. --- Makefile | 12 ++++ README.MAKEFILE | 6 ++ projects/release/config | 5 ++ projects/release/dmg2mar | 4 ++ tools/dmg2mar | 168 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 195 insertions(+) diff --git a/Makefile b/Makefile index d49d670..1229cfa 100644 --- a/Makefile +++ b/Makefile @@ -103,6 +103,18 @@ update_responses-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed tools/update-responses/update_responses alpha +dmg2mar-release: submodule-update + $(rbm) build release --step update_responses_config --target release --target signed + $(rbm) build release --step dmg2mar --target release --target signed + tools/update-responses/download_missing_versions release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release + +dmg2mar-alpha: submodule-update + $(rbm) build release --step update_responses_config --target alpha --target signed + $(rbm) build release --step dmg2mar --target alpha --target signed + tools/update-responses/download_missing_versions alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha + submodule-update: git submodule update --init diff --git a/README.MAKEFILE b/README.MAKEFILE index 167f5d5..9e28864 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -82,6 +82,12 @@ incrementals-{release,alpha} Create incremental mar files for an unsigned build in the release or alpha channel. +dmg2mar-{release,alpha) +----------------------- +Generate updated mar files for the OSX bundles, from the dmg files, then +regenerate the OSX incremental mar files. You should run this after +signing the OSX dmg files. + update_responses-{release,alpha} -------------------------------- Create update responses xml files for a signed build in the release or diff --git a/projects/release/config b/projects/release/config index 3c771bf..0a4276a 100644 --- a/projects/release/config +++ b/projects/release/config @@ -127,3 +127,8 @@ steps: debug: 0 input_files: [] hash_incrementals: '[% INCLUDE hash_incrementals %]' + dmg2mar: + build_log: '-' + debug: 0 + input_files: [] + dmg2mar: '[% INCLUDE dmg2mar %]' diff --git a/projects/release/dmg2mar b/projects/release/dmg2mar new file mode 100644 index 0000000..d6175f5 --- /dev/null +++ b/projects/release/dmg2mar @@ -0,0 +1,4 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] +[% shell_quote(c("basedir")) %]/tools/dmg2mar diff --git a/tools/dmg2mar b/tools/dmg2mar new file mode 100755 index 0000000..51d6acb --- /dev/null +++ b/tools/dmg2mar @@ -0,0 +1,168 @@ +#!/usr/bin/perl -w +# +# This script converts all dmg files from the current directory and +# listed in the sha256sums-unsigned-build.txt file to full update +# mar files. After code signing the dmg files, this script can be used +# to update the mar files. +# +# A recent version of p7zip is required to extract the dmg files, such +# as 15.14. The version in Debian Jessie (9.20) is not recent enough. +# It is possible to install the p7zip-full package from Debian testing, +# or build p7zip from sources: +# $ p7zipdir=/some_directory/p7zip +# $ mkdir $p7zipdir +# $ cd $p7zipdir +# $ wget http://snapshot.debian.org/archive/debian/20160417T044336Z/pool/main/p/p7zi… +# $ echo 'e9e696e2fa77b00445a4d85fa07506debeae01943fdc1bee1472152d7d1386af p7zip_15.14.1+dfsg.orig.tar.xz' | sha256sum -c +# $ wget http://snapshot.debian.org/archive/debian/20160515T161830Z/pool/main/p/p7zi… +# $ echo 'f4db6803535fc30b6ae9db5aabfd9f57a851c6773d72073847ec5e3731b7af37 p7zip_15.14.1+dfsg-2.debian.tar.xz' | sha256sum -c +# $ tar xvf p7zip_15.14.1+dfsg-2.debian.tar.xz +# $ tar xvf p7zip_15.14.1+dfsg.orig.tar.xz +# $ cd p7zip_15.14.1/ +# $ for patch in $(cat ../debian/patches/series ); do patch -p1 < ../debian/patches/$patch; done +# $ make 7z +# $ mkdir $p7zipdir/bin +# $ echo '#!/bin/sh' > $p7zipdir/bin/7z +# $ echo "export LD_LIBRARY_PATH=$PWD/bin" >> $p7zipdir/bin/7z +# $ echo "exec $PWD/bin/7z "'"$@"' >> $p7zipdir/bin/7z +# $ chmod +x $p7zipdir/bin/7z +# $ export "PATH=$p7zipdir/bin:$PATH" + +use strict; +use IO::CaptureOutput qw(capture_exec); +use File::Slurp; +use File::Find; +use Parallel::ForkManager; +use Cwd; + +# If the application is not TorBrowser (for instance, TorMessenger) +# set the application name in the TOR_APPNAME_BUNDLE_OSX and in +# the TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +sub osname { + my ($osname) = capture_exec('uname', '-s'); + my ($arch) = capture_exec('uname', '-m'); + chomp($osname, $arch); + if ($osname eq 'Linux' && $arch eq 'x86_64') { + return 'linux64'; + } + if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { + return 'linux32'; + } + exit_error 'Unknown OS'; +} + +my $martools_tmpdir; +sub extract_martools { + my $osname = osname; + my $marzip = getcwd . "/mar-tools-$osname.zip"; + $martools_tmpdir = File::Temp->newdir(); + my $old_cwd = getcwd; + chdir $martools_tmpdir; + my (undef, undef, $success) = capture_exec('unzip', $marzip); + chdir $old_cwd; + exit_error "Error extracting $marzip" unless $success; + $ENV{PATH} = "$martools_tmpdir/mar-tools:$ENV{PATH}"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } + $ENV{MAR} = "$martools_tmpdir/mar-tools/mar"; + $ENV{MSBDIFF} = "$martools_tmpdir/mar-tools/mbsdiff"; +} + +sub get_nbprocs { + return $ENV{NUM_PROCS} if defined $ENV{NUM_PROCS}; + if (-f '/proc/cpuinfo') { + return scalar grep { m/^processor\s+:\s/ } read_file '/proc/cpuinfo'; + } + return 4; +} + +sub get_dmg_files_from_sha256sums { + exit_error "Missing sha256sums-unsigned-build.txt file" + unless -f 'sha256sums-unsigned-build.txt'; + my @files; + foreach my $line (read_file('sha256sums-unsigned-build.txt')) { + my (undef, $filename) = split ' ', $line; + chomp $filename; + next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; + push @files, { filename => $filename, version => $1, lang => $2 }; + } + return @files; +} + +sub convert_files { + my $pm = Parallel::ForkManager->new(get_nbprocs); + $pm->run_on_finish(sub { print "Finished $_[2]\n" }); + foreach my $file (get_dmg_files_from_sha256sums) { + # The 'ja' locale is a special case: it is called 'ja-JP-mac' + # internally on OSX, but the dmg file still uses 'ja' to avoid + # confusing users. + my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; + my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar"; + my $step_name = "$file->{filename} -> $output"; + print "Starting $step_name\n"; + $pm->start($step_name) and next; + my $tmpdir = File::Temp->newdir(); + my (undef, $err, $success) = capture_exec('7z', 'x', "-o$tmpdir", + $file->{filename}); + exit_error "Error extracting $file->{filename}: $err" unless $success; + + # 7z does not currently extract file permissions from the dmg files + # so we also extract the old mar file to copy the permissions + # https://trac.torproject.org/projects/tor/ticket/20210 + my $tmpdir_oldmar = File::Temp->newdir(); + my $oldmar = getcwd . '/' . $output; + exit_error "Error extracting $output" + unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; + my $wanted = sub { + my $file = $File::Find::name; + $file =~ s{^$tmpdir/$appname\.app/}{}; + if (-f "$tmpdir_oldmar/$file") { + my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); + chmod $mode, $File::Find::name; + return; + } + chmod 0644, $File::Find::name if -f $File::Find::name; + chmod 0755, $File::Find::name if -d $File::Find::name; + }; + find($wanted, "$tmpdir/$appname.app"); + + unlink $output; + (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', + $output, "$tmpdir/$appname.app"); + exit_error "Error updating $output: $err" unless $success; + $pm->finish; + } + $pm->wait_all_children; +} + +sub remove_incremental_mars { + exit_error "Missing sha256sums-unsigned-build.incrementals.txt file" + unless -f 'sha256sums-unsigned-build.incrementals.txt'; + foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { + my (undef, $filename) = split ' ', $line; + chomp $filename; + next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/; + next unless -f $filename; + print "Removing $filename\n"; + unlink $filename; + } +} + +# Set LC_ALL=C to avoid reproducibility issues when creating mar files +$ENV{LC_ALL} = 'C'; + +extract_martools; +convert_files; +remove_incremental_mars;

1 0

[tor-browser-build/master] Add a README.MAKEFILE file to describe makefile rules
by boklm＠torproject.org 15 Aug '17

15 Aug '17

commit f291e750afda75d68ba29bbcb998fba67e3f8012 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 15 13:22:39 2017 +0200 Add a README.MAKEFILE file to describe makefile rules --- README | 6 +++++ README.MAKEFILE | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/README b/README index 751ccdd..de79d35 100644 --- a/README +++ b/README @@ -212,3 +212,9 @@ Hacking on the Tor Browser build The file README.HACKING tries to list the main things to know when making changes to the Tor Browser build. +Description of makefile rules +----------------------------- + +You can find a description of the makefile rules in the README.MAKEFILE +file. + diff --git a/README.MAKEFILE b/README.MAKEFILE new file mode 100644 index 0000000..ef33904 --- /dev/null +++ b/README.MAKEFILE @@ -0,0 +1,79 @@ +Description of makefile rules +============================= + + +release +------- +Build Tor Browser for the release channel, for all supported platforms. +The resulting build can be found in directory release/$version. + +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +--------------------------------------------------------- +Same as release, for the selected platform only. + +alpha +----- +Build Tor Browser for the alpha channel, for all supported platforms. +The resulting build can be found in directoryp alpha/$version. + +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +------------------------------------------------------- +Same as alpha, for the selected platform only. + +nightly +------- +Build Tor Browser for the nightly channel, for all supported platforms. +Many of the components will be based on the master branch. You might +want to run "make fetch" before, to fetch the latest commits from all +components. + +The resulting build can be found in directory nightly/$date + +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +--------------------------------------------------------- +Same as nightly, for the selected platform only. + +alpha_nightly +------------- +Build Tor Browser for the alpha channel, for all supported platforms. +This is the same as 'make alpha', but the output directory is different. +The resulting build can be found in directory alpha_nightly/$date + +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +--------------------------------------------------------------- +The same as alpha_nightly, for the selected platform only. + +testbuild +--------- +Build a Tor Browser test build. To make the build faster, only the en-US +locale is created, without mar files. By default it is based on the +alpha channel, but you can change that by editing rbm.conf.local. +The resulting build can be found in directory testbuild. + +fetch +----- +Fetch new commits from all components. This is useful when you want to +build the nightly channel. + +clean +----- +Clean files created during previous builds that are no longer used in +current builds. Before using this command, you first need to configure +in rbm.local.conf the channel(s) that you are building. + +In other software, the clean rule is used to remove all build files, +but this is not the case here, where only obsolete build files are +removed. It is usually not necessary to remove all build files before +starting a new build as the need for rebuilding components is detected +automatically. If you want to remove all build files, you can remove +the out/ directory. + +clean-dry-run +------------- +Print the files that would be removed when running 'make clean'. + +signtag-{release,alpha} +----------------------- +Create a git signed tag for the selected channel, using the version and +build number defined as var/torbrowser_version and var/torbrowser_build. +

1 0

[tor-browser-build/master] Update rbm for the build_log_append option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 89656909bd3d54722aa6ee1627b93858c5cdd93c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 13:02:32 2017 +0200 Update rbm for the build_log_append option --- rbm | 2 +- rbm.local.conf.example | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rbm b/rbm index 6902007..0f5857b 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 690200770631f4adcfbbe7988379eb39698e11ab +Subproject commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c diff --git a/rbm.local.conf.example b/rbm.local.conf.example index e30d8a8..62d13b2 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -21,6 +21,11 @@ ### stdout and stderr. #build_log: '-' +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + buildconf: buildconf: 1

1 0

[rbm/master] Add the build_log_append option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:56:25 2017 +0200 Add the build_log_append option --- NEWS | 2 ++ doc/rbm_config.asc | 5 +++++ lib/RBM.pm | 3 ++- lib/RBM/DefaultConfig.pm | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c43dc2d..d517840 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the build_log_append option + - Add the rbm_tmp_dir option - Add the input_files_paths option diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index dc3b5e4..1935cd3 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -149,6 +149,11 @@ build_log:: The file where the build logs will be written. If the value is `-` (the default), the logs will be output on stdout and stderr. +build_log_append:: + If you set to +build_log_append+ to 0, the log file (defined in + +build_log+) will be cleaned when starting a new build. The + default is 1. + fetch:: The value should be 0 or 1, depending on whether the commits from the remote git or hg repository should be fetched diff --git a/lib/RBM.pm b/lib/RBM.pm index c1240cd..df29a01 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1020,10 +1020,11 @@ sub build_run { } my $build_log = project_config($project, "build_log", $options); if ($build_log ne '-') { + my $append = project_config($project, "build_log_append", $options); $build_log = path($build_log); make_path(dirname($build_log)); my $now = localtime; - write_file($build_log, {append => 1}, "Starting build: $now\n"); + write_file($build_log, {append => $append}, "Starting build: $now\n"); print "Build log: $build_log\n"; } chdir $srcdir; diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 63021e9..b1f97cb 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -126,6 +126,7 @@ our %default_config = ( rpmspec => '[% SET tmpl = project _ ".spec"; INCLUDE $tmpl -%]', build => '[% INCLUDE build -%]', build_log => '-', + build_log_append => '1', notmpl => [ qw(projects_dir) ], describe => \&git_describe, abbrev_lenght => '12',

1 0

[tor-browser-build/master] Avoid using directory with predictable name in /tmp
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 36296855fd4e553fb871c2f03a2fc62597d562a5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:28:57 2017 +0200 Avoid using directory with predictable name in /tmp Update rbm with support for the rbm_tmp_dir option, and use it in the containers directory. --- rbm | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index f494d16..6902007 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit f494d16a1b86700661a029f5eca00c6216bf08d1 +Subproject commit 690200770631f4adcfbbe7988379eb39698e11ab diff --git a/rbm.conf b/rbm.conf index 93c5e5b..5e1e66d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -36,7 +36,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-build/master] Display container's path when opening debug shell
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit b9512ca6c0fddee7aa61e6c1672df59ddaa0aacc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:22:54 2017 +0200 Display container's path when opening debug shell --- README.HACKING | 5 ++--- rbm.conf | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.HACKING b/README.HACKING index 8dde2f2..ea5d500 100644 --- a/README.HACKING +++ b/README.HACKING @@ -256,7 +256,6 @@ in the build containers, but vi can be used instead. When you press ctrl+d (twice if you opened a bash shell) the debug shell is closed and the container containing the failed build is removed. -If you want to make a backup of the container's rootfs with the failed -build to look at it later, you should be able to find it in -/tmp/$UID/rbm-containers. +The path to the container should be printed on the screen in case you +want to backup its rootfs to be able to look at it later. diff --git a/rbm.conf b/rbm.conf index 523a005..93c5e5b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -314,6 +314,9 @@ runc: remote_exec: | #!/bin/sh set -e + [% IF c("interactive") -%] + echo Container directory: [% shell_quote(c("var/container/dir")) %] + [% END -%] mkdir -p '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/rbm echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rootfs/rbm/cmd echo [% shell_quote(c('exec_cmd')) %] >> '[% c("var/container/dir") %]'/rootfs/rbm/cmd

1 0

[rbm/master] Add the rbm_tmp_dir option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 690200770631f4adcfbbe7988379eb39698e11ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:25:55 2017 +0200 Add the rbm_tmp_dir option --- NEWS | 2 ++ doc/rbm_config.asc | 5 +++++ lib/RBM/DefaultConfig.pm | 13 +++++++++++++ 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index 4eac374..c43dc2d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the rbm_tmp_dir option + - Add the input_files_paths option - Add the ENV option diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 2e9b8ab..dc3b5e4 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -136,6 +136,11 @@ tmp_dir:: This directory will contains some scripts that will be executed, so it should not be on a partition mounted as noexec. +rbm_tmp_dir:: + A directory created inside +tmp_dir+ using +File::Temp+, that + you can use to store temporary files. This directory is removed + automatically when rbm exits. + output_dir:: The directory where output files (tarballs, spec files or packages) are created. The default value is +out+. diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index cf0ed74..63021e9 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -13,6 +13,7 @@ use File::Basename; use RBM; use Cwd qw(getcwd); use IO::CaptureOutput qw(capture_exec); +use File::Temp; sub git_describe { my ($project, $options) = @_; @@ -101,10 +102,22 @@ sub docker_version { RBM::exit_error("Could not find docker version"); } +sub rbm_tmp_dir { + my ($project, $options) = @_; + CORE::state $rbm_tmp_dir; + return $rbm_tmp_dir->dirname if $rbm_tmp_dir; + my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) + || RBM::exit_error('No tmp_dir specified'); + $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', + DIR => $tmp_dir); + return $rbm_tmp_dir->dirname; +} + our %default_config = ( sysconf_file => '/etc/rbm.conf', localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', + rbm_tmp_dir => \&rbm_tmp_dir, projects_dir => 'projects', output_dir => 'out', git_clone_dir => 'git_clones',

1 0

[tor-browser-build/master] README.HACKING: explain which mozconfig files we are using
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit 2c5b8113fa1fcbfaac8f5b3310b7e54a7ca38af2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:24:20 2017 +0200 README.HACKING: explain which mozconfig files we are using --- README.HACKING | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.HACKING b/README.HACKING index 221cc90..8dde2f2 100644 --- a/README.HACKING +++ b/README.HACKING @@ -222,6 +222,21 @@ commit you want to build. You will also need to comment the 'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). +The Firefox mozconfig files +--------------------------- + +In the gitian build, we are using the mozconfig files included in the +tor-browser.git repository (the .mozconfig, .mozconfig-mac and +.mozconfig-mingw files). + +In the rbm build however, we need to make some small modifications to +those files, so we are instead using mozconfig files stored in the +projects/firefox/ directory and ignoring the .mozconfig files from the +tor-browser.git repository. + +This could change in the future, when we are not using gitian anymore. + + Debugging a build error -----------------------

1 0

[tor-browser-build/master] Update tor-browser.git branch used in nightly
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit 8a999d86a27b8edd4dfc3ec8a497f13804d37f74 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:43:52 2017 +0200 Update tor-browser.git branch used in nightly --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index e2cf727..1360772 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -27,7 +27,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/master] Synchronize mozconfig files with their version from tor-browser.git
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit aa96f1ab37786d11529f8266a1eeca07b04e7016 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:39:09 2017 +0200 Synchronize mozconfig files with their version from tor-browser.git The main change is the removal of the --enable-jemalloc=4 option which was done with #22482. --- projects/firefox/mozconfig-linux-i686 | 3 +-- projects/firefox/mozconfig-linux-x86_64 | 3 +-- projects/firefox/mozconfig-osx-x86_64 | 3 +-- projects/firefox/mozconfig-windows-i686 | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 8b4ecb3..a7d75fa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -31,7 +31,6 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index cde5b49..7d9ab1c 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -23,7 +23,6 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 1658e18..bc7a30e 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -50,7 +50,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for OS X right now) +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index de86c49..af30573 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -21,7 +21,7 @@ ac_add_options --enable-verify-mar # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox -# EME is not running without sandbox. Thus, don't compile it in the first place. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service

1 0

[tor-browser-bundle/master] Bug 23171: Copy snowflake doc files to proper location
by gk＠torproject.org 10 Aug '17

10 Aug '17

commit 32c98b835b5b104de5817d1d54ffaa3755a70b4d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 10 10:00:34 2017 +0000 Bug 23171: Copy snowflake doc files to proper location --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index ebfcaa9..710f891 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -231,8 +231,8 @@ script: | cmp client client.stomped && (echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed. Check descriptors/mac/gitian-pluggable-transports.yml"; exit 1) cp -a client.stomped $PTDIR/snowflake-client cd .. - mkdir -p $INSTDIR/Docs/snowflake - cp -a README.md LICENSE $INSTDIR/Docs/snowflake + mkdir -p $DOCSDIR/snowflake + cp -a README.md LICENSE $DOCSDIR/snowflake cd .. # Grabbing the result

1 0

[tor-browser-build/master] README.HACKING: explain how to test a firefox patch
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit cebdaf3303a4165f200d20e6d9f8c04ea90f15e2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 11:48:13 2017 +0200 README.HACKING: explain how to test a firefox patch --- README.HACKING | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.HACKING b/README.HACKING index 2687ed1..221cc90 100644 --- a/README.HACKING +++ b/README.HACKING @@ -198,6 +198,30 @@ To find the resulting file from the build, you can use 'ls -ltr out/tor/' to find the file with the last modification time. +Patching Firefox (or an other component) +---------------------------------------- + +If you want to test a firefox patch, the easiest way to do it is to +copy the patch file to the projects/firefox/ directory, then edit +projects/firefox/config to add the new patch to the list of input_files: + + - filename: patch-for-XXXX.patch + +Then edit projects/firefox/build to add a line somewhere (probably just +before running the configure script) to apply the patch: + + patch -p1 < $rootdir/patch-for-XXXX.patch + +You can now run 'make testbuild' (or an other build target) to start a +build with the patch. + +As an alternative, if you have your patch in a git repository, you can +edit projects/firefox/config to change the git_url option to point to +your git repository, and change the git_hash option to point to the +commit you want to build. You will also need to comment the +'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). + + Debugging a build error -----------------------

1 0

[tor-browser-build/master] Fix var/publish_dir for nightly, alpha_nightly and testbuild
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48deeaa2fc6caeb378623c4d4cb1fc1142b9774a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:27:55 2017 +0200 Fix var/publish_dir for nightly, alpha_nightly and testbuild Fix an error introduced by 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8. --- projects/release/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/release/config b/projects/release/config index ee318c2..b785878 100644 --- a/projects/release/config +++ b/projects/release/config @@ -39,15 +39,15 @@ targets: nightly: output_dir: 'nightly' - publish_dir: '[% c("var/today") %]' var: build_target: nightly + publish_dir: '[% c("var/today") %]' alpha_nightly: output_dir: 'alpha_nightly' - publish_dir: '[% c("var/today") %]' var: build_target: alpha + publish_dir: '[% c("var/today") %]' alpha: output_dir: 'alpha/unsigned' @@ -56,9 +56,9 @@ targets: testbuild: output_dir: 'testbuild' - publish_dir: '' var: build_target: torbrowser-testbuild + publish_dir: '' input_files:

1 0

[tor-browser-build/master] Remove hardened targets
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48b01dee52a63cb0f490b6303cb2a4e93855c118 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:24:19 2017 +0200 Remove hardened targets --- .gitignore | 1 - Makefile | 3 --- projects/release/config | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7c83e82..c4c3919 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /alpha /alpha_nightly /nightly -/hardened /testbuild /rbm.local.conf /logs diff --git a/Makefile b/Makefile index 274e11c..c45b0a1 100644 --- a/Makefile +++ b/Makefile @@ -77,9 +77,6 @@ testbuild-windows-i686: submodule-update testbuild-osx-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 -hardened-linux-x86_64: submodule-update - $(rbm) build release --target hardened --target torbrowser-linux-x86_64 - signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/projects/release/config b/projects/release/config index db62a95..ee318c2 100644 --- a/projects/release/config +++ b/projects/release/config @@ -60,17 +60,6 @@ targets: var: build_target: torbrowser-testbuild - hardened_nightly: - output_dir: 'hardened_nightly' - publish_dir: '[% c("var/today") %]' - var: - build_target: hardened - - hardened: - output_dir: 'hardened' - var: - build_target: hardened - input_files: # Release

1 0

[tor-browser-build/master] Fix faketime path in ddmg.sh
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 9a732cfa7e869ff50f679c9bdaa964892fa80328 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:10:54 2017 +0200 Fix faketime path in ddmg.sh --- projects/tor-browser/ddmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index 20bd8f9..a715300 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -10,7 +10,7 @@ pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] -export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 +export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755

1 0

[tor-browser-build/master] tbb-7.5a4-build2
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 4195b8f52cc7e380e44f281f80f148e361a3b2e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:11:21 2017 +0200 tbb-7.5a4-build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 4efc57c..523a005 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,7 +15,7 @@ buildconf: var: torbrowser_version: '7.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] winpython: use wine to run python.exe
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit b67299f66b4f43deaf532b68a7cbca9cce60ba43 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:04:20 2017 +0200 winpython: use wine to run python.exe We need wine to run python.exe. It seems it was working without explicitely using wine on my build machine, probably because of the binfmt configuration in the kernel of that machine. --- projects/winpython/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/winpython/build b/projects/winpython/build index 2a30acc..5f53b9c 100644 --- a/projects/winpython/build +++ b/projects/winpython/build @@ -25,7 +25,7 @@ echo "FAKETIME = \"$FAKETIME\"" >> settings.py # Must pre-copy python27.dll into the build directory, or else py2exe can't find it. mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $distdir/python27.dll build/bdist.win32/winexe/bundle-2.7/ -LD_PRELOAD= $distdir/python.exe setup.py py2exe +LD_PRELOAD= wine $distdir/python.exe setup.py py2exe mkdir -p $distdir/wineroot/windows/ cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $distdir/wineroot/windows/ cp $rootdir/pyc-timestamp.sh $distdir/

1 0

[tor-browser-bundle/master] Fix typos in changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit e5a74a3aa67c15a093c15a9f40fa221acf2f74fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 11:57:50 2017 +0000 Fix typos in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 272bd74..aa0c5a8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Bug 22618: Downloading pdf file via file:/// is stalling * Bug 22542: Resize slider window to work without scrollbars * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up @@ -52,7 +52,7 @@ Tor Browser 7.0.4 -- August 8 2017 * Update Tor to 0.3.0.10 * Update Torbutton to 1.9.7.5 * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up

1 0

[tor-browser-build/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit cdb545afe64aa22364f2a7e08e0afe27a1f60129 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 16:44:15 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 6745cdc..4efc57c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -274,8 +274,11 @@ gpg_wrapper: | SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; END; -%] - if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ - && [ "$2" = '--verify' ] + # git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 + if ( [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] ) \ + || ( [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] ) then [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]}

1 0

[tor-browser-bundle/maint-7.0] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit ddfbe17d6b6a83fc3c7fda2e6737d33221f8539c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 6b1c63cc05cd28a55a241296808eef448bdf96f3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 50046217378fd7b3d95a669cdb3c890a8c085fa9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 08:52:54 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 16c10f5..272bd74 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -46,6 +46,33 @@ Tor Browser 7.5a4 -- August 9 2017 * Linux * Bug 20929: Bump GCC version to 5.4.0 +Tor Browser 7.0.4 -- August 8 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.0.10 + * Update Torbutton to 1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Windows + * Bug 22829: Remove default obfs4 bridge riemann. + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[tor-browser-build/master] Update rbm: include stdout in remote_exec/remote_start error output
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit 47e0f00751def20f7458bc0df95cbb0f341b9d6c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 21:05:22 2017 +0200 Update rbm: include stdout in remote_exec/remote_start error output --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 31be478..f494d16 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 31be478688e0448d36373d21939922f2a108aeea +Subproject commit f494d16a1b86700661a029f5eca00c6216bf08d1

1 0

[rbm/master] Include stdout in remote_exec/remote_start error output
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit f494d16a1b86700661a029f5eca00c6216bf08d1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 21:00:10 2017 +0200 Include stdout in remote_exec/remote_start error output Sometimes stdout can include useful informations about the error so include it in addition to stderr. --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 100bc04..c1240cd 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -976,7 +976,7 @@ sub build_run { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec); if (!$success) { - $error = "Error starting remote:\n$stderr"; + $error = "Error starting remote:\n$stdout\n$stderr"; goto EXIT; } } @@ -991,7 +991,7 @@ sub build_run { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec); if (!$success) { - $error = "Error connecting to remote:\n$stderr"; + $error = "Error connecting to remote:\n$stdout\n$stderr"; goto EXIT; } $remote_tmp = (split(/\r?\n/, $stdout))[0];

1 0

[tor-browser-bundle/master] Bump package versions for nightly builds
by gk＠torproject.org 08 Aug '17

08 Aug '17

commit d27f3739c5557ad2ce7b67b6a36c05c274d817c5 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 8 07:25:31 2017 +0000 Bump package versions for nightly builds --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a2062bd..3559f80 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -13,11 +13,11 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=0 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -57,7 +57,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=3.8.0 @@ -80,7 +80,7 @@ ELFUTILS_VER=0.166 ## 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-5.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -116,7 +116,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-build/master] Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit d8de49152e01a1b6cf4b0801bd1e3b3f42f0e857 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 02:49:59 2017 +0200 Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 9dbe709..db265c7 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,7 +7,7 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ -% END -%] +[% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ [% END -%]

1 0

[tor-browser-build/master] Fix .gitignore syntax
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 15435cbc400074d2a415cb3e8b14bdb7bd0fb653 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:59:22 2017 +0200 Fix .gitignore syntax Add a leading slash on all lines to match files/directories only in the root directory. --- .gitignore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe0aec..7c83e82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -git_clones -hg_clones -gclient -out -release -alpha -alpha_nightly -nightly -hardened -testbuild -rbm.local.conf -logs +/git_clones +/hg_clones +/gclient +/out +/release +/alpha +/alpha_nightly +/nightly +/hardened +/testbuild +/rbm.local.conf +/logs

1 0

[tor-browser-build/master] Add script to help tagging a release
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5a438172202b385f962f3b715efff2b20be859f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:37:15 2017 +0200 Add script to help tagging a release The 'make signtag-release' and 'make signtag-alpha' commands can be used to tag a stable or alpha release using the version informations from rbm.conf. --- Makefile | 6 ++++++ projects/release/config | 6 ++++++ projects/release/signtag | 8 ++++++++ rbm | 2 +- rbm.conf | 1 + rbm.local.conf.example | 5 +++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b82309c..274e11c 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,12 @@ testbuild-osx-x86_64: submodule-update hardened-linux-x86_64: submodule-update $(rbm) build release --target hardened --target torbrowser-linux-x86_64 +signtag-release: submodule-update + $(rbm) build release --step signtag --target release + +signtag-alpha: submodule-update + $(rbm) build release --step signtag --target alpha + submodule-update: git submodule update --init diff --git a/projects/release/config b/projects/release/config index 8beea7e..db62a95 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,3 +117,9 @@ input_files: - torbrowser-windows-i686 - expert-bundle +steps: + signtag: + build_log: '-' + debug: 0 + input_files: [] + signtag: '[% INCLUDE signtag %]' diff --git a/projects/release/signtag b/projects/release/signtag new file mode 100644 index 0000000..3ce2e48 --- /dev/null +++ b/projects/release/signtag @@ -0,0 +1,8 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg/git +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +cd [% c("basedir") %] +git tag [% c("buildconf/git_signtag_opt") %] -m \ + 'Tagging [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \ + tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %] diff --git a/rbm b/rbm index ff4299f..31be478 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f +Subproject commit 31be478688e0448d36373d21939922f2a108aeea diff --git a/rbm.conf b/rbm.conf index 13d19a5..6745cdc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,6 +11,7 @@ pkg_type: build # in var/build_id, so that changing this option does not affect the build_id. buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' + git_signtag_opt: '-s' var: torbrowser_version: '7.5a4' diff --git a/rbm.local.conf.example b/rbm.local.conf.example index a4b0212..e30d8a8 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -29,6 +29,11 @@ buildconf: ### RBM_NUM_PROCS environment variable. The default is 4. #num_procs: 8 + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + var: local_conf: 1

1 0

[tor-browser-build/master] Move projects/release/config build to a separate file
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit c87cfc7291c7faf95c7afc8af693a7f689cdcc0a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:04:18 2017 +0200 Move projects/release/config build to a separate file --- projects/release/build | 26 ++++++++++++++++++++++++++ projects/release/config | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/projects/release/build b/projects/release/build new file mode 100644 index 0000000..9dbe709 --- /dev/null +++ b/projects/release/build @@ -0,0 +1,26 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" +mkdir -p "$destdir" +[% IF c("var/torbrowser-windows-i686") -%] + mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ +% END -%] +[% IF c("var/torbrowser-osx-x86_64") -%] + mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-i686") -%] + mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-x86_64") -%] + mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +[% IF c("var/sign_build") -%] + gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt +[% END -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/release/config b/projects/release/config index 43a36e8..8beea7e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,30 +117,3 @@ input_files: - torbrowser-windows-i686 - expert-bundle -build: | - #!/bin/sh - [% c("var/set_default_env") -%] - # reset HOME which was changed by var/set_default_env, for gpg - [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] - destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" - mkdir -p "$destdir" - [% IF c("var/torbrowser-windows-i686") -%] - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-osx-x86_64") -%] - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-i686") -%] - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-x86_64") -%] - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END -%] - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt - [% IF c("var/sign_build") -%] - gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt - [% END -%] - cat sha256sums-unsigned-build.txt

1 0

[rbm/master] Update some URLs in documentation
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 04bef8756754fae67419b13ce7c1e2a081972c62 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 22:46:44 2017 +0200 Update some URLs in documentation --- README.md | 2 +- doc/index.asc | 9 +++++---- doc/rbm.asc | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d7d0e1d..3b6862d 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - http://rbm.boklm.eu/ + https://people.torproject.org/~boklm/rbm/ diff --git a/doc/index.asc b/doc/index.asc index 0a2ed92..735c246 100644 --- a/doc/index.asc +++ b/doc/index.asc @@ -26,16 +26,17 @@ include::documentation.asc[] Download and installation ------------------------- -The sources are available https://github.com/boklm/rbm[on github]. +The sources are available on https://gitweb.torproject.org/builders/rbm.git/. -Packages will soon be available for various distributions. +The recommanded way to use rbm to build your project is to use it as a +git submodule so you can pick the commit to use. Examples -------- -An example of package templates and configuration is available in -https://github.com/boklm/burps-workspace[this git repository]. +You can look at the https://gitweb.torproject.org/builders/tor-browser-build.git/[Tor Browser build repository] +for an example of how it can be used. License diff --git a/doc/rbm.asc b/doc/rbm.asc index 50df8f4..4c6a0a6 100644 --- a/doc/rbm.asc +++ b/doc/rbm.asc @@ -31,7 +31,7 @@ include::documentation.asc[] EXAMPLES -------- -Some examples of package templates and configuration are available in -the git repository at the following address : -https://github.com/boklm/burps-workspace +You can look at the Tor Browser build repository for an example of how +it can be used. +https://gitweb.torproject.org/builders/tor-browser-build.git/

1 0

[rbm/master] rbm-build: allow selecting the build script using the step option
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 31be478688e0448d36373d21939922f2a108aeea Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:44:06 2017 +0200 rbm-build: allow selecting the build script using the step option --- doc/rbm-build.asc | 16 ++++++++++++---- doc/rbm-deb-src.asc | 2 ++ doc/rbm-deb.asc | 2 ++ doc/rbm-rpm.asc | 2 ++ doc/rbm-srpm.asc | 2 ++ doc/rbm_cli.asc | 5 +++-- lib/RBM.pm | 2 +- rbm | 1 + test.pl | 2 +- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/doc/rbm-build.asc b/doc/rbm-build.asc index 042ab41..e7a2666 100644 --- a/doc/rbm-build.asc +++ b/doc/rbm-build.asc @@ -19,16 +19,24 @@ Build a package for the selected project. CONFIGURATION OPTIONS --------------------- -The +build+ option is used as the build script. The default value of -the +build+ option is '[% INCLUDE build -%]' which means that you can -create the build script as a +build+ file in the project's directory. +When no +step+ was selected in the command line options, the +build+ +option is used as the build script. The default value of the +build+ +option is '[% INCLUDE build -%]' which means that you can create the +build script as a +build+ file in the project's directory. + +If a +step+ is selected in the command line options, an option of the +same name is used as the build script. See link:rbm_config.html[rbm_config(7)] for all other options. COMMAND LINE OPTIONS -------------------- -See link:rbm_cli.html[rbm_cli(7)]. + +The --step=<step> option can be used to select the build script to run. + +See link:rbm_cli.html[rbm_cli(7)] for the other command line options. SEE ALSO -------- link:rbm.html[rbm(1)] +link:rbm_steps.html[rbm_steps(7)] diff --git a/doc/rbm-deb-src.asc b/doc/rbm-deb-src.asc index 07c8f39..d0212ea 100644 --- a/doc/rbm-deb-src.asc +++ b/doc/rbm-deb-src.asc @@ -16,6 +16,8 @@ DESCRIPTION Create a debian source package for the selected project. +This is equivalent to running 'rbm build --step deb_src <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-deb.asc b/doc/rbm-deb.asc index 4f0562e..0544b89 100644 --- a/doc/rbm-deb.asc +++ b/doc/rbm-deb.asc @@ -16,6 +16,8 @@ DESCRIPTION Build a debian package. +This is equivalent to running 'rbm build --step deb <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-rpm.asc b/doc/rbm-rpm.asc index 1edc118..75f1886 100644 --- a/doc/rbm-rpm.asc +++ b/doc/rbm-rpm.asc @@ -16,6 +16,8 @@ DESCRIPTION Build an rpm package for the selected project. +This is equivalent to running 'rbm build --step rpm <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-srpm.asc b/doc/rbm-srpm.asc index 9fe40fb..bc2a28c 100644 --- a/doc/rbm-srpm.asc +++ b/doc/rbm-srpm.asc @@ -16,6 +16,8 @@ DESCRIPTION Create a source rpm package for the select project. +This is equivalent to running 'rbm build --step srpm <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm_cli.asc b/doc/rbm_cli.asc index adb8b27..0e6828c 100644 --- a/doc/rbm_cli.asc +++ b/doc/rbm_cli.asc @@ -65,8 +65,9 @@ The following options can be set on the command line : directory in case of build failure. --step:: - This sets the current step. This is only meaningful with the - showconf command. + This sets the current step when using the showconf command. When + using the build command this is used to select the step (and build + script of the same name) to start. include::clioptions_tar.asc[] diff --git a/lib/RBM.pm b/lib/RBM.pm index 888c3e1..100bc04 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -46,7 +46,7 @@ sub load_config { $config = load_config_file($config_file); $config->{default} = \%default_config; $config->{basedir} = dirname($config_file); - $config->{step} = 'init'; + $config->{step} = 'rbm_init'; $config->{opt} = {}; my $pdir = $config->{projects_dir} || $config->{default}{projects_dir}; foreach my $p (glob path($pdir) . '/*') { diff --git a/rbm b/rbm index 9a8ccf2..2c4ad0d 100755 --- a/rbm +++ b/rbm @@ -173,6 +173,7 @@ sub build_script { my $cmd = shift; my $args = set_options(@_); usageexit($cmd) unless @$args == 1; + $script_name = $RBM::config->{step} if $RBM::config->{step} ne 'rbm_init'; RBM::build_pkg($args->[0], { pkg_type => $script_name }); } diff --git a/test.pl b/test.pl index 2748614..8e842e7 100755 --- a/test.pl +++ b/test.pl @@ -196,7 +196,7 @@ my @tests = ( foreach my $test (@tests) { set_target($test->{target} ? @{$test->{target}} : ()); - set_step($test->{step} ? $test->{step} : 'init'); + set_step($test->{step} ? $test->{step} : 'rbm_init'); if ($test->{config}) { is( RBM::project_config(@{$test->{config}}),

1 0

[rbm/master] Add a man page for rbm-build
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 0732a77db13fa713b481877593cb8f4d005560c2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:14:37 2017 +0200 Add a man page for rbm-build --- doc/Makefile | 1 + doc/documentation.asc | 1 + doc/rbm-build.asc | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/doc/Makefile b/doc/Makefile index c3c8f11..593ecba 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -35,6 +35,7 @@ MAN1_ASC += rbm-deb-src.asc MAN1_ASC += rbm-deb.asc MAN1_ASC += rbm-pkg.asc MAN1_ASC += rbm-publish.asc +MAN1_ASC += rbm-build.asc MAN7_ASC += rbm_tutorial.asc MAN7_ASC += rbm_layout.asc diff --git a/doc/documentation.asc b/doc/documentation.asc index 492ad47..82b5e62 100644 --- a/doc/documentation.asc +++ b/doc/documentation.asc @@ -14,6 +14,7 @@ rbm commands : - link:rbm-usage.html[rbm-usage(1)] - link:rbm-tar.html[rbm-tar(1)] - link:rbm-showconf.html[rbm-showconf(1)] +- link:rbm-build.html[rbm-build(1)] - link:rbm-srpm.html[rbm-srpm(1)] - link:rbm-rpm.html[rbm-rpm(1)] - link:rbm-rpmspec.html[rbm-rpmspec(1)] diff --git a/doc/rbm-build.asc b/doc/rbm-build.asc new file mode 100644 index 0000000..042ab41 --- /dev/null +++ b/doc/rbm-build.asc @@ -0,0 +1,34 @@ +rbm-build(1) +============ + +NAME +---- +rbm-build - Build a package + + +SYNOPSIS +-------- +[verse] +'rbm build' <project> [options] + +DESCRIPTION +----------- + +Build a package for the selected project. + +CONFIGURATION OPTIONS +--------------------- + +The +build+ option is used as the build script. The default value of +the +build+ option is '[% INCLUDE build -%]' which means that you can +create the build script as a +build+ file in the project's directory. + +See link:rbm_config.html[rbm_config(7)] for all other options. + +COMMAND LINE OPTIONS +-------------------- +See link:rbm_cli.html[rbm_cli(7)]. + +SEE ALSO +-------- +link:rbm.html[rbm(1)]

1 0

[tor-browser-build/master] Add a torbrowser_build option and use it in the build output directory
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 19:47:53 2017 +0200 Add a torbrowser_build option and use it in the build output directory --- projects/release/config | 10 +++++----- rbm.conf | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/release/config b/projects/release/config index 3351959..43a36e8 100644 --- a/projects/release/config +++ b/projects/release/config @@ -4,7 +4,7 @@ output_dir: 'release/unsigned' var: today: '[% USE date; date.format(format = "%Y-%m-%d") %]' - publish_dir: '[% c("version") %]' + publish_dir: '[% c("version") %]-[% c("var/torbrowser_build") %]' targets: torbrowser-all: @@ -39,13 +39,13 @@ targets: nightly: output_dir: 'nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: nightly alpha_nightly: output_dir: 'alpha_nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: alpha @@ -56,13 +56,13 @@ targets: testbuild: output_dir: 'testbuild' - version: '.' + publish_dir: '' var: build_target: torbrowser-testbuild hardened_nightly: output_dir: 'hardened_nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: hardened diff --git a/rbm.conf b/rbm.conf index 46d487c..13d19a5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -14,6 +14,7 @@ buildconf: var: torbrowser_version: '7.5a4' + torbrowser_build: 'build1' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Refresh keyring/firefox.gpg
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5ef1e3f8014542af7409ad973601b73a15acf119 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 17:17:08 2017 +0200 Refresh keyring/firefox.gpg --- keyring/firefox.gpg | Bin 11220 -> 13463 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/firefox.gpg b/keyring/firefox.gpg index fa6d1b5..9c71261 100644 Binary files a/keyring/firefox.gpg and b/keyring/firefox.gpg differ

1 0

[tor-browser-build/master] Fix firefox tag
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 974f99fdd011255fea5e063396940893b1f40146 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 16:50:21 2017 +0200 Fix firefox tag --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 30f89d6..e2cf727 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg

1 0

[tor-browser-build/master] Release preparations for 7.5a4
by boklm＠torproject.org 04 Aug '17

04 Aug '17

commit c29deee7324f0b7c7ceea95db9a28a6f44c6c34e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 4 13:24:59 2017 +0200 Release preparations for 7.5a4 Changelog update and version bumps. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: 0d192217fc71cccf16bce16e3904460b0991b43d tor-browser-bundle.git commit: 6d54b0e2b8cf45fb817e2bbc822c61e5a4ad78de tor-browser-bundle.git commit: 1a15760dcb3889417809ab4a38bf4b523ecf74a7 tor-browser-bundle.git commit: 8b061ed2d5112c006a80723ea63333d0098b94c4 --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/openssl/config | 9 +--- projects/sandbox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 57 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 2 +- 11 files changed, 69 insertions(+), 17 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..dd96dcd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index b2400c9..30f89d6 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_version: 52.2.0esr + firefox_version: 52.3.0esr torbrowser_branch: 7.5 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 6ee1ee9..00987b0 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.2.18 +version: 5.2.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/openssl/config b/projects/openssl/config index 4cb9eea..dca3a1c 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2k +version: 1.0.2l filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -7,8 +7,6 @@ var: use_container: 1 targets: - nightly: - version: 1.0.2l linux-x86_64: var: configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-generic64 @@ -27,7 +25,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 - targets: - nightly: - sha256sum: ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c + sha256sum: ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c diff --git a/projects/sandbox/config b/projects/sandbox/config index 017d78d..5dc59bd 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.7 +version: 0.0.12 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2e52d7c..16c10f5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,60 @@ +Tor Browser 7.5a4 -- August 9 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.1.5-alpha + * Update OpenSSL to 1.0.2l + * Update Torbutton to 1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Update sandboxed-tor-browser to 0.0.12 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Bug 22829: Remove default obfs4 bridge riemann. + * Windows + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22831: Enable Snowflake for mac + * Linux + * Bug 22832: Don't include monthly timestamp in libwebrtc build output + * Bug 20848: Deploy Selfrando in 32bit Linux builds + * Build system + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + +Tor Browser 7.5a3 -- July 28 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a2 -- July 6 2017 * All Platforms * Update Tor to 0.3.1.4-alpha diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4f708bc..ac6fbb6 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -57,9 +57,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b + sha256sum: ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 2995d08..ea7b2e5 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.12.2 +version: 0.2.12.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 74ae828..2bd33a4 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.1.3-alpha +version: 0.3.1.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 7864a38..fbdc76a 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.7.4 +version: 1.9.8 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f89fa74..46d487c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -13,7 +13,7 @@ buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' var: - torbrowser_version: '7.5a3' + torbrowser_version: '7.5a4' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 23075: rename RBM_NB_CORES to RBM_NUM_CORES
by boklm＠torproject.org 04 Aug '17

04 Aug '17

commit b466ec4bcf9e534652dd98e0f401309e79a93447 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 4 13:03:52 2017 +0200 Bug 23075: rename RBM_NB_CORES to RBM_NUM_CORES And buildconf/nb_procs to buildconf/num_procs. --- README | 6 +++--- projects/binutils/build | 2 +- projects/cmake/build | 2 +- projects/elfutils/build | 2 +- projects/firefox/build | 2 +- projects/gcc/build | 2 +- projects/gmp/build | 2 +- projects/libdmg-hfsplus/build | 2 +- projects/libevent/build | 2 +- projects/llvm/build | 2 +- projects/mingw-w64/build | 8 ++++---- projects/tor/build | 2 +- projects/yasm/build | 2 +- rbm.conf | 4 ++-- rbm.local.conf.example | 6 +++--- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README b/README index 7a2a671..751ccdd 100644 --- a/README +++ b/README @@ -96,11 +96,11 @@ Number of make processes By default the builds are run with 4 processes simultaneously (with make -j4). If you want to change the number of processes used, you can -set the RBM_NB_PROCS environment variable: +set the RBM_NUM_PROCS environment variable: - $ export RBM_NB_PROCS=8 + $ export RBM_NUM_PROCS=8 -You can also set the buildconf/nb_procs option in rbm.local.conf. +You can also set the buildconf/num_procs option in rbm.local.conf. Automated builds diff --git a/projects/binutils/build b/projects/binutils/build index cdfd045..a7d83d9 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -32,7 +32,7 @@ cd [% project %]-[% c("version") %] patch -p1 < $rootdir/binutils-224-gold.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install [% IF c("var/linux") %] diff --git a/projects/cmake/build b/projects/cmake/build index 4a58896..a5eca23 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -5,7 +5,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/elfutils/build b/projects/elfutils/build index 57adf83..5e24dba 100644 --- a/projects/elfutils/build +++ b/projects/elfutils/build @@ -13,7 +13,7 @@ tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/elfutils') %] cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix="$distdir" -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist diff --git a/projects/firefox/build b/projects/firefox/build index 439369e..8ff265d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -90,7 +90,7 @@ rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" -make -j[% c("buildconf/nb_procs") %] -f client.mk build +make -j[% c("buildconf/num_procs") %] -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] diff --git a/projects/gcc/build b/projects/gcc/build index c7e3ea8..79cc5f7 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -17,7 +17,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/gmp/build b/projects/gmp/build index b9ea3bc..2752afe 100644 --- a/projects/gmp/build +++ b/projects/gmp/build @@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # during compile time. ./configure --disable-static --enable-shared --enable-cxx \ [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 66e4232..80d5f75 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -7,7 +7,7 @@ cd [% project %]-[% c('version') %] patch -p1 < ../libdmg.patch cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt cd dmg -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd $distdir [% c('tar', { diff --git a/projects/libevent/build b/projects/libevent/build index d44371d..a38422a 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/llvm/build b/projects/llvm/build index fc72e38..b018ca5 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -21,7 +21,7 @@ export LLVM_HOME=$(pwd) mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 246ade1..0fc4517 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -31,25 +31,25 @@ sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-min # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ -make -j[% c("buildconf/nb_procs") %] all-gcc +make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \ --host=i686-w64-mingw32 --prefix=$distdir/i686-w64-mingw32 -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \ --prefix=$distdir --target=i686-w64-mingw32 -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/build/gcc -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install mkdir -p $distdir/gcclibs cp i686-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs diff --git a/projects/tor/build b/projects/tor/build index 577c194..86d4384 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -64,7 +64,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install [% IF c("var/osx") -%] unset LD_PRELOAD diff --git a/projects/yasm/build b/projects/yasm/build index b736761..c11924c 100644 --- a/projects/yasm/build +++ b/projects/yasm/build @@ -5,7 +5,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] cd /var/tmp/build/yasm-[% c("version") %] ./configure --prefix="$distdir" -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/rbm.conf b/rbm.conf index 327cd39..f89fa74 100644 --- a/rbm.conf +++ b/rbm.conf @@ -10,7 +10,7 @@ pkg_type: build # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id. buildconf: - nb_procs: '[% GET ENV.RBM_NB_PROCS ? ENV.RBM_NB_PROCS : "4" %]' + num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' var: torbrowser_version: '7.5a3' @@ -22,7 +22,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt", { buildconf => { nb_procs => 4 } })).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 4 } })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 5e322cf..a4b0212 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -24,10 +24,10 @@ buildconf: buildconf: 1 - ### The buildconf/nb_procs option can be used to select the number of + ### The buildconf/num_procs option can be used to select the number of ### build processes to run simultaneously. You can also use the - ### RBM_NB_PROCS environment variable. The default is 4. - #nb_procs: 8 + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 var: local_conf: 1

1 0

[tor-browser-bundle/master] Fix selfrando tag breakcage
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit cf3625070b1f0703c2e19ec5a8bfc57b4cc870f7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 10:45:27 2017 +0000 Fix selfrando tag breakcage --- gitian/mkbundle-linux.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index d348ca5..cd9a236 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -78,6 +78,7 @@ die_msg() { # the utils both if we verify tags and if we don't. LIBEVENT_TAG_ORIG=$LIBEVENT_TAG +SELFRANDO_TAG_ORIG=$SELFRANDO_TAG if [ "z$VERIFY_TAGS" = "z1" ]; then @@ -112,8 +113,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ ! -f inputs/go-$GO_VER-linux32-utils.zip -o \ ! -f inputs/go-$GO_VER-linux64-utils.zip -o \ - ! -f inputs/selfrando-$SELFRANDO_TAG-linux32-utils.zip -o \ - ! -f inputs/selfrando-$SELFRANDO_TAG-linux64-utils.zip ]; + ! -f inputs/selfrando-$SELFRANDO_TAG_ORIG-linux32-utils.zip -o \ + ! -f inputs/selfrando-$SELFRANDO_TAG_ORIG-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/7 for Linux) ******" @@ -140,8 +141,8 @@ then ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux32-utils.zip selfrando-linux32-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux32-utils.zip selfrando-linux32-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux64-utils.zip selfrando-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ else @@ -163,8 +164,8 @@ else ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux32-utils.zip selfrando-linux32-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux32-utils.zip selfrando-linux32-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux64-utils.zip selfrando-linux64-utils.zip cd .. fi

1 0

[tor-browser-bundle/master] Don't foget to bump the sandboxed tor browser version
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 8b061ed2d5112c006a80723ea63333d0098b94c4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:13:41 2017 +0000 Don't foget to bump the sandboxed tor browser version --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cb49399..16c10f5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Update NoScript to 5.0.8.1 * Bug 22362: Remove workaround for XSS related browser freezing * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Update sandboxed-tor-browser to 0.0.12 * Bug 22610: Avoid crashes when canceling external helper app related downloads * Bug 22472: Fix FTP downloads when external helper app dialog is shown * Bug 22471: Downloading pdf files via the PDF viewer download button is broken diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e202870..e7fc29a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -41,7 +41,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e -SANDBOX_TAG=sandboxed-tor-browser-0.0.9 +SANDBOX_TAG=sandboxed-tor-browser-0.0.12 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101

1 0

[tor-browser-bundle/master] Adapt OPENSSL_HASH to the correct SHA-256 sum
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 1a15760dcb3889417809ab4a38bf4b523ecf74a7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:09:23 2017 +0000 Adapt OPENSSL_HASH to the correct SHA-256 sum --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1e20aa4..e202870 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -110,7 +110,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 +OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3

1 0

[tor-browser-bundle/master] 7.5a3 changelog correction
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6d54b0e2b8cf45fb817e2bbc822c61e5a4ad78de Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:02:29 2017 +0000 7.5a3 changelog correction --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8558526..cb49399 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -48,7 +48,6 @@ Tor Browser 7.5a4 -- August 9 2017 Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default - * Bug 22829: Remove default obfs4 bridge riemann. Tor Browser 7.0.3 -- July 27 2017 * Linux

1 0

[tor-browser-bundle/master] Release preparations for 7.5a4
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 0d192217fc71cccf16bce16e3904460b0991b43d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:02:07 2017 +0000 Release preparations for 7.5a4 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 47 +++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 22 +++++++++--------- tools/update-responses/config.yml | 11 ++++----- 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 224ccaa..8558526 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,50 @@ +Tor Browser 7.5a4 -- August 9 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.1.5-alpha + * Update OpenSSL to 1.0.2l + * Update Torbutton to 1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Bug 22829: Remove default obfs4 bridge riemann. + * Windows + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22831: Enable Snowflake for mac + * Linux + * Bug 22832: Don't include monthly timestamp in libwebrtc build output + * Bug 20848: Deploy Selfrando in 32bit Linux builds + * Build system + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c35c51b..1e20aa4 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-1-build2 -TOR_TAG=tor-0.3.1.4-alpha -TORLAUNCHER_TAG=0.2.12.2 -TORBUTTON_TAG=1.9.7.4 -HTTPSE_TAG=5.2.19 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-2-build1 +TOR_TAG=tor-0.3.1.5-alpha +TORLAUNCHER_TAG=0.2.12.3 +TORBUTTON_TAG=1.9.8 +HTTPSE_TAG=5.2.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -49,12 +49,12 @@ SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a SELFRANDO_TAG=tb-v0.3.2 -GITIAN_TAG=tor-browser-builder-4-4 +GITIAN_TAG=tor-browser-builder-4-5 -OPENSSL_VER=1.0.2k +OPENSSL_VER=1.0.2l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=3.8.0 @@ -77,7 +77,7 @@ ELFUTILS_VER=0.166 ## 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-5.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -113,7 +113,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a4f1f91..e6dcf27 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -19,14 +19,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 7.5a2 + alpha: 7.5a4 release: 6.0.1 versions: - 7.5a2: - platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-75a2-released + 7.5a4: + platformVersion: 52.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-75a4-released incremental_from: - - 7.5a1 + - 7.5a2 + - 7.5a3 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-bundle/master] Fold in 7.5a3 changelog
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6be301f7449f4f320137027a242edcacd7b636c6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 10:47:44 2017 +0000 Fold in 7.5a3 changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2c5c7e8..224ccaa 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.5a3 -- July 28 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.0.3 -- July 27 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6bc3048b901d3261f7644751232ecf98fc8680a6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 10:46:40 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2e52d7c..2c5c7e8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a2 -- July 6 2017 * All Platforms * Update Tor to 0.3.1.4-alpha

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 47df7aa33aa1ea4a72ac029169725609f2f518aa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 18 16:22:32 2017 -0400 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." This reverts commit 648d842b127e6ca6457d43e45244c65ee1773aa3. --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 --- netwerk/protocol/http/HttpBaseChannel.h | 1 - netwerk/protocol/http/NullHttpChannel.cpp | 6 --- netwerk/protocol/http/nsIHttpChannel.idl | 9 +--- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ----- .../exthandler/nsExternalHelperAppService.cpp | 57 ---------------------- 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 5ea6a002a40f..e0f7edec05f9 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,13 +1233,6 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } -NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) -{ - NS_ENSURE_ARG_POINTER(aIsPendingUnforced); - *aIsPendingUnforced = mIsPending; - return NS_OK; -} - NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index 3a1a8ba525b0..c8184a601b9e 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,7 +190,6 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; - NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8b362cb24233..8c048a6b5a7e 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,12 +82,6 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -NullHttpChannel::IsPendingUnforced(bool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 0de0676ad156..75ec2c73989a 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] +[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,11 +469,4 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; - - /** - * Returns true if a request is pending due to "natural" causes and - * not just because ForcePending() has been called. See isPending() - * in nsIRequest.idl for more details about pending requests. - */ - boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9f9b89438fba..9ed71c4ef001 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,17 +740,6 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -nsViewSourceChannel::IsPendingUnforced(bool *result) -{ - if (mHttpChannel) { - return mHttpChannel->IsPendingUnforced(result); - } - - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); - return mChannel->IsPending(result); -} - -NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 4a7fd7f92f15..51a7ee0f6ab6 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,7 +41,6 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" -#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -106,7 +105,6 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" -#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -436,22 +434,6 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } -static nsresult shouldCancel(bool *aShouldCancel) -{ - NS_ENSURE_ARG_POINTER(aShouldCancel); - - nsCOMPtr<nsISupportsPRBool> cancelObj = - do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); - cancelObj->SetData(false); - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - if (!obs) - return NS_ERROR_FAILURE; - - obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); - cancelObj->GetData(aShouldCancel); - return NS_OK; -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -1028,14 +1010,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_OK; - } - nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); @@ -1669,37 +1643,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } - // Give other modules, including extensions, a chance to cancel. - // To avoid a problem where OnDataAvailable fires but is not handled - // correctly while a modal dialog displayed by Torbutton is open, we - // suspend and then we either cancel or resume active requests. - // See bugs 21766 and 21886. - bool isPending = false; - nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); - if (httpChan) { - rv = httpChan->IsPendingUnforced(&isPending); - } else { - rv = request->IsPending(&isPending); - } - NS_ENSURE_SUCCESS(rv, rv); - - if (isPending) { - Unused << request->Suspend(); // Best effort: ignore failures. - } - - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - mCanceled = true; - request->Cancel(NS_BINDING_ABORTED); - return NS_OK; - } - - if (isPending) { - Unused << request->Resume(); // Best effort: ignore failures. - } - rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv;

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 0c48149c2a4d4603f066c26c1b54f5e4fe554454 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 20 17:04:44 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. --- .../exthandler/nsExternalHelperAppService.cpp | 162 ++++++++++++++++++--- uriloader/exthandler/nsExternalHelperAppService.h | 3 + .../exthandler/nsIExternalHelperAppService.idl | 47 ++++++ 3 files changed, 195 insertions(+), 17 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 51a7ee0f6ab6..df08905304fb 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -132,6 +132,9 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] = static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] = "browser.helperApps.neverAsk.openFile"; +static const char WARNING_DIALOG_CONTRACT_ID[] = + "@torproject.org/torbutton-extAppBlocker;1"; + // Helper functions for Content-Disposition headers /** @@ -594,6 +597,107 @@ static const nsDefaultMimeTypeEntry nonDecodableExtensions[] = { { APPLICATION_GZIP, "svgz" } }; +////////////////////////////////////////////////////////////////////////////////////////////////////// +// begin nsExternalLoadURIHandler class definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// +class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher +{ +public: + NS_DECL_THREADSAFE_ISUPPORTS + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER + + nsExternalLoadURIHandler(nsIInterfaceRequestor * aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo); + +protected: + ~nsExternalLoadURIHandler(); + + nsCOMPtr<nsIInterfaceRequestor> mWindowContext; + nsCOMPtr<nsIURI> mURI; + nsCOMPtr<nsIHandlerInfo> mHandlerInfo; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; +}; + +NS_IMPL_ADDREF(nsExternalLoadURIHandler) +NS_IMPL_RELEASE(nsExternalLoadURIHandler) + +NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) +NS_INTERFACE_MAP_END_THREADSAFE + +nsExternalLoadURIHandler::nsExternalLoadURIHandler( + nsIInterfaceRequestor *aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo) +: mWindowContext(aWindowContext) +, mURI(aURI) +, mHandlerInfo(aHandlerInfo) +{ + nsresult rv = NS_OK; + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, aWindowContext); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } +} + +nsExternalLoadURIHandler::~nsExternalLoadURIHandler() +{ +} + +NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() +{ + MOZ_ASSERT(mURI); + MOZ_ASSERT(mHandlerInfo); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + nsHandlerInfoAction preferredAction; + mHandlerInfo->GetPreferredAction(&preferredAction); + bool alwaysAsk = true; + mHandlerInfo->GetAlwaysAskBeforeHandling(&alwaysAsk); + + // if we are not supposed to ask, and the preferred action is to use + // a helper app or the system default, we just launch the URI. + if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || + preferredAction == nsIHandlerInfo::useSystemDefault)) + return mHandlerInfo->LaunchWithURI(mURI, mWindowContext); + + nsresult rv = NS_OK; + nsCOMPtr<nsIContentDispatchChooser> chooser = + do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + + return chooser->Ask(mHandlerInfo, mWindowContext, mURI, + nsIContentDispatchChooser::REASON_CANNOT_HANDLE); +} + +NS_IMETHODIMP nsExternalLoadURIHandler::CancelRequest(nsresult aReason) +{ + NS_ENSURE_ARG(NS_FAILED(aReason)); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + return NS_OK; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////// +// nsExternalHelperAppService definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// NS_IMPL_ISUPPORTS( nsExternalHelperAppService, nsIExternalHelperAppService, @@ -1014,23 +1118,13 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); - nsHandlerInfoAction preferredAction; - handler->GetPreferredAction(&preferredAction); - bool alwaysAsk = true; - handler->GetAlwaysAskBeforeHandling(&alwaysAsk); + RefPtr<nsExternalLoadURIHandler> h = + new nsExternalLoadURIHandler(aWindowContext, uri, handler); + if (!h) { + return NS_ERROR_OUT_OF_MEMORY; + } - // if we are not supposed to ask, and the preferred action is to use - // a helper app or the system default, we just launch the URI. - if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || - preferredAction == nsIHandlerInfo::useSystemDefault)) - return handler->LaunchWithURI(uri, aWindowContext); - - nsCOMPtr<nsIContentDispatchChooser> chooser = - do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - return chooser->Ask(handler, aWindowContext, uri, - nsIContentDispatchChooser::REASON_CANNOT_HANDLE); + return NS_OK; } NS_IMETHODIMP nsExternalHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval) @@ -1198,6 +1292,7 @@ NS_INTERFACE_MAP_BEGIN(nsExternalAppHandler) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIHelperAppLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) NS_INTERFACE_MAP_ENTRY(nsICancelable) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsIBackgroundFileSaverObserver) @@ -1671,6 +1766,29 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo httpInternal->SetChannelIsForDownload(true); } + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, GetDialogParent()); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } + + return NS_OK; +} + +NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest) + mWarningDialog = nullptr; + // now that the temp file is set up, find out if we need to invoke a dialog // asking the user what they want us to do with this content... @@ -1731,6 +1849,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo action = nsIMIMEInfo::saveToDisk; } + nsresult rv = NS_OK; if (alwaysAsk) { // Display the dialog @@ -1786,6 +1905,15 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } +NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest) + mWarningDialog = nullptr; + + return Cancel(aReason); +} + // Convert error info into proper message text and send OnStatusChange // notification to the dialog progress listener or nsITransfer implementation. void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequest *aRequest, const nsAFlatString &path) @@ -2477,7 +2605,7 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) } // Break our reference cycle with the helper app dialog (set up in - // OnStartRequest) + // ContinueRequest) mDialog = nullptr; mRequest = nullptr; diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h index ceec66661dd4..3146407dcbe5 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.h +++ b/uriloader/exthandler/nsExternalHelperAppService.h @@ -210,6 +210,7 @@ private: */ class nsExternalAppHandler final : public nsIStreamListener, public nsIHelperAppLauncher, + public nsIHelperAppWarningLauncher, public nsITimerCallback, public nsIBackgroundFileSaverObserver { @@ -218,6 +219,7 @@ public: NS_DECL_NSISTREAMLISTENER NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIHELPERAPPLAUNCHER + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER NS_DECL_NSICANCELABLE NS_DECL_NSITIMERCALLBACK NS_DECL_NSIBACKGROUNDFILESAVEROBSERVER @@ -478,6 +480,7 @@ protected: nsCOMPtr<nsIChannel> mOriginalChannel; /**< in the case of a redirect, this will be the pre-redirect channel. */ nsCOMPtr<nsIHelperAppLauncherDialog> mDialog; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; /** * Keep request alive in case when helper non-modal dialog shown. diff --git a/uriloader/exthandler/nsIExternalHelperAppService.idl b/uriloader/exthandler/nsIExternalHelperAppService.idl index bfdfff5ceaa8..546252f04ba3 100644 --- a/uriloader/exthandler/nsIExternalHelperAppService.idl +++ b/uriloader/exthandler/nsIExternalHelperAppService.idl @@ -152,3 +152,50 @@ interface nsIHelperAppLauncher : nsICancelable */ readonly attribute int64_t contentLength; }; + +/** + * nsIHelperAppWarningLauncher is implemented by two classes: + * nsExternalLoadURIHandler + * nsExternalAppHandler + */ +[scriptable, uuid(cffd508b-4aaf-43ad-99c6-671d35cbc558)] +interface nsIHelperAppWarningLauncher : nsISupports +{ + /** + * Callback invoked by the external app warning dialog to continue the + * request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + */ + void continueRequest(); + + /** + * Callback invoked by the external app warning dialog to cancel the request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + * + * @param aReason + * Pass a failure code to indicate the reason why this operation is + * being canceled. It is an error to pass a success code. + */ + void cancelRequest(in nsresult aReason); +}; + +/** + * nsIHelperAppWarningDialog is implemented by Torbutton's external app + * blocker (src/components/external-app-blocker.js). + */ +[scriptable, uuid(f4899a3f-0df3-42cc-9db8-bdf599e5a208)] +interface nsIHelperAppWarningDialog : nsISupports +{ + /** + * Possibly show a launch warning dialog (it will not be shown if the user + * has chosen to not see the warning again). + * + * @param aLauncher + * A nsIHelperAppWarningLauncher to be invoked after the user confirms + * or cancels the download. + * @param aWindowContext + * The window associated with the download. + */ + void maybeShow(in nsIHelperAppWarningLauncher aLauncher, + in nsISupports aWindowContext); +};

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21830: Copying large test from web console leaks to /tmp
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 06580161f901dedf60e6dcb9252e7ce6b3e7b37b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:55:49 2017 +0000 Bug 21830: Copying large test from web console leaks to /tmp Patch written by Neill Miller --- widget/nsTransferable.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp index e99d45401df8..976180c7581e 100644 --- a/widget/nsTransferable.cpp +++ b/widget/nsTransferable.cpp @@ -39,6 +39,7 @@ Notes to self: #include "nsIFile.h" #include "nsILoadContext.h" #include "mozilla/UniquePtr.h" +#include "mozilla/Preferences.h" NS_IMPL_ISUPPORTS(nsTransferable, nsITransferable) @@ -248,6 +249,11 @@ nsTransferable::Init(nsILoadContext* aContext) if (aContext) { mPrivateData = aContext->UsePrivateBrowsing(); + } else { + // without aContext here to provide PrivateBrowsing information, + // we defer to the active configured setting + mPrivateData = + mozilla::Preferences::GetBool("browser.privatebrowsing.autostart"); } #ifdef DEBUG mInitialized = true;

1 0

[torbutton/master] Changelog update and version bump
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6c76c3083f5ed221deddc51d13e09e8f8b6418f4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:33:06 2017 +0000 Changelog update and version bump --- src/CHANGELOG | 13 +++++++++++++ src/install.rdf | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 775884c..ddd40d8 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,16 @@ +1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + 1.9.7.4 * Bug 22542: Security Settings window too small on macOS 10.12 diff --git a/src/install.rdf b/src/install.rdf index 868faea..c501b6a 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.4</em:version> + <em:version>1.9.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit d48388d248ddf23150e70c7f0e4b84109e793a0d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 20 17:11:53 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. For compatibility with recent changes to our browser patch, change the external app blocker module so it implements the new nsIHelperAppWarningDialog interface. Since the external app blocker module is no longer a service, split the drag and drop filter into a separate component (which remains a service). --- src/chrome.manifest | 7 +- src/components/dragDropFilter.js | 86 +++++++++++++++++ src/components/external-app-blocker.js | 169 ++++++++++++++++----------------- 3 files changed, 175 insertions(+), 87 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 272401b..65f55a9 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -143,8 +143,11 @@ skin torbutton classic/1.0 chrome/skin/ style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css # Firefox 4-style component registration +component {f605ec27-d867-44b5-ad97-2a29276642c3} components/dragDropFilter.js +contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} + component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} components/external-app-blocker.js -contract @torproject.org/torbutton-extAppBlockerService;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} +contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} component {06322def-6fde-4c06-aef6-47ae8e799629} components/startup-observer.js contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} @@ -165,4 +168,4 @@ category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selec category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 -category profile-after-change ExtAppBlockerService @torproject.org/torbutton-extAppBlockerService;1 +category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1 diff --git a/src/components/dragDropFilter.js b/src/components/dragDropFilter.js new file mode 100644 index 0000000..22dde86 --- /dev/null +++ b/src/components/dragDropFilter.js @@ -0,0 +1,86 @@ +/************************************************************************* + * Drag and Drop Handler. + * + * Implements an observer that filters drag events to prevent OS + * access to URLs (a potential proxy bypass vector). + *************************************************************************/ + +const Cc = Components.classes; +const Ci = Components.interfaces; +const Cu = Components.utils; + +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + +// Module specific constants +const kMODULE_NAME = "Torbutton Drag and Drop Handler"; +const kCONTRACT_ID = "@torproject.org/torbutton-dragDropFilter;1"; +const kMODULE_CID = Components.ID("f605ec27-d867-44b5-ad97-2a29276642c3"); + +const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; + +function DragDropFilter() { + this.logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Ci.nsISupports).wrappedJSObject; + this.logger.log(3, "Component Load 0: New DragDropFilter."); + + try { + var observerService = Cc["@mozilla.org/observer-service;1"]. + getService(Ci.nsIObserverService); + observerService.addObserver(this, "on-datatransfer-available", false); + } catch(e) { + this.logger.log(5, "Failed to register drag observer"); + } +} + +DragDropFilter.prototype = +{ + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), + + // make this an nsIClassInfo object + flags: Ci.nsIClassInfo.DOM_OBJECT, + classDescription: kMODULE_NAME, + contractID: kCONTRACT_ID, + classID: kMODULE_CID, + + // method of nsIClassInfo + getInterfaces: function(count) { + count.value = kInterfaces.length; + return kInterfaces; + }, + + // method of nsIClassInfo + getHelperForLanguage: function(count) { return null; }, + + // method of nsIObserver + observe: function(subject, topic, data) { + if (topic == "on-datatransfer-available") { + this.logger.log(3, "The DataTransfer is available"); + return this.filterDataTransferURLs(subject); + } + }, + + filterDataTransferURLs: function(aDataTransfer) { + var types = null; + var type = ""; + var count = aDataTransfer.mozItemCount; + var len = 0; + for (var i = 0; i < count; ++i) { + this.logger.log(3, "Inspecting the data transfer: " + i); + types = aDataTransfer.mozTypesAt(i); + len = types.length; + for (var j = 0; j < len; ++j) { + type = types[j]; + this.logger.log(3, "Type is: " + type); + if (type == "text/x-moz-url" || + type == "text/x-moz-url-data" || + type == "text/uri-list" || + type == "application/x-moz-file-promise-url") { + aDataTransfer.clearData(type); + this.logger.log(3, "Removing " + type); + } + } + } + } +}; + +var NSGetFactory = XPCOMUtils.generateNSGetFactory([DragDropFilter]); diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index e56fed3..ca86580 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -7,19 +7,24 @@ * Handles displaying confirmation dialogs for external apps and protocols * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 * - * Also implements an observer that filters drag events to prevent OS - * access to URLs (a potential proxy bypass vector). + * An instance of this module is created each time the browser starts to + * download a file that may be opened by another or application and when + * an external application may be invoked to handle an URL (e.g., when the + * user clicks on a mailto: URL). *************************************************************************/ const Cc = Components.classes; const Ci = Components.interfaces; +const Cr = Components.results; const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/SharedPromptUtils.jsm"); // Module specific constants const kMODULE_NAME = "Torbutton External App Handler"; -const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlockerService;1"; +const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1"; const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; @@ -28,23 +33,14 @@ function ExternalAppBlocker() { this.logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; this.logger.log(3, "Component Load 0: New ExternalAppBlocker."); - - this._prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - - try { - var observerService = Cc["@mozilla.org/observer-service;1"]. - getService(Ci.nsIObserverService); - observerService.addObserver(this, "external-app-requested", false); - observerService.addObserver(this, "on-datatransfer-available", false); - } catch(e) { - this.logger.log(5, "Failed to register external app observer or drag observer"); - } } ExternalAppBlocker.prototype = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), + _helperAppLauncher: undefined, + + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver, + Ci.nsIHelperAppWarningDialog]), // make this an nsIClassInfo object flags: Ci.nsIClassInfo.DOM_OBJECT, @@ -58,83 +54,86 @@ ExternalAppBlocker.prototype = return kInterfaces; }, - // method of nsIClassInfo + // method of nsIClassInfo getHelperForLanguage: function(count) { return null; }, - // Returns true if launch should proceed. - _confirmLaunch: function() { - if (!this._prefs.getBoolPref("extensions.torbutton.launch_warning")) { - return true; - } - - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Ci.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - - var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Ci.nsIPromptService); - var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_IS_STRING + - prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_IS_STRING + - prompts.BUTTON_DELAY_ENABLE + - prompts.BUTTON_POS_1_DEFAULT; - - var title = chrome.torbutton_get_property_string("torbutton.popup.external.title"); - var app = chrome.torbutton_get_property_string("torbutton.popup.external.app"); - var note = chrome.torbutton_get_property_string("torbutton.popup.external.note"); - var suggest = chrome.torbutton_get_property_string("torbutton.popup.external.suggest"); - var launch = chrome.torbutton_get_property_string("torbutton.popup.launch"); - var cancel = chrome.torbutton_get_property_string("torbutton.popup.cancel"); - var dontask = chrome.torbutton_get_property_string("torbutton.popup.dontask"); - - var check = {value: false}; - var result = prompts.confirmEx(chrome, title, app+note+suggest+" ", - flags, launch, cancel, "", dontask, check); - - if (check.value) { - this._prefs.setBoolPref("extensions.torbutton.launch_warning", false); + // method of nsIHelperAppWarningDialog + maybeShow: function(aLauncher, aWindowContext) + { + // Hold a reference to the object that called this component. This is + // important not just because we need to later invoke the + // continueRequest() or cancelRequest() callback on aLauncher, but also + // so that the launcher object (which is a reference counted object) is + // not released too soon. + this._helperAppLauncher = aLauncher; + + if (!Services.prefs.getBoolPref("extensions.torbutton.launch_warning")) { + this._helperAppLauncher.continueRequest(); + return; } - return (0 == result); - }, - - observe: function(subject, topic, data) { - if (topic == "external-app-requested") { - this.logger.log(3, "External app requested"); - // subject.data is true if the launch should be canceled. - if ((subject instanceof Ci.nsISupportsPRBool) - && !subject.data /* not canceled already */ - && !this._confirmLaunch()) { - subject.data = true; // The user said to cancel the launch. - } - } else if (topic == "on-datatransfer-available") { - this.logger.log(3, "The DataTransfer is available"); - return this.filterDataTransferURLs(subject); - } + this._showPrompt(aWindowContext); }, - filterDataTransferURLs: function(aDataTransfer) { - var types = null; - var type = ""; - var count = aDataTransfer.mozItemCount; - var len = 0; - for (var i = 0; i < count; ++i) { - this.logger.log(3, "Inspecting the data transfer: " + i); - types = aDataTransfer.mozTypesAt(i); - len = types.length; - for (var j = 0; j < len; ++j) { - type = types[j]; - this.logger.log(3, "Type is: " + type); - if (type == "text/x-moz-url" || - type == "text/x-moz-url-data" || - type == "text/uri-list" || - type == "application/x-moz-file-promise-url") { - aDataTransfer.clearData(type); - this.logger.log(3, "Removing " + type); - } - } + /* + * The _showPrompt() implementation uses some XUL and JS that is part of the + * browser's confirmEx() implementation. Specifically, _showPrompt() depends + * on chrome://global/content/commonDialog.xul as well as some of the code + * in resource://gre/modules/SharedPromptUtils.jsm. + */ + _showPrompt: function(aWindowContext) { + let parentWin; + try { + parentWin = aWindowContext.getInterface(Ci.nsIDOMWindow); + } catch (e) { + parentWin = Services.wm.getMostRecentWindow("navigator:browser"); } - } + let title = parentWin.torbutton_get_property_string("torbutton.popup.external.title"); + let app = parentWin.torbutton_get_property_string("torbutton.popup.external.app"); + let note = parentWin.torbutton_get_property_string("torbutton.popup.external.note"); + let suggest = parentWin.torbutton_get_property_string("torbutton.popup.external.suggest"); + let launch = parentWin.torbutton_get_property_string("torbutton.popup.launch"); + let cancel = parentWin.torbutton_get_property_string("torbutton.popup.cancel"); + let dontask = parentWin.torbutton_get_property_string("torbutton.popup.dontask"); + + let args = { + promptType: "confirmEx", + title: title, + text: app+note+suggest+" ", + checkLabel: dontask, + checked: false, + ok: false, + button0Label: launch, + button1Label: cancel, + defaultButtonNum: 1, // Cancel + buttonNumClicked: 1, // Cancel + enableDelay: true, + }; + + let propBag = PromptUtils.objectToPropBag(args); + let uri = "chrome://global/content/commonDialog.xul"; + let promptWin = Services.ww.openWindow(parentWin, uri, "_blank", + "centerscreen,chrome,titlebar", propBag); + promptWin.addEventListener("load", aEvent => { + promptWin.addEventListener("unload", aEvent => { + PromptUtils.propBagToObject(propBag, args); + + if (0 == args.buttonNumClicked) { + // Save the checkbox value and tell the browser's external helper app + // module about the user's choice. + if (args.checked) { + Services.prefs.setBoolPref("extensions.torbutton.launch_warning", + false); + } + + this._helperAppLauncher.continueRequest(); + } else { + this._helperAppLauncher.cancelRequest(Cr.NS_BINDING_ABORTED); + } + }, false); + }, false); + }, }; var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]);

1 0

[tor-browser-build/master] Add a README.HACKING file
by boklm＠torproject.org 03 Aug '17

03 Aug '17

commit 41dc4091f04a16754b208af8edbb2e501a0a3831 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 4 00:19:47 2017 +0200 Add a README.HACKING file Add a file to list the main things to know when making changes to the Tor Browser build. --- README | 7 ++ README.HACKING | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 230 insertions(+) diff --git a/README b/README index e5fc45d..7a2a671 100644 --- a/README +++ b/README @@ -205,3 +205,10 @@ Common Build Errors You can look at the README.BUILD_ERRORS file for a list of common build errors and their solutions. + +Hacking on the Tor Browser build +-------------------------------- + +The file README.HACKING tries to list the main things to know when +making changes to the Tor Browser build. + diff --git a/README.HACKING b/README.HACKING new file mode 100644 index 0000000..2687ed1 --- /dev/null +++ b/README.HACKING @@ -0,0 +1,223 @@ +Hacking on Tor Browser Build +============================ + +This file tries to list the main things to know when making changes to +the Tor Browser build. + + +rbm documentation +----------------- + +If you go to directory rbm/doc, you can find the rbm documentation. You +can build it with 'make html' or 'make man'. + + +Using and defining options +-------------------------- + +Options can be used in templates with the following syntax: + + [% c("option_name") %] + +More details about the templates syntax can be found in +rbm/doc/rbm_templates.7 and [http://template-toolkit.org/docs/manual/index.html] + +Some options have a specific meaning to rbm. You can see their descriptions +in rbm/doc/rbm_config.7 and rbm/doc/rbm_input_files.7. + +When the option does not have a specific meaning to rbm, it is a good +idea to define it under var/ to avoid potential conflicts in option names +with a future version of rbm. + +The options can be defined in different places: + +- rbm.conf for options available to all components +- project/$project/config for options available to one component +- rbm.local.conf for user defined options + +In each of those places, an option can be defined: + +- at the root of the document +- under targets/$target/, in which case the definition only applies when + a specific target is defined + +The targets are usually used to select: + +- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, + torbrowser-windows-i686, torbrowser-osx-x86_64 +- the channel: release, nightly, alpha + +The targets torbrowser-linux-x86_64, torbrowser-linux-i686, +torbrowser-windows-i686, torbrowser-osx-x86_64 are special cases. They +do not contain options directly, instead they contain a list of other +targets. For instance, the torbrowser-linux-x86_64 target is pointing +to the linux-x86_64 and linux targets. You should define an option under +the linux target if it applies to Linux on both architectures, or under +the linux-x86_64 if it only applies to the x86_64 architecture. + +An option that is defined at the root of rbm.conf can be overrided by +an other definition under a target, or inside projects/$project/config. +You can find the complete priority order in rbm/doc/rbm_config.7. + + +Defining a project's filename +----------------------------- + +The filename option defines the output file or directory from the build +of a component. If the file or directory exists in the out/$component +directory, the component will not be rebuilt when it is used as a +dependency from an other component. + +The filename is usually something like this: + + filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +The var/build_id value is a hash that is based on the build inputs of +the component: + - the build script (after template evaluation) + - the container definition + - the input files (the filename when it is a dependency on an other + project, the filename and hash of its content otherwise) +This means that each time the build script, the container or one of the +dependencies is modified, the output filename will change and a rebuild +of the component will be required. + +The version and var/osname values could be removed from the filename, +but they are useful to get an idea of what a file contains. + + +Adding some Linux/Windows/OSX specific changes to a build script +---------------------------------------------------------------- + +You can use the following template syntax in the build scripts: + + [% IF c("var/linux") -%] + # do something for linux + [% ELSIF c("var/windows") -%] + # do something for windows + [% ELSIF c("var/osx") -%] + # do something for osx + [% END -%] + +You can also use var/linux-x86_64 and var/linux-i686 for things that +only apply to x86_64 and i686 linux builds. You can use the var/release, +var/alpha and var/nightly options to do things depending on the channel. + +As an alternative you can define an option with a different value +depending on the target: + + targets: + linux: + var: + do_something: 'do something for linux' + windows-i686: + var: + do_something: 'do something for windows' + osx-x86_64: + var: + do_something: 'do something for osx' + +And in the build script, use: + + [% c("var/do_something") %] + + +Evaluating a component's build script +------------------------------------- + +If you want to look at the build script used to build a component for a +specific platform/channel, you can use the following command: + + $ ./rbm/rbm showconf $component build --target $channel --target $platform + +$component should be replaced by the name of the component. + +$channel should be one of the following: + + - release + + - alpha + + - nightly + +$platform should be one of the following: + + - torbrowser-linux-x86_64 + + - torbrowser-linux-i686 + + - torbrowser-windows-i686 + + - torbrowser-osx-x86_64 + +For example, to see the tor's build script for linux x86_64 on the alpha +channel, you can use: + + $ ./rbm/rbm showconf tor build --target alpha --target \ + torbrowser-linux-x86_64 + +If the component you are looking at has many dependencies, the display +can take some time as various build_id values need to be computed. If +you don't care about the accuracy of input and output file names, you +can add '--target no_build_id' to the command line. For instance if you +want to look at the build script for the tor-browser component (which +has a lot of dependencies), you can use: + + $ ./rbm/rbm showconf tor build --target alpha --target \ + torbrowser-linux-x86_64 --target no_build_id + +The same type of commands can be used to look at any option values, +replacing build with the name of the option you want to look at. For +instance if you want to know the output filename of tor on linux-x86_64 +on the alpha channel, you can use: + + $ ./rbm/rbm showconf tor filename --target alpha --target \ + torbrowser-linux-x86_64 + + +Building a single component +--------------------------- + +When you are working on some changes to a component, before creating a +full bundle with those changes, you might want to try a build of the +component you modified only. + +This can be done with the following command: + + $ ./rbm/rbm build $component --target $channel --target $platform + +See the previous section "Evaluating a component's build script" for a +list of possible values for $channel and $platform. + +For instance if you want to build tor for linux-x86_64 on the alpha +channel, you can run: + + $ ./rbm/rbm build tor --target alpha --target torbrowser-linux-x86_64 + +To find the resulting file from the build, you can use 'ls -ltr out/tor/' +to find the file with the last modification time. + + +Debugging a build error +----------------------- + +If the build fails, a debugging shell will automatically be opened in +the container used for the build (unless you set debug to 0 in +rbm.local.conf). + +Before using the debugging shell, you can first look at the build logs +in an other terminal (the filename of the log file is indicated in the +rbm output). + +In the debug shell, you can type 'bash' to get a shell with completion. +You can then look at the 'build' file, and copy paste some of its commands +to debug the problem. If you need to edit files, vim is not installed +in the build containers, but vi can be used instead. + +When you press ctrl+d (twice if you opened a bash shell) the debug shell +is closed and the container containing the failed build is removed. + +If you want to make a backup of the container's rootfs with the failed +build to look at it later, you should be able to find it in +/tmp/$UID/rbm-containers. +

1 0

[tor-browser-build/master] firefox: add var/torbrowser_update_channel value for the release channel
by boklm＠torproject.org 03 Aug '17

03 Aug '17

commit 47552843a3111c640c809524b34054246f9e4806 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 3 23:49:08 2017 +0200 firefox: add var/torbrowser_update_channel value for the release channel --- projects/firefox/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/firefox/config b/projects/firefox/config index 50d7a4e..b2400c9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -22,6 +22,10 @@ var: use_container: 1 targets: + release: + var: + torbrowser_update_channel: release + nightly: git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0

1 0

[tor-browser-build/master] Add var/release, var/alpha, var/nightly options
by boklm＠torproject.org 03 Aug '17

03 Aug '17

commit bec3345342b0a60a5a8e908e50a37dbdd4e0697b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 3 23:44:17 2017 +0200 Add var/release, var/alpha, var/nightly options Add some options to be able to write things like this in templates: [% IF c("var/release") -%] do something on release channel [% ELSIF c("var/alpha") -%] do something on alpha channel [% ELSIF c("var/nightly") -%] do something on nightly channel [% END -%] --- rbm.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rbm.conf b/rbm.conf index c93019e..327cd39 100644 --- a/rbm.conf +++ b/rbm.conf @@ -98,8 +98,15 @@ targets: noint: debug: 0 + release: + var: + release: 1 + alpha: + var: + alpha:1 nightly: var: + nightly: 1 multi_lingual: 1 torbrowser-testbuild:

1 0

[tor-browser-build/master] Add comment to explain why we build https-e once for all platforms
by boklm＠torproject.org 03 Aug '17

03 Aug '17

commit 84fd513bee8b345d636a3f9d6529fe683c40f0a1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 3 21:43:42 2017 +0200 Add comment to explain why we build https-e once for all platforms --- projects/https-everywhere/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 3652aaa..6ee1ee9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -7,6 +7,14 @@ gpg_keyring: https-everywhere.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" var: + # HTTPS Everywhere is expected to be the same on all platforms. To avoid + # building the same thing 4 times, using 4 different container images + # (each one with a different suite or architecture), we set the container + # to wheezy/amd64 for all platforms. This allows us to create only one + # container image, and also build the extension only one time as the + # filename does not contain the platform, and var/build_id should be + # the same since there is now nothing platform specific in the build + # inputs. This allows us to save a little time and disk space. container: use_container: 1 suite: wheezy

1 0

[tor-browser-build/master] Bug 22499: build obfsproxy and fteproxy for Windows
by boklm＠torproject.org 03 Aug '17

03 Aug '17

commit 6221fac747287361a0e4432c3ebf6590461bbbcf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 3 17:56:39 2017 +0200 Bug 22499: build obfsproxy and fteproxy for Windows Also finish including the Linux build of obfsproxy and fteproxy. Based on gitian/descriptors/windows/gitian-pluggable-transports.yml from tor-browser-bundle.git. --- keyring/winpython.gpg | Bin 0 -> 1167 bytes projects/argparse/build | 20 +++++++--- projects/argparse/config | 7 ++++ projects/fteproxy/build | 21 +++++++++- projects/fteproxy/config | 9 +++++ projects/libfte/build | 23 +++++++++-- projects/libfte/config | 8 ++++ projects/obfsproxy/build | 32 ++++++++++++++-- projects/obfsproxy/config | 25 +++++++++++- projects/parsley/build | 21 +++++++--- projects/parsley/config | 7 ++++ projects/pycrypto/build | 29 +++++++++++--- projects/pycrypto/config | 7 ++++ projects/pyptlib/build | 21 +++++++--- projects/pyptlib/config | 7 ++++ projects/pyyaml/build | 21 +++++++--- projects/pyyaml/config | 7 ++++ projects/tor-browser/build | 4 ++ projects/tor-browser/config | 3 ++ projects/twisted/build | 32 +++++++++++++--- projects/twisted/config | 10 +++++ projects/txsocksx/build | 21 +++++++--- projects/txsocksx/config | 7 ++++ projects/winpython/build | 36 ++++++++++++++++++ projects/winpython/config | 55 +++++++++++++++++++++++++++ projects/winpython/pyc-timestamp.sh | 18 +++++++++ projects/winpython/wine-wrappers/common.py | 27 +++++++++++++ projects/winpython/wine-wrappers/dllwrap.py | 36 ++++++++++++++++++ projects/winpython/wine-wrappers/g++.py | 39 +++++++++++++++++++ projects/winpython/wine-wrappers/gcc.py | 36 ++++++++++++++++++ projects/winpython/wine-wrappers/settings.py | 2 + projects/winpython/wine-wrappers/setup.py | 7 ++++ projects/zope.interface/build | 27 ++++++++++--- projects/zope.interface/config | 9 +++++ rbm.conf | 29 ++++++++++++++ 35 files changed, 612 insertions(+), 51 deletions(-) diff --git a/keyring/winpython.gpg b/keyring/winpython.gpg new file mode 100644 index 0000000..97abdc1 Binary files /dev/null and b/keyring/winpython.gpg differ diff --git a/projects/argparse/build b/projects/argparse/build index 938c5e9..29e4221 100644 --- a/projects/argparse/build +++ b/projects/argparse/build @@ -1,14 +1,24 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% ELSE -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/argparse.py $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + mkdir -p $pydir/Lib/site-packages + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(winepath -w $pydir) +[% ELSE -%] + python2 setup.py build --build-lib build + cp -a build/argparse.py $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/argparse/config b/projects/argparse/config index 87f80b0..c4d9dec 100644 --- a/projects/argparse/config +++ b/projects/argparse/config @@ -12,8 +12,15 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/a/argparse/argparse-[% c("version") %].tar.gz' sha256sum: ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/fteproxy/build b/projects/fteproxy/build index b33c3a5..0d9baf1 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -3,11 +3,28 @@ distdir="/var/tmp/dist/[% project %]" [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END -%] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/libfte') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -cp -a bin/fteproxy $PTDIR/fteproxy.bin -cp -ra fteproxy $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup_tbb.py py2exe + py2exe_zip_timestomp dist/fteproxy.zip + cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ + mkdir -p $PTDIR/fteproxy + cp -a fteproxy/VERSION $PTDIR/fteproxy + mkdir -p $PTDIR/fteproxy/defs + cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs + rm -Rf $pydir +[% ELSE -%] + cp -a bin/fteproxy $PTDIR/fteproxy.bin + cp -ra fteproxy $PTDIR/ +[% END -%] cp -a {COPYING,README.md} $DOCSDIR/ cd $distdir [% c('tar', { diff --git a/projects/fteproxy/config b/projects/fteproxy/config index 059381b..6a13e0d 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -15,6 +15,15 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image + - project: libfte + name: libfte + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/libfte/build b/projects/libfte/build index fc7b9f6..62c8fce 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -10,9 +10,26 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] ln -s /var/tmp/dist/gmp thirdparty/gmp -export PYTHON=python2 -make -cp -ra fte $PTDIR/ +mkdir -p $distdir +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] +[% IF c("var/windows") -%] + pydir=$distdir/python + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + export LD_PRELOAD= + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + # FTE only needs libgmp-10.dll and no libgmpxx anymore. + cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll . + cp -a /var/tmp/dist/gmp/bin/libgmp-10.dll $distdir/TorBrowser/Tor/ + WINDOWS_BUILD=1 CROSS_COMPILE=1 make + $PYTHON setup.py install --prefix=$(winepath -w "$pydir") + $PYTHON setup.py install +[% ELSE -%] + export PYTHON=python2 + make + cp -ra fte $PTDIR/ + mkdir -p $distdir/TorBrowser/Tor + cp /var/tmp/dist/gmp/lib/libgmp.so.10 $distdir/TorBrowser/Tor/ +[% END -%] cp -a {LICENSE,README.md} $DOCSDIR/ cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 cd $distdir diff --git a/projects/libfte/config b/projects/libfte/config index e2219a7..4c34116 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -14,6 +14,12 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - faketime input_files: - project: container-image @@ -21,3 +27,5 @@ input_files: project: '[% c("var/compiler") %]' - project: gmp name: gmp + - project: obfsproxy + name: obfsproxy diff --git a/projects/obfsproxy/build b/projects/obfsproxy/build index 841c608..9d64aa9 100644 --- a/projects/obfsproxy/build +++ b/projects/obfsproxy/build @@ -3,13 +3,37 @@ distdir="/var/tmp/dist/[% project %]" [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% ELSE -%] +[% END -%] +mkdir -p $distdir +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pycrypto') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/twisted') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/argparse') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/parsley') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyptlib') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/pyyaml') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/txsocksx') %] +tar -C $distdir -xf $rootdir/[% c('input_files_by_name/zope.interface') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/obfsproxy $PTDIR/ -cp -a bin/obfsproxy $PTDIR/obfsproxy.bin +[% IF c("var/windows") -%] + pydir="$distdir/python" + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup_py2exe.py py2exe + $PYTHON setup.py install --prefix=$(winepath -w $pydir) + py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip + cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/ + # http://bugs.winehq.org/show_bug.cgi?id=3591 + cp -a /var/tmp/dist/winpython/python27.dll $PTDIR +[% ELSE -%] + export PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/obfsproxy $PTDIR/ + cp -a bin/obfsproxy $PTDIR/obfsproxy.bin +[% END -%] cp -a {LICENSE,README} $DOCSDIR cd $distdir [% c('tar', { diff --git a/projects/obfsproxy/config b/projects/obfsproxy/config index ad436dd..9134de1 100644 --- a/projects/obfsproxy/config +++ b/projects/obfsproxy/config @@ -7,7 +7,7 @@ gpg_keyring: obfsproxy.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: - DOCSDIR_project: Obsfproxy + DOCSDIR_project: Obfsproxy container: use_container: 1 @@ -17,6 +17,29 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image + - project: pycrypto + name: pycrypto + - project: twisted + name: twisted + - project: argparse + name: argparse + - project: parsley + name: parsley + - project: pyptlib + name: pyptlib + - project: pyyaml + name: pyyaml + - project: txsocksx + name: txsocksx + - project: zope.interface + name: zope.interface + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/parsley/build b/projects/parsley/build index ea5f19a..1d52f9a 100644 --- a/projects/parsley/build +++ b/projects/parsley/build @@ -1,14 +1,25 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% ELSE -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/Parsley-[% c('version') %].tar.gz cd /var/tmp/build/Parsley-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/parsley.py build/ometa build/terml $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + mkdir -p $pydir/Lib/site-packages + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(winepath -w $pydir) +[% ELSE -%] + PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/parsley.py build/ometa build/terml $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/parsley/config b/projects/parsley/config index 72d5bfc..b788899 100644 --- a/projects/parsley/config +++ b/projects/parsley/config @@ -12,8 +12,15 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/P/Parsley/Parsley-[% c("version") %].tar.gz' sha256sum: 50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/pycrypto/build b/projects/pycrypto/build index 9b005ab..51ec5ce 100644 --- a/projects/pycrypto/build +++ b/projects/pycrypto/build @@ -1,22 +1,39 @@ #!/bin/bash +set -e [% c("var/set_default_env") -%] [% c("var/setarch") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/linux") -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 [% IF c("var/linux-i686") -%] export CFLAGS=-m32 export CXXFLAGS=-m32 export LDFLAGS=-m32 [% END -%] -./configure --build=i686-linux-gnu [% c("var/configure_opt") %] -$PYTHON setup.py build --build-lib build -cp -a build/Crypto $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + mkdir -p "$pydir" + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + export LD_PRELOAD=[% c("var/faketime_path") %] + # This is bogus, that we run the configure script in the build environment, + # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for + # ac_cv_func_malloc_0_nonnull. + ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32 + export LD_PRELOAD= + $PYTHON setup.py build_ext -c mingw32 + $PYTHON setup.py install --prefix=$(winepath -w $pydir) +[% ELSE -%] + export PYTHON=python2 + ./configure --build=i686-linux-gnu [% c("var/configure_opt") %] + python2 setup.py build --build-lib build + cp -a build/Crypto $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/pycrypto/config b/projects/pycrypto/config index 3a9f24b..ca314c8 100644 --- a/projects/pycrypto/config +++ b/projects/pycrypto/config @@ -12,6 +12,13 @@ targets: - python-dev - python-setuptools + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - faketime + input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/pyptlib/build b/projects/pyptlib/build index 1dc0c07..de70c5b 100644 --- a/projects/pyptlib/build +++ b/projects/pyptlib/build @@ -1,14 +1,25 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/linux") -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/pyptlib $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + mkdir -p "$pydir" + $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) +[% ELSE -%] + export PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/pyptlib $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/pyptlib/config b/projects/pyptlib/config index e8ca100..7ae1d68 100644 --- a/projects/pyptlib/config +++ b/projects/pyptlib/config @@ -16,6 +16,13 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/pyyaml/build b/projects/pyyaml/build index c10855c..d3d60d7 100644 --- a/projects/pyyaml/build +++ b/projects/pyyaml/build @@ -1,14 +1,25 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% ELSE -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/PyYAML-[% c('version') %].tar.gz cd /var/tmp/build/PyYAML-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/yaml $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + mkdir -p $pydir/Lib/site-packages + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install --prefix=$(winepath -w $pydir) +[% ELSE -%] + export PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/yaml $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/pyyaml/config b/projects/pyyaml/config index 5324c10..8d43bf6 100644 --- a/projects/pyyaml/config +++ b/projects/pyyaml/config @@ -12,8 +12,15 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-[% c("version") %].tar.gz' sha256sum: c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/tor-browser/build b/projects/tor-browser/build index b9537a3..77a02ea 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -56,6 +56,10 @@ mv $TBDIR/meek-http-helper(a)bamsoftware.com.xpi $TBDIR/$MEEKPROFILEPATH/extension tar -C $TBDIR -xf [% c('input_files_by_name/snowflake') -%] [% END -%] +[% IF c("var/fteproxy") -%] + tar -C $TBDIR -xf [% c('input_files_by_name/fteproxy') %] +[% END -%] + tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_files_by_name/fonts') %] [% IF c("var/linux") %] diff --git a/projects/tor-browser/config b/projects/tor-browser/config index fef279b..4f708bc 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -50,6 +50,9 @@ input_files: name: meek - project: obfs4 name: obfs4 + - project: fteproxy + name: fteproxy + enable: '[% c("var/fteproxy") %]' - project: snowflake name: snowflake enable: '[% c("var/snowflake") %]' diff --git a/projects/twisted/build b/projects/twisted/build index acc5c9d..0d9154f 100644 --- a/projects/twisted/build +++ b/projects/twisted/build @@ -1,14 +1,36 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% ELSE -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 cd /var/tmp/build/Twisted-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/twisted $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + export LD_PRELOAD=[% c("var/faketime_path") %] + # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" + # rather than "Python.h". + ln -sf Python.h /var/tmp/dist/winpython/include/python.h + # We need to set the "mingw32" compiler to avoid an error in build_ext, but + # Twisted's "install" command calls build_ext unconditionally, whether the + # extensions have been built already or not, so we can't just call build_ext + # separately as with other packages. The "install" command doesn't recognize + # the -c option, so we set the compiler in a configuration file. + echo $'[build_ext]\ncompiler=mingw32' > setup.cfg + mkdir -p $pydir/Lib/site-packages + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) +[% ELSE -%] + export PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/twisted $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/twisted/config b/projects/twisted/config index f2f7de8..2f35166 100644 --- a/projects/twisted/config +++ b/projects/twisted/config @@ -12,8 +12,18 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - p7zip-full + - faketime input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/T/Twisted/Twisted-[% c("version") %].tar.bz2' sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/txsocksx/build b/projects/txsocksx/build index 3491a26..31d7b18 100644 --- a/projects/txsocksx/build +++ b/projects/txsocksx/build @@ -1,8 +1,12 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% ELSE -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] @@ -11,9 +15,16 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . mkdir vcversioner-1.14.1.1-py2.7.egg -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/txsocksx $PTDIR/ +[% IF c("var/windows") -%] + pydir="$distdir/python" + mkdir -p $pydir/Lib/site-packages + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + $PYTHON setup.py install_lib --install-dir=$(winepath -w "$pydir/Lib/site-packages") +[% ELSE -%] + export PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/txsocksx $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/txsocksx/config b/projects/txsocksx/config index 6142943..18fc4a8 100644 --- a/projects/txsocksx/config +++ b/projects/txsocksx/config @@ -14,6 +14,13 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/projects/winpython/build b/projects/winpython/build new file mode 100644 index 0000000..2a30acc --- /dev/null +++ b/projects/winpython/build @@ -0,0 +1,36 @@ +#!/bin/bash +set -e +[% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +distdir="/var/tmp/dist/[% project %]" +mkdir -p $distdir +WINEROOT=$HOME/.wine/drive_c +wineboot -i +msiexec /qn /i python-[% c("version") %].msi TARGETDIR=$distdir +sed -i 's/self.dll_libraries = get_msvcr()/pass#self.dll_libraries = get_msvcr()/g' $distdir/Lib/distutils/cygwinccompiler.py +tar xf setuptools-*.tar.gz +rm setuptools-*.tar.gz +cd setuptools-* +wine $distdir/python.exe setup.py install +cd $rootdir +7z x $rootdir/py2exe-*.exe +cp -a PLATLIB/* $distdir/Lib/site-packages/ +export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" +export LD_PRELOAD=[% c("var/faketime_path") %] +cd wine-wrappers +# Push our config into wine-wrappers. +> settings.py +echo "LD_PRELOAD = \"$LD_PRELOAD\"" >> settings.py +echo "FAKETIME = \"$FAKETIME\"" >> settings.py +# Must pre-copy python27.dll into the build directory, or else py2exe can't find it. +mkdir -p build/bdist.win32/winexe/bundle-2.7/ +cp -a $distdir/python27.dll build/bdist.win32/winexe/bundle-2.7/ +LD_PRELOAD= $distdir/python.exe setup.py py2exe +mkdir -p $distdir/wineroot/windows/ +cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $distdir/wineroot/windows/ +cp $rootdir/pyc-timestamp.sh $distdir/ +cd $distdir/.. +[% c('tar', { + tar_src => [ project, 'mingw-w64' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/winpython/config b/projects/winpython/config new file mode 100644 index 0000000..dcd21f6 --- /dev/null +++ b/projects/winpython/config @@ -0,0 +1,55 @@ +# vim: filetype=yaml sw=2 +version: 2.7.5 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' + +var: + compiler: mingw-w64 + post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - p7zip-full + - faketime + container: + use_container: 1 + setup: | + [% pc('mingw-w64', 'var/setup') %] + # wine path ($HOME/.wine) gets included in some binaries, so set HOME + # to a fixed path. + export HOME=/var/tmp/home + mkdir -p $HOME + WINEROOT=$HOME/.wine/drive_c + wineboot -i + cp -a /var/tmp/dist/winpython/wineroot/windows/* $WINEROOT/windows/ + export PYTHON="wine /var/tmp/dist/winpython/python.exe" + + # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. + function py2exe_zip_timestomp { + ZIPFILE="$1" + local tmpdir="$(mktemp -d)" + local tmpzip="$(mktemp -u)" + unzip -d "$tmpdir" "$ZIPFILE" + cd "$tmpdir" + find . -name '*.pyc' -print0 | xargs -0 /var/tmp/dist/winpython/pyc-timestamp.sh "2000-01-01 00:00:00" + [% c('zip', { + zip_src => [ '.' ], + zip_args => '$tmpzip', + }) %] + cd - + mv -f "$tmpzip" "$ZIPFILE" + rm -rf "$tmpdir" + } + + +input_files: + - project: container-image + - URL: 'https://www.python.org/ftp/python/[% c("version") %]/python-[% c("version") %].msi' + file_gpg_id: 1 + sig_ext: asc + gpg_keyring: winpython.gpg + - URL: https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.tar.gz + sha256sum: 75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 + - URL: http://downloads.sourceforge.net/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe + sha256sum: 610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - filename: wine-wrappers + - filename: pyc-timestamp.sh diff --git a/projects/winpython/pyc-timestamp.sh b/projects/winpython/pyc-timestamp.sh new file mode 100755 index 0000000..e092268 --- /dev/null +++ b/projects/winpython/pyc-timestamp.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Usage: pyc-timestamp.sh "2001-01-01" FILENAMES... +# Overwrite (in place) the timestamp in .pyc Python bytecode files. +# +# http://hg.python.org/cpython/file/2.7/Lib/py_compile.py#l123 +# http://nedbatchelder.com/blog/200804/the_structure_of_pyc_files.html +# http://benno.id.au/blog/2013/01/15/python-determinism + +TIMESPEC="$1" +shift + +hex=$(printf 0x%08x $(date +%s --date="$TIMESPEC")) +# Write little-endian. +esc=$(printf "\\\\x%02x\\\\x%02x\\\\x%02x\\\\x%02x" $(($hex&0xff)) $((($hex>>8)&0xff)) $((($hex>>16)&0xff)) $((($hex>>24)&0xff))) +for filename in "$@"; do + echo $filename + echo -n -e "$esc" | dd of="$filename" bs=1 seek=4 conv=notrunc +done diff --git a/projects/winpython/wine-wrappers/common.py b/projects/winpython/wine-wrappers/common.py new file mode 100644 index 0000000..19e994b --- /dev/null +++ b/projects/winpython/wine-wrappers/common.py @@ -0,0 +1,27 @@ +import os +import subprocess + +import settings + +def winepath(windowspath): + """Convert a Windows path to a Unix path.""" + return subprocess.check_output(["winepath", "-u", windowspath])[:-1] + +def search_startswith(a, elems): + """Search for the first element of the array a that startswith any of the + members of elems, and return it. Return None if no match was found.""" + for e in elems: + if a.startswith(e): + return e + return None + +def popen_faketime(*args, **kwargs): + """Does subprocess.Popen after setting faketime environment variables.""" + ld_preload = os.getenv("LD_PRELOAD") + if ld_preload: + # ld.so(8): "The items of [LD_PRELOAD] can be separated by spaces or colons." + ld_preload += ":" + ld_preload += settings.LD_PRELOAD + os.putenv("LD_PRELOAD", ld_preload) + os.putenv("FAKETIME", settings.FAKETIME) + return subprocess.Popen(*args, **kwargs) diff --git a/projects/winpython/wine-wrappers/dllwrap.py b/projects/winpython/wine-wrappers/dllwrap.py new file mode 100755 index 0000000..300a3bd --- /dev/null +++ b/projects/winpython/wine-wrappers/dllwrap.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-dllwrap that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 dllwrap can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/var/tmp/dist/mingw-w64/bin/i686-w64-mingw32-dllwrap"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a in ("-I", "-L", "-s", "--def", "--output-lib"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L", "--def=", "--output-lib=")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/projects/winpython/wine-wrappers/g++.py b/projects/winpython/wine-wrappers/g++.py new file mode 100755 index 0000000..a71c4e3 --- /dev/null +++ b/projects/winpython/wine-wrappers/g++.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-g++ that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 g++ can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/var/tmp/dist/mingw-w64/bin/i686-w64-mingw32-g++"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a == "--output-lib": + o = sys.argv.pop(0) + a = "-out-implib="+o + if a in ("-I", "-L"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/projects/winpython/wine-wrappers/gcc.py b/projects/winpython/wine-wrappers/gcc.py new file mode 100755 index 0000000..3db89b4 --- /dev/null +++ b/projects/winpython/wine-wrappers/gcc.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-gcc that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 gcc can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/var/tmp/dist/mingw-w64/bin/i686-w64-mingw32-gcc"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a in ("-I", "-L"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/projects/winpython/wine-wrappers/settings.py b/projects/winpython/wine-wrappers/settings.py new file mode 100644 index 0000000..f395433 --- /dev/null +++ b/projects/winpython/wine-wrappers/settings.py @@ -0,0 +1,2 @@ +LD_PRELOAD = "/usr/lib/faketime/libfaketime.so.1" +FAKETIME = "2000-01-01 00:00:00" diff --git a/projects/winpython/wine-wrappers/setup.py b/projects/winpython/wine-wrappers/setup.py new file mode 100644 index 0000000..f80f2c0 --- /dev/null +++ b/projects/winpython/wine-wrappers/setup.py @@ -0,0 +1,7 @@ +from distutils.core import setup +import py2exe +setup( + console=["gcc.py", "g++.py", "dllwrap.py"], + zipfile=None, + options={"py2exe": {"bundle_files": 1, "compressed": True}} +) diff --git a/projects/zope.interface/build b/projects/zope.interface/build index 23501a3..29406fb 100644 --- a/projects/zope.interface/build +++ b/projects/zope.interface/build @@ -1,14 +1,31 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% c("var/set_PTDIR_DOCSDIR") -%] -mkdir -p $PTDIR +[% IF c("var/linux") -%] + [% c("var/set_PTDIR_DOCSDIR") -%] + mkdir -p $PTDIR +[% END -%] +[% IF c("var/windows") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END -%] mkdir -p /var/tmp/build unzip -d /var/tmp/build $rootdir/[% project %]-[% c('version') %].zip cd /var/tmp/build/[% project %]-[% c('version') %] -export PYTHON=python2 -$PYTHON setup.py build --build-lib build -cp -a build/zope $PTDIR/ +[% IF c("var/windows") -%] + find -type f -print0 | xargs -0 [% c("var/touch") %] + pydir="$distdir/python" + mkdir -p $pydir/Lib/site-packages + export PYTHONPATH="$(winepath -w $pydir)\\Lib\\site-packages" + export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" + LD_PRELOAD= $PYTHON setup.py build_ext -c mingw32 + $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(winepath -w $pydir) + # Must create this file in order for py2exe to find the package. + touch $pydir/Lib/site-packages/zope/__init__.py +[% ELSE -%] + export PYTHON=python2 + $PYTHON setup.py build --build-lib build + cp -a build/zope $PTDIR/ +[% END -%] cd $distdir [% c('tar', { tar_src => [ '.' ], diff --git a/projects/zope.interface/config b/projects/zope.interface/config index 9743b79..4ae3cff 100644 --- a/projects/zope.interface/config +++ b/projects/zope.interface/config @@ -12,8 +12,17 @@ targets: arch_deps: - python-setuptools - python-dev + windows-i686: + var: + compiler: winpython + post_pkginst: '[% c("var/install_wine_ppa") %]' + arch_deps: + - faketime input_files: - project: container-image - URL: 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-[% c("version") %].zip' sha256sum: 1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/windows") %]' diff --git a/rbm.conf b/rbm.conf index ae8c5b2..c93019e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -144,6 +144,7 @@ targets: compiler: gcc # We only build snowflake on linux and osx for now snowflake: 1 + fteproxy: 1 container: suite: wheezy deps: @@ -186,6 +187,34 @@ targets: export RBM_SETARCH=1 exec setarch i686 ./build fi + fteproxy: 1 + install_wine_ppa: | + # Install a Wine new enough to have a fix for + # http://bugs.winehq.org/show_bug.cgi?id=29764; otherwise Python run under + # Wine constantly crashes in _PyVerify_fd, which is called by such common + # operations as io.open and os.fstat (anything involving a file descriptor + # number). Ubuntu's main repository only has wine1.4, and the issue was fixed + # in 1.5.29. + echo 'deb http://ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main' >> /etc/apt/sources.list + # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and + # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. + apt-key add - << EOF + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: GnuPG v1 + + mI0ESXVzlQEEAN1BxiR961SiFrJ7tacrAImCmDdxs4OSifgpBAp8q0fe0iLcSeAo + WdS7H+7Y4T+/2t3XEw7+3cD831WBu8c/Pv0ldx5TyDyOQmEtUBlMqy33WdKVxsci + rnag8ShrNM9PtG/vAQU/JtfQl68dXfD3BsCtrXVrjqcO2AxNYBSvd9hpABEBAAG0 + IkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBXaW5lIFRlYW2ItgQTAQIAIAUCSXVz + lQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFqaBq75y42wflcD/jLMihWM + zRCO60S/a7SqD0QNqV/nAYEOsma/Y2C/uhQ44j0np+iOB6+PDRbyJ8GVgIjpaIbt + l4sReXcf7bS9Dhhn5Gbe/n6VQr7xoMr1Io0PrXdmWpmsOfCuebWU4bV1w+YBvHFF + qTu5QF2Y0Fj9bRxQdQ1M2HcnXOiLq82hKlb+ + =Z9DY + -----END PGP PUBLIC KEY BLOCK----- + EOF + apt-get update + apt-get --no-install-recommends -y install wine torbrowser-osx-x86_64: - osx-x86_64

1 0

[tor-browser-build/master] meek: include *.1.txt instead of *.1 files on Windows
by boklm＠torproject.org 03 Aug '17

03 Aug '17

commit 9a392fd711a582e1c275c1c454deb766e07c5c6f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 3 16:32:26 2017 +0200 meek: include *.1.txt instead of *.1 files on Windows --- projects/meek/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/meek/build b/projects/meek/build index 81734be..57185b3 100644 --- a/projects/meek/build +++ b/projects/meek/build @@ -27,7 +27,7 @@ cp -a meek-client-torbrowser[% IF c("var/windows") %].exe[% END %] $PTDIR [% END %] cd .. -cp -a README doc/*.1 $DOCSDIR +cp -a README doc/*.1[% IF c("var/windows") %].txt[% END %] $DOCSDIR cd firefox [% c('zip', {

1 0

[tor-browser-bundle/maint-7.0] Bug 22884: about:tor page is not showing up
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit bfcf699785a7e7aa7cb49fe61400c4d4aee3836a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 19 10:05:48 2017 -0400 Bug 22884: about:tor page is not showing up Whitelist about:tor so that NoScript does not block its JavaScript. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 6ef2c45..d6e5546 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 6ef2c45..d6e5546 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 6ef2c45..d6e5546 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.4
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit cd573d8a0c7a45594d19f8461124d7d7fa5e50d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 09:45:14 2017 +0000 Release preparations for 7.0.4 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 28 ++++++++++++++++++++++++++++ gitian/versions | 18 +++++++++--------- tools/update-responses/config.yml | 9 +++++---- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d509505..8fa01c9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,34 @@ +Tor Browser 7.0.4 -- August 8 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.0.10 + * Update Torbutton to 1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Windows + * Bug 22829: Remove default obfs4 bridge riemann. + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.0.3 -- July 27 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. Tor Browser 7.0.2 -- July 3 2017 * All Platforms diff --git a/gitian/versions b/gitian/versions index 873aa7f..0c9d620 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.9 -TORLAUNCHER_TAG=0.2.12.2 -TORBUTTON_TAG=1.9.7.4 -HTTPSE_TAG=5.2.19 +TOR_TAG=tor-0.3.0.10 +TORLAUNCHER_TAG=0.2.12.3 +TORBUTTON_TAG=1.9.7.5 +HTTPSE_TAG=5.2.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -40,12 +40,12 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-4-4 +GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## 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-5.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1547dfd..79c015d 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.3 + release: 7.0.4 versions: - 7.0.3: - platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-703-released + 7.0.4: + platformVersion: 52.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-704-released incremental_from: - 7.0.2 + - 7.0.3 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-bundle/maint-7.0] Revert "Apply patch for bug 23044"
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 0711c3e7293f8a4970fd19a7ab11736b8e39d673 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 09:53:24 2017 +0000 Revert "Apply patch for bug 23044" This reverts commit a11a8b301950e1c25adcfd5bea07c773f5082533. We do the right thing and get the patch via the tor-brower repo. No need to use this workaround anymore which was there for our emergency release. --- gitian/descriptors/linux/gitian-firefox.yml | 2 -- gitian/patches/gio.patch | 48 ----------------------------- 2 files changed, 50 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 49c457c..1ff66a2 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -33,7 +33,6 @@ files: - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" - "get-moz-build-date" -- "gio.patch" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -89,7 +88,6 @@ script: | mkdir -p $INSTDIR/Debug/Browser/ cd tor-browser - patch -p1 < ../gio.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/patches/gio.patch b/gitian/patches/gio.patch deleted file mode 100644 index 1edae4d..0000000 --- a/gitian/patches/gio.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a96f898e0da42de751a5e1367a9899cc96fadb1f Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Thu, 27 Jul 2017 07:31:38 +0000 -Subject: [PATCH] Bug 23044: Don't allow GIO supported protocols by default - - -diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js -index aaeba630422d..3edaad88f59e 100644 ---- a/browser/app/profile/000-tor-browser.js -+++ b/browser/app/profile/000-tor-browser.js -@@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); - pref("network.protocol-handler.warn-external.news", true); - pref("network.protocol-handler.warn-external.nntp", true); - pref("network.protocol-handler.warn-external.snews", true); -+// Make sure we don't have any GIO supported protocols (defense in depth -+// measure) -+pref("network.gio.supported-protocols", ""); - pref("plugin.disable", true); // Disable to search plugins on first start - pref("plugins.click_to_play", true); - pref("plugin.state.flash", 1); -diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp -index a378e8700821..5f6b2a0a2a57 100644 ---- a/extensions/gio/nsGIOProtocolHandler.cpp -+++ b/extensions/gio/nsGIOProtocolHandler.cpp -@@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) - // Get user preferences to determine which protocol is supported. - // Gvfs/GIO has a set of supported protocols like obex, network, archive, - // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be -- // irrelevant to process by browser. By default accept only smb and sftp -- // protocols so far. -+ // irrelevant to process by browser. By default accept none. - nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, - getter_Copies(mSupportedProtocols)); - if (NS_SUCCEEDED(rv)) { - mSupportedProtocols.StripWhitespace(); - ToLowerCase(mSupportedProtocols); - } -- else -- mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults -+ else { -+ mSupportedProtocols.AssignLiteral(""); // use none by default -+ } - - LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); - } --- -2.13.2 -

1 0

[gitian-builder/tor-browser-builder-4] Bug 22467: Don't break upgrade on Jessie VM
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit cbcaacd2152ca43ebc51874dcbb074de14dcc392 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 09:19:58 2017 +0000 Bug 22467: Don't break upgrade on Jessie VM The problem seems to be related to `linux-image-xxxx` trying to upgrade itself during `dist-upgrade` while `grub` is not installed, which causes the post-installation script to fail. The idea is to ensure that `linux-image-xxxx` is upgraded before removing `grub` and doing `dist-upgrade`. This patch was done by David Fifield --- target-bin/upgrade-system.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target-bin/upgrade-system.sh b/target-bin/upgrade-system.sh index 9384229..795c3b9 100644 --- a/target-bin/upgrade-system.sh +++ b/target-bin/upgrade-system.sh @@ -6,6 +6,9 @@ set -e mkdir -p /var/cache/gitian +DEBIAN_FRONTEND=noninteractive apt-get -y install grub +DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-$(uname -r) + # remove obsolete grub, it causes package dependency issues apt-get -q -y purge grub > /dev/null 2>&1 || true

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21321: Add test for .onion whitelisting
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 490f3cc2d708cf693ebb7c730b7bb2562dc8987c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 24 10:23:00 2017 +0000 Bug 21321: Add test for .onion whitelisting --- dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js index 7de8faa8f9cb..206b79742505 100644 --- a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js +++ b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js @@ -21,6 +21,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gContentSecurityManager", var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); prefs.setCharPref("dom.securecontext.whitelist", "example.net,example.org"); +prefs.setBoolPref("dom.securecontext.whitelist_onions", false); add_task(function* test_isOriginPotentiallyTrustworthy() { for (let [uriSpec, expectedResult] of [ @@ -38,10 +39,18 @@ add_task(function* test_isOriginPotentiallyTrustworthy() { ["http://example.net/", true], ["ws://example.org/", true], ["chrome://example.net/content/messenger.xul", false], + ["http://1234567890abcdef.onion/", false], ]) { let uri = NetUtil.newURI(uriSpec); let principal = gScriptSecurityManager.getCodebasePrincipal(uri); Assert.equal(gContentSecurityManager.isOriginPotentiallyTrustworthy(principal), expectedResult); } + // And now let's test whether .onion sites are properly treated when + // whitelisted, see bug 21321. + prefs.setBoolPref("dom.securecontext.whitelist_onions", true); + let uri = NetUtil.newURI("http://1234567890abcdef.onion/"); + let principal = gScriptSecurityManager.getCodebasePrincipal(uri); + Assert.equal(gContentSecurityManager.isOriginPotentiallyTrustworthy(principal), + true); });

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21321: .onion domains are shown as non-secure
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit df2223e1b1f8a4b782e7e49bbbeb79296ea74dff Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 09:07:37 2017 +0000 Bug 21321: .onion domains are shown as non-secure Websites which collect passwords but don't use HTTPS start showing scary warnings from Firefox 51 onwards (see: blog.mozilla.org/security/2017/01/20/communicating-the-dangers-of-non-secur… for details). .onion sites without HTTPS support are affected as well, although their traffic is encrypted and authenticated. This patch addresses this shortcoming by making sure .onion sites are treated as potentially trustworthy origins. The secure context specification (https://w3c.github.io/webappsec-secure-contexts/) is pretty much focused on tying security and trustworthiness to the protocol over which domains are accessed. However, it is not obvious why .onion sites should not be treated as potentially trustworthy given: "A potentially trustworthy origin is one which a user agent can generally trust as delivering data securely. This algorithms [sic] considers certain hosts, scheme, and origins as potentially trustworthy, even though they might not be authenticated and encrypted in the traditional sense." (https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy) We use step 8 in the algorithm to establish trustworthiness of .onion sites by whitelisting them given the encrypted and authenticated nature of their traffic. --- browser/app/profile/000-tor-browser.js | 3 +++ dom/security/nsContentSecurityManager.cpp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3edaad88f59e..5d209ccfdbe1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -357,6 +357,9 @@ pref("security.ssl.errorReporting.enabled", false); // in case the download panel got removed from the toolbar. pref("browser.download.panel.shown", true); +// Treat .onions as secure +pref("dom.securecontext.whitelist_onions", true); + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index c4e1ed8e18a9..c95226b56e91 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -689,6 +689,14 @@ nsContentSecurityManager::IsOriginPotentiallyTrustworthy(nsIPrincipal* aPrincipa } } } + // Maybe we have a .onion URL. Treat it as whitelisted as well when + // `dom.securecontext.whitelist_onions` is `true`. + bool whitelistOnions = + Preferences::GetBool("dom.securecontext.whitelist_onions", false); + if (whitelistOnions && StringEndsWith(host, NS_LITERAL_CSTRING(".onion"))) { + *aIsTrustWorthy = true; + return NS_OK; + } } return NS_OK;

1 0

[tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 21321: Add test for .onion whitelisting
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 7a03cca9991cfab93be16e9d5521bc58c35d4d44 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 24 10:23:00 2017 +0000 Bug 21321: Add test for .onion whitelisting --- dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js index 7de8faa8f9cb..206b79742505 100644 --- a/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js +++ b/dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js @@ -21,6 +21,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gContentSecurityManager", var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); prefs.setCharPref("dom.securecontext.whitelist", "example.net,example.org"); +prefs.setBoolPref("dom.securecontext.whitelist_onions", false); add_task(function* test_isOriginPotentiallyTrustworthy() { for (let [uriSpec, expectedResult] of [ @@ -38,10 +39,18 @@ add_task(function* test_isOriginPotentiallyTrustworthy() { ["http://example.net/", true], ["ws://example.org/", true], ["chrome://example.net/content/messenger.xul", false], + ["http://1234567890abcdef.onion/", false], ]) { let uri = NetUtil.newURI(uriSpec); let principal = gScriptSecurityManager.getCodebasePrincipal(uri); Assert.equal(gContentSecurityManager.isOriginPotentiallyTrustworthy(principal), expectedResult); } + // And now let's test whether .onion sites are properly treated when + // whitelisted, see bug 21321. + prefs.setBoolPref("dom.securecontext.whitelist_onions", true); + let uri = NetUtil.newURI("http://1234567890abcdef.onion/"); + let principal = gScriptSecurityManager.getCodebasePrincipal(uri); + Assert.equal(gContentSecurityManager.isOriginPotentiallyTrustworthy(principal), + true); });

1 0

[tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 21321: .onion domains are shown as non-secure
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 30b633b92a94bced2537354afe3d228f0eace8da Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 09:07:37 2017 +0000 Bug 21321: .onion domains are shown as non-secure Websites which collect passwords but don't use HTTPS start showing scary warnings from Firefox 51 onwards (see: blog.mozilla.org/security/2017/01/20/communicating-the-dangers-of-non-secur… for details). .onion sites without HTTPS support are affected as well, although their traffic is encrypted and authenticated. This patch addresses this shortcoming by making sure .onion sites are treated as potentially trustworthy origins. The secure context specification (https://w3c.github.io/webappsec-secure-contexts/) is pretty much focused on tying security and trustworthiness to the protocol over which domains are accessed. However, it is not obvious why .onion sites should not be treated as potentially trustworthy given: "A potentially trustworthy origin is one which a user agent can generally trust as delivering data securely. This algorithms [sic] considers certain hosts, scheme, and origins as potentially trustworthy, even though they might not be authenticated and encrypted in the traditional sense." (https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy) We use step 8 in the algorithm to establish trustworthiness of .onion sites by whitelisting them given the encrypted and authenticated nature of their traffic. --- browser/app/profile/000-tor-browser.js | 3 +++ dom/security/nsContentSecurityManager.cpp | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 3edaad88f59e..5d209ccfdbe1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -357,6 +357,9 @@ pref("security.ssl.errorReporting.enabled", false); // in case the download panel got removed from the toolbar. pref("browser.download.panel.shown", true); +// Treat .onions as secure +pref("dom.securecontext.whitelist_onions", true); + #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index c4e1ed8e18a9..c95226b56e91 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -689,6 +689,14 @@ nsContentSecurityManager::IsOriginPotentiallyTrustworthy(nsIPrincipal* aPrincipa } } } + // Maybe we have a .onion URL. Treat it as whitelisted as well when + // `dom.securecontext.whitelist_onions` is `true`. + bool whitelistOnions = + Preferences::GetBool("dom.securecontext.whitelist_onions", false); + if (whitelistOnions && StringEndsWith(host, NS_LITERAL_CSTRING(".onion"))) { + *aIsTrustWorthy = true; + return NS_OK; + } } return NS_OK;

1 0

[tor-browser/tor-browser-52.2.0esr-7.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 96a0b3ce8bf4b13d6c6f8d799af028c600ad1cb1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 13 08:48:59 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We disable the GetAddons item on the about:addons page as we don't know which extensions Mozilla is advertising to our users and we don't want to have some random Google Analytics script running either on about:addons. Fixes bug 22073. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dc7e99701293..3edaad88f59e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -297,6 +297,10 @@ pref("extensions.enabledScopes", 1); pref("extensions.pendingOperations", false); pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); +// We don't know what extensions Mozilla is advertising to our users and we +// don't want to have some random Google Analytics script running either on the +// about:addons page, see bug 22073 and 22900. +pref("extensions.getAddons.showPane", false); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"loop-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":4,\"newElementCount\":0}");

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 447b6f74f68c06258840abd1bdf5c496528e128d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 08:29:15 2017 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 14b29ce..a045040 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.12.2</em:version> + <em:version>0.2.12.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit 21d5b10f9620702feec5b8e642f5f20996b201a8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 08:29:01 2017 +0000 Translations update --- src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/cs/torlauncher.properties | 8 ++++---- src/chrome/locale/da/torlauncher.properties | 4 ++-- src/chrome/locale/es-AR/torlauncher.properties | 6 +++--- src/chrome/locale/fr-CA/network-settings.dtd | 6 +++--- src/chrome/locale/hy/network-settings.dtd | 4 ++-- src/chrome/locale/ko/network-settings.dtd | 28 +++++++++++++------------- src/chrome/locale/ko/progress.dtd | 2 +- src/chrome/locale/ko/torlauncher.properties | 10 ++++----- src/chrome/locale/mk/network-settings.dtd | 4 ++-- src/chrome/locale/mk/torlauncher.properties | 2 +- src/chrome/locale/nb/torlauncher.properties | 6 +++--- src/chrome/locale/sl/torlauncher.properties | 8 ++++---- src/chrome/locale/ur-PK/torlauncher.properties | 2 +- src/chrome/locale/zh-TW/torlauncher.properties | 2 +- 15 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index d231510..a69caff 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -65,7 +65,7 @@ <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> <!ENTITY torsettings.bridgeHelp1 "Pokud nejste schopni se připojit k síti TORu, může to být způsobeno tím, že váš posktytovatel internetu (ISP) nebo nějaká jiná služba blokuje Tor.  Většinou můžete obejít tento problém použitím Mostů TORu, což jsou přenašeče neuvedené v seznamu, které je složitější zablokovat."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "Můžete použít předem nakonfigurovanou, dodanou sadu adres přemostění, nebo můžete získat vlastní sadu adres pomocí jedné z těchto metod:"> <!ENTITY torsettings.bridgeHelp2Heading "Přes síť"> <!ENTITY torsettings.bridgeHelp2 "Použijte internetový prohlížeč k návštěvě https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Přes automatický e-mailový odpovídač"> diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index f46dd00..55142dd 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Tor spouštěč -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor byl ukončen při spuštění. To by mohlo být způsobeno chybou ve vašem torrc souboru, chybou v Toru nebo jiném programu na vašem systému, nebo vadným hardware. Dokud neopravíte základní problém a nerestartujete Tor, Tor Browser se nespustí. torlauncher.tor_exited=Tor byl neočekávaně ukončen. To by mohlo být způsobeno chybou v Toru, jiném programu na vašem systému, nebo vadným hardware. Dokud nerestartujete Tor, nebude Tor Browser schopen dosáhnout jakékoli webové stránky. Pokud problém přetrvává, prosím pošlete týmu podpory kopii souboru Tor Logu. torlauncher.tor_exited2=Restartování Tor nebude zavírat záložky prohlížeče. torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor. @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S selhal (%2$S). torlauncher.unable_to_start_tor=Tor není schopen startovat\n\n%S torlauncher.tor_missing=Spustitelný soubor Tor chybí. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Chybí soubor torrc a nemohl být vytvořen. +torlauncher.datadir_missing=Složka Tor data neexistuje a nemohla být vytvořena. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. torlauncher.failed_to_get_settings=Nelze načíst Tor nastavení.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Konec torlauncher.done=Hotovo torlauncher.forAssistance=Pro asistenci kontaktujte %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Pro asistenci navštivte %S torlauncher.copiedNLogMessages=Kopírování kompletní. %S zprávy protokolu Tor jsou připraveny k vložení do textového editoru nebo e-mailové zprávy. diff --git a/src/chrome/locale/da/torlauncher.properties b/src/chrome/locale/da/torlauncher.properties index e18d62f..14ec412 100644 --- a/src/chrome/locale/da/torlauncher.properties +++ b/src/chrome/locale/da/torlauncher.properties @@ -42,14 +42,14 @@ torlauncher.forAssistance2=For hjælp, gå til %S torlauncher.copiedNLogMessages=Kopieringen er gennemført. %S logbeskeder fra Tor er klar til at blive sat ind i et tekstdokument eller en e-mail. torlauncher.bootstrapStatus.conn_dir=Tilslutter til relæ mappe -torlauncher.bootstrapStatus.handshake_dir=Opretter en krypteret mappe forbindelse +torlauncher.bootstrapStatus.handshake_dir=Etablerer en krypteret mappe forbindelse torlauncher.bootstrapStatus.requesting_status=Henter netværk status torlauncher.bootstrapStatus.loading_status=Henter netværk status torlauncher.bootstrapStatus.loading_keys=Henter nøglecentercertifikater torlauncher.bootstrapStatus.requesting_descriptors=Anmoder om relæ information torlauncher.bootstrapStatus.loading_descriptors=Henter relæ information torlauncher.bootstrapStatus.conn_or=Opretter forbindelse til Tor-netværket -torlauncher.bootstrapStatus.handshake_or=Opretter et Tor kredsløb +torlauncher.bootstrapStatus.handshake_or=Etablerer et Tor-kredsløb torlauncher.bootstrapStatus.done=Forbundet til Tor-netværket! torlauncher.bootstrapWarning.done=færdig diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 2ba58a1..b7af741 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=No se encuentra el archivo torrc y no pudo ser creado. +torlauncher.datadir_missing=El directorio de datos de Tor no existe y no pudo ser creado. torlauncher.password_hash_missing=Falló al conseguir contraseñas encriptadas. torlauncher.failed_to_get_settings=No se pudo acceder a las configuraciones de Tor.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=Salir torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Para asistencia, visita %S torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor están listos para ser pegados en un editor de textos o un e-mail. diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 212b983..d117b0d 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torSettings.proxyExplanation2 "Si vous n'êtes pas certain de savoir comment répondre à cette question, vérifiez les paramètres Internet d'un autre navigateur ou les paramètres réseau de votre système pour voir si un serveur mandataire local est requis."> <!ENTITY torSettings.enterProxy "Saisir les paramètres du serveur mandataire."> <!ENTITY torSettings.bridgePageTitle "Configuration des ponts Tor"> -<!ENTITY torSettings.bridgeQuestion "Votre fournisseur d'accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> +<!ENTITY torSettings.bridgeQuestion "Votre fournisseur de services Internet (FSI) bloque-t-il ou censure-t-il vos connexions au réseau Tor?"> <!ENTITY torSettings.bridgeExplanation1 "Si vous n'êtes pas certain de savoir comment répondre à cette question, choisissez Non (si vous n'arrivez pas à vous connecter au réseau Tor sans pont, vous pourrez en ajouter un ultérieurement)."> <!ENTITY torSettings.bridgeExplanation2 "Si vous choisissez Oui, l'on vous demandera de configurer des ponts Tor, qui sont des relais non répertoriés rendant le blocage des connexions au réseau Tor plus difficile."> <!ENTITY torSettings.bridgeSettingsPrompt "Vous pouvez utiliser le jeu de ponts fourni ou vous pouvez obtenir et saisir un jeu de ponts personnalisé."> @@ -54,7 +54,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n'autorise que les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> -<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions vers le réseau Tor"> +<!ENTITY torsettings.useBridges.checkbox "Mon fournisseur de services Internet (FSI) bloque les connexions vers le réseau Tor"> <!ENTITY torsettings.useBridges.default "Se connecter avec les ponts fournis"> <!ENTITY torsettings.useBridges.note "Chaque type de pont utilise une méthode différente pour contourner la censure.  Si un pont ne fonctionne pas, ressayez en utilisant un autre type."> <!ENTITY torsettings.useBridges.type "Type de transport :"> @@ -64,7 +64,7 @@ <!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papiers"> <!ENTITY torsettings.bridgeHelpTitle "Aide sur les relais-ponts"> -<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> +<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur de services Internet (FSI) ou une autre organisme bloque Tor.  Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer."> <!ENTITY torsettings.bridgeHelp1B "Vous pouvez utiliser le jeu préconfiguré d'adresses de ponts fourni ou vous pouvez obtenir un jeu personnalisé d'adresses en utilisant une de ces méthodes :"> <!ENTITY torsettings.bridgeHelp2Heading "Par le Web"> <!ENTITY torsettings.bridgeHelp2 "En utilisant un navigateur Web pour visiter https://bridges.torproject.org"> diff --git a/src/chrome/locale/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index 0d2e9dc..213562d 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Այո"> +<!ENTITY torSettings.no "Ոչ"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 76c93c3..ab7f905 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -6,39 +6,39 @@  -<!ENTITY torsettings.prompt "Tor 네트워크에 연결을 시도하기 전에, 이 컴퓨터의 인터넷 연결에 대한 정보를 제공해야합니다."> +<!ENTITY torsettings.prompt "Tor 네트워크에 연결을 시도하기 전에, 이 컴퓨터의 인터넷 연결에 대한 정보를 제공해야 합니다."> <!ENTITY torSettings.yes "예"> <!ENTITY torSettings.no "아니오"> <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> <!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Tor 네트워크에 연결하기 전에 브리지 또는 로컬 프록시 설정을 구성 해야 합니다."> <!ENTITY torSettings.configure "구성"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> <!ENTITY torSettings.connect "연결"> <!ENTITY torSettings.proxyPageTitle "로컬 프록시 설정"> <!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "대부분의 경우 로컬 프록시는 필요하지 않지만 회사, 학교 또는 대학 네트워크를 통해 연결할 때 필요할 수 있습니다."> +<!ENTITY torSettings.proxyExplanation2 "이 질문에 대답하는 방법을 모르면 다른 브라우저의 인터넷 설정을 확인하거나 시스템의 네트워크 설정을 확인하여 로컬 프록시가 필요한지 확인하십시오."> <!ENTITY torSettings.enterProxy "프록시 설정에 들어갑니다."> <!ENTITY torSettings.bridgePageTitle "Tor 브릿지 설정"> <!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "제공된 브릿지 세트를 사용하거나 사용자 지정 브릿지 세트를 취득하여 입력 할 수 있습니다."> +<!ENTITY torSettings.bridgeExplanation1 "이 질문에 대답하는 방법을 모르면 아니오를 선택하십시오 (브리지 없이 Tor 네트워크에 연결할 수 없는 경우 나중에 추가 할 수 있습니다)."> +<!ENTITY torSettings.bridgeExplanation2 "예를 선택하면 Tor 네트워크에 대한 연결을 차단하기가 더 어려워지는 목록에 없는 릴레이 인 Tor 브리지를 구성하라는 메시지가 표시됩니다."> +<!ENTITY torSettings.bridgeSettingsPrompt "제공된 브리지 세트를 사용하거나 사용자 지정 브리지 세트를 취득하여 입력 할 수 있습니다.">  <!ENTITY torsettings.startingTor "Tor 시작 대기 중..."> <!ENTITY torsettings.restartTor "Tor 재시작"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "재구성"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Tor 브리지를 구성했거나 로컬 프록시 설정을 입력했습니다. Tor 네트워크에 직접 연결하려면 이 설정을 제거해야 합니다."> +<!ENTITY torsettings.discardSettings.proceed "설정 제거 및 연결"> <!ENTITY torsettings.optional "선택"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> <!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> <!ENTITY torsettings.useBridges.default "제공된 브릿지에 연결"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "각 유형의 브리지는 검열을 피하기 위해 다른 방법을 사용합니다  하나의 브리지가 작동하지 않으면 다른 브리지를 사용하여 다시 시도하십시오."> <!ENTITY torsettings.useBridges.type "전송 유형:"> <!ENTITY torsettings.useBridges.custom "이용자 브릿지 접속"> <!ENTITY torsettings.useBridges.label "1개 이상의 브릿지 중계 서버를 입력해 주세요. (각 줄에 한 개씩)"> @@ -65,11 +65,11 @@ <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> <!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> <!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.  그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these methods:"> +<!ENTITY torsettings.bridgeHelp1B "사전 구성된 브리지 주소 집합을 사용하거나 다음 방법 중 하나를 사용하여 사용자 지정 주소 집합을 얻을 수 있습니다."> <!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> <!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> <!ENTITY torsettings.bridgeHelp3.emailDesc "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.  단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 아래의 이메일(우선순위대로 기재되어 있음)으로 보내주시면 감사하겠습니다."> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, 또는 https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> -<!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중 한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의해주십시오"> +<!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의 해주십시오"> diff --git a/src/chrome/locale/ko/progress.dtd b/src/chrome/locale/ko/progress.dtd index 7669c26..6963c4f 100644 --- a/src/chrome/locale/ko/progress.dtd +++ b/src/chrome/locale/ko/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 상태"> <!ENTITY torprogress.openSettings "시작 설정"> <!ENTITY torprogress.heading "Tor 네트워크에 연결중"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다."> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 818c6a0..ca48f30 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -3,10 +3,10 @@ torlauncher.error_title=Tor 브라우저 Launcher -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종료되었습니다. 이것은 torrc 파일의 오류, Tor 또는 시스템의 다른 프로그램의 버그 또는 하드웨어 결함으로 인한 것일 수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 때까지 Tor 브라우저는 시작되지 않습니다. torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 접속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 Tor 로그를 보내주십시오. torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않음. -torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. +torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결할 수 없습니다. torlauncher.tor_failed_to_start=Tor 시작 실패. torlauncher.tor_control_failed=Tor 제어에 실패했습니다. torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 @@ -14,8 +14,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 없습니다. +torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 않으며 생성할 수 없습니다. torlauncher.password_hash_missing=해쉬 암호 획득 실패 torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S @@ -37,7 +37,7 @@ torlauncher.quit_win=종료 torlauncher.done=완료 torlauncher.forAssistance=지원자 연결 %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오. torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index 39b7855..1f69d4f 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Да"> +<!ENTITY torSettings.no "Не"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/mk/torlauncher.properties b/src/chrome/locale/mk/torlauncher.properties index 25a447d..817aa35 100644 --- a/src/chrome/locale/mk/torlauncher.properties +++ b/src/chrome/locale/mk/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Излез -torlauncher.done=Done +torlauncher.done=Завршено torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/nb/torlauncher.properties b/src/chrome/locale/nb/torlauncher.properties index 8e7a3f4..65951d6 100644 --- a/src/chrome/locale/nb/torlauncher.properties +++ b/src/chrome/locale/nb/torlauncher.properties @@ -8,9 +8,9 @@ torlauncher.tor_exited=Tor avsluttet uventet. Dette kan være forårsaket av en torlauncher.tor_exited2=Omstart av Tor vil ikke lukke fanene dine. torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport. torlauncher.tor_failed_to_start=Tor kunne ikke starte. -torlauncher.tor_control_failed=Feilet i ta kontroll over Tor. +torlauncher.tor_control_failed=Klarte ikke å ta kontroll over Tor. torlauncher.tor_bootstrap_failed=Tor fikk ikke etablert en forbindelse til Tor-nettverket. -torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S mislyktes (%2$S). torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S torlauncher.tor_missing=Den kjørbare Tor-filen finnes ikke. @@ -39,7 +39,7 @@ torlauncher.done=Ferdig torlauncher.forAssistance=For hjelp, kontakt %S torlauncher.forAssistance2=For hjelp, besøk %S -torlauncher.copiedNLogMessages=Kopiering ferdig. %S Torloggførings-meldinger er klare til å bli sent til et skriveprogram eller en e-post. +torlauncher.copiedNLogMessages=Kopiering ferdig. %S Loggføringsmeldinger fra Tor er klare til å bli sent til et skriveprogram eller en e-post. torlauncher.bootstrapStatus.conn_dir=Kobler til en rutingsstafettoppsetts-katalog torlauncher.bootstrapStatus.handshake_dir=Etablerer en kryptert katalogforbindelse diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties index 1a31cab..44f6757 100644 --- a/src/chrome/locale/sl/torlauncher.properties +++ b/src/chrome/locale/sl/torlauncher.properties @@ -4,16 +4,16 @@ torlauncher.error_title=Tor zaganjalnik torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=Tor se je nepričakovano končal. Razlog je lahko hrošč v Toru, katerikoli drug program na računalniku ali pa problem v strojni opremi. Tor brskalnik ne more doseči nobene strani, dokler ga ne zaženete ponovno. Če se težava ponavlja, prosim pošljite kopijo Tor dnevnika ekipi podpore. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Povezava na Tor nadzorna vrata ni uspela. torlauncher.tor_failed_to_start=Tor se ni zagnal. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. +torlauncher.tor_bootstrap_failed=Tor ni mogel vzpostaviti povezave s Tor omrežjem. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). -torlauncher.unable_to_start_tor=Tor se ne zažene.\n\n%S -torlauncher.tor_missing=Manjka Torjeva izvršljiva datoteka. +torlauncher.unable_to_start_tor=Tor se ne more zagnati.\n\n%S +torlauncher.tor_missing=Manjka Torova izvršljiva datoteka. torlauncher.torrc_missing=The torrc file is missing and could not be created. torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Spodletelo pridobivanje zgoščene vrednosti gesla. diff --git a/src/chrome/locale/ur-PK/torlauncher.properties b/src/chrome/locale/ur-PK/torlauncher.properties index 0f46353..9e00075 100644 --- a/src/chrome/locale/ur-PK/torlauncher.properties +++ b/src/chrome/locale/ur-PK/torlauncher.properties @@ -34,7 +34,7 @@ torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=چھوڑدیجیے (Quit) torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=مکمل ہوگیا torlauncher.forAssistance=For assistance, contact %S torlauncher.forAssistance2=For assistance, visit %S diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 6d6c006..9461178 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=洋蔥路由啟動工具 -torlauncher.tor_exited_during_startup=Tor在啟動時跳出。這可能由torcc設定檔的錯誤、Tor或其他系統程式的漏洞以及硬體缺陷造成。須先解決潛在的問題並重啟Tor，瀏覽器才能啟動。 +torlauncher.tor_exited_during_startup=洋蔥路由程式在啟動過程中意外終止。這可能是由 torcc 設定檔的錯誤、洋蔥路由程式、其他系統程式的漏洞或是硬體缺陷造成。必須先解決潛在的問題並重啟洋蔥路由程式，洋蔥路由瀏覽器才能夠啟動。 torlauncher.tor_exited=洋蔥路由程式意外地中止了。這有可能是洋蔥路由本身的程式錯誤、您系統上的其它程式或是硬體故障。除非您重新啟動洋蔥路由，否則洋蔥路由瀏覽器將無法連接上任何網站。如果此問題持續發生，請發複製並發送您的洋蔥路由歷程紀錄到支援團隊。 torlauncher.tor_exited2=重新啟動洋蔥路由將不會關閉您瀏覽器的分頁。 torlauncher.tor_controlconn_failed=無法連接至洋蔥路由控制連接埠。

1 0

[torbutton/master] Translations update
by gk＠torproject.org 03 Aug '17

03 Aug '17

commit e41a6ff5e768f95a6b0c5b5cf253ef1dfdb685c9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 3 08:21:25 2017 +0000 Translations update --- src/chrome/locale/ar/torbutton.dtd | 2 +- src/chrome/locale/de/torbutton.dtd | 2 +- src/chrome/locale/es/torbutton.dtd | 2 +- src/chrome/locale/eu/torbutton.dtd | 2 +- src/chrome/locale/fa/torbutton.dtd | 2 +- src/chrome/locale/fr/torbutton.dtd | 2 +- src/chrome/locale/it/torbutton.dtd | 2 +- src/chrome/locale/ja/torbutton.dtd | 2 +- src/chrome/locale/ko/aboutTor.dtd | 2 +- src/chrome/locale/ko/torbutton.dtd | 38 +++++++++++++++---------------- src/chrome/locale/ko/torbutton.properties | 18 +++++++-------- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/pl/torbutton.dtd | 2 +- src/chrome/locale/pt-BR/torbutton.dtd | 4 ++-- src/chrome/locale/ru/aboutTor.properties | 2 +- src/chrome/locale/ru/torbutton.dtd | 2 +- src/chrome/locale/sv/torbutton.dtd | 2 +- src/chrome/locale/tr/torbutton.dtd | 4 ++-- src/chrome/locale/tr/torbutton.properties | 2 +- src/chrome/locale/vi/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 2 +- 21 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index d391ef7..db75c7a 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_low "منخفض (افتراضي)"> diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 5df06d0..3e0aa3f 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Lassen Sie dieses Feld ausgewählt, um zu verhindern, dass verschiedene Browserfunktionen ausgenutzt werden, um Ihr Surfverhalten nachzuverfolgen. Die veränderten Funktionen betreffen: BLOB-URLs, Rundruf-Kanäle, den Browser-Puffer, Cookies, Favicons, HTTP-Authentifizierungs-Kopfdaten, Verknüpfungs-Vorverbindungen, den lokalen Speicher, URLs von Medienquellen, OCSP-Anfragen, gemeinsame JavaScript-Instanzen und Tickets von TLS-Sitzungen."> <!ENTITY torbutton.prefs.resist_fingerprinting "Details ändern, die Sie von anderen Tor-Browser-Benutzern unterscheiden"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Lassen Sie dieses Feld ausgewählt um bestimmte einzigartige Informationen Ihres Systems vor Webportalen zu verbergen, wie Ihren Akku-Status, die Rechnerleistung, Tastaturbelegung, das Sprachprofil, den Installationsort von Erweiterungen, die Liste der installierten Erweiterungen, Ihren Netzwerkstatus, die Bildschirmausrichtung, Bildschirmgröße, seitenspezifische Vergrößerungseinstellungen, unterstützte Dateitypen, Farbschemata und WebGL-Fähigkeiten."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Sicherheitsstufe"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Mit dem Sicherheitsschieberegler können Sie bestimmte Browserfunktionen, die Ihren Browser für mögliche Attacken anfälliger machen, deaktivieren."> <!ENTITY torbutton.prefs.sec_low "Gering (Standard)"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 4a8a081..a562e00 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantén marcada esta casilla para evitar que diversas características del navegador se puedan usar para rastrear tu navegación por la web. Las características modificadas incluyen URLs blob (a objetos binarios internos), BroadcastChannel (comunicación interna dentro del mismo origen), caché del navegador, cookies, favicons, cabeceras Auth de HTTP (autentificación básica), preconexiones de enlaces, objetos localStorage (almacenamiento local para aplicaciones web), URLs de objetos MediaSource (audiovisuales), peticiones OCSP (estado de certificados), SharedWorkers (subprocesos compartidos), y tickets de sesión TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que te distinguen de otros usuarios del Navegador Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantén marcada esta casilla para ocultar a los sitios web detalles sobre ti que pudan ser únicos, incluyendo el estado de tu batería, el rendimiento del equipo, la distribución del teclado, la configuración regional, la ubicación y la lista de los plugins instalados, el estado de la red, la orientación y el tamaño de la pantalla, niveles de zoom específicos para sitios web, tipos de fichero soportados, los colores del sistema, y las capacidades gráficas WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantenga esta casilla marcada para ocultar cosas a los sitios web que podrían ser únicas acerca de usted, incluyendo el rendimiento de su equipo, plano de teclado, localización, lista y ubicacion de complementos instalados, estado de su red, orientación de pantalla, tamaño de pantalla, niveles de zoom específico del sitio, tipos de fichero soportados, colores del sistema, y capacidades WebGL. "> <!ENTITY torbutton.prefs.sec_caption "Nivel de seguridad"> <!ENTITY torbutton.prefs.sec_caption_tooltip "El control deslizante del nivel de seguridad le permite deshabilitar ciertas características del navegador que pueden hacerlo más vulnerable a tentativas de hackeo."> <!ENTITY torbutton.prefs.sec_low "Bajo (por defecto)"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 00bbf76..cfffc79 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Zu beste Tor Browser erabiltzaileengandik nabarmentzen zaituzten xehetasunak aldatu"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Segurtasun maila"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_low "Baxua (lehentsia)"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 8d83d33..712e448 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "تغييردادن جزئياتى كه شمارا از كاربران ديگر تُر تميزمى‌كند"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "سطح امنیت"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_low "پایین (به طور پیش فرض)"> diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index 53e1c33..cbbbb95 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d'autres utilisateurs du navigateur Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant l'état de votre batterie, les performances de l'ordinateur, l'agencement du clavier, les paramètres de langue, l'emplacement des greffons installés, la liste de greffons installés, l'état de votre réseau, l'orientation de l'écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant les performances de votre ordinateur, l'agencement du clavier, les paramètres de langue, l'emplacement des greffons installés, la liste des greffons installés, l'état de votre réseau, l'orientation de l'écran, la taille de l'écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL."> <!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Le bouton de sécurité coulissant vous permet de désactiver certaines fonctions du navigateur qui le rendent plus vulnérable aux tentatives de piratage."> <!ENTITY torbutton.prefs.sec_low "Bas (par défaut)"> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 8f42fbc..a18ff01 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Mantieni questo box selezionato per evitare che diverse funzionalità del browser possano essere utilizzate per tracciare la tua navigazione. Le funzionalità modificate includono URL blob, canali di trasmissione, la cache del browser, cookie, favicon, intestazioni di Auth HTTP, link a cui ti sei connesso, localStorage, URL mediaSource, richieste OCSP, SharedWorkers, a ticket di sessioni TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantieni questo box selezionato per nascondere ai siti informazioni univoche su di te, incluse lo stato della batteria, le performance del computer, il layout della tastiera, locale, il luogo di installazione dei plugin, la lista dei plugin installati, lo stato della tua rete, l'orientamento dello schermo, le dimensioni dello schermo, livelli di zoom specifici per i siti, le tipologie di file supportati, i colori del sistema, and le capacità di gestire WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Tieni questa casella selezionata per nascondere ai siti web alcune cose che potrebbero essere uniche per te, incluse le prestazioni del computer, la disposizione della tastiera, la lingua, il percorso dei plugin installati, l'elenco dei plugin installati, lo stato di rete, l'orientamento dello schermo, le dimensioni dello schermo, i livelli di zoom per ogni sito, i tipi di file supportati, i colori di sistema e le funzionalità WebGL."> <!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Il Security Slider ti permette di disabilitare determinate funzionalità del browser che potrebbero renderlo più vulnerabile a tentativi di attacco."> <!ENTITY torbutton.prefs.sec_low "Basso (default)"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index d0a6940..e835f14 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "このボックスをチェックしたままにすることで、様々なブラウザーの機能が悪用されウェブの閲覧中に追跡されることを防ぐ。影響を受ける機能：blob URL、ブロードキャスト・チャンネル、ブラウザー・キャッシュ、クッキー、favicon、HTTP認証ヘッダー、link preconnects、ローカルストレージ、mediaSource URL、OCSPリクエスト、共有ワーカー、TLSセッション・チケットなど。"> <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "このボックスをチェックしたままにすることで、ウェブサイトからあなたを識別する内容を隠す：バッテリー状態、コンピューターの性能、キーボードの配列、地域設定、インストールされたプラグインの場所、インストールされたプラグインの一覧、あなたのネットワーク状態、画面の向き、画面の大きさ、サイトごとのズームレベル、対応するファイルの種類、システムの色、WebGL能力など。"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> <!ENTITY torbutton.prefs.sec_caption_tooltip "セキュリティ・スライダーを使って、あなたのブラウザーをハッキングの試みに対してより脆弱にする可能性のあるブラウザーの機能を無効にできます。"> <!ENTITY torbutton.prefs.sec_low "低い(デフォルト)"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index cba2d80..65b9b76 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "익명으로 알짱거릴 때의 팁 >>"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor 브라우저 사용자 설명서"> <!ENTITY aboutTor.helpInfo1.label "여러분도 도울 수 있습니다!"> <!ENTITY aboutTor.helpInfo2.label "여러분이 Tor 네트워크를 보다 빠르고 강하게 만들 수 있는 방법이 있습니다."> <!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 »"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 6afe330..adce6a9 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Tor 서킷 재구축"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.preferences "Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "보안 설정..."> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "토르 네트워크 설정..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> @@ -11,9 +11,9 @@ <!ENTITY torbutton.context_menu.cookieProtections "쿠키 보호...."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> +<!ENTITY torbutton.prefs.security_settings "Tor 브라우저 보안 설정"> +<!ENTITY torbutton.prefs.restore_defaults "기본값으로 복구"> +<!ENTITY torbutton.prefs.custom_warning "사용자 지정 브라우저 기본 설정으로 인해 비정상적인 보안 설정이 발생했습니다. 보안 및 개인 정보 보호를 위해 기본 보안 수준 중 하나를 선택하는 것이 좋습니다."> <!ENTITY torbutton.cookiedialog.title "쿠키 보호 관리"> <!ENTITY torbutton.cookiedialog.lockCol "보호됨"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -27,35 +27,35 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "새로운 쿠키를 보호하지 않음"> <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "웹을 탐색 할 때 다양한 브라우저 기능이 사용자를 추적하는 것을 막기 위해이 상자를 선택하십시오. 수정 된 기능에는 blob URL, 브로드 캐스트 채널, 브라우저 캐시, 쿠키, 파비콘, HTTP Auth 헤더, 링크 사전 연결, localStorage, mediaSource URL, OCSP 요청, SharedWorkers 및 TLS 세션 티켓이 포함됩니다."> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "이 상자를 체크 해둠으로써 웹사이트가 당신의 식별 할 수 있는 요소를 숨길 수 있습니다. 그것에는 컴퓨터 성능, 키보드 레이아웃, 로케일, 플러그인이 설치된 장소, 설치된 플러그인의 목록, 네트워크 상태, 화면 방향, 화면 크기, 사이트 별 확대 / 축소 수준, 지원되는 파일 형식, 시스템 색, WebGL 기능 등이 있습니다."> <!ENTITY torbutton.prefs.sec_caption "보안 등급"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> +<!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> <!ENTITY torbutton.prefs.sec_low "낮음 (기본)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "이것은 가장 유용한 사용자 경험을 제공합니다."> +<!ENTITY torbutton.prefs.sec_low_desc "이 보안 수준에서는 모든 브라우저 기능을 사용할 수 있습니다."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG 폰트 렌터링 체계가 비활성화되었습니다."> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> +<!ENTITY torbutton.prefs.sec_gen_desc "이 보안 수준에서는 다음과 같은 변경 사항이 적용됩니다 (자세한 내용은 마우스 커서 올리기)."> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 비디오 및 오디오 미디어는 NoScript를 통해 클릭 후 재생으로 변경됩니다."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "일부 사이트에서는 이러한 미디어 개체를 사용하도록 NoScript 도구 모음 단추를 사용해야 할 수 있습니다."> <!ENTITY torbutton.prefs.sec_some_jit_desc "일부 JavaScript 의 성능 최적화가 비활성화되었습니다."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline (베이스라인) JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "일부 사이트의 스크립트 동작이 느려질 수 있습니다."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_mathml_desc "수학 방정식을 표시하는 일부 메커니즘은 사용할 수 없습니다."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML가 비활성화 되었습니다."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_medium "중간"> +<!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript가 활성화 된 사이트에서는 성능 최적화가 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_font_rend_desc "일부 폰트의 렌터링이 비활성화되었습니다."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite 글꼴 렌더링 메커니즘이 비활성화 되어 있습니다."> <!ENTITY torbutton.prefs.sec_svg_desc "몇몇 종류의 이미지가 비활성화 되었습니다."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images가 비활성화 되었습니다."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript는 HTTPS가 적용되지 않은 사이트에선 기본적으로 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript는 NoScript 도구 모음 단추를 통해 사이트 별로 활성화 할 수 있습니다."> <!ENTITY torbutton.prefs.sec_high "높음"> <!ENTITY torbutton.prefs.sec_all_js_desc "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> <!ENTITY torbutton.prefs.sec_webfonts_desc "어떤 글씨체나 아이콘은 올바르지 않게 표시될 수 있습니다."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "사이트 내장 폰트가 차단되었습니다."> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "이 사이트 에서 의 Tor 회로"> diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index dad4faf..1f1054a 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -1,11 +1,11 @@ torbutton.circuit_display.internet = 인터넷 torbutton.circuit_display.ip_unknown = 미확인 IP torbutton.circuit_display.onion_site = Onion 사이트 -torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.this_browser = 이 브라우저 torbutton.circuit_display.relay = 중계 torbutton.circuit_display.tor_bridge = 브릿지 torbutton.circuit_display.unknown_country = 미확인 국가 -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor 브라우저는 이 여백을 추가하여 창의 너비와 높이를 일반화 시켜 온라인에서 사용자를 추적하는 기능을 약화 시킵니다. torbutton.panel.tooltip.disabled = Tor를 활성화하려면 클릭 torbutton.panel.tooltip.enabled = Tor를 비활성화하려면 클릭 torbutton.panel.label.disabled = Tor 비활성화 @@ -26,15 +26,15 @@ torbutton.popup.short_torbrowser = 중요한 Torbutton 정보! Torbutton은 이 torbutton.popup.confirm_plugins = 플래시와 같은 플러그인들은 당신의 프라이버시와 익명성을 해칠 수 있습니다.\n\n또한 Tor을 우회하여 당신의 현재 위치와 IP주소를 노출시킬 수도 있습니다.\n\n정말로 플러그인을 허용하시겠습니까?\n\n torbutton.popup.never_ask_again = 다시는 물어보지 않기 -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor 브라우저의 모든 창과 탭을 닫습니다. 모든 웹 사이트의 세션이 손실됩니다.\n\n신원을 재설정 하기 위해 지금 Tor 브라우저를 다시 시작할까요?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = 녹색 onion 메뉴에는 이제 보안 수준을 조정할 수 있는 보안 슬라이더가 있습니다. 확인해보세요! torbutton.slider_notification_button = 보안 설정 열기 -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Tor 브라우저를 최대화하면 웹 사이트에서 모니터 크기를 결정하여 사용자를 추적 할 수 있습니다. Tor 브라우저 창은 원래 기본 크기로 두는 것이 좋습니다. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? +canvas.siteprompt=이 웹 사이트 (%S)는 컴퓨터를 고유하게 식별하는 데 사용될 수 있는 HTML5 캔버스 이미지 데이터를 추출하려고 시도했습니다.\n\nTor 브라우저가 이 웹 사이트에서 HTML5 캔버스 이미지 데이터를 추출하는것을 허가 할까요? canvas.notNow=지금은 하지 않겠습니다 canvas.notNowAccessKey=N canvas.allow=다음에 허용함 @@ -46,6 +46,6 @@ canvas.neverAccessKey=e # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=%S 프로필 문제 profileReadOnly=%S 에서 읽기전용 파일시스템으로 실행하실 수 없습니다. 사용하시기 전에 %S를 복사하여 다른 곳에서 테스트 해 보십시오. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileReadOnlyMac=읽기 전용 파일 시스템에서는 %S를 실행할 수 없습니다. %S를 사용하기 전에 %S를 바탕 화면이나 응용 프로그램 폴더로 복사하십시오. +profileAccessDenied=%S에 프로필 액세스 권한이 없습니다. 파일 시스템 권한을 조정하고 다시 시도하십시오. +profileMigrationFailed=기존 %S 프로필을 이전하지 못했습니다. 새로운 설정이 사용됩니다. diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index f70158f..5fcfcf7 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP Auth headers, koppeling-voorverbindingen, lokale opslag, mediabron-URL's, OCSP-verzoeken, Gedeelde-werkers en TLS-sessietickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Vink dit vakje aan om websites geen inzicht te geven in dingen die uniek aan je zijn, zoals je batterijstatus, computersnelheid, toetsenbordindeling, taal, geïnstalleerde plug-ins en hun locatie, netwerkstatus, schermoriëntatie, schermgrootte, zoomniveaus per site, ondersteunde bestandstypes, systeemkleuren en WebGL-mogelijkheden."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's."> <!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index 0579185..853f5cf 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Zmień szczegóły odróżniające Cię od innych użytkowników Przeglądarki Tora"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Poziom bezpieczeństwa"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_low "Niski (domyślny)"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 88e194a..c30395b 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -6,7 +6,7 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Verificar atualizações do Navegador Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Aplicar Atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções contra Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Deixe esta opção sempre marcada para impedir que funcionalidades de navegação sejam usadas para rastreá-la(o) durante a sua navegação. Funcionalidades alteradas incluem janelas pop-up, canais de transmissão, o cache de memória, cookies, favicons, "> <!ENTITY torbutton.prefs.resist_fingerprinting "Alterar os detalhes que distinguem você de outros usuários do Navegador Tor"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Deixe esta opção marcada para ocultar suas informações individuais, como o status da bateria, a performance do computados, o formato de teclado, a localização e os plugins instalados, a lista de plugins instalados, o status da sua rede, a posição de tela, o tamanho de tela, níveis de zoom de alguns sites, tipos de arquivos compatíveis, cores de sistema, e capacidade de WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Manter esta opção ativa para ocultar de websites as suas informações que podem ser individuais: performance do computador, modelo de teclado, local, a localização e a lista dos plugins instalados, o status da sua conexão, a orientação de tela, o tamanho da tela, os níveis de zoom de certos sites, os tipos de arquivos que possuem suporte, o sistema de cores, e os recursos WebGL."> <!ENTITY torbutton.prefs.sec_caption "Nível de Segurança"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_low "Baixo (padrão)"> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 39d5e9c..2c1cba6 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -2,7 +2,7 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchDDG.privacy=Поиск<a href="%1$S">Безопасность</a> с <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Ищите<a href="%1$S">безопасно</a> с <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 585cd29..32018fe 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время сёрфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы скрывать те сведения, которые могли бы быть уникальными о вас, такие как: статус вашей батареи, производительность компьютера, раскладка клавиатуры, локализация, путь к установленным плагинам, список инсталлированных плагинов, статус вашей сети, ориентация дисплея, размер экрана, масштаб для конерктного сайта, поддерживаемые типы файлов, системная палитра и возможности WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 75612ae..e1b50cb 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Behåll det här alternativet valt för att förhindra olika webbläsarfunktioner från att missbrukas för att spåra dig när du surfar på nätet. Ändrade funktioner inkluderar blog-URLer, broadcastkanaler, webbläsar-cache, kakor, favicons, HTTP-Auth-huvuden, länk-föranslutningar, localStorage, mediaSource URLer, OCSP-förfrågningar, SharedWorkers och TLS-sessionstickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Behåll det här alternativet valt för att dölja saker från webbsidor som kan vara unika för dig, inklusive din batteristatus, datorprestanda, tangentbordslayout, språk, platser insticksmoduler är installerade på, lista över installerade insticksmoduler, din nätverksstatus, skärmorientering, skärmstorlek, platsspecifika zoom-nivåer, filtypsstöd, systemfärger och WebGL-stöd."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Låt den här kryssrutan vara ikryssad för att dölja saker från webbplatser som kan vara unika för just dig, såsom datorprestanda, tangentbordslayout, språkinställningar, plats för installerade plugin, lista över installerade plugin, nätverksstatus, skärmorientering, skärmstorlek, platsspecifika zoomnivåer, filtypsstöd, systemfärger, och WebGL-stöd."> <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Säkerhetsreglaget låter dig stänga av vissa webbläsarfunktioner som kan göra din webbläsare mer sårbar mot intrångsförsök."> <!ENTITY torbutton.prefs.sec_low "Låg (förvald)"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 0d860bd..47faf53 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bu seçeneği işaretleyerek, çeşitli web tarayıcıların, web sitelerinde yaptığınız işlemleri izlemesini engelleyebilirsiniz. Değiştirilen özellikler içinde blob İnternet adresleri, yayın kanalları, web tarayıcı ön belleği, çerezler, favicon dosyaları, HTTP Auth başlık bilgileri, ön bağlantı bilgileri, localStorage, mediaSource adresleri, OCSP istekleri, SharedWorkers ve TLS oturumu bulunur."> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor Browser kullanıcılarından sizi ayıran ayrıntılar değiştirilsin"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bu seçeneği işaretleyerek, web sitelerinden pil durumu, bilgisayar performansı, tuş takımı düzeni, yerel ayarlar, yüklü uygulama eklerinin konumu, yüklü uygulama eklerinin listesi, ağ durumunuz, ekran doğrultusu, ekran boyutu, siteye özel yakınlaştırma düzeyi, desteklenen dosya tipleri, sistem renkleri ve WebGL yetenekleri gibi sizin için önemli olabilecek bilgileri gizleyebilirsiniz. "> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın performansı, klavye düzeni, yerel dil, kurulu eklentilerin konumu, kurulu eklentilerin listesi, ağınızın durumu, ekran yönlendirmesi, ekran boyutu, siteye bağlı özel yakınlaştırma seviyeleri, desteklenen dosya türleri, sistem renkleri ve WebGL yetenekleri gibi sizin için benzersiz olabilecek şeyleri gizlemek için bu kutuyu işaretli tutun."> <!ENTITY torbutton.prefs.sec_caption "Güvenlik Düzeyi"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Güvenlik ayarı ile belirli web tarayıcı özeliklerini kapatabilirsiniz. Ancak bu durumda web tarayıcınız saldırılara karşı daha korumasız olur."> <!ENTITY torbutton.prefs.sec_low "Düşük (varsayılan)"> @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_medium "Ortam"> +<!ENTITY torbutton.prefs.sec_medium "Orta"> <!ENTITY torbutton.prefs.sec_all_jit_desc "JavaScript kullanılan web sitelerinde başarım iyileştirmeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır."> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index b228a64..ed7ee39 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -14,7 +14,7 @@ extensions.torbutton(a)torproject.org.description = Torbutton, Tor ayarlarını ya torbutton.popup.external.title = Dış bir dosya türü indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n -torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrimdışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n +torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrimdışı iken açmalı ya da Tails benzeri bir Canlı Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 992e1ec..02fe8be 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bảo đảm hộp này được đánh dấu để ngăn những tính năng khác nhau của trình duyệt không bị làm dụng để theo dõi bạn khi bạn duyệt web. Những tính năng được sửa đổi bao gồm những blob URL, những đường dẫn được kết nối trước, nơi lưu trữ nội bộ, URL nguồn trung gian, những yêu cầu OCSP, SharedWorkers, và vé của phiên TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bảo đảm hộp này được đánh dấu để ẩn những thứ từ trang web mà có thể là duy nhất về bạn bao gồm tình trạng pin, hiệu suất máy tính, nền bàn phím, nơi xảy ra, địa điểm của những thứ gắn thêm được cài đặt, danh sách những thứ gắn thêm được cài đặt, tình trạng mạng lưới của bạn, hướng xoay màn hình, kích cỡ màn hình, những mức độ phóng đại riêng của trang, những loại tập tin được hỗ trợ, những màu sắc hệ thống, và những khả năng WebGL."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Luôn đánh dấu hộp này để ẩn các dấu hiệu có thể là đặc trưng duy nhất về bạn, bao gồm khả năng làm việc của máy tính của bạn, cách sắp xếp của bàn phím, nơi ở, vị trí của các trình thêm vào (plugins) được cài đặt, danh sách của các trình thêm vào được cài đặt, trạng thái mạng của bạn, định hướng màn hình, kích thước màn hình, các mức độ phóng to-thu nhỏ đối với các trang cụ thể, các dạng tệp tin được hỗ trợ, các màu hệ thống, và các năng lực WebGL."> <!ENTITY torbutton.prefs.sec_caption "Mức độ Bảo mật"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Những Người điều chỉnh an ninh để cho bạn vô hiệu một vài tính năng của trình duyệt mà có thể làm trình duyệt của bạn dễ bị tổn thương đổi với những cố gắng tấn công."> <!ENTITY torbutton.prefs.sec_low "Thấp (mặc định)"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index d61cd9c..b153d8f 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证头部，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "该选项可防止网站参看可识别用户的信息，包括电池状态，计算机性能，键盘布局，区域，插件安装位置，插件列表，网络状态，屏幕方向和大小，特定网站缩放比例，支持文件类型，系统颜色，以及 WebGL 功能。 "> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "选中此框以避免网站获取识别您的指纹，包括您的计算机性能、键盘布局、语言区域、已安装插件位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 能力。"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_caption_tooltip "安全滑块可禁用某些浏览器功能，避免因这些功能导致的漏洞而受到攻击。"> <!ENTITY torbutton.prefs.sec_low "低（默认）">

1 0

[tor-browser-build/master] Revert "Bug 22362: NoScript's XSS filter freezes the browser"
by boklm＠torproject.org 02 Aug '17

02 Aug '17

commit 11244c5913e47ca12234ea3542d7e028171962bd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 31 13:25:10 2017 +0000 Revert "Bug 22362: NoScript's XSS filter freezes the browser" This reverts commit cec0a1d787b90f1b27c92ba83bd8f12b5a3b0fb1 That's properly fixed in NoScript >= 5.0.7.1, thus removing our workaround. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- 3 files changed, 12 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 164835a..d6e5546 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 164835a..d6e5546 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 164835a..d6e5546 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false);

1 0

[tor-browser-build/master] Bug 23075: add an option to select the number of cores used
by boklm＠torproject.org 02 Aug '17

02 Aug '17

commit 60ba86636df928e97e265417b2c19bea4e85ea3a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 2 18:23:10 2017 +0200 Bug 23075: add an option to select the number of cores used --- README | 12 ++++++++++++ projects/binutils/build | 2 +- projects/cmake/build | 2 +- projects/elfutils/build | 2 +- projects/firefox/build | 2 +- projects/gcc/build | 2 +- projects/gmp/build | 2 +- projects/libdmg-hfsplus/build | 2 +- projects/libevent/build | 2 +- projects/llvm/build | 2 +- projects/mingw-w64/build | 8 ++++---- projects/tor/build | 2 +- projects/yasm/build | 2 +- rbm.conf | 8 +++++++- rbm.local.conf.example | 8 ++++++++ 15 files changed, 42 insertions(+), 16 deletions(-) diff --git a/README b/README index 22fb90b..e5fc45d 100644 --- a/README +++ b/README @@ -91,6 +91,18 @@ components included in Tor Browser. You should run this if you want to make a nightly build with the latest commits. +Number of make processes +------------------------ + +By default the builds are run with 4 processes simultaneously (with +make -j4). If you want to change the number of processes used, you can +set the RBM_NB_PROCS environment variable: + + $ export RBM_NB_PROCS=8 + +You can also set the buildconf/nb_procs option in rbm.local.conf. + + Automated builds ---------------- diff --git a/projects/binutils/build b/projects/binutils/build index b72c41c..cdfd045 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -32,7 +32,7 @@ cd [% project %]-[% c("version") %] patch -p1 < $rootdir/binutils-224-gold.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] -make -j4 +make -j[% c("buildconf/nb_procs") %] make install [% IF c("var/linux") %] diff --git a/projects/cmake/build b/projects/cmake/build index dd5017a..4a58896 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -5,7 +5,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/elfutils/build b/projects/elfutils/build index 8fdd013..57adf83 100644 --- a/projects/elfutils/build +++ b/projects/elfutils/build @@ -13,7 +13,7 @@ tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/elfutils') %] cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix="$distdir" -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist diff --git a/projects/firefox/build b/projects/firefox/build index c35d629..439369e 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -90,7 +90,7 @@ rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" -make -j8 -f client.mk build +make -j[% c("buildconf/nb_procs") %] -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] diff --git a/projects/gcc/build b/projects/gcc/build index e2902ad..c7e3ea8 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -17,7 +17,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/gmp/build b/projects/gmp/build index 34173d6..b9ea3bc 100644 --- a/projects/gmp/build +++ b/projects/gmp/build @@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # during compile time. ./configure --disable-static --enable-shared --enable-cxx \ [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 47a5e43..66e4232 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -7,7 +7,7 @@ cd [% project %]-[% c('version') %] patch -p1 < ../libdmg.patch cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt cd dmg -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd $distdir [% c('tar', { diff --git a/projects/libevent/build b/projects/libevent/build index 0e4e074..d44371d 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/llvm/build b/projects/llvm/build index 5241944..fc72e38 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -21,7 +21,7 @@ export LLVM_HOME=$(pwd) mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 42ee716..246ade1 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -31,25 +31,25 @@ sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-min # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ -make -j4 all-gcc +make -j[% c("buildconf/nb_procs") %] all-gcc make install-gcc mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \ --host=i686-w64-mingw32 --prefix=$distdir/i686-w64-mingw32 -make -j4 +make -j[% c("buildconf/nb_procs") %] make install mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \ --prefix=$distdir --target=i686-w64-mingw32 -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/build/gcc -make -j4 +make -j[% c("buildconf/nb_procs") %] make install mkdir -p $distdir/gcclibs cp i686-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs diff --git a/projects/tor/build b/projects/tor/build index 85e158f..577c194 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -64,7 +64,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j4 +make -j[% c("buildconf/nb_procs") %] make install [% IF c("var/osx") -%] unset LD_PRELOAD diff --git a/projects/yasm/build b/projects/yasm/build index 82d037a..b736761 100644 --- a/projects/yasm/build +++ b/projects/yasm/build @@ -5,7 +5,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] cd /var/tmp/build/yasm-[% c("version") %] ./configure --prefix="$distdir" -make -j4 +make -j[% c("buildconf/nb_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/rbm.conf b/rbm.conf index 31e6a51..ae8c5b2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,6 +6,12 @@ build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %] pkg_type: build +# buildconf contains build options that the user can change in rbm.local.conf +# When adding a new option to buildconf, a default value should be defined +# in var/build_id, so that changing this option does not affect the build_id. +buildconf: + nb_procs: '[% GET ENV.RBM_NB_PROCS ? ENV.RBM_NB_PROCS : "4" %]' + var: torbrowser_version: '7.5a3' project_name: tor-browser @@ -16,7 +22,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { buildconf => { nb_procs => 4 } })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 203ce5f..5e322cf 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -21,6 +21,14 @@ ### stdout and stderr. #build_log: '-' +buildconf: + buildconf: 1 + + ### The buildconf/nb_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NB_PROCS environment variable. The default is 4. + #nb_procs: 8 + var: local_conf: 1

1 0

[tor-browser-build/master] Update rbm
by boklm＠torproject.org 01 Aug '17

01 Aug '17

commit 7a31404747c4bda63dc9640513ed2a35e5601ba2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 1 22:52:16 2017 +0200 Update rbm Update rbm, fixing a 'git checkout --detach' error due to the lack of master branch on tor-browser.git. --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 106e9b0..ff4299f 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 106e9b05aeff6309e241a3c9bae1781e0d551e7a +Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f

1 0

[rbm/master] Only run 'git checkout --detach' when necessary
by boklm＠torproject.org 01 Aug '17

01 Aug '17

commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 1 22:40:16 2017 +0200 Only run 'git checkout --detach' when necessary Before updating local branches, we need to detach HEAD to be able to update the current branch. However, we only need to do that if we are on a branch, and when this branch exists. This avoids an error when the repository we have cloned does not have a master branch: in that case we are in a branch that does not exist, which cause an error when running 'git checkout --detach'. --- lib/RBM.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 6825050..888c3e1 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -390,8 +390,12 @@ sub git_clone_fetch_chdir { if (git_need_fetch($project, $options)) { system('git', 'remote', 'set-url', 'origin', $git_url) == 0 || exit_error "Error setting git remote"; - system('git', 'checkout', '-q', '--detach') == 0 + my ($ref, undef, $success) = capture_exec('git', 'symbolic-ref', 'HEAD'); + chomp $ref; + if ($success && -e ".git/$ref") { + system('git', 'checkout', '-q', '--detach') == 0 || exit_error "Error running git checkout --detach"; + } system('git', 'fetch', @fetch_submod, 'origin', '+refs/heads/*:refs/heads/*') == 0 || exit_error "Error fetching git repository";

1 0

[tor-browser-build/master] Fix some permissions problem in runc/remote_get
by boklm＠torproject.org 01 Aug '17

01 Aug '17

commit 86210c6821e393e98dd58c7d7bb6223755b496d5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 1 12:02:03 2017 +0200 Fix some permissions problem in runc/remote_get --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 4ef6b90..31e6a51 100644 --- a/rbm.conf +++ b/rbm.conf @@ -297,10 +297,10 @@ runc: -%] mkdir -p [% dst %] srcdir='[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/[% src %] + sudo chown -R $(whoami) "$srcdir" if [ $(ls -1 "$srcdir"/* 2> /dev/null | wc -l) -gt 0 ] then - sudo chown $(whoami) "$srcdir"/* - sudo mv -f "$srcdir"/* [% dst %]/ + mv -f "$srcdir"/* [% dst %]/ fi remote_finish: |

1 0

[torbutton/master] fixup! Bug 22542: Security Settings window too small on macOS 10.12
by gk＠torproject.org 01 Aug '17

01 Aug '17

commit 8fbc96cab7ed9816da68d070b7cb01548a19a25a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 12 13:52:28 2017 -0400 fixup! Bug 22542: Security Settings window too small on macOS 10.12 Automatically adjust the height of the Security Settings window so that no scrollbar is needed. Also, add 100 pixels to the width and increase maxheight and maxwidth to give users more flexibility when they choose to manually resize the window. --- src/chrome/content/preferences.js | 46 ++++++++++++++++++++++++++++++++++---- src/chrome/content/preferences.xul | 10 ++++----- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1e47cad..a76dddb 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -42,10 +42,7 @@ function torbutton_init_security_ui() { getIntPref("extensions.torbutton.security_slider"))); torbutton_set_custom(getBoolPref("extensions.torbutton.security_custom")); - // Show a scrollbar for the description text if one is needed. - // To avoid bug 21330, we set the overflow=auto style here instead - // of directly in the XUL. - document.getElementById("descBox").style.overflow = "auto"; + setTimeout(adjustDialogSize, 0); }; // Write the two prefs from the current settings. @@ -54,3 +51,44 @@ function torbutton_save_security_settings() { sliderPositionToPrefSetting(state.slider)); setBoolPref("extensions.torbutton.security_custom", state.custom); }; + +// Increase the height of this window so that a vertical scrollbar is not +// needed on the description box. +function adjustDialogSize() { + try { + // Find the height required by the tallest description element. + let descHeight = 0; + let descs = descNames.map(name => document.getElementById(name)); + descs.forEach(elem => { + let origCollapsed = elem.collapsed; + elem.collapsed = false; + let h = elem.scrollHeight; + elem.collapsed = origCollapsed; + if (h > descHeight) + descHeight = h; + }); + + // Cap the height (just in case). + const kMaxDescriptionHeight = 550; + if (descHeight > kMaxDescriptionHeight) + descHeight = kMaxDescriptionHeight; + + // Increase the height of the description container if it is too short. + let boxElem = document.getElementById("descBox"); + if (boxElem.clientHeight < descHeight) { + boxElem.setAttribute("height", descHeight); + + // Resize the XUL window to account for the new description height. In + // order for sizeToContent() to work correctly, it seems that we must + // remove the height attribute from the dialog (that attribute is added + // after a user manually resizes the window). + document.documentElement.removeAttribute("height"); + sizeToContent(); + } + } catch (e) {} + + // Show a scrollbar for the description text if one is needed. + // To avoid bug 21330, we set the overflow=auto style here instead + // of directly in the XUL. + document.getElementById("descBox").style.overflow = "auto"; +} diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 9bd8ae3..9ebc5d6 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -13,11 +13,11 @@ onload="torbutton_init_security_ui()" align="stretch" pack="center" - maxheight="350" + maxheight="600" minwidth="400" - maxwidth="600" + maxwidth="800" ondialogaccept="torbutton_save_security_settings()" - width="400" > + width="500" > <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> @@ -26,7 +26,7 @@ <caption label="&torbutton.prefs.sec_caption;"/> <hbox id="torbutton_slider_settings" flex="1" align="stretch" hidden="false"> <vbox> - <hbox height="220"> + <hbox flex="1" minheight="220"> <vbox> <scale id="torbutton_sec_slider" flex="1" min="1" max="3" movetoclick="true" orient="vertical" @@ -57,7 +57,7 @@ </vbox> </hbox> </vbox> - <vbox id="descBox" flex="1" width="400" style="overflow: hidden;"> + <vbox id="descBox" flex="1" style="overflow: hidden;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[tor-browser-build/master] README: Update Ubuntu required version to 16.04
by boklm＠torproject.org 01 Aug '17

01 Aug '17

commit b80b64eb626bf049eb1c2fdc886deef4772aea45 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 1 10:40:59 2017 +0200 README: Update Ubuntu required version to 16.04 There is no runc package available on Ubuntu 14.04. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 2fcfadf..22fb90b 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runc (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +for runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). On Debian jessie, the runc package is available in backports. On Debian stretch, the runc package is available in the main repository. Version 0.1.1 of runc is required (which is the version available in

1 0

[tor-browser-build/master] Bug 20848: Deploy Selfrando in 32bit Linux builds
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 8db320a7a7f2f03ce516b33668ff4509e861fe8e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jul 31 18:07:53 2017 +0200 Bug 20848: Deploy Selfrando in 32bit Linux builds tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> --- projects/binutils/build | 3 +-- projects/binutils/config | 2 +- projects/firefox/build | 3 +-- projects/firefox/config | 3 +-- projects/selfrando/build | 4 ++-- projects/selfrando/config | 10 +++++++++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index baef68f..b72c41c 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -26,10 +26,9 @@ cd [% project %]-[% c("version") %] # Zeroing timestamps in PE headers reliably, see bug 12753. patch -p1 < ../peXXigen.patch [% END -%] -[% IF c("var/linux-x86_64") -%] +[% IF c("var/linux") -%] # We need to work around a gold linker bug in 2.24 to get selfrando working, # see bug 20683. - # XXX: 64bits only for now :(, see #20683. patch -p1 < $rootdir/binutils-224-gold.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] diff --git a/projects/binutils/config b/projects/binutils/config index 88640f8..f272c76 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -22,4 +22,4 @@ input_files: - filename: peXXigen.patch enable: '[% c("var/windows") %]' - filename: binutils-224-gold.patch - enable: '[% c("var/linux-x86_64") %]' + enable: '[% c("var/linux") %]' diff --git a/projects/firefox/build b/projects/firefox/build index fd9fee5..c35d629 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -27,8 +27,7 @@ mkdir -p /var/tmp/build export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% IF c("var/linux-x86_64") -%] - # XXX: 64bits only for now :(, see #20683. +[% IF c("var/linux") -%] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] # Selfrando wrapper export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" diff --git a/projects/firefox/config b/projects/firefox/config index 5db64ff..50d7a4e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -73,8 +73,7 @@ input_files: enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - # XXX: 64bits only for now :(, see #20683. - enable: '[% c("var/linux-x86_64") %]' + enable: '[% c("var/linux") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~mikeperry/mirrors/sources/msvcr100.dll diff --git a/projects/selfrando/build b/projects/selfrando/build index 8bbd63e..18437b5 100644 --- a/projects/selfrando/build +++ b/projects/selfrando/build @@ -14,9 +14,9 @@ tar -C /var/tmp/dist -xf $rootdir/[% project %]-[% c("version") %].tar.gz cd /var/tmp/dist mv [% project %]-[% c("version") %] [% project %] cd [% project %] -scons -Q arch=x86_64 LIBELF_PATH="/var/tmp/dist/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console +scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console # Fix the path where we install selfrando -sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/x86_64/bin|' Tools/TorBrowser/tc-wrapper/ld +sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/[% c("var/selfrando_arch") %]/bin|' Tools/TorBrowser/tc-wrapper/ld cd /var/tmp/dist [% c('tar', { diff --git a/projects/selfrando/config b/projects/selfrando/config index 8b73080..33e7272 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.2 +version: 0.3.2 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg @@ -13,6 +13,14 @@ var: - scons - zlib1g-dev +targets: + linux-x86_64: + var: + selfrando_arch: x86_64 + linux-i686: + var: + selfrando_arch: x86 + input_files: - project: container-image - name: binutils

1 0

[tor-browser-bundle/master] Bug 20848: Deploy Selfrando in 32bit Linux builds
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 93661cb779aada9774ea3076f983dbb8d342f1a5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 21 08:14:04 2017 +0000 Bug 20848: Deploy Selfrando in 32bit Linux builds --- gitian/descriptors/linux/gitian-firefox.yml | 22 +++++---------- gitian/descriptors/linux/gitian-utils.yml | 44 +++++++++++------------------ gitian/mkbundle-linux.sh | 5 +++- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 30 insertions(+), 45 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 9edcb3a..5710c91 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -34,12 +34,12 @@ files: - "binutils-linux64-utils.zip" - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" +- "selfrando-linux32-utils.zip" +- "selfrando-linux64-utils.zip" - "get-moz-build-date" - "re-dzip.sh" - "dzip.sh" - "versions" -# XXX: 64bits only for now :(, see #20683. -- "selfrando-linux64-utils.zip" script: | source versions INSTDIR="$HOME/install" @@ -57,11 +57,7 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - unzip -d $INSTDIR selfrando-linux64-utils.zip - fi + unzip -d $INSTDIR selfrando-linux$GBUILD_BITS-utils.zip # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip @@ -86,14 +82,10 @@ script: | find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - # Selfrando wrapper - export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" - # We need to avoid the shuffling while building as this breaks compilation - export SELFRANDO_skip_shuffle= - fi + # Selfrando wrapper + export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --with-distribution-id=org.torproject --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 2680f1b..87f2a03 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -59,9 +59,11 @@ script: | export DEB_BUILD_HARDENING_PIE=1 ARCH="" + SR_ARCH="x86" if [ $GBUILD_BITS == "64" ]; then ARCH="64" + SR_ARCH="x86_64" fi # Building Binutils @@ -77,11 +79,7 @@ script: | cd binutils* # We need to work around a gold linker bug in 2.24 to get selfrando working, # see bug 20683. - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - patch -p1 < ../binutils-224-gold.patch - fi + patch -p1 < ../binutils-224-gold.patch # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from # that it fixes #12103 and issues with ESR 31 and our Gitian setup as well @@ -129,24 +127,20 @@ script: | export PATH="$INSTDIR/binutils/bin:$INSTDIR/gcc/bin:$PATH" export LD_LIBRARY_PATH="$INSTDIR/gcc/lib$ARCH" - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - # Building Elfutils - tar xjf elfutils.tar.bz2 - cd elfutils*/ - ./configure --prefix=$INSTDIR/elfutils - make $MAKEOPTS - make install - cd .. + # Building Elfutils + tar xjf elfutils.tar.bz2 + cd elfutils*/ + ./configure --prefix=$INSTDIR/elfutils + make $MAKEOPTS + make install + cd .. - # Building Selfrando - cd selfrando - scons -Q arch=x86_64 LIBELF_PATH="$INSTDIR/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console - mkdir -p $INSTDIR/selfrando - cp out/x86_64/bin/* $INSTDIR/selfrando/ - cd .. - fi + # Building Selfrando + cd selfrando + scons -Q arch=$SR_ARCH LIBELF_PATH="$INSTDIR/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console + mkdir -p $INSTDIR/selfrando + cp out/$SR_ARCH/bin/* $INSTDIR/selfrando/ + cd .. # Building Libevent cd libevent @@ -221,9 +215,5 @@ script: | ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp ~/build/dzip.sh go-$GO_VER-linux$GBUILD_BITS-utils.zip go - # XXX: 64bits only for now :(, see #20683. - if [ $GBUILD_BITS == "64" ]; - then - ~/build/dzip.sh selfrando-$SELFRANDO_TAG-linux$GBUILD_BITS-utils.zip selfrando - fi + ~/build/dzip.sh selfrando-$SELFRANDO_TAG-linux$GBUILD_BITS-utils.zip selfrando cp *utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 0a1613f..d348ca5 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -96,10 +96,10 @@ then PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG + SELFRANDO_TAG=refs/tags/$SELFRANDO_TAG fi cd $GITIAN_DIR -# XXX: 64bits selfrando only for now :(, see #20683. if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux32-utils.zip -o \ @@ -112,6 +112,7 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ ! -f inputs/go-$GO_VER-linux32-utils.zip -o \ ! -f inputs/go-$GO_VER-linux64-utils.zip -o \ + ! -f inputs/selfrando-$SELFRANDO_TAG-linux32-utils.zip -o \ ! -f inputs/selfrando-$SELFRANDO_TAG-linux64-utils.zip ]; then echo @@ -139,6 +140,7 @@ then ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG-linux32-utils.zip selfrando-linux32-utils.zip ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ @@ -161,6 +163,7 @@ else ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG-linux32-utils.zip selfrando-linux32-utils.zip ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip cd .. fi diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 17d3849..c35c51b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -47,7 +47,7 @@ WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesou GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a -SELFRANDO_TAG=tb-v0.2 +SELFRANDO_TAG=tb-v0.3.2 GITIAN_TAG=tor-browser-builder-4-4 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1f392c3..a2062bd 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -50,7 +50,7 @@ WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesou GO_WEBRTC_TAG=master SNOWFLAKE_TAG=master UNIURI_TAG=master -SELFRANDO_TAG=tb-v0.2 +SELFRANDO_TAG=tb-v0.3.2 GITIAN_TAG=tor-browser-builder-4

1 0

[tor-browser-bundle/maint-7.0] Revert "Bug 22362: NoScript's XSS filter freezes the browser"
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit b9e83cebe097c3c3ef7454ce26310ae672de2490 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 31 13:25:10 2017 +0000 Revert "Bug 22362: NoScript's XSS filter freezes the browser" This reverts commit e8178d1373d6ce2599ef58eca4d52d1b6817263f. That's properly fixed in NoScript >= 5.0.7.1, thus removing our workaround. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- 3 files changed, 12 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..6ef2c45 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..6ef2c45 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index a34fb36..6ef2c45 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false);

1 0

[tor-browser-bundle/master] Revert "Bug 22362: NoScript's XSS filter freezes the browser"
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 47035611306843657a5847d31fd4b5600742127a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 31 13:25:10 2017 +0000 Revert "Bug 22362: NoScript's XSS filter freezes the browser" This reverts commit e8178d1373d6ce2599ef58eca4d52d1b6817263f. That's properly fixed in NoScript >= 5.0.7.1, thus removing our workaround. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- .../Data/Browser/profile.default/preferences/extension-overrides.js | 4 ---- 3 files changed, 12 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 164835a..d6e5546 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 164835a..d6e5546 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 164835a..d6e5546 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -55,7 +55,3 @@ pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); pref("noscript.clearClick", 0); -// Workaround for bug 22362: Disable XSS filter for now as it freezes the -// browser in some circumstances. -pref("noscript.filterXGet", false); -pref("noscript.filterXPost", false);

1 0

[tor-browser-build/master] Bug 22563: Update mingw-w64 to fix W^X violations
by boklm＠torproject.org 31 Jul '17

31 Jul '17

commit 373cf261bd190d69669d1545b2b99c5a09c66d15 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jul 11 18:44:48 2017 -0700 Bug 22563: Update mingw-w64 to fix W^X violations --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 61a34bd..ac1caa9 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a +git_hash: 1259532ff8f5a7ac625b2f28d499ee93a0c0841e version: '[% c("abbrev") %]' var: container:

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Revert "Getting Tor Browser to build with accessibility enabled on Windows"
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 2e5a0f5570f5b2ba0bf9d84cd74b6553407a0435 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Jul 12 11:47:39 2017 -0700 Revert "Getting Tor Browser to build with accessibility enabled on Windows" This reverts commit d890171dbb89ebb79df1522f6b37bda538ef7e32, because we have updated mingw-w64 to 1259532ff8f5a7ac625b2f28d499ee93a0c0841e --- ipc/mscom/Interceptor.h | 2 +- other-licenses/ia2/IA2TypeLibrary.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index 88acdf6650a8..ecddbddf5769 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(InterfaceT); + REFIID iidTarget = __uuidof(aTargetInterface); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget, diff --git a/other-licenses/ia2/IA2TypeLibrary.idl b/other-licenses/ia2/IA2TypeLibrary.idl index 97aa08b9a5f8..2519aca91e13 100644 --- a/other-licenses/ia2/IA2TypeLibrary.idl +++ b/other-licenses/ia2/IA2TypeLibrary.idl @@ -68,7 +68,7 @@ cpp_quote("") library IAccessible2Lib { importlib ("stdole2.tlb"); - //importlib ("oleacc.dll"); + importlib ("oleacc.dll"); interface IAccessible2; interface IAccessible2_2; interface IAccessible2_3;

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Don't break accessibility support for Windows
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit 84d370aab03e45fbafef90b0fd99153e45a1b64a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 31 11:07:12 2017 +0000 Don't break accessibility support for Windows This fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1372959 --- ipc/mscom/Interceptor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipc/mscom/Interceptor.h b/ipc/mscom/Interceptor.h index ecddbddf5769..88acdf6650a8 100644 --- a/ipc/mscom/Interceptor.h +++ b/ipc/mscom/Interceptor.h @@ -112,7 +112,7 @@ CreateInterceptor(STAUniquePtr<InterfaceT> aTargetInterface, return E_INVALIDARG; } - REFIID iidTarget = __uuidof(aTargetInterface); + REFIID iidTarget = __uuidof(InterfaceT); STAUniquePtr<IUnknown> targetUnknown(aTargetInterface.release()); return Interceptor::Create(Move(targetUnknown), aEventSink, iidTarget,

1 0

[tor-browser-bundle/master] Bug 22563: Update mingw-w64 to fix W^X violations
by gk＠torproject.org 31 Jul '17

31 Jul '17

commit b42927a08821f1e1d46267156c369e3b45379758 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Jul 16 22:31:13 2017 -0700 Bug 22563: Update mingw-w64 to fix W^X violations --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a29572a..17d3849 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a +MINGW_TAG=1259532ff8f5a7ac625b2f28d499ee93a0c0841e PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e050347..1f392c3 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -26,7 +26,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=98e5b4930a717eafddd8ca0f0dfeb7c57c6b026a +MINGW_TAG=1259532ff8f5a7ac625b2f28d499ee93a0c0841e PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0

[tor-browser-build/master] Update noscript
by boklm＠torproject.org 28 Jul '17

28 Jul '17

commit 867ebd59598ae3a77d84c21d008b2c6debec372b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jul 28 19:04:43 2017 +0200 Update noscript This fixes bug 22067. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: 0437834017c1c7ff168da868d9dcb2f2519fd122 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 8e8398a..fef279b 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -54,9 +54,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed + sha256sum: fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-bundle/maint-7.0] Updating NoScript
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit 12565f000a09b27b7dbd9ea864c5004b6d8324a9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 16:21:20 2017 +0000 Updating NoScript This fixes bug 22067. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 108d085..873aa7f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## 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-5.0.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed +NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Updating Noscript
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit 0437834017c1c7ff168da868d9dcb2f2519fd122 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 16:19:01 2017 +0000 Updating Noscript This fixes bug 22067. --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ee7384c..a29572a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -77,7 +77,7 @@ ELFUTILS_VER=0.166 ## 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-5.0.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -113,7 +113,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed +NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5fe2881..e050347 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -80,7 +80,7 @@ ELFUTILS_VER=0.166 ## 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-5.0.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -116,7 +116,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=bf1dee39f6e5936df2b03b794c1efc9236b440536a05fafcff667e33903e6aed +NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-7.0] Apply patch for bug 23044
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit a11a8b301950e1c25adcfd5bea07c773f5082533 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 08:10:20 2017 +0000 Apply patch for bug 23044 --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ gitian/patches/gio.patch | 48 +++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 1ff66a2..49c457c 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -33,6 +33,7 @@ files: - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" - "get-moz-build-date" +- "gio.patch" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -88,6 +89,7 @@ script: | mkdir -p $INSTDIR/Debug/Browser/ cd tor-browser + patch -p1 < ../gio.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/patches/gio.patch b/gitian/patches/gio.patch new file mode 100644 index 0000000..1edae4d --- /dev/null +++ b/gitian/patches/gio.patch @@ -0,0 +1,48 @@ +From a96f898e0da42de751a5e1367a9899cc96fadb1f Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 27 Jul 2017 07:31:38 +0000 +Subject: [PATCH] Bug 23044: Don't allow GIO supported protocols by default + + +diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js +index aaeba630422d..3edaad88f59e 100644 +--- a/browser/app/profile/000-tor-browser.js ++++ b/browser/app/profile/000-tor-browser.js +@@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); + pref("network.protocol-handler.warn-external.news", true); + pref("network.protocol-handler.warn-external.nntp", true); + pref("network.protocol-handler.warn-external.snews", true); ++// Make sure we don't have any GIO supported protocols (defense in depth ++// measure) ++pref("network.gio.supported-protocols", ""); + pref("plugin.disable", true); // Disable to search plugins on first start + pref("plugins.click_to_play", true); + pref("plugin.state.flash", 1); +diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp +index a378e8700821..5f6b2a0a2a57 100644 +--- a/extensions/gio/nsGIOProtocolHandler.cpp ++++ b/extensions/gio/nsGIOProtocolHandler.cpp +@@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) + // Get user preferences to determine which protocol is supported. + // Gvfs/GIO has a set of supported protocols like obex, network, archive, + // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be +- // irrelevant to process by browser. By default accept only smb and sftp +- // protocols so far. ++ // irrelevant to process by browser. By default accept none. + nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, + getter_Copies(mSupportedProtocols)); + if (NS_SUCCEEDED(rv)) { + mSupportedProtocols.StripWhitespace(); + ToLowerCase(mSupportedProtocols); + } +- else +- mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults ++ else { ++ mSupportedProtocols.AssignLiteral(""); // use none by default ++ } + + LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); + } +-- +2.13.2 +

1 0

[tor-browser-bundle/maint-7.0] Changelog update, and config.yml changes
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit fb678ac1a95ed724f0edb8bc1f7c748d0ef8b8d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 08:06:44 2017 +0000 Changelog update, and config.yml changes --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ tools/update-responses/config.yml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c7cb8c2..d509505 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + Tor Browser 7.0.2 -- July 3 2017 * All Platforms * Update Tor to 0.3.0.9, fixing bug #22753 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 9ff92ce..1547dfd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.2 + release: 7.0.3 versions: - 7.0.2: + 7.0.3: platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-702-released + detailsURL: https://blog.torproject.org/blog/tor-browser-703-released incremental_from: - - 7.0.1 + - 7.0.2 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 23044: Don't allow GIO supported protocols by default
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit a96f898e0da42de751a5e1367a9899cc96fadb1f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 07:31:38 2017 +0000 Bug 23044: Don't allow GIO supported protocols by default --- browser/app/profile/000-tor-browser.js | 3 +++ extensions/gio/nsGIOProtocolHandler.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index aaeba630422d..3edaad88f59e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +// Make sure we don't have any GIO supported protocols (defense in depth +// measure) +pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index a378e8700821..5f6b2a0a2a57 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) // Get user preferences to determine which protocol is supported. // Gvfs/GIO has a set of supported protocols like obex, network, archive, // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be - // irrelevant to process by browser. By default accept only smb and sftp - // protocols so far. + // irrelevant to process by browser. By default accept none. nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, getter_Copies(mSupportedProtocols)); if (NS_SUCCEEDED(rv)) { mSupportedProtocols.StripWhitespace(); ToLowerCase(mSupportedProtocols); } - else - mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults + else { + mSupportedProtocols.AssignLiteral(""); // use none by default + } LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); }

1 0

[tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 23044: Don't allow GIO supported protocols by default
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit 720f9061496321aa978d2f022113c40e9aeb4847 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 07:31:38 2017 +0000 Bug 23044: Don't allow GIO supported protocols by default --- browser/app/profile/000-tor-browser.js | 3 +++ extensions/gio/nsGIOProtocolHandler.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d2fb5e57378a..dc7e99701293 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +// Make sure we don't have any GIO supported protocols (defense in depth +// measure) +pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index a378e8700821..5f6b2a0a2a57 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) // Get user preferences to determine which protocol is supported. // Gvfs/GIO has a set of supported protocols like obex, network, archive, // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be - // irrelevant to process by browser. By default accept only smb and sftp - // protocols so far. + // irrelevant to process by browser. By default accept none. nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, getter_Copies(mSupportedProtocols)); if (NS_SUCCEEDED(rv)) { mSupportedProtocols.StripWhitespace(); ToLowerCase(mSupportedProtocols); } - else - mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults + else { + mSupportedProtocols.AssignLiteral(""); // use none by default + } LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); }

1 0

[tor-browser-build/master] README: mention which version of runc is needed
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit b386c5f8af06e605bdb84c5bae8bde3c8afbd485 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:10:54 2017 +0200 README: mention which version of runc is needed --- README | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README b/README index fa968ff..2fcfadf 100644 --- a/README +++ b/README @@ -5,8 +5,12 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runC (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. +for runc (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +On Debian jessie, the runc package is available in backports. On Debian +stretch, the runc package is available in the main repository. +Version 0.1.1 of runc is required (which is the version available in +Debian stretch and jessie-backports). It is not yet working with runc +version 1.0.0: https://trac.torproject.org/projects/tor/ticket/23039 Your user account should have access sudo access, which is required to be able to extract container file systems, start containers and copy

1 0

[tor-browser-build/master] Include uid in tmp containers directory
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 9084d642cfc291df76b9fd4acecdce5aeb7f71b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 12:09:07 2017 +0200 Include uid in tmp containers directory This should allow multiple users to do builds on the same machine. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ce444d4..4ef6b90 100644 --- a/rbm.conf +++ b/rbm.conf @@ -28,7 +28,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-build/master] Remove some unused options
by boklm＠torproject.org 26 Jul '17

26 Jul '17

commit 0a9f7ef3459d4e19d22bc312cdaa5961eaa650da Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 26 11:40:54 2017 +0200 Remove some unused options --- projects/debootstrap-image/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 15eec3b..ecb7f2d 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -5,9 +5,6 @@ pkg_type: build var: ubuntu_version: 17.04 - container_dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' - container_user: rbm - container: use_container: 1 # We need CAP_SYS_ADMIN for debootstrap to work

1 0

[tor-browser-bundle/maint-7.0] Bug 23028: update argparse URL
by gk＠torproject.org 25 Jul '17

25 Jul '17

1 0