- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 23630: Clarify README.HACKING on using a firefox git repository
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit 43e5d8803933af80e6e71005a5f64338c91680d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 25 18:10:04 2017 +0200 Bug 23630: Clarify README.HACKING on using a firefox git repository --- README.HACKING | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/README.HACKING b/README.HACKING index 31b8352..e328ea1 100644 --- a/README.HACKING +++ b/README.HACKING @@ -218,8 +218,25 @@ build with the patch. As an alternative, if you have your patch in a git repository, you can edit projects/firefox/config to change the git_url option to point to your git repository, and change the git_hash option to point to the -commit you want to build. You will also need to comment the -'tag_gpg_id: 1' line (unless git_hash is pointing to a signed git tag). +commit you want to build. If the new git_hash option is not pointing to +a signed tag, you will also need to comment the 'tag_gpg_id: 1' line. +The git_hash option can point to a tag, a commit, a branch or anything +that is understood by git. + +If you specify a branch in the git_hash option, you don't need to prefix +it with a git remote name as all branches from the git repository +selected in the git_url option are created as local branches. + +If you want to work on a local git repository, it is not a good idea to +work on the git_clones/firefox repository directly. Instead you should +create a separate git repository and update the git_url option with a +file:// URL pointing to your repository. + +After changing the git_url option or when new commits have been added +to a branch, you should run "make fetch" before starting a build to get +the new commits. If you want to fetch new commits automatically when +starting a new build you can add a "fetch: 1" line to +projects/firefox/config. The Firefox mozconfig files

1 0

[tor-browser-build/master] Preparing a -build5
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit 8eeb8c032e450b15cc4151409b1baa533db33364 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 26 09:07:46 2017 +0000 Preparing a -build5 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6757422..0b0193d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build4' + torbrowser_build: 'build5' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 23654: fix ja dmg file name
by gk＠torproject.org 26 Sep '17

26 Sep '17

commit f42778f91a144375f29b2f584073e3b63b564553 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 26 10:46:38 2017 +0200 Bug 23654: fix ja dmg file name --- projects/tor-browser/build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 31c2d6d..6540245 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -327,6 +327,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ tar_args => '-cJf $OUTDIR/tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.tar.xz', }) %] [% ELSIF c("var/osx") %] + [% # Rename the Japanese bundle to not confuse users + IF lang == 'ja-JP-mac'; + SET lang = 'ja'; + END; -%] [% c('var/ddmg', { dmg_src => tbdir, dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg',

1 0

[tor-browser-build/master] Bug 23384: install libyaml-perl on build-sunet-a.torproject.net
by boklm＠torproject.org 22 Sep '17

22 Sep '17

commit d9721520bc4b52aa2cf98fee35db9a5b58bfef39 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 22 22:14:57 2017 +0200 Bug 23384: install libyaml-perl on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index eb44819..f3a857c 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -34,6 +34,7 @@ - libxml-libxml-perl - libwww-perl - libjson-perl + - libyaml-perl - name: Create the tbb-build group group:

1 0

[tor-browser-build/master] Bump build version
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 540627c5a51ba9f66a8077a76cb0f2cc87da9660 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 18:39:59 2017 +0000 Bump build version --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 133b548..6757422 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Revert "Pick up new selfrando tag (needed for bug 22692)"
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 59814e17f3189f560263b807d61c4359a03bd4ed Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 18:38:04 2017 +0000 Revert "Pick up new selfrando tag (needed for bug 22692)" This reverts commit b6b18835b675dc1cae04faf474474d6a2ec65677. --- projects/selfrando/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/selfrando/config b/projects/selfrando/config index f8afa5d..33e7272 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.3.3 +version: 0.3.2 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg diff --git a/rbm.conf b/rbm.conf index 980b55d..133b548 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build3' + torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 22692: Don't use mremap in selfrando code
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 85537ff8b5a7294138ed57e44818512aaabb9d57 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 6 11:29:35 2017 +0000 Bug 22692: Don't use mremap in selfrando code --- projects/selfrando/build | 2 +- projects/selfrando/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/selfrando/build b/projects/selfrando/build index 18437b5..14d9dcf 100644 --- a/projects/selfrando/build +++ b/projects/selfrando/build @@ -14,7 +14,7 @@ tar -C /var/tmp/dist -xf $rootdir/[% project %]-[% c("version") %].tar.gz cd /var/tmp/dist mv [% project %]-[% c("version") %] [% project %] cd [% project %] -scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console +scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" NO_MREMAP=1 FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console # Fix the path where we install selfrando sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/[% c("var/selfrando_arch") %]/bin|' Tools/TorBrowser/tc-wrapper/ld diff --git a/projects/selfrando/config b/projects/selfrando/config index 33e7272..f8afa5d 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.3.2 +version: 0.3.3 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg

1 0

[tor-browser-build/master] Bug 23384: fix syntax to work with ansible 2.2
by boklm＠torproject.org 22 Sep '17

22 Sep '17

commit da8ca6fbef84c2b324802db154cfd82bad78c506 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 22 18:09:02 2017 +0200 Bug 23384: fix syntax to work with ansible 2.2 https://docs.ansible.com/ansible/latest/porting_guide_2.0.html#deprecated --- tools/ansible/roles/tbb-team/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml index 9beaf0b..5cc5755 100644 --- a/tools/ansible/roles/tbb-team/tasks/main.yml +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -5,11 +5,11 @@ state: present groups: tbb-build shell: /bin/bash - with_items: tbb_team_members + with_items: "{{ tbb_team_members }}" - name: Add ssh keys to authorized_keys authorized_key: user: "{{ item }}" state: present key: "{{ lookup('file', item + '.pub') }}" - with_items: tbb_team_members + with_items: "{{ tbb_team_members }}"

1 0

[tor-browser-build/master] Bug 23384: install dependencies for update_responses on build-sunet-a.torproject.net
by boklm＠torproject.org 22 Sep '17

22 Sep '17

commit 9c79f069e6942d3520612d1a24e6bde70e804e4e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 22 18:01:25 2017 +0200 Bug 23384: install dependencies for update_responses on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-builder/tasks/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index 2edfc18..eb44819 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -23,6 +23,18 @@ - curl - runc +- name: Install dependencies for update_responses script + apt: + name: "{{ item }}" + state: present + with_items: + - libfindbin-libs-perl + - libxml-writer-perl + - libparallel-forkmanager-perl + - libxml-libxml-perl + - libwww-perl + - libjson-perl + - name: Create the tbb-build group group: name: tbb-build

1 0

[tor-browser-build/master] Picking up new tor-browser tag
by gk＠torproject.org 22 Sep '17

22 Sep '17

commit 7fcbbaa6ad86c18743b59f5847b01bf30eeb52d4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 10:16:30 2017 +0000 Picking up new tor-browser tag --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8ff795a..5fe6eb1 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 diff --git a/rbm.conf b/rbm.conf index 8fd3351..980b55d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a4 project_name: tor-browser

1 0