- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 28725: Upgrade go-webrtc to dcbfc825aa33471253a5da1834d499257e05d557.
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit 2e1d3917340c980026c15ed9cf10e894ec665551 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 3 23:13:51 2018 +0000 Bug 28725: Upgrade go-webrtc to dcbfc825aa33471253a5da1834d499257e05d557. This necessitates an upgrade to webrtc to branch-heads/64. Compare to: https://github.com/keroserene/go-webrtc/commit/1ca4087bc01b9a6726a68c72ac54… -D_GLIBCXX_USE_CXX11_ABI=1 is no longer required, as the default has changed: https://github.com/keroserene/go-webrtc/commit/a3140c36f9933013ad2e66bc2135… I needed to add libgtk-3-dev as a build dependency for webrtc. libgtk-3-dev appears in src/build/install-build-deps.sh. I also had to upgrade depot_tools to 7d9d9233cb657e968831238346917b0b64abb4c1. I got the commit ID from src/DEPS in the webrtc source. Without upgrading depot_tools, I got this error from gclient: Error: 1> dependency url must be either a string, None, File() or From() instead of dict I needed to add a command to delete src/testing/{gmock,gtest}; otherwise "gclient sync" complains about overwriting unversioned files. https://bugs.torproject.org/25483#comment:15 https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bu… The error is src/testing (ERROR) ---------------------------------------- [0:00:00] Started. [0:00:01] From https://chromium.googlesource.com/chromium/src/testing [0:00:01] 7d7436a8..9805faa0 master -> origin/master ---------------------------------------- Error: Command 'git checkout --quiet 60c665fffe7dc505fdd5d30f9dbcbc50dde1e017' returned non-zero exit status 1 in /home/user/tor-browser-build/gclient/webrtc/src/testing error: The following untracked working tree files would be overwritten by checkout: gmock/include/gmock/gmock-actions.h gmock/include/gmock/gmock-generated-function-mockers.h gmock/include/gmock/gmock-matchers.h gmock/include/gmock/gmock.h gtest/include/gtest/gtest-death-test.h gtest/include/gtest/gtest-message.h gtest/include/gtest/gtest-param-test.h gtest/include/gtest/gtest-spi.h gtest/include/gtest/gtest.h gtest/include/gtest/gtest_prod.h Please move or remove them before you switch branches. Aborting --- projects/depot_tools/config | 2 +- projects/go-webrtc/config | 8 +- projects/webrtc/build | 6 +- projects/webrtc/config | 6 +- projects/webrtc/webrtc-linux.patch | 12 +-- projects/webrtc/webrtc-mac.patch | 204 +++++++++++++++---------------------- 6 files changed, 99 insertions(+), 139 deletions(-) diff --git a/projects/depot_tools/config b/projects/depot_tools/config index 40a6d85..a1848dc 100644 --- a/projects/depot_tools/config +++ b/projects/depot_tools/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_hash: 28216cd14b44716db5c83634afbdc6e90492652b +git_hash: 7d9d9233cb657e968831238346917b0b64abb4c1 git_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git filename: '[% project %]-[% c("version") %].tar.gz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 65be36f..8b171f9 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: 90ac15ae07cc6e820cd922a239dd892598986622 +git_hash: dcbfc825aa33471253a5da1834d499257e05d557 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -21,12 +21,8 @@ var: rm -rf include/ lib/ cp -a /var/tmp/dist/webrtc/{include,lib} . [% IF c("var/linux") -%] - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # 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. # __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_CXXFLAGS="-D__STDC_FORMAT_MACROS=1" export CGO_LDFLAGS=-latomic [% END -%] [% IF c("var/osx") -%] diff --git a/projects/webrtc/build b/projects/webrtc/build index a1abd92..ecbccb3 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -101,6 +101,8 @@ GN_ARGS+=" treat_warnings_as_errors=false" GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. GN_ARGS+=" is_clang=false use_sysroot=false" +# Use libstdc++, not libc++. +GN_ARGS+=" use_custom_libcxx=false" [% IF c("var/linux") -%] GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" @@ -116,6 +118,8 @@ GN_ARGS+=" is_clang=false use_sysroot=false" GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" + # No lld in our toolchain currently. + GN_ARGS+=" use_lld=false" # Avoid some dependencies. GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" # Tests are needed for field_trial, metrics_default, and pc_test_utils targets @@ -147,7 +151,7 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -find webrtc/ -type f -name '*.h' -print0 | while IFS= read -r -d '' h; +find . -type f -name '*.h' -print0 | while IFS= read -r -d '' h; do mkdir -p "$INCLUDE_DIR/$(dirname "$h")" cp -f "$h" "$INCLUDE_DIR/$h" diff --git a/projects/webrtc/config b/projects/webrtc/config index da60d2d..2955095 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -5,7 +5,7 @@ filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") var: container: use_container: 1 - webrtc_tag: c279861207c5b15fc51069e96595782350e0ac12 + webrtc_tag: 88f5d9180eae78a6162cccd78850ff416eb82483 input_files: - project: container-image @@ -33,6 +33,7 @@ targets: - libexpat1-dev - libglib2.0-dev - libgtk2.0-dev + - libgtk-3-dev - libudev-dev - libx11-dev - libxext-dev @@ -101,6 +102,9 @@ steps: git config diff.ignoreSubmodules all cd .. fi + # Delete the unversioned gmock and gtest directories, which cause "gclient sync" + # to fail when upgrading between webrtc branch-heads/58 and branch-heads/64. + rm -rf src/testing/gmock src/testing/gtest # "gclient" is part of depot_tools. This download takes a long time the first time. gclient sync --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] cd .. diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch index b1efb7a..efeebbb 100644 --- a/projects/webrtc/webrtc-linux.patch +++ b/projects/webrtc/webrtc-linux.patch @@ -1,6 +1,6 @@ -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 +From 2d7897d479a13cbf68335140b61228cd5552dfd9 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 3 Dec 2018 21:14:32 -0700 Subject: [PATCH] Disable some settings in build_overrides. --- @@ -8,10 +8,10 @@ Subject: [PATCH] Disable some settings in build_overrides. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_overrides/build.gni b/build_overrides/build.gni -index af4924d4c..ffaafdebc 100644 +index 81cb3e73ae..5304a64ce8 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni -@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" +@@ -10,7 +10,7 @@ enable_java_templates = true # Some non-Chromium builds don't use Chromium's third_party/binutils. @@ -21,5 +21,5 @@ index af4924d4c..ffaafdebc 100644 # 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 +2.11.0 diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch index 6b888bb..d1144af 100644 --- a/projects/webrtc/webrtc-mac.patch +++ b/projects/webrtc/webrtc-mac.patch @@ -1,7 +1,7 @@ -From bd27c327f72ea231353983aa35a0c3e6ae8055d5 Mon Sep 17 00:00:00 2001 +From df1a0923f1534a238e9773000dd03dd7b55e2c72 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:26:55 -0700 -Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. +Date: Mon, 3 Dec 2018 21:03:16 -0700 +Subject: [PATCH 1/6] Disable assertions that prevent cross-compiling for mac. --- config/BUILDCONFIG.gn | 4 ++-- @@ -9,10 +9,10 @@ Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index d055e705..78a2023a 100644 +index 48ed140c7..15e06808c 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -232,8 +232,8 @@ if (target_os == "android") { +@@ -238,8 +238,8 @@ if (target_os == "android") { } else if (target_os == "ios") { _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" } else if (target_os == "mac") { @@ -22,9 +22,9 @@ index d055e705..78a2023a 100644 + _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" } else if (target_os == "win") { # On Windows we use the same toolchain for host and target by default. - assert(target_os == host_os, "Win cross-compiles only work on win hosts.") + # Beware, win cross builds mostly don't work yet, see docs/win_cross.md diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn -index b417e76a..5f48927d 100644 +index fc113d6a3..7a0171700 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -14,7 +14,7 @@ if (is_ios) { @@ -36,13 +36,13 @@ index b417e76a..5f48927d 100644 import("//build/toolchain/cc_wrapper.gni") import("//build/toolchain/clang_static_analyzer.gni") --- +-- 2.11.0 -From a58bb43ea406939fcc978aa808714d04802074ac Mon Sep 17 00:00:00 2001 +From c9cdc59ebb986392367115105ecbc1f5b511130d Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:29:14 -0700 -Subject: [PATCH 2/8] Hardcode cross-compiling flags in config/mac/BUILD.gn. +Date: Mon, 3 Dec 2018 21:04:26 -0700 +Subject: [PATCH 2/6] Hardcode cross-compiling flags in config/mac/BUILD.gn. The build system doesn't provide a general way to set flags externally. "No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" @@ -52,12 +52,12 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=595653 1 file changed, 5 insertions(+) diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn -index 84180e6a..2054b46f 100644 +index 4c681e88c..26fbcac2b 100644 --- a/build/config/mac/BUILD.gn +++ b/build/config/mac/BUILD.gn -@@ -83,6 +83,11 @@ config("runtime_library") { +@@ -57,6 +57,11 @@ config("runtime_library") { "-isysroot", - sysroot, + rebase_path(sysroot, root_build_dir), "-mmacosx-version-min=$mac_deployment_target", + "-target", + "x86_64-apple-darwin11", @@ -67,13 +67,47 @@ index 84180e6a..2054b46f 100644 ] asmflags = common_flags --- +-- +2.11.0 + +From 86d0882084c8b0595d693cce43e96b01182814b7 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Tue, 4 Dec 2018 07:37:42 +0000 +Subject: [PATCH 3/6] Remove -instcombine-lower-dbg-declare=0 from cflags. + +Not supported in our current version of llvm: +clang (LLVM option parsing): Unknown command line argument '-instcombine-lower-dbg-declare=0'. Try: 'clang (LLVM option parsing) -help' +clang (LLVM option parsing): Did you mean '-combiner-use-tbaa=0'? +--- + config/compiler/BUILD.gn | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn +index a6ba4ea6..e775f9f5 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -427,10 +427,10 @@ config("compiler") { + if (is_clang && !is_nacl && current_toolchain == host_toolchain && + target_os != "chromeos") { + cflags += [ +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-instcombine-lower-dbg-declare=0", ++ # "-Xclang", ++ # "-mllvm", ++ # "-Xclang", ++ # "-instcombine-lower-dbg-declare=0", + ] + } + +-- 2.11.0 -From 4c57d854280a0f0a4f55cba0457ae44f6369ca08 Mon Sep 17 00:00:00 2001 +From 96d243466006263e99b08ebf8b6085c60b736ccc Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:30:28 -0700 -Subject: [PATCH 3/8] Port build/config/mac/plist_util.py to biplist. +Date: Mon, 3 Dec 2018 21:06:06 -0700 +Subject: [PATCH 4/6] Port build/config/mac/plist_util.py to biplist. So as not to require the plutil command. plutil was only being used to convert between XML and binary plist formats, because versions of the @@ -105,7 +139,7 @@ OSError: [Errno 2] No such file or directory 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py -index 0928fa13..898edc1a 100644 +index bba0208a5..019dcf918 100644 --- a/build/config/mac/plist_util.py +++ b/build/config/mac/plist_util.py @@ -3,7 +3,7 @@ @@ -117,7 +151,7 @@ index 0928fa13..898edc1a 100644 import os import re import subprocess -@@ -116,6 +116,7 @@ def Interpolate(plist, substitutions): +@@ -89,6 +89,7 @@ def Interpolate(value, substitutions): def LoadPList(path): """Loads Plist at |path| and returns it as a dictionary.""" @@ -125,133 +159,55 @@ index 0928fa13..898edc1a 100644 fd, name = tempfile.mkstemp() try: subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) -@@ -127,6 +128,7 @@ def LoadPList(path): +@@ -100,6 +101,7 @@ def LoadPList(path): def SavePList(path, format, data): """Saves |data| as a Plist to |path| in the specified |format|.""" + return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format fd, name = tempfile.mkstemp() try: - with os.fdopen(fd, 'w') as f: --- -2.11.0 - -From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:41:16 -0700 -Subject: [PATCH 5/8] Include <sys/socket.h> in macifaddrs_converter.cc. - -Without this, when built against MacOSX10.7.sdk, there are errors: - -In file included from ../../webrtc/base/macifaddrs_converter.cc:13: -/home/debian/build/MacOSX10.7.sdk/usr/include/net/if.h:300:19: error: field has incomplete type 'struct sockaddr' - struct sockaddr ifru_addr; - -Related references: -https://trac.macports.org/ticket/49012 -https://trac.macports.org/browser/trunk/dports/gnome/gstreamer1/files/patch-struct-sockadr.diff?rev=140712 ---- - webrtc/base/macifaddrs_converter.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/webrtc/base/macifaddrs_converter.cc b/webrtc/base/macifaddrs_converter.cc -index 2ad070e8e..1995f1940 100644 ---- a/webrtc/base/macifaddrs_converter.cc -+++ b/webrtc/base/macifaddrs_converter.cc -@@ -10,6 +10,7 @@ - - #include <memory> - -+#include <sys/socket.h> - #include <net/if.h> - #include <sys/ioctl.h> - #include <unistd.h> + # "plutil" does not replace the destination file but update it in place, -- 2.11.0 - -From e6a421534723408fb1292ce25051a1970f750a4a Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:42:34 -0700 -Subject: [PATCH 6/8] Provide definitions of NS_ENUM and NS_OPTIONS. - ---- - webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -index f9f15c37d..277676d85 100644 ---- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -@@ -25,4 +25,17 @@ - #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname - #endif - -+// http://iamthewalr.us/blog/2012/11/ns_enum-and-ns_options/ -+#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum)) -+#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type -+#if (__cplusplus) -+#define NS_OPTIONS(_type, _name) _type _name; enum : _type -+#else -+#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type -+#endif -+#else -+#define NS_ENUM(_type, _name) _type _name; enum -+#define NS_OPTIONS(_type, _name) _type _name; enum -+#endif -+ - #endif // WEBRTC_BASE_OBJC_RTC_MACROS_H_ --- -2.11.0 - - -From baf5ddbd1e1281cd7c4cdda709e2ea7e07903727 Mon Sep 17 00:00:00 2001 +From eb3787dd670900cc2c3020c9323a9d95983c8887 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:43:05 -0700 -Subject: [PATCH 7/8] Replace firstObject with objectAtIndex:0. - -firstObject doesn't exist in our version of the SDK. +Date: Tue, 4 Dec 2018 05:16:04 +0000 +Subject: [PATCH 5/6] Override use_system_xcode=true. -The two method calls are not exactly the same; on an empty array, -firstObject returns nil while objectAtIndex:0 raises an exception. Let's -hope that doesn't matter. --- - webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -index 182056228..93bea08f9 100644 ---- a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -+++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -@@ -176,7 +176,7 @@ using namespace webrtc::videocapturemodule; + build_overrides/build.gni | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index 81cb3e73ae..b683ea850c 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -46,3 +46,5 @@ if (host_os == "mac") { + "hermetic toolchain if the minimum OS version is not met.") + use_system_xcode = _result == 0 } - - - (AVCaptureVideoDataOutput*)currentOutput { -- return [[_captureSession outputs] firstObject]; -+ return [[_captureSession outputs] objectAtIndex:0]; - } - - - (void)startCaptureInBackgroundWithOutput: ++ ++use_system_xcode = true -- 2.11.0 - -From 0b5f86af5bc4b7697ee60adf7e1e057a023438e0 Mon Sep 17 00:00:00 2001 +From 5df71ea8f31fd25a05c6b6b881c8126b25b5475c Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:43:51 -0700 -Subject: [PATCH 8/8] Disable the desktop_capture module. +Date: Mon, 3 Dec 2018 21:11:14 -0700 +Subject: [PATCH 6/6] Disable the desktop_capture module. It's causing an error related to CoreGraphics.h and hopefully we don't need it. --- - webrtc/modules/BUILD.gn | 1 - + modules/BUILD.gn | 1 - 1 file changed, 1 deletion(-) -diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn -index e750a8109..590f34275 100644 ---- a/webrtc/modules/BUILD.gn -+++ b/webrtc/modules/BUILD.gn -@@ -18,7 +18,6 @@ group("modules") { +diff --git a/modules/BUILD.gn b/modules/BUILD.gn +index 465f32d3c4..578cdbd57e 100644 +--- a/modules/BUILD.gn ++++ b/modules/BUILD.gn +@@ -17,7 +17,6 @@ group("modules") { "audio_processing", "bitrate_controller", "congestion_controller",

1 0

[tor-browser-build/master] Use whitespace-safe loops over filenames in the webrtc build.
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit d8db312e4527c694e8f906a5e8926d0dc0c37179 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 6 07:55:25 2018 +0000 Use whitespace-safe loops over filenames in the webrtc build. --- projects/webrtc/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 5a6cece..a1abd92 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -138,7 +138,8 @@ ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # like that, not necessarily of the target architecture, and anyway are not # needed. # https://bugs.torproject.org/22832 -[% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %]"$AR" crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) +find out/Release/obj -name '*.o' -print0 | sort -z \ + | [% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %] xargs -0 -- "$AR" crs libwebrtc-magic.a mkdir -p $distdir cd $distdir @@ -146,9 +147,9 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -for h in $(find webrtc/ -type f -name '*.h'); +find webrtc/ -type f -name '*.h' -print0 | while IFS= read -r -d '' h; do - mkdir -p "$INCLUDE_DIR/$(dirname $h)" + mkdir -p "$INCLUDE_DIR/$(dirname "$h")" cp -f "$h" "$INCLUDE_DIR/$h" done

1 0

[tor-browser-build/master] Bug 28775: Add mercurial in tbb-build ansible role
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit ea1fc73e70e73d6b930c99fdfe5a729579613002 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 7 11:41:25 2018 +0100 Bug 28775: Add mercurial in tbb-build ansible role With #26843 we now require mercurial to be installed, so it should be installed by the tbb-build ansible role. --- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index f27c6cf..4e84709 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -22,6 +22,7 @@ - libgtk2.0-dev - curl - runc + - mercurial - name: Install dependencies for update_responses script apt:

1 0

[tor-browser-build/master] Release preparations for 8.5a6
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 76243271b0f02b0a965a0294ef8242c787bfc668 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 22:31:40 2018 +0000 Release preparations for 8.5a6 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ projects/torbutton/config | 2 +- rbm.conf | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 7ffaf43..639d504 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # 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") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5c3732b..54645e8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 8.5a6 -- December 11 2018 + * All Platforms + * Update Firefox to 60.4.0esr + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + * Bug 28608: Disable background HTTP response throttling + * Bug 28695: Set default security.pki.name_matching_mode to enforce (3) + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 27919: Backport SSL status API + * Windows + * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems + * Android + * Bug 26843: Multi-locale support for Tor Browser on Android + * Build System + * Android + * Bug 25164: Add .apk to our sha256sums unsigned build file + * Bug 28696: Make path to Gradle dependencies reproducible + * Bug 28697: Use pregenerated keystore and fix timestamp issues + Tor Browser 8.5a5 -- December 3 2018 * All Platforms * Update Torbutton to 2.1.2 diff --git a/projects/torbutton/config b/projects/torbutton/config index 2e48f31..0fff877 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.2 +version: 2.1.3 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f64a80b..a397752 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a5' - torbrowser_build: 'build2' + torbrowser_version: '8.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5a4 + - 8.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 28697: No need to specify the architecture for using Buster
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 0a2cc62f08063cc0c91b1db57e87505c954349a9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 22:06:03 2018 +0000 Bug 28697: No need to specify the architecture for using Buster --- projects/tor-browser/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3a7f035..6199954 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -51,7 +51,6 @@ targets: # leads to a stalled build. Work around this by switching to Buster. container: suite: buster - arch: amd64 input_files: - project: container-image

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit a3cbc068df86e03a6420bc863be2793e35078fa3 Author: Chris Peterson <cpeterson(a)mozilla.com> Date: Mon Jul 2 11:02:23 2018 -0700 Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv navigator.platform returns "Win64" in 64-bit Firefox and IE, but "Win32" in 64-bit Chrome and Edge. "Win32" appears to be the de facto platform value for Windows. This change doesn't hide the OS architecture from web content because navigator.userAgent still mentions "Win64; x64" in 64-bit Firefox, Chrome, Edge, and IE. MozReview-Commit-ID: CplYnGDQgTe --HG-- extra : rebase_source : c00a1a7462ea91d44700dd0581c88c1c4cad2346 extra : source : 1976c327f251702be255a9d0769121c6bc5303a1 This fixes our bug 28740. --- .../components/resistfingerprinting/test/browser/browser_navigator.js | 2 +- dom/base/Navigator.cpp | 4 +--- toolkit/components/resistfingerprinting/nsRFPService.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js index e0aaf6fb27fe..3736fcd33ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_navigator.js +++ b/browser/components/resistfingerprinting/test/browser/browser_navigator.js @@ -24,7 +24,7 @@ const SPOOFED_APPVERSION = { }; const SPOOFED_PLATFORM = { linux: "Linux x86_64", - win: "Win64", + win: "Win32", macosx: "MacIntel", android: "Linux armv7l", other: "Linux x86_64", diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 33563ad65ccb..55d1f7a0474b 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1653,9 +1653,7 @@ Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue) // Sorry for the #if platform ugliness, but Communicator is likewise // hardcoded and we are seeking backward compatibility here (bug 47080). -#if defined(_WIN64) - aPlatform.AssignLiteral("Win64"); -#elif defined(WIN32) +#if defined(WIN32) aPlatform.AssignLiteral("Win32"); #elif defined(XP_MACOSX) && defined(__ppc__) aPlatform.AssignLiteral("MacPPC"); diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index da79da8de948..4ed0c1d4cfaf 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -25,7 +25,7 @@ #define SPOOFED_UA_OS "Windows NT 6.1; Win64; x64" #define SPOOFED_APPVERSION "5.0 (Windows)" #define SPOOFED_OSCPU "Windows NT 6.1; Win64; x64" -#define SPOOFED_PLATFORM "Win64" +#define SPOOFED_PLATFORM "Win32" #elif defined(XP_MACOSX) #define SPOOFED_UA_OS "Macintosh; Intel Mac OS X 10.13" #define SPOOFED_APPVERSION "5.0 (Macintosh)"

1 0

[tor-browser-build/master] Bug 25164: Add .apk to our unsigned sha256sums file
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 3d7c32b67b25d869d94ec8f23da82e7558fb9993 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 19:16:16 2018 +0000 Bug 25164: Add .apk to our unsigned sha256sums file --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index e7c7410..cf190a6 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk | 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 -%]

1 0

[tor-browser-build/master] Bug 28697: Use pre-generated android keystore and fix timestamps on zipped archives
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit ea1d0b24448f0365b9c8ff60a6ab2c4a130ec279 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Dec 4 12:20:40 2018 -0800 Bug 28697: Use pre-generated android keystore and fix timestamps on zipped archives --- projects/tor-browser/android-qa.keystore | Bin 0 -> 2138 bytes projects/tor-browser/build.android | 6 +++--- projects/tor-browser/config | 4 ++++ projects/tor-browser/how-to-generate-keystore.txt | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/android-qa.keystore b/projects/tor-browser/android-qa.keystore new file mode 100644 index 0000000..90cfaed Binary files /dev/null and b/projects/tor-browser/android-qa.keystore differ diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index b623466..d56d4b5 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -9,10 +9,10 @@ cd /var/tmp/build mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff(a)eff.org.xpi mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +[% c("var/touch") %] $ext_dir $ext_dir/* zip -d $apk META-INF/\* -zip -r $apk $ext_dir +zip -r -X $apk $ext_dir # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -keytool -genkey -v -keystore qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US" -jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android +[% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 43db189..2b937bd 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -46,6 +46,7 @@ targets: var: arch_deps: - openjdk-8-jdk + - faketime input_files: - project: container-image @@ -108,3 +109,6 @@ input_files: URL: https://files.pythonhosted.org/packages/7e/9b/f99171190f04cd23768547dd34533… sha256sum: 675c35ee0e1677db9e80d2f48d8a7ff2cf38e6207e8cd5e2a2c6d126db025854 enable: '[% c("var/windows") %]' + # To generate a new keystore, see how-to-generate-keystore.txt + - filename: android-qa.keystore + enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/how-to-generate-keystore.txt b/projects/tor-browser/how-to-generate-keystore.txt new file mode 100644 index 0000000..3dbe443 --- /dev/null +++ b/projects/tor-browser/how-to-generate-keystore.txt @@ -0,0 +1,3 @@ +To generate a new keystore, type the following command: + +keytool -genkey -v -keystore android-qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US"

1 0

[tor-browser-build/master] Bug 28750: Switch to Buster for avoiding faketime issues
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 60163914e4f9418709bfe5b8fdc946fb56ca6e07 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 19:13:53 2018 +0000 Bug 28750: Switch to Buster for avoiding faketime issues If we are using faketime on Stretch when signing our debug .apk the build freezes for unknown reasons on some machines. Switching to Buster avoids that. --- projects/tor-browser/config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 2b937bd..3a7f035 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -47,6 +47,11 @@ targets: arch_deps: - openjdk-8-jdk - faketime + # On some machines using faketime with Stretch to make the debug signature + # leads to a stalled build. Work around this by switching to Buster. + container: + suite: buster + arch: amd64 input_files: - project: container-image

1 0

[tor-browser-build/master] Bug 26843: Get l10n-changesets.json from tor-browser.git
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit bad46e532fa614ffdd3ed0e21f4b8fae3ba7793d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 6 14:34:41 2018 +0000 Bug 26843: Get l10n-changesets.json from tor-browser.git The json file used by projects/firefox-locale-bundle is only available from https://product-details.mozilla.org/ after a build has been shipped, which is too late for us. However, it is also available from the firefox sources tree, so we can get it from our tor-browser.git clone instead. The format of this json file is a little different, so we also need to adapt the get_hg_hash script. --- projects/firefox-locale-bundle/build | 6 +++++- projects/firefox-locale-bundle/config | 4 ---- projects/firefox-locale-bundle/get_hg_hash | 2 +- projects/firefox/config | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build index 3fec48e..7000300 100644 --- a/projects/firefox-locale-bundle/build +++ b/projects/firefox-locale-bundle/build @@ -2,6 +2,10 @@ [% c("var/set_default_env") -%] +cat > l10n-changesets.json << 'EOF_CHANGESETS' +[% pc('firefox', 'var/l10n-changesets.json') %] +EOF_CHANGESETS + clone_dir='[% c("basedir") %]/hg_clones/[% project %]' mkdir -p "$clone_dir" cd "$clone_dir" @@ -19,7 +23,7 @@ tmpdir=$(mktemp -d) cd [% lang %] fi hg_hash=$([% c("basedir") %]/projects/firefox-locale-bundle/get_hg_hash \ - $rootdir/[% c('input_files_by_name/firefox_json') %] \ + $rootdir/l10n-changesets.json \ [% lang %]) [% c("hg") %] archive -r "$hg_hash" -t files "$tmpdir"/[% lang %] cd .. diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 13c5fb8..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -6,7 +6,3 @@ var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' ff_build: build1 - -input_files: - - name: firefox_json - URL: 'https://product-details.mozilla.org/1.0/l10n/Firefox-[% c("var/ff_version") %]-[% c("var/ff_build") %].json' diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash index 0531113..9b2b5bd 100755 --- a/projects/firefox-locale-bundle/get_hg_hash +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -16,6 +16,6 @@ exit_error("Error reading $file", 2) unless defined $json_text; my $data = decode_json($json_text); -my $changeset = $data->{locales}{$locale}{changeset}; +my $changeset = $data->{$locale}{revision}; exit_error("Can't find locale $locale in $file", 3) unless $changeset; print "$changeset\n"; diff --git a/projects/firefox/config b/projects/firefox/config index 314326f..7ffaf43 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -24,6 +24,8 @@ var: use_container: 1 # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 + # used by projects/firefox-locale-bundle + l10n-changesets.json: '[% exec("cat mobile/locales/l10n-changesets.json") %]' targets: release:

1 0

[torbutton/master] Fold in maint-2.0 CHANGELOG
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 7f3f89164b409736f4eb70019005f5f8960e906c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 14:51:17 2018 +0000 Fold in maint-2.0 CHANGELOG --- src/CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0db59514..0abd10b5 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -15,6 +15,12 @@ * Bug 28082: Add locales cs, el, hu, ka * Translations update +2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + 2.1 * Bug 27175: Add pref to allow users to persist custom noscript settings * Bug 27760: Use new NoScript API for IPC and fix about:blank issue

1 0

[torbutton/master] Release preparations for 2.1.3
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 61c79b29f463666548754d9a2a6b15c996df48ee Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 14:53:53 2018 +0000 Release preparations for 2.1.3 CHANGELOG update and version bump --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0abd10b5..6f5b3f3b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + 2.1.2 * Bug 25013: Integrate Torbutton into tor-browser for Android * Bug 27111: Update about:tor desktop version to work on mobile diff --git a/src/install.rdf b/src/install.rdf index 45bee11a..1ece0c4c 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>2.1.2</em:version> + <em:version>2.1.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-build/master] Bug 28573: Include all locales in Android testbuild
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit c359853bd44b320595d5a52fc4340ab3b6825d8d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 6 08:42:19 2018 +0000 Bug 28573: Include all locales in Android testbuild --- README.HACKING | 10 +++++++++- projects/tor-browser/build | 6 ++++-- projects/tor-browser/config | 2 +- rbm.conf | 3 +-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/README.HACKING b/README.HACKING index d9b0674..7634093 100644 --- a/README.HACKING +++ b/README.HACKING @@ -319,7 +319,15 @@ Types of builds: nightly, alpha, release, and testbuild The testbuild makefile target allows you to do a build quickly in the testbuild directory, skipping the generation of all the locales and the -mar files. This is useful during development. +.mar files. This is useful during development. + +In the case of Android builds, we are generating a multi-locale apk, +contrary to the desktop builds where we have one bundle for each locale. +Removing locales in a multi-locale bundle does not make a significant +difference in build time, therefore we still include all the locales in +the Android testbuild. There are also no .mar files generated in the +Android builds, so currently, in the Android case, the only difference +introduced by the testbuild target is the output directory. By default the testbuild is based on the alpha build. All the options can have a different definition for the alpha, release and nightly builds. diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 250a0e9..4661f7a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -209,7 +209,8 @@ popd # Prepare our language packs for using the proper search engines and embed # our default bookmarks. See bugs 18915 and 21879 for more details. -[% FOREACH lang = c('var/locales') %] +[% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] +[% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; %] @@ -325,7 +326,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ # If we did not create a multi-lingual package above, create a package for # each locale. [% IF ! c("var/multi_lingual") %] - [% FOREACH lang = c('var/locales') %] + [% SET locales = c("var/testbuild") ? [] : c("var/locales") -%] + [% FOREACH lang = locales %] [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 149b800..43db189 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -58,7 +58,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% c("var/locales").size && ! c("var/android") %]' + enable: '[% ! c("var/testbuild") && ! c("var/android") %]' - project: tor-launcher name: tor-launcher enable: '[% ! c("var/android") %]' diff --git a/rbm.conf b/rbm.conf index 0d53855..f64a80b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -136,8 +136,7 @@ targets: - alpha testbuild: var: - # To make build faster, don't build any locale - locales: [] + testbuild: 1 # Don't create mar files to save time build_mar: 0

1 0

[tor-browser-build/master] Bug 28696: Changing paths to Gradle dependencies are included in build
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 9ec8d7fb09a2069ef7c79d81547040ce6661ab3b Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Dec 4 12:14:39 2018 -0800 Bug 28696: Changing paths to Gradle dependencies are included in build --- projects/firefox/build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index f631ec5..da82862 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -1,13 +1,6 @@ #!/bin/bash [% c("var/setarch") -%] [% c("var/set_default_env") -%] -[% IF c("var/android") %] - export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" - # Prepare building the multi-locale .apk - mkdir -p /var/tmp/dist/locales - tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] -[% END -%] - [% IF c("var/windows") -%] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] # We need a link to our GCC, otherwise the system cc gets used which points to @@ -105,7 +98,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] + export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + # Move Gradle Repo to hard-coded location. This location is embedded in the file + # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app + # Prepare building the multi-locale .apk + mkdir -p /var/tmp/dist/locales + tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt))

1 0

[torbutton/master] Bug 28747: Remove NoScript (XPCOM) related unused code
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit e0b17e85b5c8924e23653d863b043509a0083bf0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 16:44:28 2018 +0000 Bug 28747: Remove NoScript (XPCOM) related unused code --- src/chrome/content/torbutton.js | 68 ++--------------------------------------- 1 file changed, 2 insertions(+), 66 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6568570c..35ae2acb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -82,7 +82,6 @@ var torbutton_unique_pref_observer = m_tb_prefs.addObserver("network.cookie", this, false); m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this, false); m_tb_prefs.addObserver("javascript", this, false); - m_tb_prefs.addObserver("noscript", this, false); m_tb_prefs.addObserver("plugin.disable", this, false); m_tb_prefs.addObserver("privacy.firstparty.isolate", this, false); m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false); @@ -99,7 +98,6 @@ var torbutton_unique_pref_observer = m_tb_prefs.removeObserver("network.cookie", this); m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this); m_tb_prefs.removeObserver("javascript", this); - m_tb_prefs.removeObserver("noscript", this); m_tb_prefs.removeObserver("plugin.disable", this); m_tb_prefs.removeObserver("privacy.firstparty.isolate", this); m_tb_prefs.removeObserver("privacy.resistFingerprinting", this); @@ -140,13 +138,7 @@ var torbutton_unique_pref_observer = } if (topic != "nsPref:changed") return; - // Make sure the NoScript button shows the current NoScript state. We - // don't want to run the update function, though, if just a timer gets - // updated. Fixes bug 21324. - if (data.startsWith("noscript.") && - data !== "noscript.subscription.lastCheck") { - torbutton_update_noscript_button(); - } + switch (data) { case "network.cookie.cookieBehavior": let val = m_tb_prefs.getIntPref("network.cookie.cookieBehavior"); @@ -974,18 +966,6 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Emitting Private Browsing Session clear event"); obsSvc.notifyObservers(null, "browser:purge-session-history", ""); - torbutton_log(3, "New Identity: Clearing NoScript Temporary Permissions"); - - try { - if ("@maone.net/noscript-service;1" in Components.classes) { - var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject - nsSvc.eraseTemp(); - } - } catch(e) { - torbutton_log(5, "New Identity: Error clearing NoScript Temporary Permissions: "+e); - window.alert("Torbutton: Error clearing NoScript Temporary Permissions: "+e); - } - torbutton_log(3, "New Identity: Clearing HTTP Auth"); if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { @@ -1263,8 +1243,7 @@ function torbutton_clear_image_caches() /* Called when we switch the use_nontor_proxy pref in either direction. * - * Enables/disables domain isolation and NoScript ABE, and then does - * new identity + * Enables/disables domain isolation and then does new identity */ function torbutton_use_nontor_proxy() { @@ -1272,15 +1251,9 @@ function torbutton_use_nontor_proxy() .getService(Ci.nsISupports).wrappedJSObject; if (m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { - // We need to enable ABE because non-tor proxies won't reject localhost - // and RFC1918, and we should block them. (The default ABE policy does this). - m_tb_prefs.setBoolPref("noscript.ABE.enabled", true); - // Disable domain isolation domainIsolator.disableIsolation(); } else { - m_tb_prefs.setBoolPref("noscript.ABE.enabled", false); - domainIsolator.enableIsolation(); } @@ -1535,15 +1508,6 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setIntPref("browser.download.manager.retention", 2); } - // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` - // to `true` if we are blocking disk records and to `false` if we are - // enabling them. - try { - if ("@maone.net/noscript-service;1" in Components.classes) { - m_tb_prefs.setBoolPref("volatilePrivatePermissions", mode); - } - } catch (e) {} - // Force prefs to be synced to disk Services.prefs.savePrefFile(null); } @@ -1810,12 +1774,6 @@ function torbutton_fixup_old_prefs() m_tb_prefs.setBoolPref("intl.locale.matchOS", matchOS); } - // Prior to TBB 5.0, NoScript was allowed to update its whitelist. This caused - // odd things to appear in people's whitelists. - if (m_tb_prefs.prefHasUserValue("capability.policy.maonoscript.sites")) { - m_tb_prefs.clearUserPref("capability.policy.maonoscript.sites"); - } - // For some reason, the Share This Page button also survived the // TBB 5.0a4 update's attempt to remove it. if (m_tb_prefs.prefHasUserValue("browser.uiCustomization.state")) { @@ -2228,28 +2186,6 @@ function torbutton_is_homepage_url(aURI) return (urls.indexOf(aURI.spec) >= 0); } -// Update the NoScript button to reflect any changes to noscript prefs -function torbutton_update_noscript_button() -{ - // Make sure pref values have fully propagated inside NoScript before - // we sync the UI. - setTimeout(() => { - try { - let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - let browserEnumerator = wm.getEnumerator("navigator:browser"); - // Update every window's NoScript status... - while (browserEnumerator.hasMoreElements()) { - let win = browserEnumerator.getNext(); - //win.noscriptOverlay._syncUINow(); - } - torbutton_log(3, 'Updated NoScript status for security settings'); - } catch (e) { - torbutton_log(4, 'Failed to update NoScript status for security setings: '+e); - } - }, 0); -} - // Makes sure the item in the Help Menu and the link in about:tor // for the Tor Browser User Manual are only visible when // show_torbrowser_manual() returns true.

1 0

[tor-browser-build/master] Bug 26843: Adding multi-locale support for Tor Browser for Android
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 524a9364ead98593507f8f881cc1aa9764945324 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 10:14:05 2018 +0000 Bug 26843: Adding multi-locale support for Tor Browser for Android --- projects/firefox/build | 12 +++++++++++- projects/firefox/config | 3 +++ projects/firefox/mozconfig-android-armv7 | 1 + projects/tor-browser/build.android | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index e81ecfe..f631ec5 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -3,6 +3,9 @@ [% c("var/set_default_env") -%] [% IF c("var/android") %] export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" + # Prepare building the multi-locale .apk + mkdir -p /var/tmp/dist/locales + tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END -%] [% IF c("var/windows") -%] @@ -154,7 +157,14 @@ rm -f js/src/configure ./mach build --verbose [% IF c("var/android") %] - ./mach package + # Building a multi-locale .apk + [% FOREACH lang = c('var/locales') %] + [% SET lang = tmpl(lang) %] + ./mach build chrome-[% lang %]; + [% END %] + export MOZ_CHROME_MULTILOCALE='[% tmpl(c('var/locales').join(' ')) %]' + AB_CD=multi ./mach package + # Copy the result over and return. There is nothing more to do for mobile. cp obj-*/dist/*unsigned-unaligned.apk [% dest_dir _ '/' _ c('filename') %]/tor-browser-unsigned-unaligned.apk [% RETURN %] [% END %] diff --git a/projects/firefox/config b/projects/firefox/config index 81416a2..314326f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -135,3 +135,6 @@ input_files: - project: orbot name: orbot enable: '[% c("var/android") %]' + - project: firefox-locale-bundle + name: firefox-locale-bundle + enable: '[% c("var/android") %]' diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index 0098ea1..8cfcc60 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -18,6 +18,7 @@ ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/ ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/bin/clang ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then # Because Google Play will likely be the primary distribution medium, diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 24bdc70..b623466 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -1,7 +1,7 @@ #!/bin/bash [% c("var/set_default_env") -%] ext_dir=assets/distribution/extensions -qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-qa.apk +qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1463936 - Set default security.pki.name_matching_mode to enforce (3) for all builds. r=jcj
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 2199c4be11b8f1a71403754ac771c96d507dc0b5 Author: Dipen Patel <bugzilla(a)pansara.org> Date: Mon Jun 11 14:52:07 2018 -0700 Bug 1463936 - Set default security.pki.name_matching_mode to enforce (3) for all builds. r=jcj MozReview-Commit-ID: CK3zoKfGfEr --HG-- extra : rebase_source : fe20f240a66d809177d30043fd9f41682073cd34 --- security/manager/ssl/security-prefs.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/security/manager/ssl/security-prefs.js b/security/manager/ssl/security-prefs.js index cf492478b279..72af0ee99938 100644 --- a/security/manager/ssl/security-prefs.js +++ b/security/manager/ssl/security-prefs.js @@ -90,11 +90,7 @@ pref("security.signed_app_signatures.policy", 2); // 2: fall back to the subject common name for certificates valid before 23 // August 2015 if necessary // 3: only use name information from the subject alternative name extension -#ifdef RELEASE_OR_BETA -pref("security.pki.name_matching_mode", 1); -#else -pref("security.pki.name_matching_mode", 2); -#endif +pref("security.pki.name_matching_mode", 3); // security.pki.netscape_step_up_policy controls how the platform handles the // id-Netscape-stepUp OID in extended key usage extensions of CA certificates.

1 0

[torbutton/master] Bug 27290: Remove WebGL pref for min capability mode
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 7d98f3bd4348aa79efe040118763c77c84745173 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 4 13:53:12 2018 +0000 Bug 27290: Remove WebGL pref for min capability mode In Mozilla Bug 1217290, a new WebGL mode was introduced specifically for `privacy.resistFingerprinting` set to `true`, which is supposed to give most machines the same WebGL profile. Previously, `webgl.min_capability_mode` was used for this purpose, but now that pref is intended strictly for browser testing and it overrides the `privacy.resistFingerprinting` setting. Furthermore, `webgl.min_capability_mode` can cause WebGL to fail unnecessarily. So we should not be enabling `webgl.min_capability_mode` any more in Tor Browser. This patch is the complement to a tor-browser patch which both remove that preference setting so it reverts to Firefox's default value (false). --- src/chrome/content/torbutton.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8bd847f9..6568570c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1551,7 +1551,6 @@ function torbutton_update_disk_prefs() { function torbutton_update_fingerprinting_prefs() { var mode = m_tb_prefs.getBoolPref("privacy.resistFingerprinting"); - m_tb_prefs.setBoolPref("webgl.min_capability_mode", mode); m_tb_prefs.setBoolPref("webgl.disable-extensions", mode); m_tb_prefs.setBoolPref("dom.network.enabled", !mode); m_tb_prefs.setBoolPref("dom.enable_performance", !mode);

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 6eadc8186a20298ed6d0469f64586d63bec1cfd1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 6 22:50:00 2018 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. In Mozilla Bug 1217290, a new WebGL mode was introduced specifically for `privacy.resistFingerprinting` set to `true`, which is supposed to give most machines the same WebGL profile. Previously, `webgl.min_capability_mode` was used for this purpose, but now that pref is intended strictly for browser testing and it overrides the `privacy.resistFingerprinting` setting. Furthermore, `webgl.min_capability_mode` can cause WebGL to fail unnecessarily. So we should not be enabling `webgl.min_capability_mode` any more in Tor Browser. This patch is the complement to a Torbutton patch which both remove that preference setting so it reverts to Firefox's default value (false). --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 8f74748f2072..e19dd0dd59ae 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -113,7 +113,6 @@ pref("browser.pocket.site", ""); pref("network.http.referer.hideOnionSource", true); // Fingerprinting -pref("webgl.min_capability_mode", true); pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false);

1 0

[tor-browser-build/maint-8.0] Tagging build2
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 9bdf6c739a5c1e4f2aa2eed04a5661ec122dbfe8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 19:15:35 2018 +0000 Tagging build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 599fe5d..1df185a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.4' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.3 project_name: tor-browser

1 0

[tor-browser-build/maint-8.0] Bug 28002: fix the precomplete file in the en-US installer
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 5c41fd90b0badbb79e37441bfd7a2a19ff42d0ca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 11 12:30:18 2018 +0200 Bug 28002: fix the precomplete file in the en-US installer The Windows installer for the en-US bundle was created from the $TB_STAGE_DIR instead of the $PKG_DIR where the precomplete file has been regenerated. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 68050f9..1dc4188 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -292,8 +292,8 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; - pushd "${TB_STAGE_DIR}" + find "$PKG_DIR" -exec [% c("var/touch") %] {} \; + pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.4
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 88491f1d51de13a2431dade85e0a18779ab7a051 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 09:22:41 2018 +0000 Release preparations for 8.0.4 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 28 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 ++-- 8 files changed, 37 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index bad1ac5..831a5fb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index e189eb9..b0b3ce9 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.9.19 +version: 2018.10.31 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b98edcb..d347684 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,31 @@ +Tor Browser 8.0.4 -- December 11 2018 + * All platforms + * Update Firefox to 60.4.0esr + * Update Tor to 0.3.4.9 + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 25794: Disable pointer events + * Bug 28608: Disable background HTTP response throttling + * Bug 28185: Add smallerRichard to Tor Browser + * Windows + * Bug 26381: about:tor page does not load on first start on Windows + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Linux + * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Build System + * All Platforms + * Bug 27218: Generate multiple Tor Browser bundles in parallel + Tor Browser 8.0.3 -- October 23 2018 * All platforms * Update Firefox to 60.3.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index bb1c259..1a37ea1 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9 + sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 1549369..5dd5206 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.4.8 +version: 0.3.4.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index df0d674..168584a 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.8 +version: 2.0.9 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index b4f58ed..599fe5d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.3' + torbrowser_version: '8.0.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.2 + - 8.0.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Update OpenSSL to 1.0.2q
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 54423878a373c34519f3ab621aa838306d1f3c24 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 3 08:06:40 2018 +0000 Update OpenSSL to 1.0.2q --- projects/openssl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index d3ed959..e91e820 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2p +version: 1.0.2q filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -26,4 +26,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00 + sha256sum: 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684

1 0

[tor-browser-build/maint-8.0] Bug 28185: Add smallerRichard to Tor Browser
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit aeab20a433870b5c93acacfebe78666b4f7d585a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 29 16:15:07 2018 +0000 Bug 28185: Add smallerRichard to Tor Browser --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index ec76ce7..f58eb02 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -39,6 +39,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:3822 pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.28", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[torbutton/maint-2.0] Translations update
by gk＠torproject.org 05 Dec '18

05 Dec '18

commit 65b6219be53b32a58125a5a5acdccbd861702d10 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 5 08:46:22 2018 +0000 Translations update --- src/chrome/locale/ar/browserOnboarding.properties | 12 ++++++------ src/chrome/locale/pl/aboutTor.dtd | 2 +- src/chrome/locale/pl/browserOnboarding.properties | 2 +- src/chrome/locale/pt-BR/aboutTor.dtd | 4 ++-- src/chrome/locale/pt-BR/torbutton.dtd | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties index 0b04e973..448f6a61 100644 --- a/src/chrome/locale/ar/browserOnboarding.properties +++ b/src/chrome/locale/ar/browserOnboarding.properties @@ -8,12 +8,12 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=الخصوصية -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=المتلصصون و اكلواسعة اﻹنترنت +onboarding.tour-tor-privacy.description=متصفح تور يعزل ملفات التعريق و يمسح ارشيف اﻹنترنت الخاص بك بعد انتهائك من التصفح. هذه التعديلات تتأكد من امانك و خصوصيتك في المتصفح. اضغط على شبكة تور لتعرف اكثر كيف نحميك على مستوى الشبكه +onboarding.tour-tor-privacy.button=اذهب الى شبكة تور -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=شبكة تور +onboarding.tour-tor-network.title=اﻹنتقال لشبكه لا مركزيه onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=الأمان -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=اختر مدى خبرتك onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index 31df7d7b..b523d30d 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -27,7 +27,7 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Siła w liczbach"> <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties index 8c1730b0..f02655f4 100644 --- a/src/chrome/locale/pl/browserOnboarding.properties +++ b/src/chrome/locale/pl/browserOnboarding.properties @@ -12,7 +12,7 @@ onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Sieć Tor onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 243a012b..02a848a7 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -39,10 +39,10 @@ <!ENTITY aboutTor.donationBanner.line2g "Apóie a liberdade na internet."> <!ENTITY aboutTor.donationBanner.line2h "Defenda a web aberta."> <!ENTITY aboutTor.donationBanner.line2i "Apóie a privacidade e liberdade online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> +<!ENTITY aboutTor.donationBanner.line2j "A Mozilla está combinando cada doação até 2019."> <!ENTITY aboutTor.donationBanner.line3 "Doe hoje, e a Mozilla duplicará a sua doação."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> +<!ENTITY aboutTor.donationBanner.line3b "Dê agora, e seu presente se torna duas vezes mais forte."> <!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> <!ENTITY aboutTor.donationBanner.buttonB "Estou dentro"> diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index 415f1517..594b4a62 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -35,12 +35,12 @@ <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider possibilita que você desabilite certas funcionalidades de navegação que podem torná-la mais vulnerável a tentativas de ataque."> <!ENTITY torbutton.prefs.sec_standard_label "Padrão"> <!ENTITY torbutton.prefs.sec_standard_description "Todos os recursos do Navegador Tor e do website estão ativos."> -<!ENTITY torbutton.prefs.sec_safer_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_label "Seguro"> <!ENTITY torbutton.prefs.sec_safer_description "Desativar recursos geralmente inseguros de websites, o que pode fazer com que alguns sites percam a funcionalidade."> -<!ENTITY torbutton.prefs.sec_safer_list_label "No nível mais seguro:"> -<!ENTITY torbutton.prefs.sec_safest_label "Mais seguro"> +<!ENTITY torbutton.prefs.sec_safer_list_label "No nível seguro:"> +<!ENTITY torbutton.prefs.sec_safest_label "Segurança máxima"> <!ENTITY torbutton.prefs.sec_safest_description "Apenas permitir os recursos dos websites necessários para sites estáticos e serviços básicos. Essas mudanças afetam imagens, mídias e scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "No nível mais seguro:"> +<!ENTITY torbutton.prefs.sec_safest_list_label "No nível de segurança máxima:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Aprenda mais"> <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript está desativado em todos os sites sem HTTPS."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está desativado por padrão em todos os sites.">

1 0