- tbb-commits - lists.torproject.org

[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

[rbm/master] Bug 23382: create tmp_dir if it does not exist
by gk＠torproject.org 07 Sep '17

07 Sep '17

commit 296fba79fca70b922cc6eb2be8b830d8074b70e4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 6 16:54:07 2017 +0200 Bug 23382: create tmp_dir if it does not exist --- lib/RBM.pm | 21 +++++++++++++-------- lib/RBM/DefaultConfig.pm | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index df29a01..b14909f 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -259,11 +259,17 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } +sub get_tmp_dir { + my ($project, $options) = @_; + my $tmp_dir = project_config($project, 'tmp_dir', $options); + make_path($tmp_dir); + return $tmp_dir; +} + sub set_git_gpg_wrapper { my ($project) = @_; my $w = project_config($project, 'gpg_wrapper'); - my (undef, $tmp) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir')); + my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); write_file($tmp, $w); chmod 0700, $tmp; system('git', 'config', 'gpg.program', $tmp) == 0 @@ -314,7 +320,7 @@ sub git_tag_sign_id { sub file_sign_id { my ($project, $options) = @_; my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir', $options)); + get_tmp_dir($project, $options)); write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', $options)); chmod 0700, $gpg_wrapper; my ($stdout, $stderr, $success, $exit_code) = @@ -445,8 +451,7 @@ sub run_script { $f //= \&capture_exec; my @res; if ($cmd =~ m/^#/) { - my (undef, $tmp) = File::Temp::tempfile(DIR => - project_config($project, 'tmp_dir')); + my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project)); write_file($tmp, $cmd); chmod 0700, $tmp; @res = $f->($tmp); @@ -540,7 +545,7 @@ sub maketar { || exit_error 'Error running git archive.'; if (project_config($project, 'git_submodule', $options)) { my $tmpdir = File::Temp->newdir( - project_config($project, 'tmp_dir', $options) . '/rbm-XXXXX'); + get_tmp_dir($project, $options) . '/rbm-XXXXX'); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $commit_hash); exit_error "Cannot checkout $commit_hash: $stderr" unless $success; @@ -952,7 +957,7 @@ sub build_run { my $old_cwd = getcwd; my $srcdir = project_config($project, 'build_srcdir', $options); my $use_srcdir = $srcdir; - my $tmpdir = File::Temp->newdir(project_config($project, 'tmp_dir', $options) + my $tmpdir = File::Temp->newdir(get_tmp_dir($project, $options) . '/rbm-XXXXX'); my @cfiles; if ($use_srcdir) { @@ -1119,7 +1124,7 @@ sub publish { project_config($project, 'publish', { error_if_undef => 1 }); my $publish_src_dir = project_config($project, 'publish_src_dir'); if (!$publish_src_dir) { - $publish_src_dir = File::Temp->newdir(project_config($project, 'tmp_dir') + $publish_src_dir = File::Temp->newdir(get_tmp_dir($project) . '/rbm-XXXXXX'); build_pkg($project, {output_dir => $publish_src_dir}); } diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index b1f97cb..d0d893a 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -106,7 +106,7 @@ sub rbm_tmp_dir { my ($project, $options) = @_; CORE::state $rbm_tmp_dir; return $rbm_tmp_dir->dirname if $rbm_tmp_dir; - my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options) + my $tmp_dir = RBM::get_tmp_dir($project, $options) || RBM::exit_error('No tmp_dir specified'); $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XXXXXX', DIR => $tmp_dir);

1 0

[tor-browser-build/master] Bug 23417: set nightly version number to 'tbb-nightly'
by gk＠torproject.org 06 Sep '17

06 Sep '17

commit 7c7ad916fabe6c23aba116f9e05e4b4cfa28e6f1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 6 15:05:22 2017 +0200 Bug 23417: set nightly version number to 'tbb-nightly' --- rbm.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rbm.conf b/rbm.conf index 10a60f8..e131c36 100644 --- a/rbm.conf +++ b/rbm.conf @@ -112,6 +112,7 @@ targets: nightly: var: nightly: 1 + torbrowser_version: tbb-nightly torbrowser-testbuild: - testbuild

1 0

[tor-browser-build/master] NoScript version bump
by gk＠torproject.org 06 Sep '17

06 Sep '17

commit c4c68bf3c10b4492d37132ed0ac9099ca6b3f5d3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 6 07:34:04 2017 +0000 NoScript version bump --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index ac6fbb6..dab0ee0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -57,9 +57,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 + sha256sum: 610dc5ffcc7133f2ccc2f1a14280e326d371a8a2fc76497becf2d5cf21257955 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-bundle/master] Bug 23213: Deprecate gitian/tor-browser-bundle development
by gk＠torproject.org 05 Sep '17

05 Sep '17

commit b273e8a38b24e716008fa9f51a2b53f20c1f1255 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 5 09:21:00 2017 +0000 Bug 23213: Deprecate gitian/tor-browser-bundle development --- README | 13 +++++++++++++ gitian/README.build | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/README b/README index 2ac74a5..fbc53ba 100644 --- a/README +++ b/README @@ -1,3 +1,16 @@ +A DEVELOPMENT NOTE: +=================== + +Developing the reproducible builds environment for Tor Browser with +gitian/tor-browser-bundle is deprecated. Recently, we switched to +rbm/tor-browser-build. See: +https://trac.torproject.org/projects/tor/ticket/23213. To get started with the +new system, check out +https://git.torproject.org/builders/tor-browser-build.git and follow the +instructions in the README file. + +------------------- + There are currently two ways to use the Tor Browser Bundle builder. If you are already on an Ubuntu 12.04+ machine or VM, please see diff --git a/gitian/README.build b/gitian/README.build index 4d01d6a..a962fca 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,3 +1,16 @@ +A DEVELOPMENT NOTE: +=================== + +Developing the reproducible builds environment for Tor Browser with +gitian/tor-browser-bundle is deprecated. Recently, we switched to +rbm/tor-browser-build. See: +https://trac.torproject.org/projects/tor/ticket/23213. To get started with the +new system, check out +https://git.torproject.org/builders/tor-browser-build.git and follow the +instructions in the README file. + +------------------- + QuickStart: On an Ubuntu 14.04+/Debian Wheezy+ machine or VM, run:

1 0