- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 24475: Add support for Windows 64 to update-responses
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit 5a274fb97d317860e59592ec37a6ce9f3a007fd9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Dec 6 13:38:49 2017 +0100 Bug 24475: Add support for Windows 64 to update-responses --- projects/release/update_responses_config.yml | 4 +++- tools/update-responses/update_responses | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 8d945dc..01c6950 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -3,7 +3,8 @@ tmp_dir: '[% c("tmp_dir") %]' appname_marfile: tor-browser appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser -appname_bundle_win: torbrowser-install +appname_bundle_win32: torbrowser-install +appname_bundle_win64: torbrowser-install-win64 releases_dir: [% path(c('output_dir')) %]/[% c("var/signed_status") %] download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser @@ -17,6 +18,7 @@ build_targets: - WINNT_x86-gcc3 - WINNT_x86-gcc3-x86 - WINNT_x86-gcc3-x64 + win64: WINNT_x86_64-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 9303ed1..b68e46a 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -136,7 +136,9 @@ sub get_version_downloads { ($os, $lang) = ('osx64', $1); } elsif ($file =~ m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) { ($os, $lang) = ($1, $2); - } elsif ($file =~ m/^$config->{appname_bundle_win}-${version}_(.+).exe$/) { + } elsif ($file =~ m/^$config->{appname_bundle_win64}-${version}_(.+).exe$/) { + ($os, $lang) = ('win64', $1); + } elsif ($file =~ m/^$config->{appname_bundle_win32}-${version}_(.+).exe$/) { ($os, $lang) = ('win32', $1); } else { next;

1 0

[tor-browser-build/master] Release preparations for 7.5a9 (build4)
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit 66f424078b1971d393406165f79d050e78d574f2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:51:42 2017 +0000 Release preparations for 7.5a9 (build4) Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index d3cc063..4821baf 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") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 57e1338..34947db 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.11.21 +version: 2017.12.6 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c92b0c0..092d36e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,8 @@ -Tor Browser 7.5a9 -- December 08 2017 +Tor Browser 7.5a9 -- December 09 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 HTTPS-Everywhere to 2017.12.6 * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 diff --git a/rbm.conf b/rbm.conf index 504c20b..5714e1f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

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

07 Dec '17

commit 69b54fd0e9ed1a806b33ffe47108c4ae59fd2034 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:37:33 2017 +0000 Revert "Getting 7.5a9 built earlier using the 52.5.1esr lang packs" This reverts commit 1ea5f33989925e3cc0217b45623f7044461a7972. No need anymore for this hack, we use the 52.5.2esr ones provided. --- 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 c5384e3..4e42939 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: 52.5.1esr + ff_version: '[% pc("firefox", "var/firefox_version") %]' ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.11
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit e66f55b7aebe0536299dada5882acaffb6dbe3ad Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:04:25 2017 +0000 Release preparations for 7.0.11 Updated again Changelog, versions file, and config.yml --- Bundle-Data/Docs/ChangeLog.txt | 10 +++++----- gitian/versions | 14 +++++++------- tools/update-responses/config.yml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1abe1ba..12dc24f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,9 @@ -Tor Browser 7.0.11 -- November 30 2017 +Tor Browser 7.0.11 -- December 09 2017 * All Platforms - * Update Firefox to 52.5.1esr - * Bug 24040: Tor Browser crashes at riot.im/app - * Update HTTPS-Everywhere to 2017.11.21 - * Update NoScript to 5.1.7 + * Update Firefox to 52.5.2esr + * Update Tor to 0.3.1.9 + * Update HTTPS-Everywhere to 2017.12.6 + * Update NoScript to 5.1.8.1 Tor Browser 7.0.10 -- November 14 2017 * All Platforms diff --git a/gitian/versions b/gitian/versions index 26545b9..b3295ca 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.5.1esr +FIREFOX_VERSION=52.5.2esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.1.8 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2-build1 +TOR_TAG=tor-0.3.1.9 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.10 -HTTPSE_TAG=2017.11.21 +HTTPSE_TAG=2017.12.6 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.7-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b +NOSCRIPT_HASH=8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index dda82ef..735b713 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -23,7 +23,7 @@ channels: release: 7.0.11 versions: 7.0.11: - platformVersion: 52.5.1 + platformVersion: 52.5.2 detailsURL: https://blog.torproject.org/tor-browser-7011-released incremental_from: - 7.0.10

1 0

[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] 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 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] Preparing build2 for 7.5a9
by gk＠torproject.org 02 Dec '17

02 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 02 Dec '17

02 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

[tor-browser-build/master] Release preparations for 7.5a9
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit 9d501237c3f8269ce7ea97787bf5773d452c3e5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 08:57:10 2017 +0000 Release preparations for 7.5a9 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/sandbox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 7 +++---- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 5b64726..0123357 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.0 + firefox_platform_version: 52.5.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 237272b..57e1338 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.10.30 +version: 2017.11.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/sandbox/config b/projects/sandbox/config index 03b6f6d..a7ed768 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.15 +version: 0.0.16 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e458f61..9d9a975 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 7.5a9 -- November 30 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 HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + * Update sandboxed-tor-browser to 0.0.16 + Tor Browser 7.5a8 -- November 15 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 06400be..c00af05 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: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c + sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor/config b/projects/tor/config index e704f13..c49ebb5 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.4-alpha +version: 0.3.2.5-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 f4fbb08..62b7902 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a8' - torbrowser_build: 'build3' + torbrowser_version: '7.5a9' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a6 - - 7.5a7 + - 7.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.11
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit fd56a5b5d2c822166baaf8bfb7baeef404e6b51a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 07:47:32 2017 +0000 Release preparations for 7.0.11 Versions bump, changelog update, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cecf4e9..1abe1ba 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 7.0.11 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + Tor Browser 7.0.10 -- November 14 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/gitian/versions b/gitian/versions index 1f08327..26545b9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.5.0esr +FIREFOX_VERSION=52.5.1esr TORBROWSER_UPDATE_CHANNEL=release @@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.8 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.10 -HTTPSE_TAG=2017.10.30 +HTTPSE_TAG=2017.11.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.7-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c +NOSCRIPT_HASH=617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 628b131..dda82ef 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.10 + release: 7.0.11 versions: - 7.0.10: - platformVersion: 52.5.0 - detailsURL: https://blog.torproject.org/tor-browser-7010-released + 7.0.11: + platformVersion: 52.5.1 + detailsURL: https://blog.torproject.org/tor-browser-7011-released incremental_from: - - 7.0.8 - - 7.0.9 + - 7.0.10 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-build/master] Bug 24361: Bump rbm commit to pick up a fixup for 24361
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 57b65bcc24372b0d7eaff35bd8cf5089fd33b035 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:46:01 2017 +0000 Bug 24361: Bump rbm commit to pick up a fixup for 24361 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a5a1748..5c89374 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88 +Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438

1 0

[rbm/master] fixup! Bug 24361: use Path::Tiny instead of File::Slurp
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 5c89374df7957238a9565c0b938ee3f30f880438 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:41:34 2017 +0000 fixup! Bug 24361: use Path::Tiny instead of File::Slurp --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b2ef57f..73b7d6c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -707,7 +707,7 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && $input_file->{sha256sum} - && $t->('sha256sum') ne sha256_hex(read_file($fname))) { + && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { $fname = undef; } if ($action eq 'input_files_id') {

1 0

[tor-browser-build/master] Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny)
by boklm＠torproject.org 27 Nov '17

27 Nov '17

commit 39b88a7e8b03877bf478cafd1b72e9abc5694ca6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 27 12:33:05 2017 +0100 Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny) --- README | 4 ++-- tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 9639d2e..a449f9d 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ You also need a few perl modules installed: - IO::Handle - IO::CaptureOutput - File::Temp -- File::Tiny +- Path::Tiny - File::Path - File::Copy::Recursive - String::ShellQuote @@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libfile-tiny-perl \ + libio-captureoutput-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index de8cce3..f27c6cf 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -12,7 +12,7 @@ - libio-handle-util-perl - libio-all-perl - libio-captureoutput-perl - - libfile-tiny-perl + - libpath-tiny-perl - libstring-shellquote-perl - libsort-versions-perl - libdigest-sha-perl

1 0

[tor-browser-build/master] Bug 24361: Bump rbm commit
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit a6d54303ad89af777a4994dc27d0ae90945f090c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:17:30 2017 +0000 Bug 24361: Bump rbm commit Furthermore we adapt the README and our ansible main.yml to take care of removing File::Slurp from our build dependencies and replacing it with Path::Tiny --- README | 4 ++-- rbm | 2 +- tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 5b4a2bc..9639d2e 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ You also need a few perl modules installed: - IO::Handle - IO::CaptureOutput - File::Temp -- File::Slurp +- File::Tiny - File::Path - File::Copy::Recursive - String::ShellQuote @@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libfile-slurp-perl \ + libio-captureoutput-perl libfile-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc diff --git a/rbm b/rbm index 236fcaa..a5a1748 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 236fcaac2012531330f21d2e9cce49a534a03b60 +Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88 diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index f3a857c..de8cce3 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -12,7 +12,7 @@ - libio-handle-util-perl - libio-all-perl - libio-captureoutput-perl - - libfile-slurp-perl + - libfile-tiny-perl - libstring-shellquote-perl - libsort-versions-perl - libdigest-sha-perl

1 0

[rbm/master] Bug 24361: fix handling of wide characters in sha256
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 134cad4e79471d7baa82f00b4a6e2d7f7d11868a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 20 17:55:23 2017 +0100 Bug 24361: fix handling of wide characters in sha256 The sha256_hex function gives an error if a string contains wide characters. To avoid this we first encode the string to utf8 (which transforms it to a sequence of octets), before passing it to sha256_hex. --- lib/RBM.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 96a1b9b..3134efe 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -2,6 +2,7 @@ package RBM; use warnings; use strict; +use Encode qw(encode); use Cwd qw(getcwd); use YAML::XS qw(LoadFile); use Template; @@ -639,7 +640,9 @@ sub process_template { tmpl => sub { process_template($project, $_[0], $dest_dir) }, shell_quote => \&shell_quote, versioncmp => \&versioncmp, - sha256 => \&sha256_hex, + sha256 => sub { + return sha256_hex(encode("utf8", $_[0])); + }, sha256file => \&sha256file, fileparse => \&fileparse, ENV => \%ENV,

1 0

[rbm/master] Merge remote-tracking branch 'boklm/bug_24361'
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit a5a1748894ae3e84cb81467b972010969f1b5c88 Merge: 6406e06 8b6831b Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:06:25 2017 +0000 Merge remote-tracking branch 'boklm/bug_24361' lib/RBM.pm | 69 ++++++++++++++++++++++++++++++++------------------------------ test.pl | 4 ++-- 2 files changed, 38 insertions(+), 35 deletions(-) diff --cc lib/RBM.pm index 7850817,9080ccf..b2ef57f --- a/lib/RBM.pm +++ b/lib/RBM.pm @@@ -836,10 -832,12 +839,10 @@@ sub input_files if $input_file->{project}; exit_error("Missing filename:\n" . pp($input_file)) unless $name; my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir); - $need_dl = input_file_id_need_dl($input_file, $t, $fname) - if $action eq 'input_files_id'; my $file_gpg_id = gpg_id($t->('file_gpg_id')); - if ($need_dl && (!$fname || $t->('refresh_input'))) { + if (input_file_need_dl($input_file, $t, $fname, $action)) { if ($t->('content')) { - write_file("$proj_out_dir/$name", $t->('content')); + path("$proj_out_dir/$name")->spew_utf8($t->('content')); } elsif ($t->('URL')) { urlget($project, {%$input_file, filename => $name}, 1); } elsif ($t->('exec')) {

1 0

[rbm/master] Bug 24361: use Path::Tiny instead of File::Slurp
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 8b6831b36becc697fc53e61cac058d18096ea4b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 21 17:13:01 2017 +0100 Bug 24361: use Path::Tiny instead of File::Slurp When a build script contains some wide character, rbm fails with an error: Wide character in syswrite at /usr/share/perl5/File/Slurp.pm line 506. This is because write_file from File::Slurp which we use to write the build scripts is encoding files to latin-1 by default. While fixing this, switching to Path::Tiny instead of File::Slurp seems like a good idea: http://blogs.perl.org/users/leon_timmermans/2015/08/fileslurp-is-broken-and… Switching to Path::Tiny is also improving performance: When using File::Slurp: $ time ./rbm/rbm showconf --target alpha --target torbrowser-linux-x86_64 tor-browser var/build_id 82b8cb real 0m28.543s user 0m24.448s sys 0m3.956s When using Path::Tiny: $ time ~/rbm/rbm showconf --target alpha --target torbrowser-linux-x86_64 tor-browser var/build_id 82b8cb real 0m15.745s user 0m13.940s sys 0m1.940s The path function in lib/RBM.pm is conflicting with the path constructor from Path::Tiny, so we rename it to rbm_path. --- lib/RBM.pm | 64 +++++++++++++++++++++++++++++++------------------------------- test.pl | 4 ++-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 3134efe..9080ccf 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -2,6 +2,7 @@ package RBM; use warnings; use strict; +use Path::Tiny; use Encode qw(encode); use Cwd qw(getcwd); use YAML::XS qw(LoadFile); @@ -12,7 +13,6 @@ use IO::CaptureOutput qw(capture_exec); use File::Temp; use File::Copy; use File::Copy::Recursive qw(fcopy); -use File::Slurp; use File::Path qw(make_path); use File::Basename; use String::ShellQuote; @@ -50,7 +50,7 @@ sub load_config { $config->{step} = 'rbm_init'; $config->{opt} = {}; my $pdir = $config->{projects_dir} || $config->{default}{projects_dir}; - foreach my $p (glob path($pdir) . '/*') { + foreach my $p (glob rbm_path($pdir) . '/*') { next unless -f "$p/config"; $config->{projects}{basename($p)} = load_config_file("$p/config"); } @@ -65,7 +65,7 @@ sub load_system_config { sub load_local_config { my ($project) = @_; my $cfile = project_config($project ? $project : 'undef', 'localconf_file'); - $cfile = path($cfile); + $cfile = rbm_path($cfile); $config->{local} = -f $cfile ? load_config_file($cfile) : {}; } @@ -80,7 +80,7 @@ sub set_default_env { %ENV = (%ENV, %{$config->{ENV}}) if ref $config->{ENV} eq 'HASH'; } -sub path { +sub rbm_path { my ($path, $basedir) = @_; $basedir //= $config->{basedir}; return ( $path =~ m|^/| ) ? $path : "$basedir/$path"; @@ -271,7 +271,7 @@ sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); - write_file($tmp, $w); + path($tmp)->spew_utf8($w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 || exit_error 'Error setting gpg.program'; @@ -322,7 +322,7 @@ sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => get_tmp_dir($project, $options)); - write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', $options)); + path($gpg_wrapper)->spew_utf8(project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = capture_exec($gpg_wrapper, '--verify', @@ -377,7 +377,7 @@ sub git_need_fetch { sub git_clone_fetch_chdir { my ($project, $options) = @_; - my $clonedir = create_dir(path(project_config($project, + my $clonedir = create_dir(rbm_path(project_config($project, 'git_clone_dir', $options))); my $git_url = project_config($project, 'git_url', $options) || exit_error "git_url is undefined"; @@ -387,7 +387,7 @@ sub git_clone_fetch_chdir { @clone_submod = ('--recurse-submodules'); @fetch_submod = ('--recurse-submodules=on-demand'); } - if (!chdir path("$clonedir/$project")) { + if (!chdir rbm_path("$clonedir/$project")) { chdir $clonedir || exit_error "Can't enter directory $clonedir: $!"; if (system('git', 'clone', @clone_submod, $git_url, $project) != 0) { exit_error "Error cloning $git_url"; @@ -429,12 +429,12 @@ sub hg_need_fetch { sub hg_clone_fetch_chdir { my ($project, $options) = @_; my $hg = project_config($project, 'hg', $options); - my $clonedir = create_dir(path(project_config($project, + my $clonedir = create_dir(rbm_path(project_config($project, 'hg_clone_dir', $options))); my $hg_url = shell_quote(project_config($project, 'hg_url', $options)) || exit_error "hg_url is undefined"; my $sq_project = shell_quote($project); - if (!chdir path("$clonedir/$project")) { + if (!chdir rbm_path("$clonedir/$project")) { chdir $clonedir || exit_error "Can't enter directory $clonedir: $!"; if (system("$hg clone -q $hg_url $sq_project") != 0) { exit_error "Error cloning $hg_url"; @@ -453,7 +453,7 @@ sub run_script { my @res; if ($cmd =~ m/^#/) { my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); - write_file($tmp, $cmd); + path($tmp)->spew_utf8($cmd); chmod 0700, $tmp; @res = $f->($tmp); unlink $tmp; @@ -505,7 +505,7 @@ sub gpg_id { sub maketar { my ($project, $options, $dest_dir) = @_; - $dest_dir //= create_dir(path(project_config($project, 'output_dir'))); + $dest_dir //= create_dir(rbm_path(project_config($project, 'output_dir'))); valid_project($project); my $old_cwd = getcwd; my $commit_hash; @@ -592,9 +592,9 @@ sub maketar { sub sha256file { CORE::state %res; - my $f = path(shift); + my $f = rbm_path(shift); return $res{$f} if exists $res{$f}; - return $res{$f} = -f $f ? sha256_hex(scalar read_file($f)) : ''; + return $res{$f} = -f $f ? sha256_hex(path($f)->slurp_raw) : ''; } sub process_template_opt { @@ -617,8 +617,8 @@ sub process_template { } return $res; } - $dest_dir //= path(project_config($project, 'output_dir')); - my $projects_dir = path(project_config($project, 'projects_dir')); + $dest_dir //= rbm_path(project_config($project, 'output_dir')); + my $projects_dir = rbm_path(project_config($project, 'projects_dir')); my $template = Template->new( ENCODING => 'utf8', INCLUDE_PATH => "$projects_dir/$project:$projects_dir/common", @@ -636,7 +636,7 @@ sub process_template { dest_dir => $dest_dir, exit_error => \&exit_error, exec => sub { execute($project, @_) }, - path => \&path, + path => \&rbm_path, tmpl => sub { process_template($project, $_[0], $dest_dir) }, shell_quote => \&shell_quote, versioncmp => \&versioncmp, @@ -655,12 +655,12 @@ sub process_template { sub rpmspec { my ($project, $dest_dir) = @_; - $dest_dir //= create_dir(path(project_config($project, 'output_dir'))); + $dest_dir //= create_dir(rbm_path(project_config($project, 'output_dir'))); valid_project($project); my $timestamp = project_config($project, 'timestamp'); my $rpmspec = project_config($project, 'rpmspec') || exit_error "Undefined config for rpmspec"; - write_file("$dest_dir/$project.spec", $rpmspec); + path("$dest_dir/$project.spec")->spew_utf8($rpmspec); utime $timestamp, $timestamp, "$dest_dir/$project.spec" if $timestamp; } @@ -673,7 +673,7 @@ sub copy_files { my @r; my $copy_files = project_config($project, 'copy_files'); return unless $copy_files; - my $proj_dir = path(project_config($project, 'projects_dir')); + my $proj_dir = rbm_path(project_config($project, 'projects_dir')); my $src_dir = "$proj_dir/$project"; foreach my $file (@$copy_files) { copy("$src_dir/$file", "$dest_dir/$file"); @@ -719,8 +719,8 @@ sub input_file_id_hash { my ($fname, $filename) = @_; return $filename . ':' . sha256file($fname) if -f $fname; return $filename . ':' . sha256file(readlink $fname) if -l $fname; - my @hashes = map { input_file_id_hash("$fname/$_", "$filename/$_") } - sort(read_dir($fname)); + my @subdirs = sort(map { $_->basename } path($fname)->children); + my @hashes = map { input_file_id_hash("$fname/$_", "$filename/$_") } @subdirs; return join("\n", @hashes); } @@ -742,7 +742,7 @@ sub recursive_copy { } my @copied; mkdir "$dest_dir/$name"; - foreach my $f (read_dir($fname)) { + foreach my $f (map { $_->basename } path($fname)->children) { push @copied, recursive_copy("$fname/$f", "$name/$f", $dest_dir); } return @copied; @@ -759,7 +759,7 @@ sub input_files { $options = {$options ? %$options : ()}; my $input_files = project_config($project, 'input_files', $options); goto RETURN_RES unless $input_files; - my $proj_dir = path(project_config($project, 'projects_dir', $options)); + my $proj_dir = rbm_path(project_config($project, 'projects_dir', $options)); my $src_dir = "$proj_dir/$project"; my $old_cwd = getcwd; chdir $src_dir || exit_error "cannot chdir to $src_dir"; @@ -813,12 +813,12 @@ sub input_files { } my $proj_out_dir; if ($input_file->{project}) { - $proj_out_dir = path(project_step_config($t->('project'), 'output_dir', + $proj_out_dir = rbm_path(project_step_config($t->('project'), 'output_dir', { %$options, step => $t->('pkg_type'), origin_project => $project, output_dir => undef, %$input_file })); } else { - $proj_out_dir = path(project_config($project, 'output_dir', + $proj_out_dir = rbm_path(project_config($project, 'output_dir', { %$input_file, output_dir => undef })); } create_dir($proj_out_dir); @@ -837,7 +837,7 @@ sub input_files { my $file_gpg_id = gpg_id($t->('file_gpg_id')); if ($need_dl && (!$fname || $t->('refresh_input'))) { if ($t->('content')) { - write_file("$proj_out_dir/$name", $t->('content')); + path("$proj_out_dir/$name")->spew_utf8($t->('content')); } elsif ($t->('URL')) { urlget($project, {%$input_file, filename => $name}, 1); } elsif ($t->('exec')) { @@ -889,7 +889,7 @@ sub input_files { } exit_error "Missing file $name" unless $fname; if ($t->('sha256sum') - && $t->('sha256sum') ne sha256_hex(read_file($fname))) { + && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { exit_error "Can't have sha256sum on directory: $fname" if -d $fname; exit_error "Wrong sha256sum for $fname.\n" . "Expected sha256sum: " . $t->('sha256sum'); @@ -954,7 +954,7 @@ sub build_run { $config->{step} = $script_name; $options //= {}; my $error; - my $dest_dir = create_dir(path(project_config($project, 'output_dir', $options))); + my $dest_dir = create_dir(rbm_path(project_config($project, 'output_dir', $options))); valid_project($project); $options = { %$options, build_id => Data::UUID->new->create_str }; my $old_cwd = getcwd; @@ -1023,16 +1023,16 @@ sub build_run { @scripts = grep { $build_script{$_} } @scripts; push @cfiles, @scripts unless $use_srcdir; foreach my $s (@scripts) { - write_file("$srcdir/$s", $build_script{$s}); + path("$srcdir/$s")->spew_utf8($build_script{$s}); chmod 0700, "$srcdir/$s"; } my $build_log = project_config($project, "build_log", $options); if ($build_log ne '-') { my $append = project_config($project, "build_log_append", $options); - $build_log = path($build_log); + $build_log = rbm_path($build_log); make_path(dirname($build_log)); my $now = localtime; - write_file($build_log, {append => $append}, "Starting build: $now\n"); + path($build_log)->append_utf8("Starting build: $now\n"); print "Build log: $build_log\n"; } chdir $srcdir; diff --git a/test.pl b/test.pl index 8e842e7..dfca8ee 100755 --- a/test.pl +++ b/test.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use File::Slurp; +use Path::Tiny; use Test::More tests => 29; use lib 'lib/'; @@ -207,7 +207,7 @@ foreach my $test (@tests) { if ($test->{build}) { unlink keys %{$test->{files}}; RBM::build_run(@{$test->{build}}); - my $res = grep { read_file($_) ne $test->{files}{$_} } keys %{$test->{files}}; + my $res = grep { path($_)->slurp_utf8 ne $test->{files}{$_} } keys %{$test->{files}}; ok(!$res, $test->{name}); } }

1 0

[tor-browser-build/master] Bug 24179: Use HTTPS-Everywhere release for nightly builds
by boklm＠torproject.org 27 Nov '17

27 Nov '17

commit ef2487d3aae2adff9d42a850c39d15e055c6735e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 09:49:03 2017 +0000 Bug 24179: Use HTTPS-Everywhere release for nightly builds --- projects/https-everywhere/config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 5225bbc..237272b 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -32,8 +32,3 @@ var: input_files: - project: container-image - -targets: - nightly: - version: master - tag_gpg_id: 0

1 0

[rbm/master] Bug 24180: Make 'rbm fetch' accept options
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 6406e0684a379d13188886f747ed57060925efaf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 8 14:32:04 2017 +0100 Bug 24180: Make 'rbm fetch' accept options --- doc/rbm-fetch.asc | 7 ++++++- rbm | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/rbm-fetch.asc b/doc/rbm-fetch.asc index 17a41e6..f0da55e 100644 --- a/doc/rbm-fetch.asc +++ b/doc/rbm-fetch.asc @@ -9,7 +9,7 @@ rbm-fetch - Fetch commits from remote git or mercurial repository SYNOPSIS -------- [verse] -'rbm fetch' [project] +'rbm fetch' [options] [project] DESCRIPTION ----------- @@ -23,6 +23,11 @@ fetched, so there is no need to use this command. Alternatively, the '--fetch' option can be used on other commands. +COMMAND LINE OPTIONS +-------------------- + +See link:rbm_cli.html[rbm_cli(7)] for options. + SEE ALSO -------- link:rbm.html[rbm(1)] diff --git a/rbm b/rbm index 2c4ad0d..5d6417b 100755 --- a/rbm +++ b/rbm @@ -131,7 +131,8 @@ sub show_conf { sub fetch { shift; $RBM::config->{run}{fetch} = 1; - my @l = @_ ? @_ : (RBM::projectslist()); + my $args = set_options(@_); + my @l = @$args ? @$args : (RBM::projectslist()); foreach my $project (@l) { RBM::valid_project($project); if (RBM::project_config($project, 'git_url')) {

1 0

[tor-browser-build/master] --remove-update-channel breaks HTTPS-Everywhere
by gk＠torproject.org 12 Nov '17

12 Nov '17

commit 72c12814f95f7b7f417f9330aa5cc4e931ed69b0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 12 19:27:12 2017 +0000 --remove-update-channel breaks HTTPS-Everywhere We can't use the --remove-update-channel option as we envisioned in #10394 as this throws an error in the WebExtensions context in Tor Browser. Falling back to regular EFF updates for now. --- projects/https-everywhere/build | 3 +-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 49018af..10dd4bf 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -2,8 +2,7 @@ [% c("var/set_default_env") -%] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] -# Bug 10394: We don't want to autoupdate HTTPS Everywhere anymore. -./make.sh --remove-update-channel +./make.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm pkg/*-amo.xpi mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1b5baf3..e458f61 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,7 +15,6 @@ Tor Browser 7.5a8 -- November 15 2017 * Update NoScript to 5.1.5 * Bug 23968: NoScript icon jumps to the right after update * Update sandboxed-tor-browser to 0.0.15 - * Bug 10394: Don't autoupdate HTTPS Everywhere anymore * Windows * Bug 20636+10026: Create 64bit Tor Browser for Windows * Bug 24052: Block file:// redirects early

1 0