September 2017 - tbb-commits - lists.torproject.org

[torbutton/master] Bug 23526: 2017 Donation banner text ready for translation
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 0387a6f7f086c101e5b3612a8cfc94a956227a4a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 14 21:41:36 2017 -0700 Bug 23526: 2017 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index f9723bf..4436e21 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance. +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day

1 0

[tor-browser-build/master] Bumping rbm commit for bug 23513
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 90653b4d43d04c8394df3c194d5469aee8980510 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 15 06:21:33 2017 +0000 Bumping rbm commit for bug 23513 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 296fba7..78d9b11 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4 +Subproject commit 78d9b11aead5ba9b2386f7ebb2003772823fa293

1 0

[rbm/master] Bug 23513: run remote_finish when there was an error in remote_start
by gk＠torproject.org 15 Sep '17

15 Sep '17

commit 78d9b11aead5ba9b2386f7ebb2003772823fa293 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 14 14:03:27 2017 +0200 Bug 23513: run remote_finish when there was an error in remote_start We were looking at the $remote_tmp_src and $remote_tmp_dst variables to decide if running remote_finish is needed. However, those variables are not defined if there was an error in remote_start, and we should still run remote_finish in that case. Instead we look at the remote_exec option to decide if we need to run remote_finish. --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b14909f..96a1b9b 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -1103,7 +1103,7 @@ sub build_run { } } EXIT: - if ($remote_tmp_src && $remote_tmp_dst) { + if (project_config($project, "remote_exec", $options)) { my $cmd = project_config($project, "remote_finish", $options); if ($cmd && (run_script($project, $cmd, sub { system(@_) }) != 0)) { $error ||= "Error finishing remote";

1 0

[tor-browser-build/master] Bug 23454: restore stderr in build logs
by gk＠torproject.org 11 Sep '17

11 Sep '17

commit 75af4379125bcf3979f54b5773f1ced1c37eb9c6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 11 14:30:03 2017 +0200 Bug 23454: restore stderr in build logs In #23425 we redirected the output from runc start to /dev/null to avoid annoying messages saying "stdin: is not a tty". However this also removes stderr from build logs. The command producing the `stdin: is not a tty` message is the `chown -R` command from runc/remote_put, so we now only hide stderr from that part while keeping it for the runc command running the build script. --- rbm.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index d574f7a..7bda275 100644 --- a/rbm.conf +++ b/rbm.conf @@ -329,7 +329,7 @@ runc: cat > '[% c("var/container/dir") %]'/config.json << EOF [% INCLUDE 'runc-config.json' %] EOF - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] remote_put: | #!/bin/sh @@ -340,7 +340,10 @@ runc: -%] sudo mkdir -p '[% c("var/container/dir") %]'/rootfs/[% dst %] sudo cp -aP [% src %] '[% c("var/container/dir") %]'/rootfs/[% dst %] - [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst }) %] + # On Ubuntu, the /root/.profile file contains a `mesg n` line which is + # producing some `stdin: is not a tty` messages. To hide them, we hide + # stderr from this part by setting runc_hide_stderr. + [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst, runc_hide_stderr => 1 }) %] remote_get: | #!/bin/sh

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 1368406 Use non-Windows Printf Format Specifiers in MinGW r=froydnj
by gk＠torproject.org 11 Sep '17

11 Sep '17

commit 7169757638781da3a706c7700bcd4eb2bc613591 Author: Tom Ritter <tom(a)mozilla.com> Date: Mon May 29 00:38:57 2017 -0500 Bug 1368406 Use non-Windows Printf Format Specifiers in MinGW r=froydnj MinGW applies the gnu_printf format attribute, which expects non-Windows format specifiers. These macros were not designed to handle MinGW. MozReview-Commit-ID: HuJrK43Bg1A --HG-- extra : rebase_source : 6ccc1b2f4ab0e71584f442e86d94322e2c6382fb --- mfbt/SizePrintfMacros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfbt/SizePrintfMacros.h b/mfbt/SizePrintfMacros.h index ec55c62c5955..94eff2fe255b 100644 --- a/mfbt/SizePrintfMacros.h +++ b/mfbt/SizePrintfMacros.h @@ -18,7 +18,7 @@ * http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx */ -#if defined(XP_WIN) +#if defined(XP_WIN) && !defined(__MINGW32__) # define PRIoSIZE "Io" # define PRIuSIZE "Iu" # define PRIxSIZE "Ix"

1 0

[tor-browser-build/master] Add tmp to .gitignore
by boklm＠torproject.org 08 Sep '17

08 Sep '17

commit 84881888708f4fd163b1867193fed6471d0c53a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 8 11:13:10 2017 +0200 Add tmp to .gitignore With #23403 we started using the tor-browser-build/tmp directory for the builds. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c4c3919..efd3840 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /testbuild /rbm.local.conf /logs +/tmp

1 0

[tor-browser-build/master] Bug 23425: fix build when there is no terminal
by gk＠torproject.org 08 Sep '17

08 Sep '17

commit e21581e108a44915c0bd0f2acd346b02288a52a0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 16:58:01 2017 +0200 Bug 23425: fix build when there is no terminal Set process.terminal to false when building, but keep it to true when we open a debugging shell. https://github.com/opencontainers/runtime-spec/blob/master/config.md#process To do that we update the runc config.json in runc/remote_exec rather than only once in runc/remote_start. We also redirect runc stderr to /dev/null to avoid some messages saying "stdin: is not a tty" during the build. --- projects/common/runc-config.json | 2 +- rbm.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 3da6c24..02be3b0 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -9,7 +9,7 @@ [% END -%] }, "process": { - "terminal": true, + "terminal": [% IF c("interactive") %]true[% ELSE %]false[% END %], "user": { "uid": 0, "gid": 0 diff --git a/rbm.conf b/rbm.conf index a93df7f..d574f7a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -308,9 +308,6 @@ runc: fi mkdir -p '[% c("var/container/dir") %]'/rootfs/rbm sudo tar -C '[% c("var/container/dir") %]'/rootfs -xf $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'*) - cat > '[% c("var/container/dir") %]'/config.json << EOF - [% INCLUDE 'runc-config.json' %] - EOF [% SET user = c("var/container/user") -%] [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'id ' _ user _ ' >/dev/null 2>&1 || adduser -m ' _ user _ ' || useradd -m ' _ user }) %] @@ -329,7 +326,10 @@ runc: echo 'su - [% user %] -c /rbm/cmd' >> '[% c("var/container/dir") %]'/rootfs/rbm/run chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/cmd chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/run - sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] + cat > '[% c("var/container/dir") %]'/config.json << EOF + [% INCLUDE 'runc-config.json' %] + EOF + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF ! c("interactive") %]2>/dev/null[% END %] remote_put: | #!/bin/sh

1 0

[tor-browser-build/master] Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit b2dd98160a1c07f73f7ab66475cb02be295e4ee5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 13:01:02 2017 +0200 Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir --- README.BUILD_ERRORS | 16 ---------------- rbm.conf | 1 + rbm.local.conf.example | 6 ++++-- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 6be4319..0562f93 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -28,19 +28,3 @@ nopat $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ---- - -tmp partition is full ---------------------- - -If your /tmp partition is small, you will get a 'No space left on device' -error during the build. To select an other directory with more space -available to store temporary files, you can define the TMPDIR environment -variable: - ----- -$ mkdir /home/user/tmp -$ export TMPDIR=/home/user/tmp ----- - -You can also define the tmp_dir option in the rbm.local.conf file. - diff --git a/rbm.conf b/rbm.conf index e131c36..a93df7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -2,6 +2,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" +tmp_dir: '[% c("basedir") %]/tmp' build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log' pkg_type: build diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 62d13b2..a6401a9 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -6,8 +6,10 @@ ### options you want to modify. -### The tmp_dir option defines where temporary files are stored. -### You should modify this if your /tmp partition is small. +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. #tmp_dir: /tmp ### The debug option defines whether a debugging shell should be opened

1 0

[tor-browser-build/master] README.HACKING: explain how to test an rbm patch
by boklm＠torproject.org 07 Sep '17

07 Sep '17

commit 53379a752224091a56d157f570155457936d6564 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 7 12:45:19 2017 +0200 README.HACKING: explain how to test an rbm patch --- README.HACKING | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.HACKING b/README.HACKING index df87410..31b8352 100644 --- a/README.HACKING +++ b/README.HACKING @@ -259,3 +259,20 @@ is closed and the container containing the failed build is removed. The path to the container should be printed on the screen in case you want to backup its rootfs to be able to look at it later. + +Testing an rbm patch +-------------------- + +When you are working on a patch to rbm, you might want to try a Tor +Browser build using your patched version of rbm. You could patch the +rbm in the rbm/ directory, however your patch can be reverted if you +use any of the makefile rules that does a 'git submodule update'. +To avoid this you can clone the rbm git repository to a separate +directory, where you will apply your patch. To do a build using your +patched rbm, take the command from the makefile, but replace $(rbm) +with the path to your patched rbm. + +For example, if you want to try a Linux x86_64 alpha build, you can run: + $ /path_to_rbm/rbm build release --target alpha --target \ + torbrowser-linux-x86_64 +

1 0

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

07 Sep '17

commit 6690281b7eec547ee4c977ae9fc89728f63c5016 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 7 10:30:57 2017 +0000 Picking up new rbm commit --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 0f5857b..296fba7 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c +Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4

1 0