- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 23738: add ansible scripts to deploy fpcentral
by gk＠torproject.org 29 Jan '18

29 Jan '18

commit c9a600cc365993321a5e9fb9db71f5112b65d78c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 4 19:52:55 2017 +0100 Bug 23738: add ansible scripts to deploy fpcentral --- tools/ansible/Makefile | 3 +++ tools/ansible/README | 5 +++++ tools/ansible/ansible-fpcentral.cfg | 2 ++ tools/ansible/fpcentral.yml | 4 ++++ tools/ansible/inventory | 3 +++ tools/ansible/roles/fpcentral/defaults/main.yml | 5 +++++ tools/ansible/roles/fpcentral/tasks/main.yml | 18 ++++++++++++++++++ tools/ansible/roles/fpcentral/templates/fpcentral.wsgi | 14 ++++++++++++++ 8 files changed, 54 insertions(+) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index eae73b5..608f932 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -1,2 +1,5 @@ ansible-tbb-build: ansible-playbook -i inventory tbb-build.yml + +fpcentral: + ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml diff --git a/tools/ansible/README b/tools/ansible/README index f631b08..6b2e6a4 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -11,3 +11,8 @@ ansible-tbb-build: Deploy changes to the machine used by Tor Browser team members to do some Tor Browser builds. +fpcentral: + Deploy fpcentral to forrestii.torproject.org. To be able to run this + you need to be in the fpcentral tpo ldap group. Your ldap password will + be asked, to sudo to the fpcentral user. + diff --git a/tools/ansible/ansible-fpcentral.cfg b/tools/ansible/ansible-fpcentral.cfg new file mode 100644 index 0000000..2ee3fb4 --- /dev/null +++ b/tools/ansible/ansible-fpcentral.cfg @@ -0,0 +1,2 @@ +[defaults] +allow_world_readable_tmpfiles=True diff --git a/tools/ansible/fpcentral.yml b/tools/ansible/fpcentral.yml new file mode 100644 index 0000000..80421a3 --- /dev/null +++ b/tools/ansible/fpcentral.yml @@ -0,0 +1,4 @@ +--- +- hosts: fpcentral + roles: + - role: fpcentral diff --git a/tools/ansible/inventory b/tools/ansible/inventory index e2597a0..32a5805 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,5 +1,8 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net +fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True [tbb-build] build-sunet-a +[fpcentral] +fpcentral diff --git a/tools/ansible/roles/fpcentral/defaults/main.yml b/tools/ansible/roles/fpcentral/defaults/main.yml new file mode 100644 index 0000000..e43b348 --- /dev/null +++ b/tools/ansible/roles/fpcentral/defaults/main.yml @@ -0,0 +1,5 @@ +--- +fpcentral_git_url: https://git.torproject.org/fpcentral.git +fpcentral_git_commit: fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 +fpcentral_rootdir: /srv/fpcentral.tbb.torproject.org +fpcentral_virtualenv: "{{ fpcentral_rootdir }}/fpcentral-virtualenv" diff --git a/tools/ansible/roles/fpcentral/tasks/main.yml b/tools/ansible/roles/fpcentral/tasks/main.yml new file mode 100644 index 0000000..e5a4d2e --- /dev/null +++ b/tools/ansible/roles/fpcentral/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: clone fpcentral git repo + git: repo={{ fpcentral_git_url }} dest={{ fpcentral_rootdir }}/fpcentral + version={{ fpcentral_git_commit }} + +- name: create python3 virtual env + command: "python3 -mvirtualenv -p python3 {{ fpcentral_virtualenv }}" + args: + creates: "{{ fpcentral_virtualenv }}" + +- name: install required python modules + command: "{{ fpcentral_virtualenv }}/bin/pip3 install -r {{ fpcentral_rootdir }}/fpcentral/requirements.txt" + +- template: + src: fpcentral.wsgi + dest: "{{ fpcentral_rootdir }}/fpcentral/fpcentral.wsgi" + mode: 0755 + diff --git a/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi new file mode 100644 index 0000000..d4d7575 --- /dev/null +++ b/tools/ansible/roles/fpcentral/templates/fpcentral.wsgi @@ -0,0 +1,14 @@ +activate_this = '{{ fpcentral_virtualenv }}/bin/activate_this.py' +with open(activate_this) as file_: + exec(file_.read(), dict(__file__=activate_this)) + +import sys +sys.path.insert(0, '{{ fpcentral_rootdir }}/fpcentral') +import os +os.chdir('{{ fpcentral_rootdir }}/fpcentral') +from run import app as application + +# we include the fpcentral commit as a comment, to make sure the +# fpcentral.wsgi file is modified when the commit is updated, causing +# the process to be restarted: +# {{ fpcentral_git_commit }}

1 0

[fpcentral/master] Bug 25060: set "Accept-Encoding" header expected value assuming we are using https
by boklm＠torproject.org 28 Jan '18

28 Jan '18

commit fc8fc9113e5ee2f84ce30f0b8051772dd9d75447 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 28 22:21:08 2018 +0100 Bug 25060: set "Accept-Encoding" header expected value assuming we are using https --- fingerprint/acceptable/torbrowser70.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fingerprint/acceptable/torbrowser70.json b/fingerprint/acceptable/torbrowser70.json index 0f50c83..1664fe3 100644 --- a/fingerprint/acceptable/torbrowser70.json +++ b/fingerprint/acceptable/torbrowser70.json @@ -32,7 +32,7 @@ "timezone": 0, "cookies": "yes", "platform": "Win32", - "Accept-Encoding": "gzip, deflate", + "Accept-Encoding": "gzip, deflate, br", "Accept-Language": "en-US,en;q=0.5", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Content-Type": "",

1 0

[fpcentral/master] Bug 22587: add support for the automated_test argument
by boklm＠torproject.org 28 Jan '18

28 Jan '18

commit a27e401cc0995cd0205c8e995b0d370167cadf6e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 28 19:53:38 2018 +0100 Bug 22587: add support for the automated_test argument If the /fp URL contains an `automated_test` argument, don't wait for the user to click the buttons to start the tests, but run them directly. This makes it easier to integrate fpcentral into our testsuite. --- static/js/clientAPI.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/js/clientAPI.js b/static/js/clientAPI.js index bf10164..498275d 100644 --- a/static/js/clientAPI.js +++ b/static/js/clientAPI.js @@ -178,6 +178,12 @@ $(document).ready(function() { localStorage.removeItem(sendTemp); localStorage.removeItem(statsTemp); } + + if (window.location.search.indexOf("automated_test") > -1) { + api.run(); + api.send(); + api.getNumberFP(); + } });

1 0

[tor-browser-build/master] Bug 23766: Document error during debootstrap
by gk＠torproject.org 26 Jan '18

26 Jan '18

commit 62ee652c588858ded1aa02261510f1c05234795a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 26 07:27:42 2018 +0000 Bug 23766: Document error during debootstrap Patch provided by kkuehl, thanks --- README.BUILD_ERRORS | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 0562f93..68333d5 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -28,3 +28,30 @@ nopat $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ---- + +Error during debootstrap image creation +--------------------------------------- + +If the debootstrap-image-.log contains errors similar to the following: +W: Failed to fetch http://archive.ubuntu.com/ubuntu/dists/zesty/InRelease + Temporary failure resolving 'archive.ubuntu.com' + +Check /etc/resolv.conf on the host to see if the nameserver is set to +127.0.0.1. This can happen when runc performs a bind mount of +/etc/resolv.conf and the host system is running systemd-resolved. + +sudo systemctl disable systemd-resolved.service +sudo service systemd-resolved stop + +Put the following line in the [main] section of your +/etc/NetworkManager/NetworkManager.conf: + +dns=default + +Delete the symlink /etc/resolv.conf + +rm /etc/resolv.conf + +Restart network-manager + +sudo service network-manager restart

1 0

[torbutton/master] Bug 24159: version check does not deal with platform specific checks
by gk＠torproject.org 25 Jan '18

25 Jan '18

commit f8604998e58fdece9c191661121ada6a3b911499 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jan 23 16:04:11 2018 -0500 Bug 24159: version check does not deal with platform specific checks For known platforms, append "-Windows", "-Linux", "-MacOS", or "-Android" to torbrowser.version before checking against the recommended versions JSON file. This allows for platform differences in the supported version. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9abc1c5..7e78ff5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -752,12 +752,27 @@ function torbutton_do_async_versioncheck() { try { var version_list = JSON.parse(req.responseText); var my_version = m_tb_prefs.getCharPref("torbrowser.version"); - for (var v in version_list) { - if (version_list[v] == my_version) { - torbutton_log(3, "Version check passed."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - return; - } + var platformSuffix; + var platform = Services.appinfo.OS; + switch (platform) { + case "WINNT": + platformSuffix = "Windows"; + break; + case "Darwin": + platformSuffix = "MacOS"; + break; + case "Linux": + case "Android": + platformSuffix = platform; + break; + } + if (platformSuffix) + my_version += "-" + platformSuffix; + + if (version_list.indexOf(my_version) >= 0) { + torbutton_log(3, "Version check passed."); + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); + return; } torbutton_log(5, "Your Tor Browser is out of date."); m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, true);

1 0

[rbm/master] Bug 25004: rename abbrev_lenght to abbrev_length
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit b83c74ca4b91732f64011f0255a1594f7747b340 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 24 17:34:49 2018 +0100 Bug 25004: rename abbrev_lenght to abbrev_length --- NEWS | 2 +- doc/options_misc.asc | 4 ++-- lib/RBM/DefaultConfig.pm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index d517840..256cad9 100644 --- a/NEWS +++ b/NEWS @@ -39,7 +39,7 @@ - Add support for external input files, documented in burps_input_files(7) -- Add the abbrev and abbrev_lenght options +- Add the abbrev and abbrev_length options - Add the tar option, to create deterministic tar files diff --git a/doc/options_misc.asc b/doc/options_misc.asc index 3b3b877..876768b 100644 --- a/doc/options_misc.asc +++ b/doc/options_misc.asc @@ -17,8 +17,8 @@ abbrev:: This option returns the abbreviated commit hash of the +git_hash+ or +hg_hash+ commit. -abbrev_lenght:: - This option sets the lenght of the abbreviated commits, when +abbrev_length:: + This option sets the length of the abbreviated commits, when using the +abbrev+ option. tar:: diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index d0d893a..4121264 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -129,10 +129,10 @@ our %default_config = ( build_log_append => '1', notmpl => [ qw(projects_dir) ], describe => \&git_describe, - abbrev_lenght => '12', + abbrev_length => '12', abbrev => '[% IF c("git_url"); - exec("git log -1 --abbrev=" _ c("abbrev_lenght") _ " --format=%h " _ c("git_hash")); + exec("git log -1 --abbrev=" _ c("abbrev_length") _ " --format=%h " _ c("git_hash")); ELSE; exec(c("hg") _ " id -i -r " _ c("hg_hash")); END;

1 0

[rbm/master] Bug 24982: update url in README.md
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 0eb1f12241ed067ef9c013ef0f72e9cca89ee5e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:00:40 2018 +0100 Bug 24982: update url in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b6862d..e3ab848 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - https://people.torproject.org/~boklm/rbm/ + https://rbm.torproject.org/

1 0

[rbm/master] Bug 24982: add script to help updating the website
by gk＠torproject.org 24 Jan '18

24 Jan '18

commit 213fad5a8fe04272359c33778626a2802efc4ebc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 23 19:01:13 2018 +0100 Bug 24982: add script to help updating the website This script will create a tarball containing the website and print commands that can be used to upload it. --- doc/make-rbm-docs-tar.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/make-rbm-docs-tar.sh b/doc/make-rbm-docs-tar.sh new file mode 100755 index 0000000..5a1b576 --- /dev/null +++ b/doc/make-rbm-docs-tar.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +docsdir=$(pwd) +tmpdir=$(mktemp -d) +make clean +make install-web webdir="$tmpdir" +cd "$tmpdir" +chmod 664 * +tar -cf "$docsdir"/rbm-docs.tar * +cd - +rm -Rf "$tmpdir" +echo "You can now update the web site with:" +echo " ssh staticiforme.torproject.org tar --overwrite -p -C /srv/rbm-master.torproject.org/htdocs -xf - < rbm-docs.tar" +echo " ssh staticiforme.torproject.org static-update-component rbm.torproject.org"

1 0

[tor-browser-build/maint-7.5] Bug 24999: Hash our *.tar.gz files as well
by boklm＠torproject.org 24 Jan '18

24 Jan '18

commit 7dfd54aab191dfc1b55250569e45840d589f7caf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 24 11:02:55 2018 +0000 Bug 24999: Hash our *.tar.gz files as well --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 3940504..a73f017 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Bug 24999: Hash our *.tar.gz files as well
by boklm＠torproject.org 24 Jan '18

24 Jan '18

commit d2dee352354ee77cd26ac37bef41322df2729ff8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 24 11:02:55 2018 +0000 Bug 24999: Hash our *.tar.gz files as well --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 3940504..a73f017 100644 --- a/projects/release/build +++ b/projects/release/build @@ -32,7 +32,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Pick up Firefox changes
by gk＠torproject.org 19 Jan '18

19 Jan '18

commit 980115dae789978ea0050a50a8c74a9e8f745ebb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 19 07:27:58 2018 +0000 Pick up Firefox changes Use tor-browser -2 and build number bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index c433deb..4157500 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release 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 diff --git a/rbm.conf b/rbm.conf index abe0547..12b1fd0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a1' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a10 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Picking up newer Firefox changes
by gk＠torproject.org 19 Jan '18

19 Jan '18

commit 61257a0f6a3a06f894dd50ca38165beab3f3f605 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 19 07:16:19 2018 +0000 Picking up newer Firefox changes Use branch -2 and build number bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 374ade7..962f340 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index a70778b..9e18b53 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.0.11 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Bump build tag
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 670dd59f827203277130d3999c9193eadb1b6022 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 12:56:44 2018 +0000 Bump build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index b966705..a70778b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.0.11 project_name: tor-browser

1 0

[tor-browser-build/maint-7.5] Bug 24930: update keyring path used to debootstrap precise images
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit e9fb651a29f6b649929bbeced662dcad4c1d6fc4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jan 18 13:24:43 2018 +0100 Bug 24930: update keyring path used to debootstrap precise images After switching the image we use for debootstrapping from 17.04 to 16.04.3 (in #24924), the path containing the keys for precise changed. --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a06cc53..2c470be 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -44,13 +44,13 @@ targets: container: suite: precise arch: amd64 - debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg precise-i386: var: container: suite: precise arch: i386 - debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg + debootstrap_opt: --keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg utopic-amd64: var: container:

1 0

[tor-browser-build/master] Bump tbb build tag
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 8643124e7deac88282ce0c071e1b1c6ee7548985 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 12:05:44 2018 +0000 Bump tbb build tag --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 2d8fd60..abe0547 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0a1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a10 project_name: tor-browser

1 0

[tor-browser-build/master] Bump browser build tag (to -build2)
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 2cba8ee37a7f189b77f6ff93ada78c0240b03deb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 11:58:08 2018 +0000 Bump browser build tag (to -build2) --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 235a552..c433deb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-1] fixup! Bug 22548: Firefox downgrades VP9 videos to VP8.
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit d93d0469d2b21b67869369063e17074563a49abf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 10:53:20 2018 +0000 fixup! Bug 22548: Firefox downgrades VP9 videos to VP8. --- dom/media/Benchmark.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp index af0f4a562da4..2c4cf1c3e368 100644 --- a/dom/media/Benchmark.cpp +++ b/dom/media/Benchmark.cpp @@ -80,7 +80,7 @@ VP9Benchmark::IsVP9DecodeFast() uint32_t decodeFps = Preferences::GetUint(sBenchmarkFpsPref); uint32_t threshold = - Preferences::GetUint("media.benchmark.vp9.threshold", 0); + Preferences::GetUint("media.benchmark.vp9.threshold", 0U); return decodeFps >= threshold; #endif

1 0

[tor-browser-build/master] No branch -2 for nightlies anymore
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit a5d545cece11bc2a5161e9bf40460de16d2b245b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 10:57:51 2018 +0000 No branch -2 for nightlies anymore --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index d2d0bb7..235a552 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release 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") %]-1' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser-build/master] Release preparations for 8.0a1
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit ecffc49f5379d2d5a4208d0d5940c386510aa600 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 09:47:24 2018 +0000 Release preparations for 8.0a1 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 23 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 ++--- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 59a4418..d2d0bb7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,15 +1,15 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.2 + firefox_platform_version: 52.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 7.5 + torbrowser_branch: 8.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 34947db..ba3f3ca 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.12.6 +version: 2018.1.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cfbe26d..5ee6e37 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,26 @@ +Tor Browser 8.0a1 -- January 23 2018 + * All Platforms + * Update Firefox to 52.6.0esr + * Update Tor to 0.3.2.9 + * Update Torbutton to 1.9.8.5 + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Translations update + * Update Tor Launcher to 0.2.14.3 + * Translations update + * Update HTTPS Everywhere to 2018.1.11 + * Bug 24756: Add noisebridge01 obfs4 bridge configuration + * Bug 23916: Add new MAR signing key + * Bug 22548: Firefox downgrades VP9 videos to VP8 for some users + * Windows + * Bug 24197: Fix win64 sandbox compile issues + * Build System + * Windows + * Bug 18691: switch Windows builds from precise to jessie + * Linux + * Bug 23892: Include Firefox and Tor debug files in final build directory + * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds + Tor Browser 7.5a10 -- December 19 2017 * All Platforms * Update Tor to 0.3.2.7-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c048175..5f04027 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14.2 +version: 0.2.14.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 6f01b29..df721e1 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.2.7-rc +version: 0.3.2.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index a4e8715..53d9a38 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.4 +version: 1.9.8.5 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 4b4162c..2d8fd60 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a10' + torbrowser_version: '8.0a1' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a8 - - 7.5a9 + - 7.5a10 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-52.6.0esr-8.0-1] Bug 23916: Add new MAR signing key
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit f0b673dbac3aba0c5ad6d13c4a7b04c3dd440906 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 15 14:11:32 2018 +0000 Bug 23916: Add new MAR signing key We make the certificate for the secondary key the new primary one, and add the certificate for the new key as the secondary one. This is the 2018 MAR signing key update. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 49a7c0185f1c..cce786025698 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index cce786025698..caf3eca56804 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 198ca216ffe36d01221e7883740664ce1f2e8eda Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 08:36:43 2018 +0000 Release preparations for 7.5 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 51 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 +-- 8 files changed, 60 insertions(+), 10 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 59a4418..374ade7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.2 + firefox_platform_version: 52.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 34947db..ba3f3ca 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.12.6 +version: 2018.1.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cfbe26d..51f0cf9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,54 @@ +Tor Browser 7.5 -- January 23 2018 + * All Platforms + * Update Firefox to 52.6.0esr + * Update Tor to 0.3.2.9 + * Update OpenSSL to 1.0.2n + * Update Torbutton to 1.9.8.5 + * Bug 21847: Update copy for security slider + * Bug 21245: Add da translation to Torbutton and keep track of it + * Bug 24702: Remove Mozilla text from banner + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update Tor Launcher to 0.2.14.3 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Bug 24623: Revise "country that censors Tor" text + * Bug 24624: tbb-logo.svg may cause network access + * Bug 23240: Retrieve current bootstrap progress before showing progress bar + * Bug 24428: Bootstrap error message sometimes lost + * Bug 22232: Add README on use of bootstrap status messages + * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up) + * Translations update + * Update HTTPS Everywhere to 2018.1.11 + * Update NoScript to 5.1.8.3 + * Bug 23104: CSS line-height reveals the platform Tor Browser is running on + * Bug 24398: Plugin-container process exhausts memory + * Bug 22501: Requests via javascript: violate FPI + * Bug 24756: Add noisebridge01 obfs4 bridge configuration + * Windows + * Bug 16010: Enable content sandboxing on Windows + * Bug 23230: Fix build error on Windows 64 + * OS X + * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser + * Bug 23025: Add some hardening flags to macOS build + * Linux + * Bug 23970: Make "Print to File" work with sandboxing enabled + * Bug 23016: "Print to File" is broken on some non-english Linux systems + * Bug 10089: Set middlemouse.contentLoadURL to false by default + * Bug 18101: Suppress upload file dialog proxy bypass (linux part) + * Android + * Bug 22084: Spoof network information API + * Build System + * All Platforms + * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build + * Windows + * Bug 22563: Update mingw-w64 to fix W^X violations + * Bug 20929: Bump GCC version to 5.4.0 + * Linux + * Bug 20929: Bump GCC version to 5.4.0 + * Bug 23892: Include Firefox and Tor debug files in final build directory + * Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds + Tor Browser 7.5a10 -- December 19 2017 * All Platforms * Update Tor to 0.3.2.7-rc diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c048175..5f04027 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.14.2 +version: 0.2.14.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index 6f01b29..df721e1 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.2.7-rc +version: 0.3.2.9 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index a4e8715..53d9a38 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.4 +version: 1.9.8.5 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 95b7447..b966705 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a10' + torbrowser_version: '7.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a8 - - 7.5a9 + - 7.0.11 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-7.5] Bug 24912: Remove selfrando export in release builds
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 2488ddcda9875f2c34c42fa0c3f10c9034c2b7e0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 08:12:23 2018 +0000 Bug 24912: Remove selfrando export in release builds --- projects/tor-browser/RelativeLink/start-tor-browser | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 94a8c99..0590eed 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -270,7 +270,9 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH +[% IF ! c("var/release") %] export SELFRANDO_write_layout_file= +[% END %] [% IF c("var/asan") -%] # We need to disable LSan which is enabled by default now. Otherwise we'll get

1 0

[tor-browser-build/master] Bug 24912: Remove selfrando export in release builds
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit a647027d20ee95355f1a5452f2b4586aeb54c68c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 18 08:12:23 2018 +0000 Bug 24912: Remove selfrando export in release builds --- projects/tor-browser/RelativeLink/start-tor-browser | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 94a8c99..0590eed 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -270,7 +270,9 @@ fi LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH +[% IF ! c("var/release") %] export SELFRANDO_write_layout_file= +[% END %] [% IF c("var/asan") -%] # We need to disable LSan which is enabled by default now. Otherwise we'll get

1 0

[tor-browser-build/maint-7.5] Bug 24924: update ubuntu images to 16.04.3
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit 32d20f6cf656f3504bc4567b92b85e7559884d57 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 17 22:02:59 2018 +0100 Bug 24924: update ubuntu images to 16.04.3 --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ecb7f2d..a06cc53 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 17.04 + ubuntu_version: 16.04.3 container: use_container: 1 @@ -67,5 +67,5 @@ targets: 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: df2c8fd540e474b8e1e29c0db8ed6b43a932918f1b9a8149bb82104a7c07ba2a + sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2

1 0

[tor-browser-build/master] Bug 24924: update ubuntu images to 16.04.3
by gk＠torproject.org 18 Jan '18

18 Jan '18

commit ebd3b6efb51aa803474b56c7798db584be4d96e3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 17 22:02:59 2018 +0100 Bug 24924: update ubuntu images to 16.04.3 --- projects/debootstrap-image/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ecb7f2d..a06cc53 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -3,7 +3,7 @@ filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/ar pkg_type: build var: - ubuntu_version: 17.04 + ubuntu_version: 16.04.3 container: use_container: 1 @@ -67,5 +67,5 @@ targets: 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: df2c8fd540e474b8e1e29c0db8ed6b43a932918f1b9a8149bb82104a7c07ba2a + sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2

1 0