- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_27531_v2'
by gk＠torproject.org 24 Jan '19

24 Jan '19

commit 74bbaa04f761acd3de775dde0c611e4cb8721b26 Merge: 64ef8a5 f79412d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 24 08:48:50 2019 +0000 Merge remote-tracking branch 'boklm/bug_27531_v2' projects/fteproxy/build | 2 ++ projects/fteproxy/config | 2 ++ projects/fteproxy/fteproxy.wrapper | 10 ++++++++++ projects/libfte/build | 4 ++-- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/maint-8.0] Using build2 for 8.0.5
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 771bcf9f7dcec6ca17cc1f117891d538b8189ffe Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 23 14:49:04 2019 +0000 Using build2 for 8.0.5 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 4f06501..5e1ec0e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.4 project_name: tor-browser

1 0

[tor-browser-build/maint-8.0] Bug 29097: Don't try to install python3.6-lxml
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 7355a3cc844aee4c5ec24b07e886d2a9c5481ee7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 23 14:53:43 2019 +0100 Bug 29097: Don't try to install python3.6-lxml Remove the python3.6-lxml package for the list of dependencies to build https-everywhere. This package does not exist anymore in Debian Buster, and it seems it is not required to build https-everywhere. --- projects/https-everywhere/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index eeef02c..59eb463 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -22,7 +22,6 @@ var: deps: - git - python3.6 - - python3.6-lxml - libxslt1.1 - libxml2-utils - sqlite3

1 0

[tor-browser-build/master] Bug 29097: Don't try to install python3.6-lxml
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 64ef8a5de677aac8b3b608ca8997363130690a6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 23 14:53:43 2019 +0100 Bug 29097: Don't try to install python3.6-lxml Remove the python3.6-lxml package for the list of dependencies to build https-everywhere. This package does not exist anymore in Debian Buster, and it seems it is not required to build https-everywhere. --- projects/https-everywhere/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index bcd47f2..3b45143 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -22,7 +22,6 @@ var: deps: - git - python3.6 - - python3.6-lxml - libxslt1.1 - libxml2-utils - sqlite3

1 0

[tor-browser-build/master] Revert "Bug 27865: Tor Browser 8.5a2 is crashing on Windows"
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit b019cacb8fba8aef0362dcef4860e51a46394a13 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 17 07:30:02 2019 +0000 Revert "Bug 27865: Tor Browser 8.5a2 is crashing on Windows" This reverts commit 49eb43da16695c8fce31129f3499a8258761025a. No longer needed after we bumped the binutils version to 2.32.1 in bug 26148. --- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..07e8851 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..1665005 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser-build/master] Bug 28618: Set MOZILLA_OFFICIAL for Windows build
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit cdf65c9b5b0f8533c78b4450e20ba4743a3a0f31 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 17 07:34:19 2019 +0000 Bug 28618: Set MOZILLA_OFFICIAL for Windows build --- projects/firefox/1464084.patch | 73 ------------------------------------------ projects/firefox/1467041.patch | 23 ------------- projects/firefox/build | 2 -- projects/firefox/config | 4 --- 4 files changed, 102 deletions(-) diff --git a/projects/firefox/1464084.patch b/projects/firefox/1464084.patch deleted file mode 100644 index 524cb7f..0000000 --- a/projects/firefox/1464084.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1a1cc016c8f6ff83ea057ee6fe6838b89c382210 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sun, 24 Jun 2018 19:36:35 +0000 -Subject: [PATCH 1/2] Revert "Bug 1464084 - Don't export - std::thread::_M_start_thread symbols with --enable-stdcxx-compat. r=froydnj, - a=RyanVM" - -This reverts commit 655e5f1d95e0d5ecd037f36dbe533372130e5621. - -diff --git a/build/unix/stdc++compat/hide_std.ld b/build/unix/stdc++compat/hide_std.ld -deleted file mode 100644 -index 4b3400b0f327..000000000000 ---- a/build/unix/stdc++compat/hide_std.ld -+++ /dev/null -@@ -1,5 +0,0 @@ --hidden { -- local: -- # std::thread::_M_start_thread(...) -- _ZNSt6thread15_M_start_thread*; --}; -diff --git a/build/unix/stdc++compat/moz.build b/build/unix/stdc++compat/moz.build -index 4444d0c4f297..20517a1caef5 100644 ---- a/build/unix/stdc++compat/moz.build -+++ b/build/unix/stdc++compat/moz.build -@@ -23,5 +23,3 @@ COMPILE_FLAGS['CLANG_PLUGIN'] = [] - - DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] - HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION'] -- --OS_LIBS += ['-Wl,--version-script,%s/hide_std.ld' % SRCDIR] -diff --git a/python/mozbuild/mozbuild/action/generate_symbols_file.py b/python/mozbuild/mozbuild/action/generate_symbols_file.py -index bf1ae917a2d0..f118060f47cf 100644 ---- a/python/mozbuild/mozbuild/action/generate_symbols_file.py -+++ b/python/mozbuild/mozbuild/action/generate_symbols_file.py -@@ -42,8 +42,6 @@ def generate_symbols_file(output, *args): - - symbols = [s.strip() for s in pp.out.getvalue().splitlines() if s.strip()] - -- libname, ext = os.path.splitext(os.path.basename(output.name)) -- - if buildconfig.substs['OS_TARGET'] == 'WINNT': - # A def file is generated for MSVC link.exe that looks like the - # following: -@@ -68,13 +66,14 @@ def generate_symbols_file(output, *args): - # those platforms, and to DATA on Windows, so that the "DATA" part - # is, in fact, part of the symbol name as far as the symbols variable - # is concerned. -+ libname, ext = os.path.splitext(os.path.basename(output.name)) - assert ext == '.def' - output.write('LIBRARY %s\nEXPORTS\n %s\n' - % (libname, '\n '.join(symbols))) - elif buildconfig.substs['GCC_USE_GNU_LD']: - # A linker version script is generated for GNU LD that looks like the - # following: -- # liblibrary.so { -+ # { - # global: - # symbol1; - # symbol2; -@@ -82,8 +81,8 @@ def generate_symbols_file(output, *args): - # local: - # *; - # }; -- output.write('%s {\nglobal:\n %s;\nlocal:\n *;\n};' -- % (libname, ';\n '.join(symbols))) -+ output.write('{\nglobal:\n %s;\nlocal:\n *;\n};' -+ % ';\n '.join(symbols)) - elif buildconfig.substs['OS_TARGET'] == 'Darwin': - # A list of symbols is generated for Apple ld that simply lists all - # symbols, with an underscore prefix. --- -2.17.1 - diff --git a/projects/firefox/1467041.patch b/projects/firefox/1467041.patch deleted file mode 100644 index a31e2e0..0000000 --- a/projects/firefox/1467041.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8d940fed5975400910c29037a6c575260d3caa22 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Sun, 24 Jun 2018 19:37:55 +0000 -Subject: [PATCH 2/2] Revert "Bug 1467041 - Default to --enable-release when - milestone is beta/release. r=froydnj, a=RyanVM" - -This reverts commit b1f09cd8f4a1abf13f85a2353ac1b9711200b0e5. - -diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure -index 67007c8dcf7c..a1e443019748 100755 ---- a/build/moz.configure/toolchain.configure -+++ b/build/moz.configure/toolchain.configure -@@ -1387,7 +1387,6 @@ imply_option('--enable-release', mozilla_official) - imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) - - js_option('--enable-release', -- default=milestone.is_release_or_beta, - help='Build with more conservative, release engineering-oriented ' - 'options. This may slow down builds.') - --- -2.17.1 - diff --git a/projects/firefox/build b/projects/firefox/build index b9d9d5a..f6f3365 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -151,8 +151,6 @@ fi [% IF c("var/windows") %] patch -p1 < $rootdir/nsis-uninstall.patch - patch -p1 < $rootdir/1464084.patch - patch -p1 < $rootdir/1467041.patch [% END -%] rm -f configure diff --git a/projects/firefox/config b/projects/firefox/config index 639d504..0e91d38 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -114,10 +114,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: nsis-uninstall.patch enable: '[% c("var/windows") %]' - - filename: 1464084.patch - enable: '[% c("var/windows") %]' - - filename: 1467041.patch - enable: '[% c("var/windows") %]' - project: rust name: rust - project: llvm

1 0

[tor-browser-build/master] Merge branch 'bug_28168_v3'
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 55556eb3dd1869980fe733d56647e0307dd66fa1 Merge: 031ecd7 cdf65c9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 23 13:18:40 2019 +0000 Merge branch 'bug_28168_v3' Which should have been "bug_28618_v3", but the changes are okay at least... projects/firefox/1464084.patch | 73 ------------------------------- projects/firefox/1467041.patch | 23 ---------- projects/firefox/build | 2 - projects/firefox/config | 4 -- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 6 files changed, 2 insertions(+), 102 deletions(-)

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 27865: Fix start-up crashes on Windows"
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 9daf30f059baff3af2f5b26ab6f60853f19516b2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 17 07:27:24 2019 +0000 Revert "Bug 27865: Fix start-up crashes on Windows" This reverts commit 59261e53591c159c10bcef78dc39478fbb270f77. After bug 26148 landed we get the crash fixes in binutils, which are available starting with 2.27. --- build/moz.configure/toolchain.configure | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 008193c6c945..67007c8dcf7c 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1382,10 +1382,8 @@ option(env='RUSTFLAGS', help='Rust compiler flags') set_config('RUSTFLAGS', depends('RUSTFLAGS')(lambda flags: flags)) -if target.os != 'WINNT': - imply_option('--enable-release', mozilla_official) -else: - imply_option('--enable-release', False) + +imply_option('--enable-release', mozilla_official) imply_option('--enable-release', depends_if('MOZ_AUTOMATION')(lambda x: True)) js_option('--enable-release',

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 23 Jan '19

23 Jan '19

commit 6a9c962b2316c6ede976faaa36294a97b121e382 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 28 09:56:25 2018 -0500 squash! Bug 4234: Use the Firefox Update Process for Tor Browser. Also fix #27828: "Check for Tor Browser update" doesn't seem to do anything. --- toolkit/mozapps/update/nsUpdateService.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 609f1e19f524..b2a4e82cf241 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -4011,7 +4011,15 @@ UpdatePrompt.prototype = { "an update was downloaded. topic: update-downloaded, status: " + update.state); Services.obs.notifyObservers(update, "update-downloaded", update.state); - if (Services.prefs.getBoolPref(PREF_APP_UPDATE_DOORHANGER, false)) { + if (background && Services.prefs.getBoolPref(PREF_APP_UPDATE_DOORHANGER, false)) { + // To fix https://trac.torproject.org/projects/tor/ticket/27828 + // ("Check for Tor Browser update" doesn't seem to do anything), in + // Tor Browser we only return here when the background parameter is + // true. This causes the update wizard XUL window to (correctly) be + // opened in response to "Check for Tor Browser Update." + // This change does not alter the behavior of any existing + // update-related UI because all callers of showUpdateDownloaded() + // other than Torbutton pass true for the background parameter. return; }

1 0

[tor-browser-build/master] Bug 28546: Rebrand Tor Browser's Window's Installer
by boklm＠torproject.org 23 Jan '19

23 Jan '19

commit 031ecd732636c627ea3b6343869d96ccbf3d2df0 Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Nov 28 16:13:50 2018 -0800 Bug 28546: Rebrand Tor Browser's Window's Installer This patch passes in the build channel to makensis as a !define so that the tbb-windows-installer torbrowser.nsi installer script can use appropriate branding and set branding-specific names and install paths. --- projects/tbb-windows-installer/config | 2 +- projects/tor-browser/build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index a990229..0ec7b0a 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.5 +version: 0.6 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4661f7a..bc663c2 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -303,7 +303,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("var/touch") %] {} \; pushd "$PKG_DIR" - makensis torbrowser.nsi + makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py @@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" - makensis torbrowser.nsi + makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py

1 0