- tbb-commits - lists.torproject.org

[tor-browser-build/master] Avoid using directory with predictable name in /tmp
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 36296855fd4e553fb871c2f03a2fc62597d562a5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:28:57 2017 +0200 Avoid using directory with predictable name in /tmp Update rbm with support for the rbm_tmp_dir option, and use it in the containers directory. --- rbm | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index f494d16..6902007 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit f494d16a1b86700661a029f5eca00c6216bf08d1 +Subproject commit 690200770631f4adcfbbe7988379eb39698e11ab diff --git a/rbm.conf b/rbm.conf index 93c5e5b..5e1e66d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -36,7 +36,7 @@ var: build: [% c("build", { filename => 'f', output_dir => '/out' }) %] container: - dir: '[% c("tmp_dir") %]/[% c("uid") %]/rbm-containers/[% sha256(c("build_id")) %]' + dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%]

1 0

[tor-browser-build/master] Display container's path when opening debug shell
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit b9512ca6c0fddee7aa61e6c1672df59ddaa0aacc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:22:54 2017 +0200 Display container's path when opening debug shell --- README.HACKING | 5 ++--- rbm.conf | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.HACKING b/README.HACKING index 8dde2f2..ea5d500 100644 --- a/README.HACKING +++ b/README.HACKING @@ -256,7 +256,6 @@ in the build containers, but vi can be used instead. When you press ctrl+d (twice if you opened a bash shell) the debug shell is closed and the container containing the failed build is removed. -If you want to make a backup of the container's rootfs with the failed -build to look at it later, you should be able to find it in -/tmp/$UID/rbm-containers. +The path to the container should be printed on the screen in case you +want to backup its rootfs to be able to look at it later. diff --git a/rbm.conf b/rbm.conf index 523a005..93c5e5b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -314,6 +314,9 @@ runc: remote_exec: | #!/bin/sh set -e + [% IF c("interactive") -%] + echo Container directory: [% shell_quote(c("var/container/dir")) %] + [% END -%] mkdir -p '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/rbm echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rootfs/rbm/cmd echo [% shell_quote(c('exec_cmd')) %] >> '[% c("var/container/dir") %]'/rootfs/rbm/cmd

1 0

[rbm/master] Add the rbm_tmp_dir option
by boklm＠torproject.org 11 Aug '17

11 Aug '17

commit 690200770631f4adcfbbe7988379eb39698e11ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 11 12:25:55 2017 +0200 Add the rbm_tmp_dir option --- NEWS | 2 ++ doc/rbm_config.asc | 5 +++++ lib/RBM/DefaultConfig.pm | 13 +++++++++++++ 3 files changed, 20 insertions(+) diff --git a/NEWS b/NEWS index 4eac374..c43dc2d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the rbm_tmp_dir option + - Add the input_files_paths option - Add the ENV option diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index 2e9b8ab..dc3b5e4 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -136,6 +136,11 @@ tmp_dir:: This directory will contains some scripts that will be executed, so it should not be on a partition mounted as noexec. +rbm_tmp_dir:: + A directory created inside +tmp_dir+ using +File::Temp+, that + you can use to store temporary files. This directory is removed + automatically when rbm exits. + output_dir:: The directory where output files (tarballs, spec files or packages) are created. The default value is +out+. diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index cf0ed74..63021e9 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -13,6 +13,7 @@ use File::Basename; use RBM; use Cwd qw(getcwd); use IO::CaptureOutput qw(capture_exec); +use File::Temp; sub git_describe { my ($project, $options) = @_; @@ -101,10 +102,22 @@ sub docker_version { RBM::exit_error("Could not find docker version"); } +sub rbm_tmp_dir { + my ($project, $options) = @_; + CORE::state $rbm_tmp_dir; + return $rbm_tmp_dir->dirname if $rbm_tmp_dir; + my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) + || RBM::exit_error('No tmp_dir specified'); + $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', + DIR => $tmp_dir); + return $rbm_tmp_dir->dirname; +} + our %default_config = ( sysconf_file => '/etc/rbm.conf', localconf_file=> 'rbm.local.conf', tmp_dir => '[% GET ENV.TMPDIR ? ENV.TMPDIR : "/tmp"; %]', + rbm_tmp_dir => \&rbm_tmp_dir, projects_dir => 'projects', output_dir => 'out', git_clone_dir => 'git_clones',

1 0

[tor-browser-build/master] Update tor-browser.git branch used in nightly
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit 8a999d86a27b8edd4dfc3ec8a497f13804d37f74 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:43:52 2017 +0200 Update tor-browser.git branch used in nightly --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index e2cf727..1360772 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -27,7 +27,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

1 0

[tor-browser-build/master] Synchronize mozconfig files with their version from tor-browser.git
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit aa96f1ab37786d11529f8266a1eeca07b04e7016 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:39:09 2017 +0200 Synchronize mozconfig files with their version from tor-browser.git The main change is the removal of the --enable-jemalloc=4 option which was done with #22482. --- projects/firefox/mozconfig-linux-i686 | 3 +-- projects/firefox/mozconfig-linux-x86_64 | 3 +-- projects/firefox/mozconfig-osx-x86_64 | 3 +-- projects/firefox/mozconfig-windows-i686 | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 8b4ecb3..a7d75fa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -31,7 +31,6 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index cde5b49..7d9ab1c 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -23,7 +23,6 @@ ac_add_options --disable-debug ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 1658e18..bc7a30e 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -50,7 +50,6 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests -# Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for OS X right now) +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme # ac_add_options --disable-ctypes diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index de86c49..af30573 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -21,7 +21,7 @@ ac_add_options --enable-verify-mar # We can't build the sandbox code with mingw-w64: # https://bugzilla.mozilla.org/show_bug.cgi?id=1042426 ac_add_options --disable-sandbox -# EME is not running without sandbox. Thus, don't compile it in the first place. +# Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service

1 0

[tor-browser-build/master] README.HACKING: explain which mozconfig files we are using
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit 2c5b8113fa1fcbfaac8f5b3310b7e54a7ca38af2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 12:24:20 2017 +0200 README.HACKING: explain which mozconfig files we are using --- README.HACKING | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.HACKING b/README.HACKING index 221cc90..8dde2f2 100644 --- a/README.HACKING +++ b/README.HACKING @@ -222,6 +222,21 @@ commit you want to build. You will also need to comment the 'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). +The Firefox mozconfig files +--------------------------- + +In the gitian build, we are using the mozconfig files included in the +tor-browser.git repository (the .mozconfig, .mozconfig-mac and +.mozconfig-mingw files). + +In the rbm build however, we need to make some small modifications to +those files, so we are instead using mozconfig files stored in the +projects/firefox/ directory and ignoring the .mozconfig files from the +tor-browser.git repository. + +This could change in the future, when we are not using gitian anymore. + + Debugging a build error -----------------------

1 0

[tor-browser-bundle/master] Bug 23171: Copy snowflake doc files to proper location
by gk＠torproject.org 10 Aug '17

10 Aug '17

commit 32c98b835b5b104de5817d1d54ffaa3755a70b4d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 10 10:00:34 2017 +0000 Bug 23171: Copy snowflake doc files to proper location --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index ebfcaa9..710f891 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -231,8 +231,8 @@ script: | cmp client client.stomped && (echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed. Check descriptors/mac/gitian-pluggable-transports.yml"; exit 1) cp -a client.stomped $PTDIR/snowflake-client cd .. - mkdir -p $INSTDIR/Docs/snowflake - cp -a README.md LICENSE $INSTDIR/Docs/snowflake + mkdir -p $DOCSDIR/snowflake + cp -a README.md LICENSE $DOCSDIR/snowflake cd .. # Grabbing the result

1 0

[tor-browser-build/master] README.HACKING: explain how to test a firefox patch
by boklm＠torproject.org 10 Aug '17

10 Aug '17

commit cebdaf3303a4165f200d20e6d9f8c04ea90f15e2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 10 11:48:13 2017 +0200 README.HACKING: explain how to test a firefox patch --- README.HACKING | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.HACKING b/README.HACKING index 2687ed1..221cc90 100644 --- a/README.HACKING +++ b/README.HACKING @@ -198,6 +198,30 @@ To find the resulting file from the build, you can use 'ls -ltr out/tor/' to find the file with the last modification time. +Patching Firefox (or an other component) +---------------------------------------- + +If you want to test a firefox patch, the easiest way to do it is to +copy the patch file to the projects/firefox/ directory, then edit +projects/firefox/config to add the new patch to the list of input_files: + + - filename: patch-for-XXXX.patch + +Then edit projects/firefox/build to add a line somewhere (probably just +before running the configure script) to apply the patch: + + patch -p1 < $rootdir/patch-for-XXXX.patch + +You can now run 'make testbuild' (or an other build target) to start a +build with the patch. + +As an alternative, if you have your patch in a git repository, you can +edit projects/firefox/config to change the git_url option to point to +your git repository, and change the git_hash option to point to the +commit you want to build. You will also need to comment the +'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). + + Debugging a build error -----------------------

1 0

[tor-browser-build/master] Remove hardened targets
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48b01dee52a63cb0f490b6303cb2a4e93855c118 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:24:19 2017 +0200 Remove hardened targets --- .gitignore | 1 - Makefile | 3 --- projects/release/config | 11 ----------- 3 files changed, 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7c83e82..c4c3919 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /alpha /alpha_nightly /nightly -/hardened /testbuild /rbm.local.conf /logs diff --git a/Makefile b/Makefile index 274e11c..c45b0a1 100644 --- a/Makefile +++ b/Makefile @@ -77,9 +77,6 @@ testbuild-windows-i686: submodule-update testbuild-osx-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 -hardened-linux-x86_64: submodule-update - $(rbm) build release --target hardened --target torbrowser-linux-x86_64 - signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/projects/release/config b/projects/release/config index db62a95..ee318c2 100644 --- a/projects/release/config +++ b/projects/release/config @@ -60,17 +60,6 @@ targets: var: build_target: torbrowser-testbuild - hardened_nightly: - output_dir: 'hardened_nightly' - publish_dir: '[% c("var/today") %]' - var: - build_target: hardened - - hardened: - output_dir: 'hardened' - var: - build_target: hardened - input_files: # Release

1 0

[tor-browser-build/master] Fix var/publish_dir for nightly, alpha_nightly and testbuild
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 48deeaa2fc6caeb378623c4d4cb1fc1142b9774a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:27:55 2017 +0200 Fix var/publish_dir for nightly, alpha_nightly and testbuild Fix an error introduced by 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8. --- projects/release/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/release/config b/projects/release/config index ee318c2..b785878 100644 --- a/projects/release/config +++ b/projects/release/config @@ -39,15 +39,15 @@ targets: nightly: output_dir: 'nightly' - publish_dir: '[% c("var/today") %]' var: build_target: nightly + publish_dir: '[% c("var/today") %]' alpha_nightly: output_dir: 'alpha_nightly' - publish_dir: '[% c("var/today") %]' var: build_target: alpha + publish_dir: '[% c("var/today") %]' alpha: output_dir: 'alpha/unsigned' @@ -56,9 +56,9 @@ targets: testbuild: output_dir: 'testbuild' - publish_dir: '' var: build_target: torbrowser-testbuild + publish_dir: '' input_files:

1 0

[tor-browser-build/master] Fix faketime path in ddmg.sh
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 9a732cfa7e869ff50f679c9bdaa964892fa80328 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 17:10:54 2017 +0200 Fix faketime path in ddmg.sh --- projects/tor-browser/ddmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index 20bd8f9..a715300 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -10,7 +10,7 @@ pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] -export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 +export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755

1 0

[tor-browser-build/master] winpython: use wine to run python.exe
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit b67299f66b4f43deaf532b68a7cbca9cce60ba43 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:04:20 2017 +0200 winpython: use wine to run python.exe We need wine to run python.exe. It seems it was working without explicitely using wine on my build machine, probably because of the binfmt configuration in the kernel of that machine. --- projects/winpython/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/winpython/build b/projects/winpython/build index 2a30acc..5f53b9c 100644 --- a/projects/winpython/build +++ b/projects/winpython/build @@ -25,7 +25,7 @@ echo "FAKETIME = \"$FAKETIME\"" >> settings.py # Must pre-copy python27.dll into the build directory, or else py2exe can't find it. mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $distdir/python27.dll build/bdist.win32/winexe/bundle-2.7/ -LD_PRELOAD= $distdir/python.exe setup.py py2exe +LD_PRELOAD= wine $distdir/python.exe setup.py py2exe mkdir -p $distdir/wineroot/windows/ cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe $distdir/wineroot/windows/ cp $rootdir/pyc-timestamp.sh $distdir/

1 0

[tor-browser-build/master] tbb-7.5a4-build2
by boklm＠torproject.org 09 Aug '17

09 Aug '17

commit 4195b8f52cc7e380e44f281f80f148e361a3b2e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 9 15:11:21 2017 +0200 tbb-7.5a4-build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 4efc57c..523a005 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,7 +15,7 @@ buildconf: var: torbrowser_version: '7.5a4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-bundle/master] Fix typos in changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit e5a74a3aa67c15a093c15a9f40fa221acf2f74fb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 11:57:50 2017 +0000 Fix typos in changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 272bd74..aa0c5a8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Bug 22618: Downloading pdf file via file:/// is stalling * Bug 22542: Resize slider window to work without scrollbars * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up @@ -52,7 +52,7 @@ Tor Browser 7.0.4 -- August 8 2017 * Update Tor to 0.3.0.10 * Update Torbutton to 1.9.7.5 * Bug 21999: Fix display of language prompt in non-en-US locales - * Bug 18193: Don't let about:tor have chrome privileges + * Bug 18913: Don't let about:tor have chrome privileges * Bug 22535: Search on about:tor discards search query * Bug 21948: Going back to about:tor page gives "Address isn't valid" error * Code clean-up

1 0

[tor-browser-build/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit cdb545afe64aa22364f2a7e08e0afe27a1f60129 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 16:44:15 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index 6745cdc..4efc57c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -274,8 +274,11 @@ gpg_wrapper: | SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; END; -%] - if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ - && [ "$2" = '--verify' ] + # git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 + if ( [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] ) \ + || ( [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] ) then [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]}

1 0

[tor-browser-bundle/maint-7.0] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit ddfbe17d6b6a83fc3c7fda2e6737d33221f8539c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 6b1c63cc05cd28a55a241296808eef448bdf96f3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 17:08:13 2017 +0200 Bug 20757: fix gpg_wrapper with git >= 2.10.0-rc0 Thanks to dcf for finding the cause of the problem. --- gitian/git-gpg-wrapper | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper index f137d6d..b277a48 100755 --- a/gitian/git-gpg-wrapper +++ b/gitian/git-gpg-wrapper @@ -8,6 +8,12 @@ if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ then gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' exit ${PIPESTATUS[0]} +# git >= 2.10.0-rc0 is calling gpg with 5 args. See #20757 +elif [ $# -eq 5 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--keyid-format=long' ] && [ "$3" = '--verify' ] +then + gpgv "$1" "$4" "$5" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} else exec gpg "$@" fi

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 09 Aug '17

09 Aug '17

commit 50046217378fd7b3d95a669cdb3c890a8c085fa9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 9 08:52:54 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 16c10f5..272bd74 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -46,6 +46,33 @@ Tor Browser 7.5a4 -- August 9 2017 * Linux * Bug 20929: Bump GCC version to 5.4.0 +Tor Browser 7.0.4 -- August 8 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.0.10 + * Update Torbutton to 1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Windows + * Bug 22829: Remove default obfs4 bridge riemann. + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[tor-browser-build/master] Update rbm: include stdout in remote_exec/remote_start error output
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit 47e0f00751def20f7458bc0df95cbb0f341b9d6c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 21:05:22 2017 +0200 Update rbm: include stdout in remote_exec/remote_start error output --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 31be478..f494d16 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 31be478688e0448d36373d21939922f2a108aeea +Subproject commit f494d16a1b86700661a029f5eca00c6216bf08d1

1 0

[rbm/master] Include stdout in remote_exec/remote_start error output
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit f494d16a1b86700661a029f5eca00c6216bf08d1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 21:00:10 2017 +0200 Include stdout in remote_exec/remote_start error output Sometimes stdout can include useful informations about the error so include it in addition to stderr. --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 100bc04..c1240cd 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -976,7 +976,7 @@ sub build_run { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec); if (!$success) { - $error = "Error starting remote:\n$stderr"; + $error = "Error starting remote:\n$stdout\n$stderr"; goto EXIT; } } @@ -991,7 +991,7 @@ sub build_run { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec); if (!$success) { - $error = "Error connecting to remote:\n$stderr"; + $error = "Error connecting to remote:\n$stdout\n$stderr"; goto EXIT; } $remote_tmp = (split(/\r?\n/, $stdout))[0];

1 0

[tor-browser-bundle/master] Bump package versions for nightly builds
by gk＠torproject.org 08 Aug '17

08 Aug '17

commit d27f3739c5557ad2ce7b67b6a36c05c274d817c5 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 8 07:25:31 2017 +0000 Bump package versions for nightly builds --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a2062bd..3559f80 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -13,11 +13,11 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=0 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -57,7 +57,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2l 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.4.0 CLANG_VER=3.8.0 @@ -80,7 +80,7 @@ ELFUTILS_VER=0.166 ## 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.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -116,7 +116,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-build/master] Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit d8de49152e01a1b6cf4b0801bd1e3b3f42f0e857 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 02:49:59 2017 +0200 Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 9dbe709..db265c7 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,7 +7,7 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ -% END -%] +[% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ [% END -%]

1 0

[tor-browser-build/master] Move projects/release/config build to a separate file
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit c87cfc7291c7faf95c7afc8af693a7f689cdcc0a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:04:18 2017 +0200 Move projects/release/config build to a separate file --- projects/release/build | 26 ++++++++++++++++++++++++++ projects/release/config | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/projects/release/build b/projects/release/build new file mode 100644 index 0000000..9dbe709 --- /dev/null +++ b/projects/release/build @@ -0,0 +1,26 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" +mkdir -p "$destdir" +[% IF c("var/torbrowser-windows-i686") -%] + mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ +% END -%] +[% IF c("var/torbrowser-osx-x86_64") -%] + mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-i686") -%] + mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-x86_64") -%] + mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +[% IF c("var/sign_build") -%] + gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt +[% END -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/release/config b/projects/release/config index 43a36e8..8beea7e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,30 +117,3 @@ input_files: - torbrowser-windows-i686 - expert-bundle -build: | - #!/bin/sh - [% c("var/set_default_env") -%] - # reset HOME which was changed by var/set_default_env, for gpg - [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] - destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" - mkdir -p "$destdir" - [% IF c("var/torbrowser-windows-i686") -%] - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-osx-x86_64") -%] - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-i686") -%] - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-x86_64") -%] - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END -%] - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt - [% IF c("var/sign_build") -%] - gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt - [% END -%] - cat sha256sums-unsigned-build.txt

1 0

[tor-browser-build/master] Add script to help tagging a release
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5a438172202b385f962f3b715efff2b20be859f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:37:15 2017 +0200 Add script to help tagging a release The 'make signtag-release' and 'make signtag-alpha' commands can be used to tag a stable or alpha release using the version informations from rbm.conf. --- Makefile | 6 ++++++ projects/release/config | 6 ++++++ projects/release/signtag | 8 ++++++++ rbm | 2 +- rbm.conf | 1 + rbm.local.conf.example | 5 +++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b82309c..274e11c 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,12 @@ testbuild-osx-x86_64: submodule-update hardened-linux-x86_64: submodule-update $(rbm) build release --target hardened --target torbrowser-linux-x86_64 +signtag-release: submodule-update + $(rbm) build release --step signtag --target release + +signtag-alpha: submodule-update + $(rbm) build release --step signtag --target alpha + submodule-update: git submodule update --init diff --git a/projects/release/config b/projects/release/config index 8beea7e..db62a95 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,3 +117,9 @@ input_files: - torbrowser-windows-i686 - expert-bundle +steps: + signtag: + build_log: '-' + debug: 0 + input_files: [] + signtag: '[% INCLUDE signtag %]' diff --git a/projects/release/signtag b/projects/release/signtag new file mode 100644 index 0000000..3ce2e48 --- /dev/null +++ b/projects/release/signtag @@ -0,0 +1,8 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg/git +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +cd [% c("basedir") %] +git tag [% c("buildconf/git_signtag_opt") %] -m \ + 'Tagging [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \ + tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %] diff --git a/rbm b/rbm index ff4299f..31be478 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f +Subproject commit 31be478688e0448d36373d21939922f2a108aeea diff --git a/rbm.conf b/rbm.conf index 13d19a5..6745cdc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,6 +11,7 @@ pkg_type: build # in var/build_id, so that changing this option does not affect the build_id. buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' + git_signtag_opt: '-s' var: torbrowser_version: '7.5a4' diff --git a/rbm.local.conf.example b/rbm.local.conf.example index a4b0212..e30d8a8 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -29,6 +29,11 @@ buildconf: ### RBM_NUM_PROCS environment variable. The default is 4. #num_procs: 8 + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + var: local_conf: 1

1 0

[tor-browser-build/master] Fix .gitignore syntax
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 15435cbc400074d2a415cb3e8b14bdb7bd0fb653 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:59:22 2017 +0200 Fix .gitignore syntax Add a leading slash on all lines to match files/directories only in the root directory. --- .gitignore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe0aec..7c83e82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -git_clones -hg_clones -gclient -out -release -alpha -alpha_nightly -nightly -hardened -testbuild -rbm.local.conf -logs +/git_clones +/hg_clones +/gclient +/out +/release +/alpha +/alpha_nightly +/nightly +/hardened +/testbuild +/rbm.local.conf +/logs

1 0