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

[tor-browser-build/master] firefox: correctly extract binutils
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit b4e028b87ff81ea12e22f1e1d59025419c911f65 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 5 18:34:23 2017 +0100 firefox: correctly extract binutils --- projects/firefox/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 453f6b3..496c215 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -17,7 +17,8 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") %] -tar xf $rootdir/[% c('input_files_by_name/binutils') %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%]

1 0

[tor-browser-build/master] binutils: add the --enable-plugins configure flag
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 375e3655ba9855a11aea1a78f7861f7843db81d6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 5 18:33:27 2017 +0100 binutils: add the --enable-plugins configure flag --- projects/binutils/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/binutils/config b/projects/binutils/config index c1e67df..2975f14 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -3,7 +3,7 @@ version: 2.24 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 var: - configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives' + configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives --enable-plugins' targets: windows-i686:

1 0

[tor-browser-build/master] Bug 21605: Switch to tpo repo for sandboxed tor browser
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit d7d65fa096b65eb5b0748658f05bbb31736bedca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Mar 2 13:52:49 2017 +0100 Bug 21605: Switch to tpo repo for sandboxed tor browser --- projects/sandbox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sandbox/config b/projects/sandbox/config index 54fe4df..44faca9 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 0.0.3 -git_url: https://git.schwanenlied.me/yawning/sandboxed-tor-browser +git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 gpg_keyring: obfs4.gpg

1 0

[tor-browser-build/master] Bug 21536: Remove scramblesuit bridge
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 51ab48b05f1ab9ea1c60b45e42c9db682c167166 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 23 13:46:14 2017 +0000 Bug 21536: Remove scramblesuit bridge --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index c56d316..61e2a9e 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -13,8 +13,6 @@ pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); - pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");

1 0

[tor-browser-build/master] Add var/set_default_env and use it in all build scripts
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 73c030f1c8a7283d8343ad6ab7401ce4b6ada0ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 5 18:28:04 2017 +0100 Add var/set_default_env and use it in all build scripts --- projects/binutils/build | 5 ++--- projects/clang/build | 2 +- projects/cmake/build | 3 +-- projects/firefox-langpacks/build | 2 +- projects/firefox/build | 9 +-------- projects/fonts/build | 3 +-- projects/gcc/build | 2 +- projects/gmp/build | 3 +-- projects/go/build | 3 +-- projects/go/config | 3 +-- projects/https-everywhere/build | 4 ++-- projects/libdmg-hfsplus/build | 4 ++-- projects/libevent/build | 3 +-- projects/llvm/build | 3 +-- projects/macosx-toolchain-gcc/build | 3 +-- projects/macosx-toolchain/build | 5 ++--- projects/meek/build | 3 +-- projects/mingw-w64/build | 5 ++--- projects/nsis/build | 5 ++--- projects/obfs4/build | 3 +-- projects/openssl/build | 3 +-- projects/release/config | 3 +-- projects/sandbox/build | 3 +-- projects/tbb-windows-installer/build | 2 +- projects/tor-browser/build | 6 +----- projects/tor-launcher/build | 4 ++-- projects/tor/build | 6 +----- projects/torbutton/build | 4 ++-- projects/zlib/build | 6 +----- rbm.conf | 10 ++++++++++ 30 files changed, 47 insertions(+), 73 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index cdd01a6..e3064cf 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/binutils [% IF c("var/linux") %] # Config options for hardening-wrapper diff --git a/projects/clang/build b/projects/clang/build index 380ca1c..ac0f21b 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -1,5 +1,5 @@ #!/bin/bash -set -e +[% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz mv [% project %]-[% c("version") %] [% project %] [% c('tar', { diff --git a/projects/cmake/build b/projects/cmake/build index d59522a..dd5017a 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 82e5452..9ac07cb 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -1,5 +1,5 @@ #!/bin/bash -set -e +[% c("var/set_default_env") -%] [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] diff --git a/projects/firefox/build b/projects/firefox/build index 7610510..453f6b3 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% IF c("var/windows") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] @@ -17,12 +16,6 @@ rootdir=$(pwd) distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build -export SHELL=/bin/bash -export HOME=$rootdir -export TZ=UTC -export LC_ALL=C -umask 0022 - [% IF c("var/linux") %] tar xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" diff --git a/projects/fonts/build b/projects/fonts/build index 4984c3b..e645c31 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/fonts mkdir -p $distdir tar xf [% project %]-[% c("version") %].tar.gz diff --git a/projects/gcc/build b/projects/gcc/build index 03cfcbd..1c24af7 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -1,5 +1,5 @@ #!/bin/sh -set -e +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 diff --git a/projects/gmp/build b/projects/gmp/build index d7b3b14..34173d6 100644 --- a/projects/gmp/build +++ b/projects/gmp/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/go/build b/projects/go/build index 2efd928..72117f6 100644 --- a/projects/go/build +++ b/projects/go/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist diff --git a/projects/go/config b/projects/go/config index 9341f98..5e55a09 100644 --- a/projects/go/config +++ b/projects/go/config @@ -20,8 +20,7 @@ var: # a list of install targets. build_go_lib: | #!/bin/bash - set -e - rootdir=$(pwd) + [% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 6e49e7b..71b2a21 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] # patch makexpi.sh because we don't have a git repository diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 2903150..47a5e43 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] distdir=$(pwd)/dist mkdir -p $distdir/[% project %] tar xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/libevent/build b/projects/libevent/build index 8aa85fc..2bed816 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/llvm/build b/projects/llvm/build index bdf7576..3773cfd 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build index 778194d..4a8f0db 100644 --- a/projects/macosx-toolchain-gcc/build +++ b/projects/macosx-toolchain-gcc/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] destdir='[% dest_dir _ '/' _ c('filename') %]' mkdir -p "$destdir" mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index b263940..b718023 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xzf [% c('input_files_by_name/SDK') %] diff --git a/projects/meek/build b/projects/meek/build index 283066a..8d1beb7 100644 --- a/projects/meek/build +++ b/projects/meek/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 39361e7..42ee716 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir /var/tmp/build diff --git a/projects/nsis/build b/projects/nsis/build index 48f1cb1..af19dd7 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,6 +1,5 @@ -#!/bin/sh -set -e -rootdir=$(pwd) +#!/bin/bash +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] # remove hardening wrappers rm -Rf /var/tmp/dist/mingw-w64/helpers diff --git a/projects/obfs4/build b/projects/obfs4/build index ff313e9..61ef481 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] diff --git a/projects/openssl/build b/projects/openssl/build index acd7bbb..3a5365e 100644 --- a/projects/openssl/build +++ b/projects/openssl/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/release/config b/projects/release/config index e2b2eb9..f6712c0 100644 --- a/projects/release/config +++ b/projects/release/config @@ -119,8 +119,7 @@ input_files: build: | #!/bin/sh - set -e - export LC_ALL=C + [% c("var/set_default_env") -%] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] diff --git a/projects/sandbox/build b/projects/sandbox/build index 28b5a48..8a3edb3 100644 --- a/projects/sandbox/build +++ b/projects/sandbox/build @@ -1,6 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] [% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] distdir=/var/tmp/dist/[% project %] mkdir -p $distdir diff --git a/projects/tbb-windows-installer/build b/projects/tbb-windows-installer/build index 380ca1c..ac0f21b 100644 --- a/projects/tbb-windows-installer/build +++ b/projects/tbb-windows-installer/build @@ -1,5 +1,5 @@ #!/bin/bash -set -e +[% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz mv [% project %]-[% c("version") %] [% project %] [% c('tar', { diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4eeb350..904f1b6 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -1,11 +1,7 @@ #!/bin/bash -set -e -rootdir=$(pwd) +[% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -export TZ=UTC -export LC_ALL=C export TORBROWSER_VERSION='[% c("version") %]' -umask 0022 mkdir -p $distdir diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 69e01b3..90c5268 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] make package diff --git a/projects/tor/build b/projects/tor/build index f0b57f1..c56cddc 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -1,9 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) -export TZ=UTC -export LC_ALL=C -umask 0022 +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/projects/torbutton/build b/projects/torbutton/build index b7a7262..38136c4 100644 --- a/projects/torbutton/build +++ b/projects/torbutton/build @@ -1,5 +1,5 @@ -#!/bin/sh -set -e +#!/bin/bash +[% c("var/set_default_env") -%] tar xvf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] mkdir -p pkg diff --git a/projects/zlib/build b/projects/zlib/build index fdcfbfb..4031ef5 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -1,9 +1,5 @@ #!/bin/bash -set -e -rootdir=$(pwd) -export TZ=UTC -export LC_ALL=C -umask 0022 +[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build diff --git a/rbm.conf b/rbm.conf index b2fb21a..e5c69b0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -67,6 +67,16 @@ var: mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %] rm -Rf "$rezip_tmpdir" + set_default_env: | + set -e + [% FOREACH env = c('ENV') -%] + export [% env.key %]="[% env.value %]" + [% END -%] + rootdir=$(pwd) + export SHELL=/bin/bash + export HOME=$rootdir + umask 0022 + targets: notarget: linux-x86_64 noint:

1 0

[tor-browser-build/master] Set TZ and LC_ALL when starting rbm
by boklm＠torproject.org 05 Mar '17

05 Mar '17

commit 51493b7b17da9d4941600f54842d0e1ddb33cf31 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Mar 5 18:20:38 2017 +0100 Set TZ and LC_ALL when starting rbm --- rbm | 2 +- rbm.conf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rbm b/rbm index b3ca063..1945b67 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b3ca063713f0d25a66f76c829d750ac977a25207 +Subproject commit 1945b67fefbcf7b834b71275e301da06232f0241 diff --git a/rbm.conf b/rbm.conf index b137595..b2fb21a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -200,3 +200,7 @@ gpg_wrapper: | else exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" fi + +ENV: + TZ: UTC + LC_ALL: C

1 0

[tor-browser-bundle/master] Release preparations for 7.0a2
by gk＠torproject.org 03 Mar '17

03 Mar '17

commit 409e1aa1aa580d9d4d193666ed89ca8ceb05acb7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 3 15:42:45 2017 +0000 Release preparations for 7.0a2 Version bumps, Changelog update, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 25 +++++++++++++++++++++++++ gitian/versions.alpha | 14 +++++++------- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6dc7b45..43e771f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,28 @@ +Tor Browser 7.0a2 -- March 7 2017 + * All Platforms + * Update Firefox to 45.8.0esr + * Tor to 0.3.0.4-rc + * OpenSSL to 1.0.2k + * Update Torbutton to 1.9.7.1 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Bug 21324: Don't update NoScript button with timer update + * Translation updates + * Update HTTPS-Everywhere to 5.2.11 + * Bug 21514: Restore W^X JIT implementation removed from ESR45 + * Bug 21536: Remove scramblesuit bridge + * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge + * Bug 21348: Make snowflake only available on Linux for now + * Linux + * Bug 21326: Update the "Using a system-installed Tor" section in start script + * Build system + * OS X + * Bug 21343: Remove unused FTE related parts for macOS + * Linux + * Bug 17034: Use our built binutils and GCC for building tor + * Clean-up + Tor Browser 7.0a1-hardened -- January 25 2017 * All Platforms * Update Firefox to 45.7.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0644778..6c06648 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.7.0esr +FIREFOX_VERSION=45.8.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 -TOR_TAG=tor-0.3.0.2-alpha +TOR_TAG=tor-0.3.0.4-rc TORLAUNCHER_TAG=0.2.10.2 -TORBUTTON_TAG=1.9.7 -HTTPSE_TAG=5.2.9 +TORBUTTON_TAG=1.9.7.1 +HTTPSE_TAG=5.2.11 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -52,10 +52,10 @@ UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a GITIAN_TAG=tor-browser-builder-4-2 -OPENSSL_VER=1.0.2j +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=r247539 @@ -105,7 +105,7 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 +OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 613da0e..1861a8c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -19,7 +19,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 7.0a1 + alpha: 7.0a2 release: 6.0.1 versions: 6.0.1: @@ -33,11 +33,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 7.0a1: - platformVersion: 45.7.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-70a1-released + 7.0a2: + platformVersion: 45.8.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-70a2-released incremental_from: - - 6.5a6 + - 7.0a1 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/master] Release preparations for 1.9.7.1
by gk＠torproject.org 03 Mar '17

03 Mar '17

commit 391ea08d24b00bd161e7916ff62d572d9102d375 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 3 09:52:03 2017 +0000 Release preparations for 1.9.7.1 Version bump, and CHANGELOG update --- src/CHANGELOG | 16 ++++++++++++++++ src/install.rdf | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 80b22e3..bc1092b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.7.1 + * Bug 21396: Allow leaking of resource/chrome URIs (off by default) + * Bug 21574: Add link for zh manual and create manual links dynamically + * Bug 21330: Non-usable scrollbar appears in tor browser security settings + * Bug 21324: Don't update NoScript button with timer update + * Translation updates + 1.9.7 * Bug 19898: Use DuckDuckGo on about:tor * Bug 21091: Hide the update check menu entry when running under the sandbox @@ -6,6 +13,15 @@ * Bug 21131: Remove 2016 donation banner * Translation updates +1.9.6.12 + * Bug 20951: Back out Unix domain socket related patches for Tor Browser 6.5 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21131: Remove 2016 donation banner + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + 1.9.6.9 * Bug 20947: Donation banner improvements diff --git a/src/install.rdf b/src/install.rdf index 6c9572d..3077598 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7</em:version> + <em:version>1.9.7.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/maint-6.5] Release preparations for 6.5.1
by gk＠torproject.org 03 Mar '17

03 Mar '17

commit dbbc765ad9ba158a7538255a5c7a027e859a106f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 3 08:11:35 2017 +0000 Release preparations for 6.5.1 build2 bumps the Torbutton and Tor Browser branch to pick up last minute bug fixes. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- gitian/versions | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 571b677..311a894 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,13 +3,13 @@ Tor Browser 6.5.1 -- March 6 2017 * Update Firefox to 45.8.0esr * Tor to 0.2.9.10 * OpenSSL to 1.0.2k - * Update Torbutton to 1.9.6.13 + * Update Torbutton to 1.9.6.14 * Bug 21396: Allow leaking of resource/chrome URIs (off by default) * Bug 21574: Add link for zh manual and create manual links dynamically * Bug 21330: Non-usable scrollbar appears in tor browser security settings * Translation updates * Update HTTPS-Everywhere to 5.2.11 - * Bug 21514: Back out backported W^X patches due to conflicts in 45.8.0esr + * Bug 21514: Restore W^X JIT implementation removed from ESR45 * Bug 21536: Remove scramblesuit bridge * Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge * Linux diff --git a/gitian/versions b/gitian/versions index f7c21df..df49b55 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.8.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-2-build1 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 -TORBUTTON_TAG=1.9.6.13 +TORBUTTON_TAG=1.9.6.14 HTTPSE_TAG=5.2.11 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 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=r247539

1 0

[torbutton/maint-1.9.6] fixup! Bug 21396: Allow leaking of resource/chrome URIs
by gk＠torproject.org 03 Mar '17

03 Mar '17

commit bcbef88add4cdb4fe42c2827c8fe3e04c045a002 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 2 11:28:13 2017 +0000 fixup! Bug 21396: Allow leaking of resource/chrome URIs --- src/components/content-policy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index b11c4e7..096827b 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -17,9 +17,10 @@ let { bindPrefAndInit } = function ContentPolicy() { this.uriFingerprinting = null; + let that = this; bindPrefAndInit("extensions.torbutton.resource_and_chrome_uri_fingerprinting", function (enabled) { - this.uriFingerprinting = enabled; + that.uriFingerprinting = enabled; }); }

1 0