- tbb-commits - lists.torproject.org

[tor-browser-build/master] Add tmp to .gitignore
by boklm＠torproject.org 08 Sep '17

08 Sep '17

commit 84881888708f4fd163b1867193fed6471d0c53a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 8 11:13:10 2017 +0200 Add tmp to .gitignore With #23403 we started using the tor-browser-build/tmp directory for the builds. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c4c3919..efd3840 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /testbuild /rbm.local.conf /logs +/tmp

1 0

[tor-browser-build/master] Bug 23425: fix build when there is no terminal
by gk＠torproject.org 08 Sep '17

08 Sep '17

commit e21581e108a44915c0bd0f2acd346b02288a52a0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 16:58:01 2017 +0200 Bug 23425: fix build when there is no terminal Set process.terminal to false when building, but keep it to true when we open a debugging shell. https://github.com/opencontainers/runtime-spec/blob/master/config.md#process To do that we update the runc config.json in runc/remote_exec rather than only once in runc/remote_start. We also redirect runc stderr to /dev/null to avoid some messages saying "stdin: is not a tty" during the build. --- projects/common/runc-config.json | 2 +- rbm.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 3da6c24..02be3b0 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -9,7 +9,7 @@ [% END -%] }, "process": { - "terminal": true, + "terminal": [% IF c("interactive") %]true[% ELSE %]false[% END %], "user": { "uid": 0, "gid": 0 diff --git a/rbm.conf b/rbm.conf index a93df7f..d574f7a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -308,9 +308,6 @@ runc: fi mkdir -p '[% c("var/container/dir") %]'/rootfs/rbm sudo tar -C '[% c("var/container/dir") %]'/rootfs -xf $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'*) - cat > '[% c("var/container/dir") %]'/config.json << EOF - [% INCLUDE 'runc-config.json' %] - EOF [% SET user = c("var/container/user") -%] [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'id ' _ user _ ' >/dev/null 2>&1 || adduser -m ' _ user _ ' || useradd -m ' _ user }) %] @@ -329,7 +326,10 @@ runc: echo 'su - [% user %] -c /rbm/cmd' >> '[% c("var/container/dir") %]'/rootfs/rbm/run chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/cmd chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/run - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] + cat > '[% c("var/container/dir") %]'/config.json << EOF + [% INCLUDE 'runc-config.json' %] + EOF + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] remote_put: | #!/bin/sh

1 0

[tor-browser-build/master] Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit b2dd98160a1c07f73f7ab66475cb02be295e4ee5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 13:01:02 2017 +0200 Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir --- README.BUILD_ERRORS | 16 ---------------- rbm.conf | 1 + rbm.local.conf.example | 6 ++++-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 6be4319..0562f93 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -28,19 +28,3 @@ nopat $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ---- - -tmp partition is full ---------------------- - -If your /tmp partition is small, you will get a 'No space left on device' -error during the build. To select an other directory with more space -available to store temporary files, you can define the TMPDIR environment -variable: - ----- -$ mkdir /home/user/tmp -$ export TMPDIR=/home/user/tmp ----- - -You can also define the tmp_dir option in the rbm.local.conf file. - diff --git a/rbm.conf b/rbm.conf index e131c36..a93df7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -2,6 +2,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" +tmp_dir: '[% c("basedir") %]/tmp' build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log' pkg_type: build diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 62d13b2..a6401a9 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -6,8 +6,10 @@ ### options you want to modify. -### The tmp_dir option defines where temporary files are stored. -### You should modify this if your /tmp partition is small. +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. #tmp_dir: /tmp ### The debug option defines whether a debugging shell should be opened

1 0

[tor-browser-build/master] README.HACKING: explain how to test an rbm patch
by boklm＠torproject.org 07 Sep '17

07 Sep '17

commit 53379a752224091a56d157f570155457936d6564 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 12:45:19 2017 +0200 README.HACKING: explain how to test an rbm patch --- README.HACKING | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.HACKING b/README.HACKING index df87410..31b8352 100644 --- a/README.HACKING +++ b/README.HACKING @@ -259,3 +259,20 @@ is closed and the container containing the failed build is removed. 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. + +Testing an rbm patch +-------------------- + +When you are working on a patch to rbm, you might want to try a Tor +Browser build using your patched version of rbm. You could patch the +rbm in the rbm/ directory, however your patch can be reverted if you +use any of the makefile rules that does a 'git submodule update'. +To avoid this you can clone the rbm git repository to a separate +directory, where you will apply your patch. To do a build using your +patched rbm, take the command from the makefile, but replace $(rbm) +with the path to your patched rbm. + +For example, if you want to try a Linux x86_64 alpha build, you can run: + $ /path_to_rbm/rbm build release --target alpha --target \ + torbrowser-linux-x86_64 +

1 0

[tor-browser-build/master] Picking up new rbm commit
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit 6690281b7eec547ee4c977ae9fc89728f63c5016 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 7 10:30:57 2017 +0000 Picking up new rbm commit --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 0f5857b..296fba7 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c +Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4

1 0

[rbm/master] Bug 23382: create tmp_dir if it does not exist
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit 296fba79fca70b922cc6eb2be8b830d8074b70e4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 6 16:54:07 2017 +0200 Bug 23382: create tmp_dir if it does not exist --- lib/RBM.pm | 21 +++++++++++++-------- lib/RBM/DefaultConfig.pm | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index df29a01..b14909f 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -259,11 +259,17 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } +sub get_tmp_dir { + my ($project, $options) = @_; + my $tmp_dir = project_config($project, 'tmp_dir', $options); + make_path($tmp_dir); + return $tmp_dir; +} + sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); - my (undef, $tmp) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir')); + my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); write_file($tmp, $w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 @@ -314,7 +320,7 @@ sub git_tag_sign_id { sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir', $options)); + get_tmp_dir($project, $options)); write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = @@ -445,8 +451,7 @@ sub run_script { $f //= \&capture_exec; my @res; if ($cmd =~ m/^#/) { - my (undef, $tmp) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir')); + my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); write_file($tmp, $cmd); chmod 0700, $tmp; @res = $f->($tmp); @@ -540,7 +545,7 @@ sub maketar { || exit_error 'Error running git archive.'; if (project_config($project, 'git_submodule', $options)) { my $tmpdir = File::Temp->newdir( - project_config($project, 'tmp_dir', $options) . '/rbm-XXXXX'); + get_tmp_dir($project, $options) . '/rbm-XXXXX'); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $commit_hash); exit_error "Cannot checkout $commit_hash: $stderr" unless $success; @@ -952,7 +957,7 @@ sub build_run { my $old_cwd = getcwd; my $srcdir = project_config($project, 'build_srcdir', $options); my $use_srcdir = $srcdir; - my $tmpdir = File::Temp->newdir(project_config($project, 'tmp_dir', $options) + my $tmpdir = File::Temp->newdir(get_tmp_dir($project, $options) . '/rbm-XXXXX'); my @cfiles; if ($use_srcdir) { @@ -1119,7 +1124,7 @@ sub publish { project_config($project, 'publish', { error_if_undef => 1 }); my $publish_src_dir = project_config($project, 'publish_src_dir'); if (!$publish_src_dir) { - $publish_src_dir = File::Temp->newdir(project_config($project, 'tmp_dir') + $publish_src_dir = File::Temp->newdir(get_tmp_dir($project) . '/rbm-XXXXXX'); build_pkg($project, {output_dir => $publish_src_dir}); } diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index b1f97cb..d0d893a 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -106,7 +106,7 @@ 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) + my $tmp_dir = RBM::get_tmp_dir($project, $options) || RBM::exit_error('No tmp_dir specified'); $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', DIR => $tmp_dir);

1 0

[tor-browser-build/master] Bug 23417: set nightly version number to 'tbb-nightly'
by gk＠torproject.org 06 Sep '17

06 Sep '17

commit 7c7ad916fabe6c23aba116f9e05e4b4cfa28e6f1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 6 15:05:22 2017 +0200 Bug 23417: set nightly version number to 'tbb-nightly' --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index 10a60f8..e131c36 100644 --- a/rbm.conf +++ b/rbm.conf @@ -112,6 +112,7 @@ targets: nightly: var: nightly: 1 + torbrowser_version: tbb-nightly torbrowser-testbuild: - testbuild

1 0

[tor-browser-build/master] NoScript version bump
by gk＠torproject.org 06 Sep '17

06 Sep '17

commit c4c68bf3c10b4492d37132ed0ac9099ca6b3f5d3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 6 07:34:04 2017 +0000 NoScript version bump --- 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 ac6fbb6..dab0ee0 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: ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 + sha256sum: 610dc5ffcc7133f2ccc2f1a14280e326d371a8a2fc76497becf2d5cf21257955 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-bundle/master] Bug 23213: Deprecate gitian/tor-browser-bundle development
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit b273e8a38b24e716008fa9f51a2b53f20c1f1255 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 09:21:00 2017 +0000 Bug 23213: Deprecate gitian/tor-browser-bundle development --- README | 13 +++++++++++++ gitian/README.build | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/README b/README index 2ac74a5..fbc53ba 100644 --- a/README +++ b/README @@ -1,3 +1,16 @@ +A DEVELOPMENT NOTE: +=================== + +Developing the reproducible builds environment for Tor Browser with +gitian/tor-browser-bundle is deprecated. Recently, we switched to +rbm/tor-browser-build. See: +https://trac.torproject.org/projects/tor/ticket/23213. To get started with the +new system, check out +https://git.torproject.org/builders/tor-browser-build.git and follow the +instructions in the README file. + +------------------- + There are currently two ways to use the Tor Browser Bundle builder. If you are already on an Ubuntu 12.04+ machine or VM, please see diff --git a/gitian/README.build b/gitian/README.build index 4d01d6a..a962fca 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,3 +1,16 @@ +A DEVELOPMENT NOTE: +=================== + +Developing the reproducible builds environment for Tor Browser with +gitian/tor-browser-bundle is deprecated. Recently, we switched to +rbm/tor-browser-build. See: +https://trac.torproject.org/projects/tor/ticket/23213. To get started with the +new system, check out +https://git.torproject.org/builders/tor-browser-build.git and follow the +instructions in the README file. + +------------------- + QuickStart: On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run:

1 0

[tor-browser-build/master] Bug 23408: Don't include 'ALL' in nightly filenames
by boklm＠torproject.org 05 Sep '17

05 Sep '17

commit 28752f60a2c5d197c5cd6478e7d9918b7bc4a695 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 08:58:49 2017 +0000 Bug 23408: Don't include 'ALL' in nightly filenames In test builds only the en-US locale is provided, this 'ALL' in the filename is confusing. And the nightlies are not being built multi- lingual for a while now in tor-browser-bundle --- rbm.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 44fc9f5..10a60f8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -112,7 +112,6 @@ targets: nightly: var: nightly: 1 - multi_lingual: 1 torbrowser-testbuild: - testbuild

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit ddd7f3b9b5d8ea75aacffee63d21c50faae073c2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 08:18:49 2017 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 16c10f5..8945e0c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.0.5 -- September 4 2017 + * All Platforms + * Update Torbutton to 1.9.7.6 + * Bug 22989: Fix dimensions of new windows on macOS + * Translations update + * Update HTTPS-Everywhere to 2017.8.31 + * Update NoScript to 5.0.9 + * Bug 23166: Add new obfs4 bridge to the built-in ones + * Bug 23258: Fix broken HTTPS-Everywhere on higher security levels + * Bug 21270: NoScript settings break WebExtensions add-ons + Tor Browser 7.5a4 -- August 9 2017 * All Platforms * Update Firefox to 52.3.0esr

1 0

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

05 Sep '17

commit 945f0018487de8977628ccb1cded278de1685af4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 07:20:14 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index aa0c5a8..f6c37f9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 7.0.5 -- September 4 2017 + * All Platforms + * Update Torbutton to 1.9.7.6 + * Bug 22989: Fix dimensions of new windows on macOS + * Translations update + * Update HTTPS-Everywhere to 2017.8.31 + * Update NoScript to 5.0.9 + * Bug 23166: Add new obfs4 bridge to the built-in ones + * Bug 23258: Fix broken HTTPS-Everywhere on higher security levels + * Bug 21270: NoScript settings break WebExtensions add-ons + Tor Browser 7.5a4 -- August 9 2017 * All Platforms * Update Firefox to 52.3.0esr

1 0

[tor-browser-bundle/maint-7.0] Fix 7.0.5 release date
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit 8c4abb9d01658f67f6a608db5a3b50a00eb0652d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 2 12:23:30 2017 +0000 Fix 7.0.5 release date --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 53c52b7..aace374 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 7.0.5 -- September 2 2017 +Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6 * Bug 22989: Fix dimensions of new windows on macOS

1 0

[tor-browser/tor-browser-52.3.0esr-7.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit e3d89bee3d500a82193fcf2d284a7d096f6bf0b3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 4 17:14:07 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23404: Add Noto Sans Buginese to the macOS whitelist --- browser/app/profile/000-tor-browser.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5d209ccfdbe1..16c23be0d65a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -369,12 +369,12 @@ pref("dom.securecontext.whitelist_onions", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); -pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name.cursive.ar", "Arial"); pref("font.name.fantasy.ar", "Arial"); pref("font.name.monospace.ar", "Arial");

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit 89417fed09e5f45c3078efcc1c9d297ebef622fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 4 17:14:07 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23404: Add Noto Sans Buginese to the macOS whitelist --- browser/app/profile/000-tor-browser.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5d209ccfdbe1..16c23be0d65a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -369,12 +369,12 @@ pref("dom.securecontext.whitelist_onions", true); #ifdef MOZ_BUNDLED_FONTS #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); -pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi, STHeiti, STIX Math, Tahoma, Thonburi, Times, Times New Roman, Verdana"); +pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name.cursive.ar", "Arial"); pref("font.name.fantasy.ar", "Arial"); pref("font.name.monospace.ar", "Arial");

1 0

[tor-browser-build/master] Bug 23384: install tor, torsocks, screen on build-sunet-a.torproject.net
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit a03188749910eba898935f872b32770f8e12b0f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 22:11:32 2017 +0200 Bug 23384: install tor, torsocks, screen on build-sunet-a.torproject.net --- tools/ansible/roles/useful-packages/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/ansible/roles/useful-packages/tasks/main.yml b/tools/ansible/roles/useful-packages/tasks/main.yml index a15fc28..5cee49f 100644 --- a/tools/ansible/roles/useful-packages/tasks/main.yml +++ b/tools/ansible/roles/useful-packages/tasks/main.yml @@ -8,3 +8,6 @@ - locales - vim-nox - tmux + - tor + - torsocks + - screen

1 0

[tor-browser-build/master] Bug 23384: Add user gk on build-sunet-a.torproject.net
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit 87f10c820a02889791770821f9192f1eabe5538e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 20:29:51 2017 +0200 Bug 23384: Add user gk on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/gk.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index b76fc26..475acca 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,3 +1,4 @@ --- tbb_team_members: - boklm + - gk diff --git a/tools/ansible/roles/tbb-team/files/gk.pub b/tools/ansible/roles/tbb-team/files/gk.pub new file mode 100644 index 0000000..a0985d9 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/gk.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDGAn0mJnf4IUiASnXgOHE6zsCtO0P+TFS6YauchrC2knH+kJXyHswHibNO/R16JayyPkgX5c00Z3QAO2gkvYODLO37/lwWyy7/58Zqa6XRz5VnwvJ1eCzHJrBa+ll57GEsBaU9+tSXVnk6mF2d4+/mzAxdBco1N2mAd7KxjRgJFX+UV2aDDWalLiHzqj1ZQIt/4P/z4pLU1fPISy1EygA7pZ/gOGV3T0hpH/yxrOc5cspJb4APA6fWzsFBE2SFWx/+4cvtorIUi55UWbWqen3BDrQxFaGEovWGYsa0ykMbA3TZ/cTGqkneJjFzJuFYwu+x/XMUEUYo7TqXzInz1kOMLep/1MQWX0n3NCUoUMxBlg93YaEnkff0D7pAQsi2Km+6PQXYiHSve61IBVaq6J2deZnrsriI+u3OR5/5OuUnrpbQI4QyDojAF/ZFtKeaLsWQGgjzChogckdttplESO+Sa8/YVepPd3ukpNLuDgIIimwkJkwniZYtkPZxC7WmDFRYswB5zKnmOwFwa9qjZ0i//DeehHCADqorjXQeEt8sxt1qzjk5SddgJEcIgnlimhRr4pFRVOy/oCCGLNuBQvmTKqqED3hZJB8c+g1SzW2MyGdKELJne3S300W2b3nGQvhv+vSr+2lOWtNFA7oz0oqfX3E/7oNp3Sqad8PPO/ImXQ== thomas@debian

1 0

[tor-browser-build/master] Bug 23384: install packages needed for building Tor Browser on build-sunet-a.torproject.net
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit 093a213a2940e5c005e5044bc89b4fbedc46d461 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 15:37:01 2017 +0200 Bug 23384: install packages needed for building Tor Browser on build-sunet-a.torproject.net --- tools/ansible/Makefile | 2 ++ tools/ansible/README | 13 +++++++++ tools/ansible/inventory | 5 ++++ .../roles/tbb-builder/files/sudoers-tbb-build | 1 + tools/ansible/roles/tbb-builder/tasks/main.yml | 32 ++++++++++++++++++++++ tools/ansible/roles/useful-packages/tasks/main.yml | 10 +++++++ tools/ansible/tbb-build.yml | 6 ++++ 7 files changed, 69 insertions(+) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile new file mode 100644 index 0000000..eae73b5 --- /dev/null +++ b/tools/ansible/Makefile @@ -0,0 +1,2 @@ +ansible-tbb-build: + ansible-playbook -i inventory tbb-build.yml diff --git a/tools/ansible/README b/tools/ansible/README new file mode 100644 index 0000000..f631b08 --- /dev/null +++ b/tools/ansible/README @@ -0,0 +1,13 @@ +This directory contains some ansible script that we use to setup some +machines that we use for Tor Browser development. + +To deploy some changes you need the ansible package to be installed on +your machine, and be able to log in with ssh as root on the machine(s) +where the changes need to be deployed. + +You can then use one of the following makefile targets: + +ansible-tbb-build: + Deploy changes to the machine used by Tor Browser team members to do + some Tor Browser builds. + diff --git a/tools/ansible/inventory b/tools/ansible/inventory new file mode 100644 index 0000000..e2597a0 --- /dev/null +++ b/tools/ansible/inventory @@ -0,0 +1,5 @@ +build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net + +[tbb-build] +build-sunet-a + diff --git a/tools/ansible/roles/tbb-builder/files/sudoers-tbb-build b/tools/ansible/roles/tbb-builder/files/sudoers-tbb-build new file mode 100644 index 0000000..5f2e48d --- /dev/null +++ b/tools/ansible/roles/tbb-builder/files/sudoers-tbb-build @@ -0,0 +1 @@ +%tbb-build ALL=(ALL) NOPASSWD: ALL diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml new file mode 100644 index 0000000..2edfc18 --- /dev/null +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -0,0 +1,32 @@ +--- + +- name: Install dependencies for Tor Browser build + apt: + name: "{{ item }}" + state: present + with_items: + - git + - sudo + - libyaml-libyaml-perl + - libtemplate-perl + - libio-handle-util-perl + - libio-all-perl + - libio-captureoutput-perl + - libfile-slurp-perl + - libstring-shellquote-perl + - libsort-versions-perl + - libdigest-sha-perl + - libdata-uuid-perl + - libdata-dump-perl + - libfile-copy-recursive-perl + - libgtk2.0-dev + - curl + - runc + +- name: Create the tbb-build group + group: + name: tbb-build + state: present + +- name: Give sudo access to tbb-build group members + copy: src=sudoers-tbb-build dest=/etc/sudoers.d/tbb-build owner=root group=root mode=0440 diff --git a/tools/ansible/roles/useful-packages/tasks/main.yml b/tools/ansible/roles/useful-packages/tasks/main.yml new file mode 100644 index 0000000..a15fc28 --- /dev/null +++ b/tools/ansible/roles/useful-packages/tasks/main.yml @@ -0,0 +1,10 @@ +--- + +- name: Install some useful packages + apt: + name: "{{ item }}" + state: present + with_items: + - locales + - vim-nox + - tmux diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml new file mode 100644 index 0000000..dc5dfe5 --- /dev/null +++ b/tools/ansible/tbb-build.yml @@ -0,0 +1,6 @@ +--- + +- hosts: tbb-build + roles: + - role: tbb-builder + - role: useful-packages

1 0

[tor-browser-build/master] Bug 23384: Add user boklm on build-sunet-a.torproject.net
by boklm＠torproject.org 04 Sep '17

04 Sep '17

commit 1f108e3d3ddcfeff88c613f99983afc2e41cc273 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 4 15:39:14 2017 +0200 Bug 23384: Add user boklm on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 3 +++ tools/ansible/roles/tbb-team/files/boklm.pub | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 15 +++++++++++++++ tools/ansible/tbb-build.yml | 1 + 4 files changed, 20 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml new file mode 100644 index 0000000..b76fc26 --- /dev/null +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -0,0 +1,3 @@ +--- +tbb_team_members: + - boklm diff --git a/tools/ansible/roles/tbb-team/files/boklm.pub b/tools/ansible/roles/tbb-team/files/boklm.pub new file mode 100644 index 0000000..471f271 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/boklm.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuY6Clt4tqljhnQAfIAq2RcuB3UgQ1odLtYc+AlnwcgWgYoqByGXT52YnYd44MQ0rPpXGh6M5MeXGF33OOLkBm8QeFHiev4njq/14A5qMIH+xV4T/ft1vEE3PTuarzyhv/Qp1s0dt4/XibzMPND5zFQJUFsTON6WYix0cwBOa80W46P56jPca56kTnL045N8MJNFA4ELby68QaMMK0lEzupgLtzRnqc123paZr3FAgCOxNlYC83ftAsDuVNCzbp0+i3W0ZWBbqVo+wWbty7WJK4TjuQszS2oP+d5xxktXUVyVXu2xm0BV0kXgh6lV4ixDPKQsZrlUYalFN5QIQWwzb q-wo diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml new file mode 100644 index 0000000..9beaf0b --- /dev/null +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -0,0 +1,15 @@ +--- +- name: Add tbb-team users + user: + name: "{{ item }}" + state: present + groups: tbb-build + shell: /bin/bash + with_items: tbb_team_members + +- name: Add ssh keys to authorized_keys + authorized_key: + user: "{{ item }}" + state: present + key: "{{ lookup('file', item + '.pub') }}" + with_items: tbb_team_members diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index dc5dfe5..e74e665 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -4,3 +4,4 @@ roles: - role: tbb-builder - role: useful-packages + - role: tbb-team

1 0

[tor-browser-bundle/maint-7.0] Let's pick up a new HTTPS-E version and do a build2
by gk＠torproject.org 01 Sep '17

01 Sep '17

commit af77e037638b93853a15653772cc973846055c9e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 1 08:57:54 2017 +0000 Let's pick up a new HTTPS-E version and do a build2 --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- gitian/versions | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6c541ef..53c52b7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,9 @@ -Tor Browser 7.0.5 -- August 30 2017 +Tor Browser 7.0.5 -- September 2 2017 * All Platforms * Update Torbutton to 1.9.7.6 * Bug 22989: Fix dimensions of new windows on macOS * Translations update - * Update HTTPS-Everywhere to 2017.8.19 + * Update HTTPS-Everywhere to 2017.8.31 * Update NoScript to 5.0.9 * Bug 23166: Add new obfs4 bridge to the built-in ones * Bug 23258: Fix broken HTTPS-Everywhere on higher security levels diff --git a/gitian/versions b/gitian/versions index 56ff0db..d6e1dd4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.0.10 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.6 -HTTPSE_TAG=2017.8.19 +HTTPSE_TAG=2017.8.31 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] squash! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 31 Aug '17

31 Aug '17

commit 9ecbfca98dc5488527495e3bfde0fabf75a8529a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 16:58:52 2017 -0400 squash! 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. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling --- uriloader/exthandler/nsExternalHelperAppService.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index df08905304fb..1c0dd8ee66f7 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -606,7 +606,7 @@ public: NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_NSIHELPERAPPWARNINGLAUNCHER - nsExternalLoadURIHandler(nsIInterfaceRequestor * aWindowContext, + nsExternalLoadURIHandler(nsIInterfaceRequestor *aWindowContext, nsIURI *aURI, nsIHandlerInfo *aHandlerInfo); @@ -669,7 +669,7 @@ NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() bool alwaysAsk = true; mHandlerInfo->GetAlwaysAskBeforeHandling(&alwaysAsk); - // if we are not supposed to ask, and the preferred action is to use + // 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)) @@ -1786,7 +1786,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() { // Break our reference cycle with the download warning dialog (set up in - // OnStartRequest) + // OnStartRequest). mWarningDialog = nullptr; // now that the temp file is set up, find out if we need to invoke a dialog @@ -1908,7 +1908,7 @@ NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) { // Break our reference cycle with the download warning dialog (set up in - // OnStartRequest) + // OnStartRequest). mWarningDialog = nullptr; return Cancel(aReason);

1 0

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

31 Aug '17

commit 8e5e391c71d6c5f3ae80c88e45d1e8522f981214 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 12:06:24 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. Improve the overview/summary comment in external-app-blocker.js. --- src/components/external-app-blocker.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index ca86580..1f88fc7 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -8,9 +8,8 @@ * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 * * 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). + * download a file 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;

1 0

[tor-launcher/master] Bug 22232: fix typo in README-BOOTSTRAP.
by brade＠torproject.org 30 Aug '17

30 Aug '17

commit a120bb02f4dbcb3e26fe0c031d383a9a8681678a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 10:43:34 2017 -0400 Bug 22232: fix typo in README-BOOTSTRAP. --- README-BOOTSTRAP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-BOOTSTRAP b/README-BOOTSTRAP index 8bc2a76..a5354e7 100644 --- a/README-BOOTSTRAP +++ b/README-BOOTSTRAP @@ -35,7 +35,7 @@ mBootstrapErrorOccurred (Boolean) This is set to true when a mIsBootstrapDone is set to true as well as after the user makes changes to their settings (after a SAVECONF is done). -The PROGRESS field of the STATUS_CLIENT messages are used directly +The PROGRESS field within each STATUS_CLIENT message is used directly to display the completion percentage (progress bar). The TAG= keywords within the STATUS_CLIENT messages are used for

1 0

[tor-browser-build/master] README: mention that rbm is included as a git submodule
by boklm＠torproject.org 30 Aug '17

30 Aug '17

commit da7485a0b8f89b9ee2278d6132fc7bb53d5220e8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 30 14:45:07 2017 +0200 README: mention that rbm is included as a git submodule --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index 4381074..10cadec 100644 --- a/README +++ b/README @@ -46,6 +46,10 @@ If you are running Debian or Ubuntu, you can install them with: libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc +The build system is based on rbm, which is included as a git submodule +in the rbm/ directory. You can fetch the rbm git submodule by running +'make submodule-update'. + Starting a build ----------------

1 0

[tor-launcher/master] Bug 23240: retrieve current bootstrap progress before showing progress bar
by gk＠torproject.org 29 Aug '17

29 Aug '17

commit 26d284e3835ddd5b283b732278b7b5b740bace6e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Aug 14 16:09:47 2017 -0400 Bug 23240: retrieve current bootstrap progress before showing progress bar To avoid showing an incorrect progress value, keep the progress bar hidden until after we have retrieved the current bootstrap progress value. --- src/chrome/content/progress.js | 28 +++++++++++++++++++++++++++- src/chrome/content/progress.xul | 5 +++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 48362e7..f7bcaff 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2017, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -81,6 +81,16 @@ function initDialog() if (pleaseWait) pleaseWait.removeAttribute("hidden"); } + + // To avoid showing an incorrect progress value, we keep the progress bar + // hidden until a TorBootstrapStatus notification is received. We request + // the most recent bootstrap status info (which should cause such a + // notification to be generated) and also start a fail-safe timer to ensure + // that the progress bar is displayed within 2 seconds in all cases. + let protocolSvc = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports).wrappedJSObject; + protocolSvc.TorRetrieveBootstrapStatus(); + window.setTimeout(function() { showProgressMeterIfNoError(); }, 2000); } @@ -158,6 +168,17 @@ function stopTorBootstrap() } +function showProgressMeterIfNoError() +{ + let meter = document.getElementById("progressMeter"); + if (meter && + !document.documentElement.hasAttribute("bootstrapErrorOccurred")) + { + meter.style.visibility = "visible"; + } +} + + var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) @@ -184,7 +205,10 @@ var gObserver = { var meter = document.getElementById("progressMeter"); if (meter) + { meter.value = percentComplete; + showProgressMeterIfNoError(); + } var bootstrapDidComplete = (percentComplete >= 100); if (percentComplete >= 100) @@ -199,6 +223,8 @@ var gObserver = { if (s) labelText = s; + document.documentElement.setAttribute("bootstrapErrorOccurred", true); + if (meter) meter.setAttribute("hidden", true); diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index 473dab9..5b26110 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -37,7 +37,8 @@ <description id="progressDesc" /> </vbox> </hbox> - <progressmeter id="progressMeter" mode="determined" value="0" /> + <progressmeter id="progressMeter" mode="determined" value="0" + style="visibility:hidden" /> <description id="progressPleaseWait" hidden="true">&torprogress.pleaseWait;</description> </vbox>

1 0