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

[tor-browser-build/master] Bug 25101: Add the prune-old-builds script
by gk＠torproject.org 18 Dec '19

18 Dec '19

commit 073dfa5f7402b54cfe7772d71a1c931552908463 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 20:52:54 2019 +0100 Bug 25101: Add the prune-old-builds script Previously we were using the prune-old-builds script which was located in the testsuite repository in tools/prune-old-builds, as a git submodule. As this script is not used anywhere other than here, it doesn't make much sense to keep it as a separate git submodule. To simplify modification of this script, we move it here. --- .../roles/tbb-nightly-build/files/prune-old-builds | 74 ++++++++++++++++++++++ .../ansible/roles/tbb-nightly-build/tasks/main.yml | 7 ++ .../tbb-nightly-build/templates/start-tbb-nightly | 2 +- 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds new file mode 100755 index 0000000..5d54229 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/files/prune-old-builds @@ -0,0 +1,74 @@ +#!/usr/bin/perl -w +use strict; +use Getopt::Long; +use DateTime; +use DateTime::Duration; +use File::Path qw(remove_tree); + +my %options = ( + days => 6, + weeks => 3, + months => 3, + prefix => 'tbb-nightly-', +); + +sub keep_builds { + my %res; + + my $day = DateTime::Duration->new(days => 1); + my $week = DateTime::Duration->new(weeks => 1); + my $month = DateTime::Duration->new(months => 1); + + my $n = $options{days}; + my $dt = DateTime->now; + while ($n) { + $res{ $options{prefix} . $dt->ymd } = 1; + $dt = $dt - $day; + $n--; + } + + my $w = $options{weeks}; + while ($dt->day_of_week != 1) { + $dt = $dt - $day; + } + while ($w) { + $res{ $options{prefix} . $dt->ymd } = 1; + $dt = $dt - $week; + $w--; + } + + my $m = $options{months}; + $dt = DateTime->now; + while ($dt->day != 1) { + $dt = $dt - $day; + } + while ($m) { + $res{ $options{prefix} . $dt->ymd } = 1; + $dt = $dt - $month; + $m--; + } + + return \%res; +} + +sub clean_directory { + my ($directory) = @_; + my $k = keep_builds; + chdir $directory || die "Error entering $directory"; + foreach my $file (glob "$options{prefix}*") { + next unless $file =~ m/^$options{prefix}\d{4}-\d{2}-\d{2}$/; + next if $k->{$file}; + if ($options{'dry-run'}) { + print "Would remove $file\n"; + } else { + remove_tree($file); + } + } +} + +my @opts = qw(days=i weeks=i months=i prefix=s dry-run!); +Getopt::Long::GetOptions(\%options, @opts); +die "Missing argument: directory to clean" unless @ARGV; +foreach my $dir (@ARGV) { + clean_directory($dir); +} diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml index 64d31a9..2c795b8 100644 --- a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -39,6 +39,13 @@ mode: 0644 owner: "{{ nightly_build_user }}" +- name: prune-old-builds + copy: + src: prune-old-builds + dest: "/home/{{ nightly_build_user }}/prune-old-builds" + mode: 0755 + owner: "{{ nightly_build_user }}" + - name: add start-tbb-nightly script template: src: start-tbb-nightly diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly index 3c1847d..c93bc94 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -2,4 +2,4 @@ cd {{ testsuite_dir }} export RBM_NO_DEBUG=1 ./tbb-testsuite --config=tbb-nightly "$@" -./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds +/home/{{ nightly_build_user }}/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds

1 0

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

18 Dec '19

commit 16e629f680bbbe07a408a3022c3b819acd833bd2 Merge: b61a049 608fbb6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 18 13:58:26 2019 +0000 Merge remote-tracking branch 'boklm/bug_25101_v12' .../roles/tbb-nightly-build/defaults/main.yml | 4 +- .../roles/tbb-nightly-build/files/prune-old-builds | 136 +++++++++++++++++++++ .../ansible/roles/tbb-nightly-build/tasks/main.yml | 7 ++ .../tbb-nightly-build/templates/start-tbb-nightly | 2 +- .../tbb-nightly-build/templates/testsuite-config | 6 +- 5 files changed, 150 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 32750: Sign nightly sha256sums files with gpg
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit 32ce9d2bf8bbd09017533175ffebf0b3599eb617 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 13 17:52:17 2019 +0100 Bug 32750: Sign nightly sha256sums files with gpg --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 1 + tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 0d19cff..8e4bc05 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 @@ -3,3 +3,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', 'sysrqb(a)torproject.org', ]," +nightly_build_sign_build: 1 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf index f83d8f3..4380480 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -45,12 +45,14 @@ var: local_conf: 1 ### The var/sign_build option defines if you want to sign the - ### sha256sums-unsigned-build.txt file with gpg. - #sign_build: 1 + ### sha256sums-unsigned-build.txt and + ### sha256sums-unsigned-build.incrementals.txt files with gpg. + {% if nightly_build_sign_build is defined %}sign_build: {{ nightly_build_sign_build }}{% endif %} + ### The var/sign_build_gpg_opts option can be used to define some gpg ### options to select the key to use to sign the sha256sums-unsigned-build.txt - ### file. + ### and sha256sums-unsigned-build.incrementals.txt files. #sign_build_gpg_opts: '--local-user XXXXXXXX' ### The clean configuration is used by the cleaning script to find the

1 0

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

17 Dec '19

commit b61a0497f0258ffebb2586c41267462e16a69cf0 Merge: 38624f8 32ce9d2 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 17 20:09:03 2019 +0000 Merge remote-tracking branch 'boklm/bug_32750_v4' tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 1 + tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.3
by sysrqb＠torproject.org 17 Dec '19

17 Dec '19

commit 38624f870024a93c907c15e6a16838faedda8ead Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Dec 17 18:53:54 2019 +0000 Fold in stable changelog for 9.0.3 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c4866d4..fd891e0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +Tor Browser 9.0.2 -- December 3 2019 + * All Platforms + * Update Firefox to 68.3.0esr + * Bump NoScript to 11.0.9 + * Bug 32362: NoScript TRUSTED setting doesn't work + * Bug 32429: Issues with about:blank and NoScript on .onion sites + * Bump HTTPS Everywhere to 2019.11.7 + * Bug 27268: Preferences clean-up in Torbutton code + * Translations update + * Windows + OS X + Linux + * Bug 32125: Fix circuit display for bridge without a fingerprint + * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) + * Windows + * Bug 31989: Backport backout of old mingw-gcc patch + * Bug 32616: Disable GetSecureOutputDirectoryPath() functionality + * Android + * Bug 32365: Localization is broken in Tor Browser 9 on Android + * Build System + * All Platforms + * Bug 32413: Bump Go version to 1.12.13 + Tor Browser 9.5a3 -- December 3 2019 * All Platforms * Update Firefox to 68.3.0esr

1 0

[tor-browser/tor-browser-68.3.0esr-9.0-1] Bug #32405: Crash immediately after bootstrap on Android
by sysrqb＠torproject.org 17 Dec '19

17 Dec '19

commit 4eb56ec0936e03dcc5d7e83322961c986065dc5d Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Nov 27 21:08:02 2019 -0800 Bug #32405: Crash immediately after bootstrap on Android --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 36f0b0dbb66c..38dac85ef3bc 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3032,7 +3032,10 @@ public class BrowserApp extends GeckoApp // When the content loaded in the background (such as about:tor), // it was loaded while mBrowserChrome was GONE. We should refresh the // height now so the page is rendered correctly. - Tabs.getInstance().getSelectedTab().doReload(true); + final Tab currentTab = Tabs.getInstance().getSelectedTab(); + if (currentTab != null) { + currentTab.doReload(true); + } // If we finished, then Tor bootstrapped 100% mTorNeedsStart = false;

1 0

[tor-browser-build/master] Bug 32751: Allow gpg to find its keys in hash_incrementals
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit b8ade5ac89f85dc122894a458b22f47802530a63 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 21:29:34 2019 +0100 Bug 32751: Allow gpg to find its keys in hash_incrementals var/set_default_env is changing $HOME, preventing gpg to find the keys in its default configuration directory. We avoid that by reseting $HOME to its previous value before running gpg. --- projects/release/hash_incrementals | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/release/hash_incrementals b/projects/release/hash_incrementals index cf31bfd..4ab0f4d 100644 --- a/projects/release/hash_incrementals +++ b/projects/release/hash_incrementals @@ -1,4 +1,8 @@ #!/bin/bash +[% IF c("var/sign_build") -%] + # var/set_default_env will reset HOME. We need to restore it to use gpg. + old_HOME="$HOME" +[% END -%] [% c("var/set_default_env") -%] [% IF c("var/nightly") -%] cd [% shell_quote(path(dest_dir)) %]/[% c("version") %] @@ -7,5 +11,6 @@ [% END -%] sha256sum `ls -1 | grep '\.incremental\.mar$' | sort` > sha256sums-[% c("var/signed_status") %]-build.incrementals.txt [% IF c("var/sign_build") -%] + export HOME="$old_HOME" gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-[% c("var/signed_status") %]-build.incrementals.txt [% END -%]

1 0

[tor-browser-build/maint-9.0] Bug 32547: Add new default bridge at UMN.
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit 095dfed8762cd1756b3fc50ed4aa6e8f2d0dc849 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Dec 10 13:33:29 2019 -0800 Bug 32547: Add new default bridge at UMN. Researchers at the University of Minnesota generously agreed to running a default bridge. This fixes <https://bugs.torproject.org/32547>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 0004046..da3f2cd 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,6 +15,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:270 pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-9.0] Pick up new obfs4 bridge for mobile (#32547)
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit d6bd267e1747a14d2a326a36099bf8e79bbc6a91 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 17 08:29:49 2019 +0000 Pick up new obfs4 bridge for mobile (#32547) --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 669733b..b65c657 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 1a2f8b9d7e4d10b2057eee0e68d5aacc5d26f8ae +git_hash: 4a81e5806f36e7d0bf9492437d824599ecf4ff43 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 32547: Add new default bridge at UMN.
by gk＠torproject.org 17 Dec '19

17 Dec '19

commit 00f4ea3a18f1cbce16f256ca2b7c1c90ad3b1daf Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Dec 10 13:33:29 2019 -0800 Bug 32547: Add new default bridge at UMN. Researchers at the University of Minnesota generously agreed to running a default bridge. This fixes <https://bugs.torproject.org/32547>. --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 0004046..da3f2cd 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -15,6 +15,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:270 pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0