December 2017 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.5.2esr-7.5-1] Bug 24478: Enable debug assertions and tests in our ASan builds
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit e17e2c643eea02103a25470b946e9e6c4c11b24c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 1 12:50:57 2017 +0000 Bug 24478: Enable debug assertions and tests in our ASan builds --- .mozconfig-asan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mozconfig-asan b/.mozconfig-asan index 096bcc6ef634..18d334e90507 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -34,8 +34,8 @@ ac_add_options --enable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug +ac_add_options --enable-tests +ac_add_options --enable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc

1 0

[tor-browser-build/master] Bug 21998: add option for debug builds
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 055e751493bedd4914605f418aee590ba79f96d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 23 14:47:13 2017 +0100 Bug 21998: add option for debug builds --- Makefile | 12 ++++++++++++ README.MAKEFILE | 4 ++++ projects/firefox/build | 6 ++++++ projects/release/config | 6 +++++- projects/tor-browser/RelativeLink/start-tor-browser | 7 +++++++ projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 4 +++- projects/tor/build | 1 + rbm.conf | 7 +++++++ 9 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 54965ef..2707d41 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ release: submodule-update release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 +release-linux-x86_64-debug: submodule-update + $(rbm) build release --target release --target torbrowser-linux-x86_64-debug + release-linux-i686: submodule-update $(rbm) build release --target release --target torbrowser-linux-i686 @@ -26,6 +29,9 @@ alpha: submodule-update alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 +alpha-linux-x86_64-debug: submodule-update + $(rbm) build release --target alpha --target torbrowser-linux-x86_64-debug + alpha-linux-i686: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-i686 @@ -44,6 +50,9 @@ nightly: submodule-update nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 +nightly-linux-x86_64-debug: submodule-update + $(rbm) build release --target nightly --target torbrowser-linux-x86_64-debug + nightly-linux-i686: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-i686 @@ -80,6 +89,9 @@ testbuild: submodule-update testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 +testbuild-linux-x86_64-debug: submodule-update + $(rbm) build release --target testbuild --target torbrowser-linux-x86_64-debug + testbuild-linux-i686: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-i686 diff --git a/README.MAKEFILE b/README.MAKEFILE index 98137b2..8094651 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -50,6 +50,10 @@ locale is created, without mar files. By default it is based on the alpha channel, but you can change that by editing rbm.conf.local. The resulting build can be found in directory testbuild. +{release,alpha,nightly,testbuild}-linux-x86_64-debug +---------------------------------------------------- +Create a debug build for Linux x86_64 with debug features such as ASan. + fetch ----- Fetch new commits from all components. This is useful when you want to diff --git a/projects/firefox/build b/projects/firefox/build index 13142e0..ed559b0 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -49,6 +49,12 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c("version") %] mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig +[% IF c("var/asan") -%] + mv -f .mozconfig-asan .mozconfig + # Without disabling LSan our build is blowing up: + # https://bugs.torproject.org/10599#comment:52 + export ASAN_OPTIONS="detect_leaks=0" +[% END -%] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt)) if [ -z $MOZ_BUILD_DATE ] diff --git a/projects/release/config b/projects/release/config index 674ec80..e53ea43 100644 --- a/projects/release/config +++ b/projects/release/config @@ -17,6 +17,10 @@ targets: torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 + torbrowser-linux-x86_64-debug: + var: + torbrowser-linux-x86_64: 1 + debug-build: '-debug' torbrowser-linux-i686: var: torbrowser-linux-i686: 1 @@ -77,7 +81,7 @@ input_files: enable: '[% c("var/torbrowser-linux-x86_64") %]' target: - '[% c("var/build_target") %]' - - torbrowser-linux-x86_64 + - 'torbrowser-linux-x86_64[% c("var/debug-build") %]' - name: sandbox-linux-x86_64 project: sandbox diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 2dd40fc..94a8c99 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -272,6 +272,13 @@ LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH export SELFRANDO_write_layout_file= +[% IF c("var/asan") -%] +# We need to disable LSan which is enabled by default now. Otherwise we'll get +# a crash during shutdown: https://bugs.torproject.org/10599#comment:59 +ASAN_OPTIONS="detect_leaks=0" +export ASAN_OPTIONS +[% END -%] + function setControlPortPasswd() { local ctrlPasswd=$1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 56d6294..f8f1356 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -70,6 +70,10 @@ tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_f [% IF c("var/linux") %] cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ cp RelativeLink/start-tor-browser.desktop ${TB_STAGE_DIR}/ + cat > ${TB_STAGE_DIR}/Browser/start-tor-browser << 'RBM_TB_EOF' +[% INCLUDE 'RelativeLink/start-tor-browser' -%] +RBM_TB_EOF + chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index eb0a5d0..42f77e4 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -69,7 +69,9 @@ input_files: - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b - - filename: RelativeLink + - filename: 'RelativeLink/start-tor-browser.desktop' + enable: '[% c("var/linux") %]' + - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg diff --git a/projects/tor/build b/projects/tor/build index 24617ce..ac51782 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -57,6 +57,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ + [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] diff --git a/rbm.conf b/rbm.conf index 4f74450..5abc5ff 100644 --- a/rbm.conf +++ b/rbm.conf @@ -130,6 +130,10 @@ targets: torbrowser-linux-x86_64: - linux-x86_64 - linux + torbrowser-linux-x86_64-debug: + - linux-debug + - linux-x86_64 + - linux torbrowser-linux-i686: - linux-i686 - linux @@ -171,6 +175,9 @@ targets: - libtool - zip - unzip + linux-debug: + var: + asan: 1 torbrowser-windows-i686: - windows-i686

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_21998_v4'
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit d0f2bcf4697fe06cb034e412bd6d262ac12d3a3e Merge: 826d27b 055e751 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:55:46 2017 +0000 Merge remote-tracking branch 'boklm/bug_21998_v4' Makefile | 12 ++++++++++++ README.MAKEFILE | 4 ++++ projects/firefox/build | 6 ++++++ projects/release/config | 6 +++++- projects/tor-browser/RelativeLink/start-tor-browser | 7 +++++++ projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 4 +++- projects/tor/build | 1 + rbm.conf | 7 +++++++ 9 files changed, 49 insertions(+), 2 deletions(-) diff --cc projects/tor-browser/config index 9aff47d,42f77e4..d2085b0 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@@ -66,10 -66,12 +66,12 @@@ 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: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b + sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 - - filename: RelativeLink + - filename: 'RelativeLink/start-tor-browser.desktop' + enable: '[% c("var/linux") %]' + - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg

1 0

[tor-browser/tor-browser-52.5.2esr-7.5-1] Bug 21925: Don't compile with ASan and FORTIFY_SOURCE
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 1b16d85c3fb36565a8f36bb7c9e4a5890b65c143 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 5 19:35:47 2017 +0000 Bug 21925: Don't compile with ASan and FORTIFY_SOURCE ASan and FORTIFY_SOURCE are not compatible with each other right now. Thus, we make sure that we have FORTIFY_SOURCE disabled in case the sanitizer is used. See #21925 for more details. --- build/autoconf/sanitize.m4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/autoconf/sanitize.m4 b/build/autoconf/sanitize.m4 index 3193d5c624cc..272bf0cda69a 100644 --- a/build/autoconf/sanitize.m4 +++ b/build/autoconf/sanitize.m4 @@ -32,8 +32,10 @@ if test -n "$MOZ_ASAN"; then CXXFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CXXFLAGS" fi fi - CFLAGS="-fsanitize=address $CFLAGS" - CXXFLAGS="-fsanitize=address $CXXFLAGS" + # ASan and FORTIFY_SOURCE are not compatible yet. Let's make sure we are + # compiling without FORTIFY_SOURCE if ASan is enabled, see #21925. + CFLAGS="-fsanitize=address $CFLAGS -U_FORTIFY_SOURCE" + CXXFLAGS="-fsanitize=address $CXXFLAGS -U_FORTIFY_SOURCE" if test -z "$CLANG_CL"; then LDFLAGS="-fsanitize=address $LDFLAGS" fi

1 0

[tor-browser-build/master] Preparing build3 for 7.5a9
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 826d27b49fb16d0188efedd6bca7962d14abba16 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:27:58 2017 +0000 Preparing build3 for 7.5a9 Changelog update to pick up new release date and newer NoScript version. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c7ac62f..c92b0c0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,9 @@ -Tor Browser 7.5a9 -- December 05 2017 +Tor Browser 7.5a9 -- December 08 2017 * All Platforms * Update Firefox to 52.5.2esr * Update Tor to 0.3.2.6-alpha * Update HTTPS-Everywhere to 2017.11.21 - * Update NoScript to 5.1.7 + * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 Tor Browser 7.5a8 -- November 15 2017 diff --git a/rbm.conf b/rbm.conf index 4f74450..6e0790a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Update NoScript
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 90fc7e48dcda13988516e83ff9bfb16939472804 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:26:27 2017 +0000 Update NoScript --- 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 eb0a5d0..9aff47d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,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: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b + sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-build/master] Preparing build2 for 7.5a9
by gk＠torproject.org 03 Dec '17

03 Dec '17

commit a718f53f4667e679cabf5d9bc42a0f6a75c3127d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:24:41 2017 +0000 Preparing build2 for 7.5a9 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- projects/tor/config | 2 +- rbm.conf | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0123357..d3cc063 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.1 + firefox_platform_version: 52.5.2 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9d9a975..c7ac62f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,7 @@ -Tor Browser 7.5a9 -- November 30 2017 +Tor Browser 7.5a9 -- December 05 2017 * All Platforms - * Update Firefox to 52.5.1esr - * Bug 24040: Tor Browser crashes at riot.im/app - * Update Tor to 0.3.2.5-alpha + * Update Firefox to 52.5.2esr + * Update Tor to 0.3.2.6-alpha * Update HTTPS-Everywhere to 2017.11.21 * Update NoScript to 5.1.7 * Update sandboxed-tor-browser to 0.0.16 diff --git a/projects/tor/config b/projects/tor/config index c49ebb5..f662561 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.5-alpha +version: 0.3.2.6-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index 62b7902..4f74450 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Getting 7.5a9 built earlier using the 52.5.1esr lang packs
by gk＠torproject.org 03 Dec '17

03 Dec '17

commit 1ea5f33989925e3cc0217b45623f7044461a7972 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:23:30 2017 +0000 Getting 7.5a9 built earlier using the 52.5.1esr lang packs --- projects/firefox-langpacks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..c5384e3 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -3,7 +3,7 @@ version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' var: - ff_version: '[% pc("firefox", "var/firefox_version") %]' + ff_version: 52.5.1esr ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

1 0

[tor-browser-build/master] Bug 24477: Fix generation of Windows 64 mar files
by gk＠torproject.org 01 Dec '17

01 Dec '17

commit 0abccfe4258218612f38ac1c2d762c319781386f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 1 00:48:20 2017 +0100 Bug 24477: Fix generation of Windows 64 mar files --- projects/tor-browser/build | 5 +++++ projects/tor-browser/config | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 022d6e9..56d6294 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions # Extract the MAR tools. unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip MARTOOLS=$rootdir/mar-tools +[% IF c("var/windows-x86_64") -%] + # Workaround for bug 24477 + rm -Rf $MARTOOLS + unzip -d $rootdir $rootdir/mar-tools-linux32.zip +[% END -%] mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c00af05..eb0a5d0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -85,3 +85,9 @@ input_files: enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' + # Workaround for bug 24477 + - URL: https://archive.torproject.org/tor-package-archive/torbrowser/7.5a7/mar-too… + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: torbrowser.gpg + enable: '[% c("var/windows-x86_64") %]'

1 0