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

[tor-browser-build/maint-8.0] Bump tor version to 0.3.5.8
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit fbd366f2f0a0b1b58642cf5f860d98ba768ebe78 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:32:59 2019 +0000 Bump tor version to 0.3.5.8 Fixes #29660 and similar bugs where tor mishandled empty SOCKS auth. See #29175 for more details. --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index f5e2515..9301818 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.5.7 +version: 0.3.5.8 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser-build/master] Bump tor version to 0.4.0.2-alpha
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit 864a167a1cdef48560b52c5f3ba559f343eddae0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:30:53 2019 +0000 Bump tor version to 0.4.0.2-alpha Fixes #29660 and similar bugs where tor mishandled empty SOCKS auth. See #29175 for more details. --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index af90885..ffdb200 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.4.0.1-alpha +version: 0.4.0.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 29445: Enable support for enterprise policies
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit 7ce43156780e3b91f35481cce1eb4afed56a4b0f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 5 13:58:52 2019 -0500 Bug 29445: Enable support for enterprise policies Enable enterprise policies for all update channels, including "release" (which Tor Browser uses instead of "esr"). --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 7c864f5fbc43..1380c0c228a4 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = { } if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) { - log.error(`Policy ${policyName} is only allowed on ESR`); + log.error(`Enterprise policy ${policyName} is not allowed`); continue; } @@ -314,10 +314,6 @@ let DisallowedFeatures = {}; * Checks whether the policies marked as enterprise_only in the * schema are allowed to run on this browser. * - * This is meant to only allow policies to run on ESR, but in practice - * we allow it to run on channels different than release, to allow - * these policies to be tested on pre-release channels. - * * @returns {Bool} Whether the policy can run. */ function areEnterpriseOnlyPoliciesAllowed() { @@ -328,12 +324,7 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; } - if (AppConstants.MOZ_UPDATE_CHANNEL != "release" || - Cu.isInAutomation) { - return true; - } - - return false; + return true; } /*

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_27210_v3'
by boklm＠torproject.org 05 Mar '19

05 Mar '19

commit ba9064e4b5a369b9c70201e335ef706db25f2815 Merge: 799ccf0 f4b5f7b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 5 21:45:55 2019 +0100 Merge remote-tracking branch 'gk/bug_27210_v3' Conflicts: projects/orbot/build Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++++++++ projects/orbot/config | 2 +- projects/release/build | 3 +++ projects/release/config | 11 ++++++++ projects/rust/build | 5 +++- projects/rust/config | 12 ++++++--- projects/tor-browser/config | 2 +- rbm.conf | 15 ++++++++++- 11 files changed, 115 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Bug 27210: Add support for x86 on Android
by boklm＠torproject.org 05 Mar '19

05 Mar '19

commit f4b5f7b3b38679456d97b71904b0c59d4e4600d9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 8 10:49:13 2019 +0000 Bug 27210: Add support for x86 on Android --- Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++++++++ projects/orbot/build | 7 ++++- projects/orbot/config | 2 +- projects/release/build | 3 +++ projects/release/config | 11 ++++++++ projects/rust/build | 5 +++- projects/rust/config | 12 ++++++--- projects/tor-browser/config | 2 +- rbm.conf | 15 ++++++++++- 12 files changed, 121 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8ec5d0c..d419422 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ release: submodule-update release-android-armv7: submodule-update $(rbm) build release --target release --target torbrowser-android-armv7 +release-android-x86: submodule-update + $(rbm) build release --target release --target torbrowser-android-x86 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -32,6 +35,9 @@ alpha: submodule-update alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target torbrowser-android-armv7 +alpha-android-x86: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-x86 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -56,6 +62,9 @@ nightly: submodule-update nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target torbrowser-android-armv7 +nightly-android-x86: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-x86 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -80,6 +89,9 @@ alpha_nightly: submodule-update alpha_nightly-android-armv7: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 +alpha_nightly-android-x86: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -101,6 +113,9 @@ testbuild: submodule-update testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-armv7 +testbuild-android-x86: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-x86 + 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 a9d3139..ff899d2 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -17,8 +17,14 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -# API 16 is the minimum we currently support for Tor Browser on Android -./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm + +# The architectures we support +archs="arm x86" +for arch in $archs; do + # API 16 is the minimum we currently support for Tor Browser on Android for + # 32bit. + ./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch +done # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/config b/projects/firefox/config index 68f2326..4d68969 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -41,7 +41,7 @@ targets: torbrowser_update_channel: default branding_directory: browser/branding/nightly - android-armv7: + android: var: arch_deps: - openjdk-8-jdk diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 new file mode 100644 index 0000000..1fe0b93 --- /dev/null +++ b/projects/firefox/mozconfig-android-x86 @@ -0,0 +1,48 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-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=i386-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=16 +ac_add_options --with-branding=mobile/android/branding/torbrowser + +# 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/x86/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/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, +# 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/orbot/build b/projects/orbot/build index 4e222a9..22667b5 100644 --- a/projects/orbot/build +++ b/projects/orbot/build @@ -23,7 +23,12 @@ done # Build OrbotService Native Libraries pushd /var/tmp/build/[% project %]-[% c('version') %]/orbotservice/src/main /var/tmp/dist/android-toolchain/android-ndk/ndk-build -mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so +[% IF c("var/android-armv7") %] + arch=armeabi-v7a +[% ELSE %] + arch=x86 +[% END %] +mv libs/$arch/pdnsd libs/$arch/pdnsd.so popd # Build Android Libraries and Apps diff --git a/projects/orbot/config b/projects/orbot/config index 1bedbdb..5ad5bfc 100644 --- a/projects/orbot/config +++ b/projects/orbot/config @@ -24,7 +24,7 @@ var: gradle_dependencies_version: 1 targets: - android-armv7: + android: var: arch_deps: - openjdk-8-jdk diff --git a/projects/release/build b/projects/release/build index cf190a6..ca7b26d 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,6 +7,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-x86") -%] + mv [% c('input_files_by_name/android-x86') %]/* "$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 65e297d..1a742ac 100644 --- a/projects/release/config +++ b/projects/release/config @@ -15,9 +15,13 @@ targets: - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 - torbrowser-android-armv7 + - torbrowser-android-x86 torbrowser-android-armv7: var: torbrowser-android-armv7: 1 + torbrowser-android-x86: + var: + torbrowser-android-x86: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -91,6 +95,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-armv7 + - name: android-x86 + project: tor-browser + enable: '[% c("var/torbrowser-android-x86") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-x86 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]' diff --git a/projects/rust/build b/projects/rust/build index 3c1d130..0df84a1 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -67,8 +67,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src [% END %] [% IF c("var/android") %] - patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch patch -p1 < $rootdir/replace_pagesize_in_mmap.patch + # The additional Rust patch is not necessary for x86. + [% IF c("var/android-armv7") %] + patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + [% END %] [% END %] mkdir build diff --git a/projects/rust/config b/projects/rust/config index 48912ab..3d78ad3 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -15,15 +15,21 @@ var: use_container: 1 targets: - android-armv7: + android: var: rust_arch: x86_64 arch_deps: - libssl-dev - pkg-config - zlib1g-dev + android-armv7: + var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc + android-x86: + 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 + linux: var: arch_deps: @@ -92,7 +98,7 @@ input_files: enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]' - filename: unwind_128.patch enable: '[% c("input_file_var/unwind_128") %]' - - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch - enable: '[% c("var/android") %]' - filename: replace_pagesize_in_mmap.patch enable: '[% c("var/android") %]' + - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + enable: '[% c("var/android-armv7") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c4f25ff..9b26bc8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -41,7 +41,7 @@ targets: windows-x86_64: var: mar_osname: win64 - android-armv7: + android: build: '[% INCLUDE build.android %]' var: arch_deps: diff --git a/rbm.conf b/rbm.conf index 03c105e..1b82e60 100644 --- a/rbm.conf +++ b/rbm.conf @@ -159,11 +159,23 @@ targets: torbrowser-android-armv7: - android-armv7 + - android android-armv7: arch: armv7 var: - android: 1 + android-armv7: 1 osname: android-armv7 + torbrowser-android-x86: + - android-x86 + - android + android-x86: + arch: x86 + var: + android-x86: 1 + osname: android-x86 + android: + var: + android: 1 compiler: android-toolchain snowflake: 0 fteproxy: 0 @@ -178,6 +190,7 @@ targets: - libtool - zip - unzip + torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 27486 Avoid about:blank tabs when opening onboarding pages.
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit 3a69f6697799d7c6d0ed408df8aa28239b430556 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 13 11:32:13 2019 -0500 Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". --- browser/extensions/onboarding/bootstrap.js | 17 +++++++------- .../extensions/onboarding/content/onboarding.js | 26 +++++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index 0762249ba1e9..a90bef0faaa2 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -91,16 +91,17 @@ function setPrefs(prefs) { }); } -function openTorCircuitDisplayPage() { - let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; - const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo +function openTorTab(aURL, aFrameScript) { let win = Services.wm.getMostRecentWindow('navigator:browser'); if (win) { let tabBrowser = win.gBrowser; - let tab = tabBrowser.addTab(kOnionURL); + let tab = tabBrowser.addTab(aURL); tabBrowser.selectedTab = tab; - let b = tabBrowser.getBrowserForTab(tab); - b.messageManager.loadFrameScript(kFrameScript, true); + + if (aFrameScript) { + let b = tabBrowser.getBrowserForTab(tab); + b.messageManager.loadFrameScript(aFrameScript, true); + } } } @@ -177,8 +178,8 @@ function initContentMessageListener() { isLoggedIn: syncTourChecker.isLoggedIn() }); break; - case "tor-open-circuit-display-page": - openTorCircuitDisplayPage(); + case "tor-open-tab": + openTorTab(msg.data.params.url, msg.data.params.frameScriptURL); break; #if 0 // No telemetry in Tor Browser. diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 9d03a6fc82d8..5cb81852bb73 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -195,12 +195,9 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-expect-differences.title", "onboarding.tour-tor-expect-differences.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-expect-differences.png"); - let button = createOnboardingTourButton(div, + createOnboardingTourButton(div, "onboarding-tour-tor-expect-differences-button", - "onboarding.tour-tor-expect-differences.button", "a"); - let anchor = button.querySelector("a"); - anchor.setAttribute("href", "https://support.torproject.org/#faq"); - anchor.setAttribute("target", "_blank"); + "onboarding.tour-tor-expect-differences.button"); return div; }, @@ -214,12 +211,9 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-onion-services.title", "onboarding.tour-tor-onion-services.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-onion-services.png"); - let button = createOnboardingTourButton(div, + createOnboardingTourButton(div, "onboarding-tour-tor-onion-services-button", - "onboarding.tour-tor-onion-services.button", "a"); - let anchor = button.querySelector("a"); - anchor.setAttribute("href", "https://3g2upl4pq6kufc4m.onion/"); - anchor.setAttribute("target", "_blank"); + "onboarding.tour-tor-onion-services.button"); return div; }, @@ -836,6 +830,7 @@ class Onboarding { ({ id, classList } = target.firstChild); } + const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button": @@ -918,7 +913,16 @@ class Onboarding { handledTourActionClick = true; break; case "onboarding-tour-tor-circuit-display-button": - sendMessageToChrome("tor-open-circuit-display-page"); + let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; + sendMessageToChrome("tor-open-tab", + {url: kOnionURL, frameScriptURL: kFrameScript}); + break; + case "onboarding-tour-tor-expect-differences-button": + const kFAQURL = "https://support.torproject.org/#faq"; + sendMessageToChrome("tor-open-tab", {url: kFAQURL}); + break; + case "onboarding-tour-tor-onion-services-button": + sendMessageToChrome("tor-open-tab", {url: kOnionURL}); break; } if (classList.contains("onboarding-tour-item")) {

1 0

[tor-browser-build/master] Bug 29194: Set DEBIAN_FRONTEND=noninteractive
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit a4689ee18278443aaf10f72da623efba657a970a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 16:17:15 2019 +0100 Bug 29194: Set DEBIAN_FRONTEND=noninteractive Update rbm to set DEBIAN_FRONTEND=noninteractive when using apt-get in install_package. Also set DEBIAN_FRONTEND=noninteractive for the other apt-get commands we use in debootstrap-image and container-image. We now also use the -q (quiet) argument. --- projects/container-image/config | 5 +++-- projects/debootstrap-image/config | 5 +++-- rbm | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/container-image/config b/projects/container-image/config index 95d7557..68c401a 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -17,11 +17,12 @@ pre: | #!/bin/sh # [% c('var/container/suite') %] set -e + export DEBIAN_FRONTEND=noninteractive [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] - apt-get update -y - apt-get upgrade -y + apt-get update -y -q + apt-get upgrade -y -q [% deps = []; IF pc(c('origin_project'), 'var/deps'); diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ba34032..4dbbfef 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -14,10 +14,11 @@ var: pre: | #!/bin/sh set -e + export DEBIAN_FRONTEND=noninteractive # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462) dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb - apt-get update -y - apt-get install -y debian-archive-keyring ubuntu-keyring debootstrap + apt-get update -y -q + apt-get install -y -q debian-archive-keyring ubuntu-keyring debootstrap debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %] [% IF c("var/apt_package_filename") || c("var/apt_utils_package_filename") || c("var/libapt_inst_package_filename") || c("var/libapt_pkg_package_filename") -%] mkdir ./base-image/apt-update diff --git a/rbm b/rbm index eb500fa..c61e694 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit eb500fa9467fb4d7229c9ca87f202ef18603d023 +Subproject commit c61e6940a1824462648064898be0759dd1600414

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_29194_v2'
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit 799ccf053e78b385fbd2900e092113849d73c94b Merge: e39c1db a4689ee Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 5 08:56:37 2019 +0000 Merge remote-tracking branch 'boklm/bug_29194_v2' projects/container-image/config | 5 +++-- projects/debootstrap-image/config | 5 +++-- rbm | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-)

1 0

[rbm/master] Bug 29194: Set DEBIAN_FRONTEND=noninteractive
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit c61e6940a1824462648064898be0759dd1600414 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 16:08:03 2019 +0100 Bug 29194: Set DEBIAN_FRONTEND=noninteractive Set DEBIAN_FRONTEND=noninteractive when using apt-get in install_package. Also use the -q (quiet) argument. --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index d758b8e..f8165c3 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -540,7 +540,7 @@ OPT_END my $dnf = 'rpm -q [% c("pkg_name") %] > /dev/null || dnf install -y [% c("pkg_name") %]'; my $zypper = 'rpm -q [% c("pkg_name") %] > /dev/null || zypper install [% c("pkg_name") %]'; my $urpmi = 'rpm -q [% c("pkg_name") %] > /dev/null || urpmi [% c("pkg_name") %]'; - my $apt = 'dpkg -s [% c("pkg_name") %] 2> /dev/null | grep -q "^Status: install ok installed\$" || apt-get install -y [% c("pkg_name") %]'; + my $apt = 'dpkg -s [% c("pkg_name") %] 2> /dev/null | grep -q "^Status: install ok installed\$" || DEBIAN_FRONTEND=noninteractive apt-get install -q -y [% c("pkg_name") %]'; my %install = ( Fedora => $dnf, 'Fedora-20' => $yum,

1 0

[tor-browser-build/master] Bug 29633: Don't ship pdnsd anymore
by boklm＠torproject.org 04 Mar '19

04 Mar '19

commit e39c1dbe69a48274c5e806efc0ef2d407085b255 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 19:16:56 2019 +0000 Bug 29633: Don't ship pdnsd anymore We don't use Orbot's VPN mode and therefore don't need pdnsd bundled. Thanks, Nathan, for noticing. --- projects/orbot/build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/orbot/build b/projects/orbot/build index 4e222a9..840df3e 100644 --- a/projects/orbot/build +++ b/projects/orbot/build @@ -20,12 +20,6 @@ for p in $rootdir/*.patch do patch -p1 < $p done -# Build OrbotService Native Libraries -pushd /var/tmp/build/[% project %]-[% c('version') %]/orbotservice/src/main -/var/tmp/dist/android-toolchain/android-ndk/ndk-build -mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so -popd - # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.1/bin/gradle --offline assembleRelease -x lint

1 0