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

[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] 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-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-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