- tbb-commits - lists.torproject.org

[tor-browser-build/master] Update webrtc, go-webrtc and snowflake
by boklm＠torproject.org 23 Apr '17

23 Apr '17

commit cebffc5e3931f7f921068f44214ff19a0350bf11 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 23 23:29:41 2017 +0200 Update webrtc, go-webrtc and snowflake tor-browser-bundle.git commit: 38689af2a845dfa85765bf52e535c89476863378 tor-browser-bundle.git commit: 121de1ca7cbee29f34f99753a7948c7447e38965 tor-browser-bundle.git commit: e9b16e19134655aa16a8840e09093e01692138d5 --- projects/go-webrtc/config | 6 ++- projects/snowflake/config | 2 +- .../Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- projects/webrtc/build | 58 +++++++++++++--------- projects/webrtc/config | 17 ++++--- projects/webrtc/webrtc-linux.patch | 25 ++++++++++ 6 files changed, 75 insertions(+), 35 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 778d3db..3a1a9d4 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/keroserene/go-webrtc.git -git_hash: 69c5ca70533142494d145b43ef2f46ca94715557 +git_hash: ab1b64862e0c4b4182010699911c2c5818f0a101 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -23,7 +23,9 @@ var: # the prebuilt libwebrtc-magic.a libraries. Since we build our own # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, # using CGO_CXXFLAGS. - export CGO_CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=1 + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_LDFLAGS=-latomic targets: master: diff --git a/projects/snowflake/config b/projects/snowflake/config index 5ba006b..3233ba4 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 6cecd31fd896eb26e64ad8bab8a9ea510ec3b21d +git_hash: 9f2e9a6ecb696149708716ca06ce842df03cf492 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index bcf3a19..922e181 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,4 +39,4 @@ pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8C pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); -pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3"); +pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72"); diff --git a/projects/webrtc/build b/projects/webrtc/build index 5a70fbe..3ae7ed0 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -22,20 +22,17 @@ tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz builddir=/var/tmp/build/[% project %]/src cd $builddir -export GYP_CROSSCOMPILE=1 -export GYP_DEFINES="OS=[% c("var/webrtc/os") %] target_arch=[% c("var/webrtc/arch") %]" -# Do not use bundled utilities. -GYP_DEFINES+=" clang=0 host_clang=0 use_sysroot=0" -GYP_DEFINES+=" linux_use_bundled_gold=0 linux_use_gold_flags=0 linux_use_bundled_binutils=0" -# Avoid some dependencies. Some of these don't seem to work fully; for -# example even with use_alsa=0 we need libasound2-dev. -GYP_DEFINES+=" use_x11=0 use_gtk=0 use_gconf=0 use_alsa=0 use_pulseaudio=0 use_libpci=0 include_internal_audio_device=0 enabled_libjingle_device_manager=0" -# examples and tests also bring in dependencies. -GYP_DEFINES+=" include_examples=0 include_tests=0" -# embedded=1 is supposed to turn of various features; see -# https://bugs.chromium.org/p/chromium/issues/detail?id=318413. -GYP_DEFINES+=" embedded=1" -GYP_DEFINES+=" werror=" + +patch -p1 < $rootdir/webrtc-linux.patch + +# First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. +cd tools/gn +# __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. +CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean +cd ../.. +# This is where bootstrap.py stashes the built gn. +GN="$PWD/out_bootstrap/gn" + [% IF c("var/linux") -%] export CC=gcc export CXX=g++ @@ -48,16 +45,31 @@ GYP_DEFINES+=" werror=" export CXXFLAGS=-m32 export LDFLAGS=-m32 [% END -%] -JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py -ninja -C out/Release -# Run ninja once more, without include_tests=0, in order to build just the -# FakeAudioCaptureModule that go-webrtc uses. -GYP_DEFINES="$(echo "$GYP_DEFINES" | sed -e 's/include_tests=0//g')" -JAVA_HOME=/usr/lib/jvm/default-java webrtc/build/gyp_webrtc.py -ninja -C out/Release obj/webrtc/api/test/peerconnection_unittests.fakeaudiocapturemodule.o + +export GN_ARGS="" +# For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". +# https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… +GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" +# Not debug. +GN_ARGS+=" is_debug=false" +# There are warnings from unused returns. +GN_ARGS+=" treat_warnings_as_errors=false" +# Build static libraries. +GN_ARGS+=" is_component_build=false" +# Do not use bundled utilities. +GN_ARGS+=" is_clang=false use_sysroot=false" +GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" +# Make extra sure we don't use bundled binutils. +rm -rf third_party/binutils/Linux_* +# Avoid some dependencies. +GN_ARGS+=" use_ozone=true use_gconf=false" +GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" +# Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? +#GN_ARGS+=" rtc_include_tests=false" +rm -rf out/Release +"$GN" gen out/Release --args="$GN_ARGS" +ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # https://github.com/keroserene/go-webrtc/issues/23#issuecomment-175312648 -# dump_syms_regtest.o is actually an executable, not an object file. If not -# excluded, it results in the error: # libwebrtc-linux-386-magic.a(dump_syms_regtest.o): unsupported ELF file type 2 ar crs libwebrtc-magic.a $(find . -name '*.o' -not -name '*.main.o' -not -name 'dump_syms_regtest.o' | sort) diff --git a/projects/webrtc/config b/projects/webrtc/config index 52618c2..bfd38c9 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -4,7 +4,7 @@ remote_docker: 1 filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: - webrtc_tag: f33698296719f956497d2dbff81b5080864a8804 + webrtc_tag: c279861207c5b15fc51069e96595782350e0ac12 input_files: - project: docker-image @@ -17,6 +17,8 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' + - filename: webrtc-linux.patch + enable: '[% c("var/linux") %]' targets: linux: @@ -28,16 +30,17 @@ targets: dockerbuild: "[% pc('docker-image', 'pre') %]" sort_deps: 0 arch_deps: - - default-jre-headless - - default-jdk - lib32asound2-dev - lib64expat1 - libexpat1-dev:i386 + - libglib2.0-dev:i386 + - libgtk2.0-dev:i386 - libudev-dev:i386 - libx11-dev:i386 - libxext-dev:i386 - libxrandr-dev:i386 - lib32stdc++6 + - pkg-config - hardening-wrapper webrtc: arch: ia32 @@ -46,14 +49,15 @@ targets: linux-x86_64: var: arch_deps: - - default-jre-headless - - default-jdk - libasound2-dev - libexpat1-dev + - libglib2.0-dev + - libgtk2.0-dev - libudev-dev - libx11-dev - libxext-dev - libxrandr-dev + - pkg-config webrtc: arch: x64 lib_arch: amd64 @@ -70,10 +74,7 @@ steps: # https://webrtc.org/native-code/development/ tar xf [% c('input_files_by_name/depot_tools') %] export PATH="$rootdir/depot_tools:$PATH" - # GYP_CROSSCOMPILE=1 and GYP_DEFINES="use_x11=0" prevent probing for certain dependencies. # Use --no-history because the whole checkout with history is about 12 GB. - export GYP_CROSSCOMPILE=1 - export GYP_DEFINES="use_x11=0" # JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE. # default-java comes from the package default-jdk-headless. export JAVA_HOME=/usr/lib/jvm/default-java diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch new file mode 100644 index 0000000..b1efb7a --- /dev/null +++ b/projects/webrtc/webrtc-linux.patch @@ -0,0 +1,25 @@ +From ebc1773a92884bec7d93274b2d729ccf76050197 Mon Sep 17 00:00:00 2001 +From: David Fifield <fifield(a)eecs.berkeley.edu> +Date: Wed, 22 Mar 2017 09:53:07 -0400 +Subject: [PATCH] Disable some settings in build_overrides. + +--- + build_overrides/build.gni | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index af4924d4c..ffaafdebc 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" + enable_java_templates = true + + # Some non-Chromium builds don't use Chromium's third_party/binutils. +-linux_use_bundled_binutils_override = true ++linux_use_bundled_binutils_override = false + + # Variable that can be used to support multiple build scenarios, like having + # Chromium specific targets in a client project's GN file etc. +-- +2.12.1 +

1 0

[tor-browser-build/master] Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend.
by boklm＠torproject.org 23 Apr '17

23 Apr '17

commit abfa8f3f04988154da35154924d8b43c04550b92 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21918: Move meek-amazon to the d2cly7j4zqgua7.cloudfront.net backend. Still using the same TorLandMeek bridge. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 922e181..fea436d 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,7 +36,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72");

1 0

[tor-browser-bundle/master] Bug 21710: Upgrade Go to 1.8.1.
by gk＠torproject.org 21 Apr '17

21 Apr '17

commit 9d546f20ae711e7df9c574d9bdfccf34ddf1b650 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 13 17:19:30 2017 -0700 Bug 21710: Upgrade Go to 1.8.1. Remove workaround for fixed upstream bug, GitHub #17732 (__MAC_OS_X_VERSION_MAX_ALLOWED). I wasn't able to remove the cc-for-target workaround for GitHub #15457 (CC_FOR_TARGET). Even though according to https://github.com/golang/go/issues/15457 it has been been fixed, make.bash still seems to lose all but the first argument of CC_FOR_TARGET somewhere. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 3 --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index c430bb8..75ad899 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -93,9 +93,6 @@ script: | export GOARCH=amd64 tar xvf go.tar.gz cd go/src - # Remove a preprocessor directive that causes problems when building with the 10.7 SDK. - # https://github.com/golang/go/issues/17732 - sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" diff --git a/gitian/versions b/gitian/versions index e64baa4..8cb2278 100755 --- a/gitian/versions +++ b/gitian/versions @@ -65,7 +65,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.5 +GO_VER=1.8.1 NSIS_VER=2.51 YASM_VER=1.2.0 @@ -119,7 +119,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 +GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d1ea48b..adb9dbf 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -68,7 +68,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.5 +GO_VER=1.8.1 NSIS_VER=2.51 YASM_VER=1.2.0 @@ -122,7 +122,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 +GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index ed7c124..7d843c7 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -54,7 +54,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.5 +GO_VER=1.8.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -99,7 +99,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 +GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9142915..4e1618c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -75,7 +75,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.7.5 +GO_VER=1.8.1 NSIS_VER=2.51 YASM_VER=1.2.0 @@ -129,7 +129,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 +GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-browser-bundle/master] Bug 22025: Fix broken certificate error pages on higher security levels
by gk＠torproject.org 21 Apr '17

21 Apr '17

commit bf51814f82a93a2f26322a3eea7e31ef061edc6d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 21 06:51:11 2017 +0000 Bug 22025: Fix broken certificate error pages on higher security levels We need to allow JavaScript on `about:certerror` pages explicitly. Otherwise are those pages broken on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 09f3f8e..2ad9731 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 09f3f8e..2ad9731 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 09f3f8e..2ad9731 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Bump tor-browser branch for nightly builds
by gk＠torproject.org 21 Apr '17

21 Apr '17

commit 5eb70e227d1111080e63b32d24e39b572410237c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 21 08:17:49 2017 +0000 Bump tor-browser branch for nightly builds --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 360f1ba..9142915 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=52.0.2esr +FIREFOX_VERSION=52.1.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -60,7 +60,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0

1 0

[tor-browser-build/master] Pick up build3 from Mozilla and bug fixes
by boklm＠torproject.org 20 Apr '17

20 Apr '17

commit da2bb257968d238a538ebc6ddfb7da2e35041985 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 20 09:47:04 2017 +0200 Pick up build3 from Mozilla and bug fixes tor-browser-bundle.git commit: 421091532d3536893e715f62cab9055cd822b95a --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..39f04cb 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: build3 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 14c1cd5..2c74e4b 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-build2' +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

1 0

[tor-browser-build/master] Bump sandboxed to browser tag to 0.0.6
by boklm＠torproject.org 20 Apr '17

20 Apr '17

commit 41a5df93e6c92b3481057f077201472caef8b9e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 20 09:44:20 2017 +0200 Bump sandboxed to browser tag to 0.0.6 tor-browser-bundle.git commit: 947fedb72f4a43b46fcc2e72531db79e8aa7d943 --- projects/sandbox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sandbox/config b/projects/sandbox/config index 9dc52c6..218a276 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.5 +version: 0.0.6 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-bundle/master] Bump sandboxed to browser tag to 0.0.6
by gk＠torproject.org 20 Apr '17

20 Apr '17

commit 947fedb72f4a43b46fcc2e72531db79e8aa7d943 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 20 06:50:18 2017 +0000 Bump sandboxed to browser tag to 0.0.6 --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fffb050..d1ea48b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -41,7 +41,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e -SANDBOX_TAG=sandboxed-tor-browser-0.0.5 +SANDBOX_TAG=sandboxed-tor-browser-0.0.6 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101

1 0

[tor-browser-bundle/master] Bug 19316: add support for minSupportedInstructionSet in config.yml
by gk＠torproject.org 19 Apr '17

19 Apr '17

commit 70961a33301ca42b1fe3eb9eee87ea16bef4fea2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 19 12:14:04 2017 +0200 Bug 19316: add support for minSupportedInstructionSet in config.yml --- tools/update-responses/update_responses | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b7f4b63..0ed19c1 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -292,6 +292,7 @@ sub get_response { goto CLOSETAGS; } my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + my $mininstruc = get_config($config, $version, $os, 'minSupportedInstructionSet'); $writer->startTag('update', type => 'minor', displayVersion => $version, @@ -302,6 +303,7 @@ sub get_response { actions => 'showURL', openURL => get_config($config, $version, $os, 'detailsURL'), defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + defined $mininstruc ? ( minSupportedInstructionSet => $mininstruc ) : (), ); foreach my $patch (@patches) { my @sorted_patch = map { $_ => $patch->{$_} } sort keys %$patch;

1 0

[tor-browser-bundle/master] Pick up build3 from Mozilla and bug fixes
by gk＠torproject.org 18 Apr '17

18 Apr '17

commit 421091532d3536893e715f62cab9055cd822b95a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 18 11:26:23 2017 +0000 Pick up build3 from Mozilla and bug fixes --- Bundle-Data/Docs/ChangeLog.txt | 3 +++ gitian/versions.alpha | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3d36c6e..b2ee463 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -58,10 +58,12 @@ Tor Browser 7.0a3 -- April 20 2017 * Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID * Bug 21724: Make Firefox and Tor Browser distinct macOS apps * Bug 21931: Backport OSX SetupMacCommandLine updater fixes + * Bug 15910: Don't download GMPs via the local fallback * Linux * Bug 21907: Fix runtime error on CentOS 6 * Bug 21748: Fix broken Snowflake build and update bridge details * Bug 21954: Snowflake breaks the 7.0a3 build + * Bug 15910: Don't download GMPs via the local fallback * Build system * Windows * Bug 21837: Fix reproducibility of accessibility code for Windows @@ -78,6 +80,7 @@ Tor Browser 7.0a3 -- April 20 2017 * Linux * Bug 21930: NSS libraries are missing from mar-tools archive * Bug 21239: Adapt Linux Firefox descriptor to ESR52 (use GTK2) + * Bug 21960: Linux bundles based on ESR 52 are not reproducible anymore * Bug 21629: Fix broken ASan builds when switching to ESR 52 Tor Browser 7.0a2-hardened -- March 7 2017 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b16341a..fffb050 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=52.1.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2-build1 TOR_TAG=tor-0.3.0.5-rc TORLAUNCHER_TAG=0.2.12 TORBUTTON_TAG=1.9.7.2 @@ -48,12 +48,12 @@ GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101 SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a -GITIAN_TAG=tor-browser-builder-4-3 +GITIAN_TAG=tor-browser-builder-4-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0

1 0