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

[tor-browser-build/maint-9.0] Bug 32741 - Update CMake Git repo URL
by gk＠torproject.org 13 Dec '19

13 Dec '19

commit 13bd5905aca8765316b352478544f16bfdffad48 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 12 22:20:33 2019 +0000 Bug 32741 - Update CMake Git repo URL --- projects/cmake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/cmake/config b/projects/cmake/config index fd8d186..28afa05 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 3.15.3 -git_url: https://cmake.org/cmake.git +git_url: https://gitlab.kitware.com/cmake/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: cmake.gpg

1 0

[tor-browser-build/master] Bug 32741 - Update CMake Git repo URL
by gk＠torproject.org 13 Dec '19

13 Dec '19

commit 8f723ac38a8b715adcffe978fcfba70c0f499dd0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 12 22:20:33 2019 +0000 Bug 32741 - Update CMake Git repo URL --- projects/cmake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/cmake/config b/projects/cmake/config index fd8d186..28afa05 100644 --- a/projects/cmake/config +++ b/projects/cmake/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 3.15.3 -git_url: https://cmake.org/cmake.git +git_url: https://gitlab.kitware.com/cmake/cmake.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: cmake.gpg

1 0

[tor-browser-build/master] Add sysrqb to nightly build emails
by boklm＠torproject.org 12 Dec '19

12 Dec '19

commit cb114218a4d8a2270ba7aac4ee7a03ea950c5d6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 12 15:21:54 2019 +0100 Add sysrqb to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 01f1e16..0d19cff 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,4 +2,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ],"

1 0

[tor-browser-build/master] Bug 32738: Use any of the mar-tools available
by gk＠torproject.org 12 Dec '19

12 Dec '19

commit 25d9f797f4d2b1313ea396fada5b7cfb77c8232c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 12 13:02:24 2019 +0100 Bug 32738: Use any of the mar-tools available If the linux64 mar-tools is not available, use any of the other mar-tools that is available. --- tools/update-responses/update_responses | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 3dfd05d..399d289 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -429,24 +429,19 @@ sub write_downloads_json { } } -sub osname { - my ($osname) = capture_exec('uname', '-s'); - my ($arch) = capture_exec('uname', '-m'); - chomp($osname, $arch); - if ($osname eq 'Linux' && $arch eq 'x86_64') { - return 'linux64'; - } - if ($osname eq 'Linux' && $arch =~ m/^i.86$/) { - return 'linux32'; +sub marzip_path { + my ($config, $version) = @_; + for my $osname (qw/linux64 linux32 mac64 win64 win32/) { + my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; + return $marzip if -f $marzip; } - exit_error 'Unknown OS'; + exit_error 'Could not find mar-tools'; } my $martools_tmpdir; sub extract_martools { my ($config, $version) = @_; - my $osname = osname; - my $marzip = version_dir($config, $version) . "/mar-tools-$osname.zip"; + my $marzip = marzip_path($config, $version); $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; @@ -566,7 +561,7 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-' . osname . '.zip'; + my $martools = 'mar-tools-linux64.zip'; exit_error "Error downloading $urldir/$martools\n" unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; exit_error "Error downloading $urldir/$martools.asc\n"

1 0

[tor-browser-build/master] Remove GeKo from nightly build emails
by boklm＠torproject.org 12 Dec '19

12 Dec '19

commit 3f5fe6ac613012297d00cc4567e7c19bcb661e04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 12 11:18:27 2019 +0100 Remove GeKo from nightly build emails Asked by GeKo on IRC. --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 77c4ad6..01f1e16 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,4 +2,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org' ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', ],"

1 0

[tor-browser-build/master] Bug 31130: Use Debian 10 for our Android container images
by gk＠torproject.org 12 Dec '19

12 Dec '19

commit 26be3f16054b7d9b1c4c6cf0332d90f92511fc3e Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Oct 22 10:21:32 2019 -0700 Bug 31130: Use Debian 10 for our Android container images --- projects/debootstrap-image/config | 17 +++++++++-------- projects/firefox/build | 1 + projects/firefox/config | 5 ----- projects/https-everywhere/config | 1 + projects/tor-android-service/config | 6 ------ projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 1 - projects/tor-onion-proxy-library/config | 6 ------ rbm.conf | 13 +++++++++++-- 9 files changed, 23 insertions(+), 29 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a50cbf1..f7b9e57 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -4,7 +4,7 @@ version: 2 pkg_type: build var: - ubuntu_version: 18.04.1 + ubuntu_version: 19.10 container: use_container: 1 @@ -15,8 +15,6 @@ 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 -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") %] @@ -65,14 +63,17 @@ targets: suite: stretch arch: amd64 + buster-amd64: + var: + minimal_apt_version: 1.8.2 + container: + suite: buster + arch: amd64 + input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: ed76e649f65548a80b361b68011085ec4dde7bb762d667657acbef87765e1a12 - - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt_1.6.6ubuntu0.1_amd64.… - sha256sum: df210f9e30cf9deba5fbe815203af854e5e77bdbbe0b96d0d1c0da46a6a8dd0a - - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/libapt-pkg5.0_1.6.6ubuntu… - sha256sum: 0a05a97b1e9b8d52ee8df040a14c5fabdebbb2c2235ac495db29df34f4c8cec3 + sha256sum: eedcb1dc0ccc86b59eb1f89960c322a2ba3ed3e0323a20a1da8bcc0e6f100f4f - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") %]' sha256sum: '[% c("var/apt_package_sha256sum") %]' enable: '[% c("var/apt_package_filename") %]' diff --git a/projects/firefox/build b/projects/firefox/build index 456aa07..b89e404 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -57,6 +57,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% END -%] [% IF c("var/android") %] + export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 gradle_repo=/var/tmp/dist/gradle-dependencies export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" export GRADLE_FLAGS="--no-daemon --offline" diff --git a/projects/firefox/config b/projects/firefox/config index 1af3014..74dbc78 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -57,11 +57,6 @@ targets: torbrowser_update_channel: default branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' - android: - var: - arch_deps: - - openjdk-8-jdk - linux: var: post_pkginst: | diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 6232669..3206491 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -27,6 +27,7 @@ var: - rsync - zip - unzip + pre_pkginst: '' input_files: - project: container-image diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 492a3e1..296d1e5 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -13,12 +13,6 @@ var: # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index f8f3a8d..751db11 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -55,4 +55,4 @@ cd tmp }) %] # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest -java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index f78b4f8..09fe15f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -45,7 +45,6 @@ targets: build: '[% INCLUDE build.android %]' var: arch_deps: - - openjdk-8-jdk - apksigner input_files: diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index c2bd1a4..7029c07 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -15,12 +15,6 @@ var: # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 3 -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - input_files: - project: container-image - name: '[% c("var/compiler") %]' diff --git a/rbm.conf b/rbm.conf index 727c09f..0ed6841 100644 --- a/rbm.conf +++ b/rbm.conf @@ -220,7 +220,7 @@ targets: android_min_api_x86_64: 21 snowflake: 0 container: - suite: stretch + suite: buster arch: amd64 deps: - build-essential @@ -229,7 +229,16 @@ targets: - libtool - zip - unzip - + pre_pkginst: | + SNAPSHOT_VERSION=20191201T212855Z + OPENJDK_URL=https://snapshot.debian.org/archive/debian/$SNAPSHOT_VERSION/po… + JDK_VERSION=8u232-b09-1~deb9u1_amd64 + apt-get install -y -q wget ca-certificates-java + wget $OPENJDK_URL/openjdk-8-jdk-headless_$JDK_VERSION.deb + wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb + echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c + echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c + dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-31130h'
by gk＠torproject.org 12 Dec '19

12 Dec '19

commit 757acf012f08b6c68ed037ea095922b505e7f17e Merge: b6aeb06 26be3f1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 12 07:11:27 2019 +0000 Merge remote-tracking branch 'sisbell/bug-31130h' projects/debootstrap-image/config | 17 +++++++++-------- projects/firefox/build | 1 + projects/firefox/config | 5 ----- projects/https-everywhere/config | 1 + projects/tor-android-service/config | 6 ------ projects/tor-browser/build.android | 2 +- projects/tor-browser/config | 1 - projects/tor-onion-proxy-library/config | 6 ------ rbm.conf | 13 +++++++++++-- 9 files changed, 23 insertions(+), 29 deletions(-) diff --cc projects/firefox/config index c6f840b,74dbc78..2c7c037 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -52,13 -54,9 +52,8 @@@ targets git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: - torbrowser_update_channel: default branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/nightly' - android: - var: - arch_deps: - - openjdk-8-jdk - linux: var: post_pkginst: | diff --cc rbm.conf index 0fe7acb,0ed6841..f94cf4a --- a/rbm.conf +++ b/rbm.conf @@@ -233,10 -219,8 +233,10 @@@ targets android_min_api_x86: 16 android_min_api_x86_64: 21 snowflake: 0 + CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' + CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' container: - suite: stretch + suite: buster arch: amd64 deps: - build-essential

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26861'
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit b6aeb0654a1e97feae322f2249b2a15d5b995085 Merge: f017571 b7035b0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 10 19:53:12 2019 +0000 Merge remote-tracking branch 'boklm/bug_26861' projects/common/runc-config.json | 7 ------- 1 file changed, 7 deletions(-)

1 0

[tor-browser-build/master] Bug 26861: don't set RLIMIT_NOFILE in containers
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit b7035b046a06b63edb2ca07e6e8d7afe3a5dc0bd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 25 12:22:59 2018 +0200 Bug 26861: don't set RLIMIT_NOFILE in containers --- projects/common/runc-config.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index e75c13d..e5c4f28 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -119,13 +119,6 @@ "CAP_CHOWN" ], [% END -%] - "rlimits": [ - { - "type": "RLIMIT_NOFILE", - "hard": 1024, - "soft": 1024 - } - ], "noNewPrivileges": true }, "root": {

1 0

[tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit cb3038cf717f25e759fb3fdc0a8e941dbfc4e0f1 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Dec 9 16:55:21 2019 -0800 fixup! TB3: Tor Browser's official .mozconfigs. --- .mozconfig | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.mozconfig b/.mozconfig index 9383f1ad1a73..b4c5440304ac 100755 --- a/.mozconfig +++ b/.mozconfig @@ -1,5 +1,14 @@ . $topsrcdir/browser/config/mozconfig +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. The platform-specific mozconfig configuration +# files used in official Tor Browser releases can be found in the +# tor-browser-build repo: +# https://gitweb.torproject.org/builders/tor-browser-build.git/ +# under: +# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 @@ -10,7 +19,8 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -ac_add_options --enable-tor-browser-update +ac_add_options --disable-tor-launcher +ac_add_options --disable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -25,4 +35,6 @@ ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= + +ac_add_options --with-tor-browser-version=dev-build

1 0