- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.5] Remove default bridge.
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit fa9325b3cc143ce7b72308ad4727fb0a96268915 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Aug 6 12:21:41 2019 -0700 Remove default bridge. The operator's server contract expires at the end of August. This fixes <https://bugs.torproject.org/31357>. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 4eb4644..3405a53 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -3,16 +3,15 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.3"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "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

[tor-browser-build/maint-8.5] Bug 31465: Bump Go to 1.12.9
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit c8b281ca4609c3d86b30f102f90a26440679c3ea Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c039b04..34aea9a 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -87,7 +87,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/maint-8.5] Bug 28119: Tor Browser for aarch64
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 1eeda4986c5f88f07bf53a2801e9e32ba3dba80b Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 31 13:01:30 2019 +0000 Bug 28119: Tor Browser for aarch64 Thanks to boklm for help with this patch. --- Makefile | 15 +++++++++ projects/android-toolchain/build | 8 ++--- projects/firefox/mozconfig-android-aarch64 | 50 ++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 10 ++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 9 ++++-- rbm.conf | 14 ++++++++- 8 files changed, 104 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 285b49d..94a26f6 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ release-android-armv7: submodule-update release-android-x86: submodule-update $(rbm) build release --target release --target torbrowser-android-x86 +release-android-aarch64: submodule-update + $(rbm) build release --target release --target torbrowser-android-aarch64 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -41,6 +44,9 @@ alpha-android-armv7: submodule-update alpha-android-x86: submodule-update $(rbm) build release --target alpha --target torbrowser-android-x86 +alpha-android-aarch64: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-aarch64 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -71,6 +77,9 @@ nightly-android-armv7: submodule-update nightly-android-x86: submodule-update $(rbm) build release --target nightly --target torbrowser-android-x86 +nightly-android-aarch64: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-aarch64 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -101,6 +110,9 @@ alpha_nightly-android-armv7: submodule-update alpha_nightly-android-x86: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 +alpha_nightly-android-aarch64: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -128,6 +140,9 @@ testbuild-android-armv7: submodule-update testbuild-android-x86: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-x86 +testbuild-android-aarch64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-aarch64 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 9fe40f7..e0f59a9 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -18,11 +18,9 @@ cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -# The architectures we support -archs="arm x86" -for arch in $archs; do - ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api") %] --arch $arch --install-dir=./$arch -done +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64 # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 new file mode 100644 index 0000000..2a9eb67 --- /dev/null +++ b/projects/firefox/mozconfig-android-aarch64 @@ -0,0 +1,50 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=aarch64-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle +ac_add_options --with-android-version=21 + +# Android NDK does not contain llvm-config so set clang path in options +ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm64/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm64/bin/clang + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +# We do not use Tor Launcher on Android: +ac_add_options --disable-tor-launcher + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme diff --git a/projects/release/build b/projects/release/build index af9d673..3e930e0 100644 --- a/projects/release/build +++ b/projects/release/build @@ -10,6 +10,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-x86") -%] mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-aarch64") -%] + mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index ddb17d1..1623083 100644 --- a/projects/release/config +++ b/projects/release/config @@ -24,6 +24,9 @@ targets: torbrowser-android-x86: var: torbrowser-android-x86: 1 + torbrowser-android-aarch64: + var: + torbrowser-android-aarch64: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -117,6 +120,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-x86 + - name: android-aarch64 + project: tor-browser + enable: '[% c("var/torbrowser-android-aarch64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-aarch64 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]' diff --git a/projects/rust/config b/projects/rust/config index 0c3b280..e2b0999 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -30,6 +30,10 @@ targets: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + android-aarch64: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=aarch64-linux-android --set=target.aarch64-linux-android.cc=$ANDROID_NDK_HOME/arm64/bin/aarch64-linux-android-gcc + linux: var: rust_arch: x86_64 diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index be36abc..b90c8b9 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -24,13 +24,16 @@ zip -d $apk lib/\* zip_src => [ 'lib/x86/*' ], zip_args => '$apk', }) %] -[% END %] - -[% IF c("var/android-armv7") %] +[% ELSIF c("var/android-armv7") %] [% c('zip', { zip_src => [ 'lib/armeabi-v7a/*' ], zip_args => '$apk', }) %] +[% ELSIF c("var/android-aarch64") %] + [% c('zip', { + zip_src => [ 'lib/arm64-v8a/*' ], + zip_args => '$apk', + }) %] [% END %] rm -fR lib diff --git a/rbm.conf b/rbm.conf index 831f918..0ad63c1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -190,12 +190,24 @@ targets: var: android-x86: 1 osname: android-x86 + torbrowser-android-aarch64: + - android-aarch64 + - android + android-aarch64: + arch: aarch64 + var: + android-aarch64: 1 + osname: android-aarch64 android: var: android: 1 compiler: android-toolchain # API 16 is the minimum we currently support for Tor Browser on Android - android_min_api: 16 + android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]' + # API 21 is the minimum we currently support for arm64 on Android + android_min_api_aarch64: 21 + android_min_api_armv7: 16 + android_min_api_x86: 16 snowflake: 0 fteproxy: 0 container:

1 0

[torbutton/maint-2.1] Bug 31140 - Do not enable IonMonkey at low security level on AARCH64
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 2a15af35080b9723d88e5111151f8cd889d592e0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Aug 19 16:18:40 2019 +0000 Bug 31140 - Do not enable IonMonkey at low security level on AARCH64 --- src/modules/security-prefs.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fa97b70d..94480123 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -5,6 +5,11 @@ let {classes: Cc, utils: Cu } = Components; let { getBoolPref, setBoolPref, getIntPref, setIntPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; + +// Used for detecting the current system architecture +let { XPCOMABI } = + Cu.import("resource://gre/modules/Services.jsm", {}).Services.appinfo; + let { bindPref, bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); let logger = Components.classes["@torproject.org/torbutton-logger;1"] @@ -41,8 +46,16 @@ const kCustomPref = "extensions.torbutton.security_custom"; // to the pref database. var write_setting_to_prefs = function (settingIndex) { Object.keys(kSecuritySettings).forEach( - prefName => setBoolPref( - prefName, kSecuritySettings[prefName][settingIndex])); + prefName => { + // Bug 31140 - Do not enable IonMonkey on AARCH64. + if (XPCOMABI.split("-")[0] == "aarch64" && + prefName == "javascript.options.ion") { + setBoolPref(prefName, false); + continue; + } + setBoolPref( + prefName, kSecuritySettings[prefName][settingIndex]); + }); }; // __read_setting_from_prefs()__.

1 0

[tor-browser/tor-browser-68.0esr-9.0-3] Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD
by gk＠torproject.org 26 Aug '19

26 Aug '19

commit 39af5f2d4da655d6cb7bb5c411272634a4cdf039 Author: Adam Gashlin <agashlin(a)mozilla.com> Date: Mon Aug 19 15:44:42 2019 -0700 Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD --- toolkit/components/bitsdownload/components.conf | 2 +- toolkit/components/bitsdownload/moz.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/components/bitsdownload/components.conf b/toolkit/components/bitsdownload/components.conf index d8a7b5721e00..fe7090d366be 100644 --- a/toolkit/components/bitsdownload/components.conf +++ b/toolkit/components/bitsdownload/components.conf @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. Classes = [] -if buildconfig.substs['OS_ARCH'] == 'WINNT' and defined('MOZ_BITS_DOWNLOAD'): +if defined('MOZ_BITS_DOWNLOAD'): Classes += [ { 'cid': '{495d6f3d-9748-4d30-8ce5-0290c0001edf}', diff --git a/toolkit/components/bitsdownload/moz.build b/toolkit/components/bitsdownload/moz.build index 1d3f45937bdb..5f1dc96e9490 100644 --- a/toolkit/components/bitsdownload/moz.build +++ b/toolkit/components/bitsdownload/moz.build @@ -14,7 +14,7 @@ XPCOM_MANIFESTS += [ 'components.conf', ] -if CONFIG['OS_ARCH'] == 'WINNT': +if CONFIG['MOZ_BITS_DOWNLOAD']: EXPORTS += [ 'Bits.h' ]

1 0

[tor-browser-build/master] Bug 31447: Update comment about python package
by gk＠torproject.org 24 Aug '19

24 Aug '19

commit ace69bc2a6abb9bc5aaba625eb9a693ae2e2a5c7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 19 18:45:32 2019 +0200 Bug 31447: Update comment about python package --- projects/firefox/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index a481815..a5851fa 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -20,7 +20,9 @@ var: - zip - autoconf2.13 - yasm - # XXX: for mach + # We are building our own version of Python 3.6, which is required + # for the build. However mach still requires Python 2.7, so we + # install this version using the package. - python - pkg-config container:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_31447_v2'
by gk＠torproject.org 24 Aug '19

24 Aug '19

commit 00354e514c96c25dea3107a8240249063526a29a Merge: 7d1b5fa ace69bc Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 24 06:18:35 2019 +0000 Merge remote-tracking branch 'boklm/bug_31447_v2' projects/firefox/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Remove torbutton from projects/release
by boklm＠torproject.org 23 Aug '19

23 Aug '19

commit 7d1b5facf83069f7d8a055a6f0e65350e39a75f2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 23 09:42:51 2019 +0200 Remove torbutton from projects/release Torbutton was removed with commit 44c6bc36a106f2e95eec12c296041bd13c999c58. --- projects/release/build | 1 - projects/release/config | 8 -------- 2 files changed, 9 deletions(-) diff --git a/projects/release/build b/projects/release/build index 3e930e0..347d9a8 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,6 @@ mkdir -p "$destdir" [% END -%] [% IF c("var/torbrowser-src") -%] mv [% c('input_files_by_name/src-firefox') %] \ - [% c('input_files_by_name/src-torbutton') %] \ [% c('input_files_by_name/src-tor-launcher') %] \ "$destdir"/ [% END -%] diff --git a/projects/release/config b/projects/release/config index 0133c3f..524eadf 100644 --- a/projects/release/config +++ b/projects/release/config @@ -188,14 +188,6 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-src - - name: src-torbutton - project: torbutton - enable: '[% c("var/torbrowser-src") %]' - pkg_type: src-tarballs - target: - - '[% c("var/build_target") %]' - - torbrowser-src - - name: src-tor-launcher project: tor-launcher enable: '[% c("var/torbrowser-src") %]'

1 0

[tor-browser-build/master] Re-enable missing configure arguments
by gk＠torproject.org 23 Aug '19

23 Aug '19

commit 4dbcdaaca258bf7c9a8486f103ad9e0816426a36 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 23 06:22:00 2019 +0000 Re-enable missing configure arguments We disabled a bunch of configure arguments to get nightly builds going as some of the required patches were not available back then. Re-enable the missing arguments now. --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 5d4d2a3..31b812a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -154,7 +154,7 @@ fi rm -f configure rm -f js/src/configure -./mach configure --with-distribution-id=org.torproject --enable-bundled-fonts +./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts --with-branding=[% c("var/branding_directory") %] # Don't build with --verbose anymore or otherwise Stylo compilation breaks on # Linux. See: #30321 for details. ./mach build

1 0

[tor-browser-build/master] Pick up 68.0 -3 for updater patches
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit c54f90e102124dcd77d6efb9e186a4e3215972a8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 22 21:41:11 2019 +0000 Pick up 68.0 -3 for updater patches --- projects/firefox/config | 2 +- projects/firefox/mozconfig-linux-i686 | 2 +- projects/firefox/mozconfig-linux-x86_64 | 2 +- projects/firefox/mozconfig-osx-x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a1073d5..f6ce67c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -49,7 +49,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ff65c87..c8f19a4 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -28,7 +28,7 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -# XXX: ac_add_options --enable-tor-browser-update +ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 69dc4ef..12f1b28 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -23,7 +23,7 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -# XXX: ac_add_options --enable-tor-browser-update +ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 188bcc9..07dd023 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -38,7 +38,7 @@ ac_add_options --enable-optimize ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir -#ac_add_options --enable-tor-browser-update +ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar

1 0

[tor-browser-build/master] Revert "No .mar files an non-en-US locales for nightlies right now"
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 536715a6c5d134bc25ebb07147c81c422c11c3b3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 22 21:42:26 2019 +0000 Revert "No .mar files an non-en-US locales for nightlies right now" This reverts commit 4ae27ff4c296983624c4701e8fed38619a75ca6f. --- rbm.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index c7c3320..ca3f058 100644 --- a/rbm.conf +++ b/rbm.conf @@ -146,8 +146,6 @@ targets: fetch: 1 var: nightly: 1 - testbuild: 1 - build_mar: 0 channel: nightly torbrowser_version: tbb-nightly

1 0

[tor-launcher/master] Bug 31488: Moat: support a comma-separated list of transports
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 71ade2c3d4bb53fdd61f5a40fa574bc614db5d6a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 22 09:45:38 2019 -0400 Bug 31488: Moat: support a comma-separated list of transports Improve our ClientTransportPlugin config parser to recognize "meek" and "meek_client" when they appear within a comma-separated list of transports. --- src/chrome/content/network-settings.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index a4f2866..8c1db0f 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -642,14 +642,26 @@ function onOpenBridgeDBRequestPrompt() let meekClientArgs; reply.lineArray.forEach(aLine => { + // Parse each ClientTransportPlugin line and look for the meek or + // meek_lite transport. This code works a lot like the Tor daemon's + // parse_transport_line() function. let tokens = aLine.split(' '); - if ((tokens.length > 2) && - ((tokens[0] == "meek") || (tokens[0] == "meek_lite")) && - (tokens[1] == "exec")) + if ((tokens.length > 2) && (tokens[1] == "exec")) { - meekTransport = tokens[0]; - meekClientPath = tokens[2]; - meekClientArgs = tokens.slice(3); + let transportArray = tokens[0].split(",").map(aStr => aStr.trim()); + let transport = transportArray.find( + aTransport => (aTransport === "meek")); + if (!transport) + { + transport = transportArray.find( + aTransport => (aTransport === "meek_lite")); + } + if (transport) + { + meekTransport = transport; + meekClientPath = tokens[2]; + meekClientArgs = tokens.slice(3); + } } });

1 0

[tor-launcher/master] Bug 31487: Modify moat client code so it is compatible with ESR68
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit f69f055708526c207eb69f40f577da9a80cd75ca Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 22 09:39:20 2019 -0400 Bug 31487: Modify moat client code so it is compatible with ESR68 Account for changes to XPCOM APIs. --- src/modules/tl-bridgedb.jsm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index de580bc..8cc7919 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -532,7 +532,7 @@ _MoatRequestor.prototype = let noTimeout = 0xFFFFFFFF; // UINT32_MAX let proxyInfo = proxyPS.newProxyInfoWithAuth(this.mMeekClientProxyType, this.mMeekClientIP, this.mMeekClientPort, - userName, password, + userName, password, undefined, undefined, flags, noTimeout, undefined); let uriStr = TorLauncherUtil.getCharPref(this.kPrefMoatService); if (!uriStr) @@ -546,14 +546,14 @@ _MoatRequestor.prototype = // There does not seem to be a way to directly create an nsILoadInfo from // JavaScript, so we create a throw away non-proxied channel to get one. - let loadInfo = Services.io.newChannelFromURI2(uri, undefined, + let loadInfo = Services.io.newChannelFromURI(uri, undefined, Services.scriptSecurityManager.getSystemPrincipal(), undefined, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, Ci.nsIContentPolicy.TYPE_OTHER).loadInfo; let httpHandler = Services.io.getProtocolHandler("http") .QueryInterface(Ci.nsIHttpProtocolHandler); - let ch = httpHandler.newProxiedChannel2(uri, proxyInfo, 0, undefined, + let ch = httpHandler.newProxiedChannel(uri, proxyInfo, 0, undefined, loadInfo).QueryInterface(Ci.nsIHttpChannel); // Remove unwanted HTTP headers and set request parameters. @@ -616,13 +616,13 @@ _MoatResponseListener.prototype = mResponseLength: 0, mResponseBody: undefined, - onStartRequest: function(aRequest, aContext) + onStartRequest: function(aRequest) { this.mResponseLength = 0; this.mResponseBody = ""; }, - onStopRequest: function(aRequest, aContext, aStatus) + onStopRequest: function(aRequest, aStatus) { this.mChannel = undefined; @@ -636,9 +636,9 @@ _MoatResponseListener.prototype = let statusCode, msg; try { - statusCode = aContext.responseStatus; - if (aContext.responseStatusText) - msg = statusCode + " " + aContext.responseStatusText; + statusCode = aRequest.responseStatus; + if (aRequest.responseStatusText) + msg = statusCode + " " + aRequest.responseStatusText; } catch (e) {} @@ -693,7 +693,7 @@ _MoatResponseListener.prototype = } }, // onStopRequest - onDataAvailable: function(aRequest, aContext, aStream, aSrcOffset, aLength) + onDataAvailable: function(aRequest, aStream, aSrcOffset, aLength) { TorLauncherLogger.log(2, "Moat onDataAvailable: " + aLength + " bytes"); if ((this.mResponseLength + aLength) > this.mRequestor.kMaxResponseLength)

1 0

[tor-browser-build/master] Bug 31465: Make SDK version explicit in directory
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 859c6e9dd35010047749372791062e47d2464eea Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 11:00:41 2019 +0000 Bug 31465: Make SDK version explicit in directory --- projects/firefox/mozconfig-osx-x86_64 | 2 +- projects/macosx-toolchain/build | 2 +- projects/macosx-toolchain/config | 2 +- projects/rust/build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d82d12..188bcc9 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -4,7 +4,7 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools -CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK +CROSS_SYSROOT=$TOOLCHAIN_DIR/MacOSX10.11.sdk CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index c9cd282..f306302 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -3,7 +3,7 @@ distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xjf [% c('input_files_by_name/SDK') %] -mv MacOSX10.11.sdk "$distdir/SDK" +mv MacOSX10.11.sdk "$distdir/" tar xf [% c('input_files_by_name/clang') %] mv clang "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 57e471f..b7d5a39 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -7,7 +7,7 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export sysrootdir=/var/tmp/dist/[% project %]/SDK/ + export sysrootdir=/var/tmp/dist/[% project %]/MacOSX10.11.sdk/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/bin:$cctoolsdir:$PATH" diff --git a/projects/rust/build b/projects/rust/build index 592c6ea..9624c2f 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -40,7 +40,7 @@ export PATH="$distdir-rust-old/bin:$PATH" cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' #!/bin/sh BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" EOF chmod +x $distdir/helper/x86_64-apple-darwin-clang

1 0

[tor-browser-build/master] Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 4c6a14cd4d4cbd539302264d9cc9228a0f2b6074 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:37:38 2019 +0000 Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent --- projects/libevent/build | 3 +++ projects/tor/build | 2 ++ 2 files changed, 5 insertions(+) diff --git a/projects/libevent/build b/projects/libevent/build index 00ee78c..0ec76b6 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -7,6 +7,9 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] patch -p1 < $rootdir/autotools-openssl-mac.patch + # Setting this after `configure` but before `make` might be enough, but let's + # not bet on that and just set it here. + export MACOSX_DEPLOYMENT_TARGET=10.9 [% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir diff --git a/projects/tor/build b/projects/tor/build index 8c8ed45..8737716 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -72,6 +72,8 @@ openssldir=/var/tmp/dist/openssl [% IF c("var/osx") %] cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ + # The target version needs to be set before the configure step. + export MACOSX_DEPLOYMENT_TARGET=10.9 [% END %] cd /var/tmp/build/[% project %]-[% c('version') %]

1 0

[tor-browser-build/master] fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 7a01c99641fcdc88a94c94dccb2698fbb7d82bee Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 21 20:15:29 2019 +0200 fixup! Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET --- projects/go-webrtc/config | 6 +++--- projects/rust/build | 4 ++-- projects/snowflake/build | 6 +++--- projects/webrtc/build | 4 ++-- rbm.conf | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index ba1e801..fcf6e89 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -27,9 +27,9 @@ var: [% END -%] [% IF c("var/osx") -%] export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" [% END -%] diff --git a/projects/rust/build b/projects/rust/build index 9624c2f..5cf8c02 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -20,12 +20,12 @@ export PATH="$distdir-rust-old/bin:$PATH" # Target 10.9 as our toolchain does. Without this explicit declaration Bad # Things will happen, as a lot of dependent code then assumes that the # official macOS target, x86_64-apple-darwin, essentially means 10.4. - export MACOSX_DEPLOYMENT_TARGET=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused # that way. Changing the Rust target to x86_64-apple-darwin11 would require a # fair amount of patching, thus we create symlinks to provide Rust with the - # necessary tools while using our toolchain underneath, targeting 10.7. + # necessary tools while using our toolchain underneath, targeting 10.9. cd $cctoolsdir for f in `ls x86_64-apple-darwin11-*`; do ln -s $f ${f//x86_64-apple-darwin11/x86_64-apple-darwin} diff --git a/projects/snowflake/build b/projects/snowflake/build index ae0ebea..6534329 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -16,9 +16,9 @@ distdir=/var/tmp/dist/[% project %] mkdir -p $PTDIR $DOCSDIR [% IF c("var/osx") %] export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.9" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" [% END %] diff --git a/projects/webrtc/build b/projects/webrtc/build index e84a0b1..77d4026 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -66,7 +66,7 @@ print("$sysrootdir") print("10.11") EOF cat <<EOF > build/config/mac/sdk_info.py -print("machine_os_build=\"10.9\"") +print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"") print("sdk_build=\"10.11\"") print("sdk_path=\"$sysrootdir\"") print("sdk_platform_path=\"$sysrootdir\"") @@ -115,7 +115,7 @@ GN_ARGS+=" use_custom_libcxx=false" #GN_ARGS+=" rtc_include_tests=false" [% END -%] [% IF c("var/osx") -%] - GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.9\"" + GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" # No lld in our toolchain currently. diff --git a/rbm.conf b/rbm.conf index d6c0926..c7c3320 100644 --- a/rbm.conf +++ b/rbm.conf @@ -334,6 +334,7 @@ targets: configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"' FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" + macosx_deployment_target: '10.9' locale_ja: ja-JP-mac # We only build snowflake for linux and macOS on the alpha and nightly # channels for now.

1 0

[tor-browser-build/master] Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 3c36d79abdb6b56c67ff42f844c6f8a2d6dbce3c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 18:19:43 2019 +0000 Bug 30323: Bump MACOSX_DEPLOYMENT_TARGET --- projects/rust/build | 4 ++-- projects/snowflake/build | 6 +++--- projects/snowflake/config | 1 + projects/webrtc/build | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 633604c..592c6ea 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -17,10 +17,10 @@ export PATH="$distdir-rust-old/bin:$PATH" # (i.e. Linux). unset CC unset LDFLAGS - # Target 10.7 as our toolchain does. Without this explicit declaration Bad + # Target 10.9 as our toolchain does. Without this explicit declaration Bad # Things will happen, as a lot of dependent code then assumes that the # official macOS target, x86_64-apple-darwin, essentially means 10.4. - export MACOSX_DEPLOYMENT_TARGET=10.7 + export MACOSX_DEPLOYMENT_TARGET=10.9 # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built # for x86_64-apple-darwin11. We can't mix those targets as clang gets confused # that way. Changing the Rust target to x86_64-apple-darwin11 would require a diff --git a/projects/snowflake/build b/projects/snowflake/build index daeb185..ae0ebea 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -16,9 +16,9 @@ distdir=/var/tmp/dist/[% project %] mkdir -p $PTDIR $DOCSDIR [% IF c("var/osx") %] export CGO_ENABLED=1 - export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" - export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" - export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.9" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.9" export CC="$clangdir/bin/clang" export CXX="$clangdir/bin/clang++" [% END %] diff --git a/projects/snowflake/config b/projects/snowflake/config index 468b704..cef0930 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -22,6 +22,7 @@ targets: osx-x86_64: var: arch_deps: + - pkg-config - faketime input_files: diff --git a/projects/webrtc/build b/projects/webrtc/build index ecbccb3..e84a0b1 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -66,7 +66,7 @@ print("$sysrootdir") print("10.11") EOF cat <<EOF > build/config/mac/sdk_info.py -print("machine_os_build=\"10.7\"") +print("machine_os_build=\"10.9\"") print("sdk_build=\"10.11\"") print("sdk_path=\"$sysrootdir\"") print("sdk_platform_path=\"$sysrootdir\"") @@ -115,7 +115,7 @@ GN_ARGS+=" use_custom_libcxx=false" #GN_ARGS+=" rtc_include_tests=false" [% END -%] [% IF c("var/osx") -%] - GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" + GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.9\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" # No lld in our toolchain currently.

1 0

[tor-browser-build/master] Bug 31465: Bump Go to 1.12.9
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 15d4645a678b12e093f5db89f60f726275f508f6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c2baeca..fd96bb6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -91,7 +91,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8 + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] fixup! Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 0be0e0461475a29b5c01ad3b841030633c345179 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 21 20:16:38 2019 +0200 fixup! Bug 31465: Set proper MACOSX_DEPLOYMENT_TARGET for tor and libevent --- projects/libevent/build | 2 +- projects/tor/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/libevent/build b/projects/libevent/build index 0ec76b6..de9ba80 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/autotools-openssl-mac.patch # Setting this after `configure` but before `make` might be enough, but let's # not bet on that and just set it here. - export MACOSX_DEPLOYMENT_TARGET=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh ./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir diff --git a/projects/tor/build b/projects/tor/build index 8737716..6b684a0 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -73,7 +73,7 @@ openssldir=/var/tmp/dist/openssl [% IF c("var/osx") %] cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ # The target version needs to be set before the configure step. - export MACOSX_DEPLOYMENT_TARGET=10.9 + export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END %] cd /var/tmp/build/[% project %]-[% c('version') %]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_31465'
by gk＠torproject.org 22 Aug '19

22 Aug '19

commit 039f83d716b5050d6faeda8e1bbce3a674a9f2d5 Merge: e9ff867 0be0e04 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 22 06:36:28 2019 +0000 Merge remote-tracking branch 'boklm/bug_31465' projects/go-webrtc/config | 6 +++--- projects/libevent/build | 3 +++ projects/rust/build | 6 +++--- projects/snowflake/build | 6 +++--- projects/snowflake/config | 1 + projects/tor/build | 2 ++ projects/webrtc/build | 4 ++-- rbm.conf | 1 + 8 files changed, 18 insertions(+), 11 deletions(-)

1 0

[tor-browser-build/master] Bug 31465: Make SDK version explicit in directory
by boklm＠torproject.org 21 Aug '19

21 Aug '19

commit e5c707ff79b3e0191e0c2e1065c5df09cd584895 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 11:00:41 2019 +0000 Bug 31465: Make SDK version explicit in directory --- projects/firefox/mozconfig-osx-x86_64 | 2 +- projects/macosx-toolchain/build | 2 +- projects/macosx-toolchain/config | 2 +- projects/rust/build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 5d82d12..188bcc9 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -4,7 +4,7 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain mk_add_options "export LD_LIBRARY_PATH=$TOOLCHAIN_DIR/clang/lib" CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools -CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK +CROSS_SYSROOT=$TOOLCHAIN_DIR/MacOSX10.11.sdk CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index c9cd282..f306302 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -3,7 +3,7 @@ distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xjf [% c('input_files_by_name/SDK') %] -mv MacOSX10.11.sdk "$distdir/SDK" +mv MacOSX10.11.sdk "$distdir/" tar xf [% c('input_files_by_name/clang') %] mv clang "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 57e471f..b7d5a39 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -7,7 +7,7 @@ var: setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export sysrootdir=/var/tmp/dist/[% project %]/SDK/ + export sysrootdir=/var/tmp/dist/[% project %]/MacOSX10.11.sdk/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/bin:$cctoolsdir:$PATH" diff --git a/projects/rust/build b/projects/rust/build index 633604c..599d42e 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -40,7 +40,7 @@ export PATH="$distdir-rust-old/bin:$PATH" cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' #!/bin/sh BASEDIR=/var/tmp/dist/macosx-toolchain -$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -B $BASEDIR/cctools/bin -isysroot $BASEDIR/MacOSX10.11.sdk/ -Wl,-syslibroot,$BASEDIR/MacOSX10.11.sdk/ -Wl,-dead_strip -Wl,-pie "$@" EOF chmod +x $distdir/helper/x86_64-apple-darwin-clang

1 0

[tor-browser-build/master] Bug 31465: Bump Go to 1.12.9
by boklm＠torproject.org 21 Aug '19

21 Aug '19

commit e9ff8677a5ab59325bcf435fa92e06ba73d67f2f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c2baeca..fd96bb6 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -91,7 +91,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8 + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 30323: Adapt macOS toolchain for esr68
by boklm＠torproject.org 21 Aug '19

21 Aug '19

commit 1877dbbdf499e51beb6dd5be2d53e74f57428130 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 18:18:22 2019 +0000 Bug 30323: Adapt macOS toolchain for esr68 There are already included some simplifications as done in https://bugzilla.mozilla.org/show_bug.cgi?id=1513798 but not all of them as some break our current setup. This needs to get investigated in a different bug. --- projects/firefox/build | 48 +++++++++++++++-------------------- projects/firefox/config | 1 - projects/firefox/mozconfig-osx-x86_64 | 15 +++++------ projects/macosx-toolchain/build | 7 ++--- projects/macosx-toolchain/config | 4 +-- 5 files changed, 31 insertions(+), 44 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 18db7b9..5d4d2a3 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -52,24 +52,23 @@ EOF wine wineboot -i [% END -%] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/python') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] +export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" + [% IF c("var/linux") %] - mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/python') %] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %] - export PATH="/var/tmp/dist/binutils/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:$PATH" + export PATH="/var/tmp/dist/binutils/bin:$PATH" # Use clang for everything on Linux now. - tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] - export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" export PATH="/var/tmp/dist/clang/bin:$PATH" [% END -%] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] -export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:$PATH" - tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] @@ -226,27 +225,22 @@ cp -p config/createprecomplete.py $MARTOOLS/ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ -[% IF c("var/linux") %] +[% IF c("var/linux") || c("var/osx") %] cp -p obj-*/dist/bin/signmar $MARTOOLS/ cp -p obj-*/dist/bin/certutil $MARTOOLS/ cp -p obj-*/dist/bin/modutil $MARTOOLS/ cp -p obj-*/dist/bin/pk12util $MARTOOLS/ cp -p obj-*/dist/bin/shlibsign $MARTOOLS/ - NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" - NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + [% IF c("var/linux") %] + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssckbi.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + [% ELSE %] + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" + # No NSPR_LIBS for macOS + NSPR_LIBS="" + [% END %] for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ - done -[% END %] -[% IF c("var/osx") %] - cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ - cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ - cp -p obj-*/security/nss/cmd/modutil/modutil_modutil/modutil $MARTOOLS/ - cp -p obj-*/security/nss/cmd/pk12util/pk12util_pk12util/pk12util $MARTOOLS/ - cp -p obj-*/security/nss/cmd/shlibsign/shlibsign_shlibsign/shlibsign $MARTOOLS/ - NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libsoftokn3.dylib" - for LIB in $NSS_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] [% IF c("var/windows") %] diff --git a/projects/firefox/config b/projects/firefox/config index a481815..a1073d5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -152,7 +152,6 @@ input_files: name: python - project: clang name: clang - enable: '[% c("var/linux") %]' - project: fxc2 name: fxc2 enable: '[% c("var/windows") %]' diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index a87bf35..5d82d12 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -11,21 +11,18 @@ FLAGS="-target x86_64-apple-darwin11 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" -export CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config -export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-pie" export BINDGEN_CFLAGS="$FLAGS" export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11- -export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" +export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/dsymutil" -export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang" -export HOST_CXX="$TOOLCHAIN_DIR/clang/bin/clang++" -export HOST_CPP="$TOOLCHAIN_DIR/clang/bin/clang -E" export HOST_CFLAGS="-g" export HOST_CXXFLAGS="-g" export HOST_LDFLAGS="-g" -ac_add_options --target=x86_64-apple-darwin +ac_add_options --target=x86_64-apple-darwin11 +ac_add_options --with-macos-sdk=$CROSS_SYSROOT ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos @@ -41,14 +38,14 @@ ac_add_options --enable-optimize ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir -ac_add_options --enable-tor-browser-update +#ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection # ac_add_options --disable-ctypes diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index d1d8c34..c9cd282 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -4,15 +4,12 @@ distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" tar xjf [% c('input_files_by_name/SDK') %] mv MacOSX10.11.sdk "$distdir/SDK" -tar xf [% c('input_files_by_name/llvm') %] -mv llvm "$distdir/clang" +tar xf [% c('input_files_by_name/clang') %] +mv clang "$distdir/clang" tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin11-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin11-clang++ -# "go link", libevent, and the jemalloc cross-compilation during the Rust build -# expect to find a program called "dsymutil" exactly. -ln -s ../../clang/bin/llvm-dsymutil dsymutil cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 8502f57..57e471f 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - name: llvm - project: llvm + - name: clang + project: clang - name: cctools project: cctools - name: SDK

1 0

[tor-browser-build/master] Bump tor-browser branch to pick up latest changes from #30429
by gk＠torproject.org 19 Aug '19

19 Aug '19

commit 4792ed5246d389caad036290e9ed34ff0ae1f0ad Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 10:04:50 2019 +0000 Bump tor-browser branch to pick up latest changes from #30429 --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index ef0fa83..a481815 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -49,7 +49,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/master] Bump snowflake to cd650fa009
by gk＠torproject.org 19 Aug '19

19 Aug '19

commit 4f475bc94a0237cfb8c932f21d9c7770ea5d0501 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Aug 14 20:22:53 2019 +0000 Bump snowflake to cd650fa009 Closes bug 31403. --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 2165f80..468b704 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: d11e55aabe3753dbddca18ae084c80ad09e282d3 +git_hash: cd650fa0097f948b15dddd889ad2e6908b58bd66 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0