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

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31621'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit f08dbd57ed76faa08007608130da50c4f80a9d64 Merge: 873865a 5648e14 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:26:32 2019 +0200 Merge remote-tracking branch 'gk/bug_31621' projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1500436 - Redirect node.js's stderr to a pipe. r=froydnj
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 4458b4e8a09aaa759f1735b36aec860aa61f3ba7 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Wed Jun 26 21:44:00 2019 +0000 Bug 1500436 - Redirect node.js's stderr to a pipe. r=froydnj This works around https://github.com/nodejs/node/issues/14752, which causes problems with make. Differential Revision: https://phabricator.services.mozilla.com/D35986 --HG-- extra : moz-landing-system : lando --- python/mozbuild/mozbuild/action/node.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py index de4e094a9471..73f13ac48503 100644 --- a/python/mozbuild/mozbuild/action/node.py +++ b/python/mozbuild/mozbuild/action/node.py @@ -52,14 +52,25 @@ def execute_node_cmd(node_cmd_list): print('Executing "{}"'.format(printable_cmd), file=sys.stderr) sys.stderr.flush() - output = subprocess.check_output(node_cmd_list) + # We need to redirect stderr to a pipe because + # https://github.com/nodejs/node/issues/14752 causes issues with make. + proc = subprocess.Popen( + node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + stdout, stderr = proc.communicate() + retcode = proc.wait() + + if retcode != 0: + print(stderr, file=sys.stderr) + sys.stderr.flush() + sys.exit(retcode) # Process the node script output # # XXX Starting with an empty list means that node scripts can # (intentionally or inadvertently) remove deps. Do we want this? deps = [] - for line in output.splitlines(): + for line in stdout.splitlines(): if 'dep:' in line: deps.append(line.replace('dep:', '')) else:

1 0

[tor-browser-build/master] Update rbm for #31264
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 873865aa9dc3d3f734458e86dbe542db67ad1929 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:06:51 2019 +0200 Update rbm for #31264 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e04f03f..5a41aae 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e04f03f9626e993bb66d7784d258f95ca07bc769 +Subproject commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09

1 0

[rbm/master] Bug 31264: Remove timestamps from gzip headers
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09 Author: JeremyRand <biolizard89(a)gmail.com> Date: Tue Jul 30 22:34:19 2019 +0000 Bug 31264: Remove timestamps from gzip headers See https://wiki.debian.org/ReproducibleBuilds/TimestampsInGzipHeaders Thanks to boklm for helping with this patch. --- lib/RBM.pm | 2 +- lib/RBM/DefaultConfig.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 75912af..087ebe3 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -582,7 +582,7 @@ sub maketar { } my %compress = ( xz => ['xz', '-f'], - gz => ['gzip', '-f'], + gz => ['gzip', '--no-name', '-f'], bz2 => ['bzip2', '-f'], ); if (my $c = project_config($project, 'compress_tar', $options)) { diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index f8165c3..f7de8bb 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -575,7 +575,7 @@ OPT_END find [% src.join(' ') %] [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 700 {} \\; find [% src.join(' ') %] ! [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 600 {} \\; find [% src.join(' ') %] | sort | \ - tar --no-recursion [% IF c('gnu_utils') -%] + GZIP="--no-name \${GZIP}" tar --no-recursion [% IF c('gnu_utils') -%] --owner=root --group=root --mtime=@[% c('timestamp') %] [%- END -%] [% c('tar_args', { error_if_undef => 1 }) %] -T -

1 0

[tor-browser-build/master] Bug 31450: Use still GCC for our ASan builds
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 47670953afb9026f2e49301f494d5a2faba15ec2 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 8 09:38:58 2019 +0000 Bug 31450: Use still GCC for our ASan builds --- projects/firefox/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 87f8532..ba8422a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -29,8 +29,11 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" [% IF c("var/linux") || c("var/android") %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" - # Use clang for everything on Linux now. - export PATH="/var/tmp/dist/clang/bin:$PATH" + # Use clang for everything on Linux and Android now if we don't build with + # ASan. + [% IF ! c("var/asan") -%] + export PATH="/var/tmp/dist/clang/bin:$PATH" + [% END -%] [% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31450'
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 71eb0d2431d59ec06e4c1832df595fcd4a30cbf8 Merge: 82d382d 4767095 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 10 21:41:49 2019 +0200 Merge remote-tracking branch 'gk/bug_31450' projects/firefox/build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31450: Setting proper BINDGEN_CFLAGS
by boklm＠torproject.org 10 Sep '19

10 Sep '19

commit 56be840ce8e2c852bb040b39640db812a714a73b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 8 14:54:53 2019 +0000 Bug 31450: Setting proper BINDGEN_CFLAGS --- .mozconfig-asan | 1 + 1 file changed, 1 insertion(+) diff --git a/.mozconfig-asan b/.mozconfig-asan index 04dd4373cd1f..8748f5825d3e 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -15,6 +15,7 @@ export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 +export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' ac_add_options --enable-address-sanitizer ac_add_options --disable-jemalloc

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 82d382db0d7ca83896ae1bc75b3c923904f626b1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 19:23:38 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6fcd33a..f97cb65 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 8.5.6 -- September 9 2019 + * Android + * Update Torbutton to 2.1.14 + * Bug 31616: Fix JIT related crashes on aarch64 + Tor Browser 9.0a6 -- September 4 2019 * All platforms * Update Firefox to 68.1.0esr

1 0

[tor-browser-build/master] Add missing item in 9.0a6 Changelog
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit ff6fd56b61cbd0773448845c1187fb62f9adb7f4 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 19:23:01 2019 +0000 Add missing item in 9.0a6 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2cf1c5a..6fcd33a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -24,6 +24,7 @@ Tor Browser 9.0a6 -- September 4 2019 * Bug 25214: Canvas data extraction on locale pdf file should be allowed * Bug 30657: Locale is leaked via title of link tag on non-html page * Bug 31015: Disabling SVG hides UI icons in extensions + * Bug 30538: Unable to comment on The Independent Newspaper * Bug 31357: Retire Tom's default obfs4 bridge * Windows + OS X + Linux * Update Tor to 0.4.1.5

1 0

[tor-browser-build/maint-8.5] Prepare 8.5.6 for Android
by gk＠torproject.org 09 Sep '19

09 Sep '19

commit 816407cfd7ee029b677e1b225d7faef255c51863 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 9 06:09:24 2019 +0000 Prepare 8.5.6 for Android Changelog update and version bump --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 2d022aa..544cdd2 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") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 27d86a9..088b96d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 8.5.6 -- September 9 2019 + * Android + * Update Torbutton to 2.1.14 + * Bug 31616: Fix JIT related crashes on aarch64 + Tor Browser 8.5.5 -- September 3 2019 * All platforms * Update Firefox to 60.9.0esr diff --git a/rbm.conf b/rbm.conf index 2a95652..6783d6d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,8 +24,8 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.5' - torbrowser_build: 'build2' + torbrowser_version: '8.5.6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5.4 project_name: tor-browser

1 0