- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 31596: Bump mingw-w64 version for fix for #31567
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 3ea80a42a85edc5e931cd241218cc5f0f2ff5b57 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 3 06:22:58 2019 +0000 Bug 31596: Bump mingw-w64 version for fix for #31567 --- projects/mingw-w64-clang/31567_1.patch | 33 -------------- projects/mingw-w64-clang/31567_2.patch | 82 ---------------------------------- projects/mingw-w64-clang/build | 3 +- projects/mingw-w64-clang/config | 4 +- projects/mingw-w64/config | 2 +- 5 files changed, 3 insertions(+), 121 deletions(-) diff --git a/projects/mingw-w64-clang/31567_1.patch b/projects/mingw-w64-clang/31567_1.patch deleted file mode 100644 index be316ee..0000000 --- a/projects/mingw-w64-clang/31567_1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d9c7a5aa3ac8d29b98f28af71d862c2d3931e7d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:05:40 +0000 -Subject: [PATCH 1/2] This function was moved from inline in header to a - statically linked one in 52a34d52d6f5f1789d329abd4e, where the use of this - define was dropped. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As this function is statically linked, the caller can't control -and change the behaviour of the function by defining -UCRTBASE_PRINTF_DEFAULT_WIDE in the calling translation unit, -but we should at least use the headers' default value (which currently -is zero). - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -index bf9f4de2..c505c31e 100644 ---- a/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -+++ b/mingw-w64-crt/stdio/ucrt__vsnwprintf.c -@@ -10,6 +10,6 @@ - - int __cdecl _vsnwprintf(wchar_t * __restrict__ _Dest,size_t _Count,const wchar_t * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN - { -- return __stdio_common_vswprintf(UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); -+ return __stdio_common_vswprintf(UCRTBASE_PRINTF_DEFAULT_WIDE | UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, _Dest, _Count, _Format, NULL, _Args); - } - int __cdecl (*__MINGW_IMP_SYMBOL(_vsnwprintf))(wchar_t *__restrict__, size_t, const wchar_t *__restrict__, va_list) = _vsnwprintf; --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/31567_2.patch b/projects/mingw-w64-clang/31567_2.patch deleted file mode 100644 index 12070aa..0000000 --- a/projects/mingw-w64-clang/31567_2.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 44d0691f6fa51d2b3a0df911652c801635424e4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> -Date: Sun, 1 Sep 2019 06:08:24 +0000 -Subject: [PATCH 2/2] When __USE_MINGW_ANSI_STDIO is defined, we still call the - custom implementation bundled in libmingwex, which has the C99 standard - semantics for %s in wide format strings. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This matches how the wide stdio functions behave both when using -msvcrt.dll, and in all versions of MSVC, even the modern ones that -use ucrt. - -Signed-off-by: Martin Storsjö <martin(a)martin.st> - -diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h -index 363203c3..a92ee059 100644 ---- a/mingw-w64-headers/crt/conio.h -+++ b/mingw-w64-headers/crt/conio.h -@@ -21,12 +21,13 @@ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h -index e183236d..e8d3c857 100644 ---- a/mingw-w64-headers/crt/stdio.h -+++ b/mingw-w64-headers/crt/stdio.h -@@ -147,12 +147,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - -diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h -index cd26e098..d1348bc2 100644 ---- a/mingw-w64-headers/crt/wchar.h -+++ b/mingw-w64-headers/crt/wchar.h -@@ -247,12 +247,13 @@ extern FILE (* __MINGW_IMP_SYMBOL(_iob))[]; /* A pointer to an array of FILE */ - #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) - #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) - --// Default wide printfs and scanfs to the standard mode -+// Default wide printfs and scanfs to the legacy wide mode. Only code built -+// with -D__USE_MINGW_ANSI_STDIO=1 will expect the standard behaviour. - #ifndef UCRTBASE_PRINTF_DEFAULT_WIDE --#define UCRTBASE_PRINTF_DEFAULT_WIDE 0 -+#define UCRTBASE_PRINTF_DEFAULT_WIDE UCRTBASE_PRINTF_LEGACY_WIDE_SPECIFIERS - #endif - #ifndef UCRTBASE_SCANF_DEFAULT_WIDE --#define UCRTBASE_SCANF_DEFAULT_WIDE 0 -+#define UCRTBASE_SCANF_DEFAULT_WIDE UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS - #endif - #endif - --- -2.23.0.rc1 - diff --git a/projects/mingw-w64-clang/build b/projects/mingw-w64-clang/build index 820346d..b4000f5 100644 --- a/projects/mingw-w64-clang/build +++ b/projects/mingw-w64-clang/build @@ -69,8 +69,7 @@ default_win32_winnt=0x601 cd $builddir/mingw-w64-clang patch -p1 < $rootdir/mingw-winrt.patch -patch -p1 < $rootdir/31567_1.patch -patch -p1 < $rootdir/31567_2.patch + cd mingw-w64-headers mkdir build && cd build ../configure --host=[% c("arch") %]-w64-mingw32 \ diff --git a/projects/mingw-w64-clang/config b/projects/mingw-w64-clang/config index 16adee8..a6b6cde 100644 --- a/projects/mingw-w64-clang/config +++ b/projects/mingw-w64-clang/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' llvm_version: 8.0.0 gpg_keyring: clang.gpg @@ -36,5 +36,3 @@ input_files: - project: llvm-mingw name: llvm-mingw - filename: mingw-winrt.patch - - filename: 31567_1.patch - - filename: 31567_2.patch diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 3bb1dda..0145194 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: https://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 2d52c4b3433e55b1c454f9567c0ae9adc4b83b41 +git_hash: 330025c54b85512d54b6960fad07498365c8fee3 version: '[% c("abbrev") %]' var: container:

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Sep '19

11 Sep '19

commit e489c5048b762b3226db23b6ea9ffc440617615e Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 17:49:40 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31601: Disable recommended extensions again --- browser/app/profile/000-tor-browser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 81352dcbaece..b2cecfdb1a82 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -273,8 +273,9 @@ 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. +// about:addons page, see bug 22073, 22900 and 31601. pref("extensions.getAddons.showPane", false); +pref("extensions.htmlaboutaddons.recommendations.enabled", false); // Show our legacy extensions directly on about:addons and get rid of the // warning for the default theme. pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton(a)torproject.org");

1 0

[tor-browser-build/master] Bug 31621: Add --verbose flag to mach again
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit 5648e1499c10d2565e2cd9ca23599b532df8cff4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 4 18:53:58 2019 +0000 Bug 31621: Add --verbose flag to mach again The underlying node bug got worked around in Mozilla's bug 1500436 and we cherry-pick that patch onto our esr68 branches. Thanks to a cypherpunk for finding that bugfix. --- projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1450576..1a7893d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -104,9 +104,7 @@ rm -f js/src/configure # Android does not support --enable-bundled-fonts option ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] [% IF ! c("var/android") %]--enable-bundled-fonts[% END -%] --with-branding=[% c("var/branding_directory") %] -# Don't build with --verbose anymore or otherwise Stylo compilation breaks on -# Linux. See: #30321 for details. -./mach build +./mach build --verbose [% IF c("var/android") %] # Building a multi-locale .apk

1 0

[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