- tbb-commits - lists.torproject.org

[tor-browser-build/master] Update rbm: include stdout in remote_exec/remote_start error output
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit 47e0f00751def20f7458bc0df95cbb0f341b9d6c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 21:05:22 2017 +0200 Update rbm: include stdout in remote_exec/remote_start error output --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 31be478..f494d16 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 31be478688e0448d36373d21939922f2a108aeea +Subproject commit f494d16a1b86700661a029f5eca00c6216bf08d1

1 0

[rbm/master] Include stdout in remote_exec/remote_start error output
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit f494d16a1b86700661a029f5eca00c6216bf08d1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 21:00:10 2017 +0200 Include stdout in remote_exec/remote_start error output Sometimes stdout can include useful informations about the error so include it in addition to stderr. --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 100bc04..c1240cd 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -976,7 +976,7 @@ sub build_run { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec); if (!$success) { - $error = "Error starting remote:\n$stderr"; + $error = "Error starting remote:\n$stdout\n$stderr"; goto EXIT; } } @@ -991,7 +991,7 @@ sub build_run { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec); if (!$success) { - $error = "Error connecting to remote:\n$stderr"; + $error = "Error connecting to remote:\n$stdout\n$stderr"; goto EXIT; } $remote_tmp = (split(/\r?\n/, $stdout))[0];

1 0

[tor-browser-bundle/master] Bump package versions for nightly builds
by gk＠torproject.org 08 Aug '17

08 Aug '17

commit d27f3739c5557ad2ce7b67b6a36c05c274d817c5 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 8 07:25:31 2017 +0000 Bump package versions for nightly builds --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a2062bd..3559f80 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -13,11 +13,11 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=0 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -57,7 +57,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=3.8.0 @@ -80,7 +80,7 @@ ELFUTILS_VER=0.166 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -116,7 +116,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-build/master] Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a
by boklm＠torproject.org 08 Aug '17

08 Aug '17

commit d8de49152e01a1b6cf4b0801bd1e3b3f42f0e857 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 02:49:59 2017 +0200 Fix a typo introduced in c87cfc7291c7faf95c7afc8af693a7f689cdcc0a --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index 9dbe709..db265c7 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,7 +7,7 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ -% END -%] +[% END -%] [% IF c("var/torbrowser-osx-x86_64") -%] mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ [% END -%]

1 0

[tor-browser-build/master] Move projects/release/config build to a separate file
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit c87cfc7291c7faf95c7afc8af693a7f689cdcc0a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:04:18 2017 +0200 Move projects/release/config build to a separate file --- projects/release/build | 26 ++++++++++++++++++++++++++ projects/release/config | 27 --------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/projects/release/build b/projects/release/build new file mode 100644 index 0000000..9dbe709 --- /dev/null +++ b/projects/release/build @@ -0,0 +1,26 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" +mkdir -p "$destdir" +[% IF c("var/torbrowser-windows-i686") -%] + mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ +% END -%] +[% IF c("var/torbrowser-osx-x86_64") -%] + mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-i686") -%] + mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/torbrowser-linux-x86_64") -%] + mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | 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 -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/release/config b/projects/release/config index 43a36e8..8beea7e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,30 +117,3 @@ input_files: - torbrowser-windows-i686 - expert-bundle -build: | - #!/bin/sh - [% c("var/set_default_env") -%] - # reset HOME which was changed by var/set_default_env, for gpg - [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] - destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" - mkdir -p "$destdir" - [% IF c("var/torbrowser-windows-i686") -%] - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-osx-x86_64") -%] - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-i686") -%] - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - [% END -%] - [% IF c("var/torbrowser-linux-x86_64") -%] - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip - [% END -%] - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | 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 -%] - cat sha256sums-unsigned-build.txt

1 0

[tor-browser-build/master] Add script to help tagging a release
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5a438172202b385f962f3b715efff2b20be859f8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 8 00:37:15 2017 +0200 Add script to help tagging a release The 'make signtag-release' and 'make signtag-alpha' commands can be used to tag a stable or alpha release using the version informations from rbm.conf. --- Makefile | 6 ++++++ projects/release/config | 6 ++++++ projects/release/signtag | 8 ++++++++ rbm | 2 +- rbm.conf | 1 + rbm.local.conf.example | 5 +++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b82309c..274e11c 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,12 @@ testbuild-osx-x86_64: submodule-update hardened-linux-x86_64: submodule-update $(rbm) build release --target hardened --target torbrowser-linux-x86_64 +signtag-release: submodule-update + $(rbm) build release --step signtag --target release + +signtag-alpha: submodule-update + $(rbm) build release --step signtag --target alpha + submodule-update: git submodule update --init diff --git a/projects/release/config b/projects/release/config index 8beea7e..db62a95 100644 --- a/projects/release/config +++ b/projects/release/config @@ -117,3 +117,9 @@ input_files: - torbrowser-windows-i686 - expert-bundle +steps: + signtag: + build_log: '-' + debug: 0 + input_files: [] + signtag: '[% INCLUDE signtag %]' diff --git a/projects/release/signtag b/projects/release/signtag new file mode 100644 index 0000000..3ce2e48 --- /dev/null +++ b/projects/release/signtag @@ -0,0 +1,8 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +# reset HOME which was changed by var/set_default_env, for gpg/git +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +cd [% c("basedir") %] +git tag [% c("buildconf/git_signtag_opt") %] -m \ + 'Tagging [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \ + tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %] diff --git a/rbm b/rbm index ff4299f..31be478 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit ff4299fcf372aef5d28fe7024a60d81d413fcd6f +Subproject commit 31be478688e0448d36373d21939922f2a108aeea diff --git a/rbm.conf b/rbm.conf index 13d19a5..6745cdc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -11,6 +11,7 @@ pkg_type: build # in var/build_id, so that changing this option does not affect the build_id. buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' + git_signtag_opt: '-s' var: torbrowser_version: '7.5a4' diff --git a/rbm.local.conf.example b/rbm.local.conf.example index a4b0212..e30d8a8 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -29,6 +29,11 @@ buildconf: ### RBM_NUM_PROCS environment variable. The default is 4. #num_procs: 8 + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + var: local_conf: 1

1 0

[tor-browser-build/master] Fix .gitignore syntax
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 15435cbc400074d2a415cb3e8b14bdb7bd0fb653 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:59:22 2017 +0200 Fix .gitignore syntax Add a leading slash on all lines to match files/directories only in the root directory. --- .gitignore | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0fe0aec..7c83e82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -git_clones -hg_clones -gclient -out -release -alpha -alpha_nightly -nightly -hardened -testbuild -rbm.local.conf -logs +/git_clones +/hg_clones +/gclient +/out +/release +/alpha +/alpha_nightly +/nightly +/hardened +/testbuild +/rbm.local.conf +/logs

1 0

[rbm/master] rbm-build: allow selecting the build script using the step option
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 31be478688e0448d36373d21939922f2a108aeea Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:44:06 2017 +0200 rbm-build: allow selecting the build script using the step option --- doc/rbm-build.asc | 16 ++++++++++++---- doc/rbm-deb-src.asc | 2 ++ doc/rbm-deb.asc | 2 ++ doc/rbm-rpm.asc | 2 ++ doc/rbm-srpm.asc | 2 ++ doc/rbm_cli.asc | 5 +++-- lib/RBM.pm | 2 +- rbm | 1 + test.pl | 2 +- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/doc/rbm-build.asc b/doc/rbm-build.asc index 042ab41..e7a2666 100644 --- a/doc/rbm-build.asc +++ b/doc/rbm-build.asc @@ -19,16 +19,24 @@ Build a package for the selected project. CONFIGURATION OPTIONS --------------------- -The +build+ option is used as the build script. The default value of -the +build+ option is '[% INCLUDE build -%]' which means that you can -create the build script as a +build+ file in the project's directory. +When no +step+ was selected in the command line options, the +build+ +option is used as the build script. The default value of the +build+ +option is '[% INCLUDE build -%]' which means that you can create the +build script as a +build+ file in the project's directory. + +If a +step+ is selected in the command line options, an option of the +same name is used as the build script. See link:rbm_config.html[rbm_config(7)] for all other options. COMMAND LINE OPTIONS -------------------- -See link:rbm_cli.html[rbm_cli(7)]. + +The --step=<step> option can be used to select the build script to run. + +See link:rbm_cli.html[rbm_cli(7)] for the other command line options. SEE ALSO -------- link:rbm.html[rbm(1)] +link:rbm_steps.html[rbm_steps(7)] diff --git a/doc/rbm-deb-src.asc b/doc/rbm-deb-src.asc index 07c8f39..d0212ea 100644 --- a/doc/rbm-deb-src.asc +++ b/doc/rbm-deb-src.asc @@ -16,6 +16,8 @@ DESCRIPTION Create a debian source package for the selected project. +This is equivalent to running 'rbm build --step deb_src <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-deb.asc b/doc/rbm-deb.asc index 4f0562e..0544b89 100644 --- a/doc/rbm-deb.asc +++ b/doc/rbm-deb.asc @@ -16,6 +16,8 @@ DESCRIPTION Build a debian package. +This is equivalent to running 'rbm build --step deb <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-rpm.asc b/doc/rbm-rpm.asc index 1edc118..75f1886 100644 --- a/doc/rbm-rpm.asc +++ b/doc/rbm-rpm.asc @@ -16,6 +16,8 @@ DESCRIPTION Build an rpm package for the selected project. +This is equivalent to running 'rbm build --step rpm <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm-srpm.asc b/doc/rbm-srpm.asc index 9fe40fb..bc2a28c 100644 --- a/doc/rbm-srpm.asc +++ b/doc/rbm-srpm.asc @@ -16,6 +16,8 @@ DESCRIPTION Create a source rpm package for the select project. +This is equivalent to running 'rbm build --step srpm <project>'. + CONFIGURATION OPTIONS --------------------- diff --git a/doc/rbm_cli.asc b/doc/rbm_cli.asc index adb8b27..0e6828c 100644 --- a/doc/rbm_cli.asc +++ b/doc/rbm_cli.asc @@ -65,8 +65,9 @@ The following options can be set on the command line : directory in case of build failure. --step:: - This sets the current step. This is only meaningful with the - showconf command. + This sets the current step when using the showconf command. When + using the build command this is used to select the step (and build + script of the same name) to start. include::clioptions_tar.asc[] diff --git a/lib/RBM.pm b/lib/RBM.pm index 888c3e1..100bc04 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -46,7 +46,7 @@ sub load_config { $config = load_config_file($config_file); $config->{default} = \%default_config; $config->{basedir} = dirname($config_file); - $config->{step} = 'init'; + $config->{step} = 'rbm_init'; $config->{opt} = {}; my $pdir = $config->{projects_dir} || $config->{default}{projects_dir}; foreach my $p (glob path($pdir) . '/*') { diff --git a/rbm b/rbm index 9a8ccf2..2c4ad0d 100755 --- a/rbm +++ b/rbm @@ -173,6 +173,7 @@ sub build_script { my $cmd = shift; my $args = set_options(@_); usageexit($cmd) unless @$args == 1; + $script_name = $RBM::config->{step} if $RBM::config->{step} ne 'rbm_init'; RBM::build_pkg($args->[0], { pkg_type => $script_name }); } diff --git a/test.pl b/test.pl index 2748614..8e842e7 100755 --- a/test.pl +++ b/test.pl @@ -196,7 +196,7 @@ my @tests = ( foreach my $test (@tests) { set_target($test->{target} ? @{$test->{target}} : ()); - set_step($test->{step} ? $test->{step} : 'init'); + set_step($test->{step} ? $test->{step} : 'rbm_init'); if ($test->{config}) { is( RBM::project_config(@{$test->{config}}),

1 0

[rbm/master] Add a man page for rbm-build
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 0732a77db13fa713b481877593cb8f4d005560c2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 23:14:37 2017 +0200 Add a man page for rbm-build --- doc/Makefile | 1 + doc/documentation.asc | 1 + doc/rbm-build.asc | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/doc/Makefile b/doc/Makefile index c3c8f11..593ecba 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -35,6 +35,7 @@ MAN1_ASC += rbm-deb-src.asc MAN1_ASC += rbm-deb.asc MAN1_ASC += rbm-pkg.asc MAN1_ASC += rbm-publish.asc +MAN1_ASC += rbm-build.asc MAN7_ASC += rbm_tutorial.asc MAN7_ASC += rbm_layout.asc diff --git a/doc/documentation.asc b/doc/documentation.asc index 492ad47..82b5e62 100644 --- a/doc/documentation.asc +++ b/doc/documentation.asc @@ -14,6 +14,7 @@ rbm commands : - link:rbm-usage.html[rbm-usage(1)] - link:rbm-tar.html[rbm-tar(1)] - link:rbm-showconf.html[rbm-showconf(1)] +- link:rbm-build.html[rbm-build(1)] - link:rbm-srpm.html[rbm-srpm(1)] - link:rbm-rpm.html[rbm-rpm(1)] - link:rbm-rpmspec.html[rbm-rpmspec(1)] diff --git a/doc/rbm-build.asc b/doc/rbm-build.asc new file mode 100644 index 0000000..042ab41 --- /dev/null +++ b/doc/rbm-build.asc @@ -0,0 +1,34 @@ +rbm-build(1) +============ + +NAME +---- +rbm-build - Build a package + + +SYNOPSIS +-------- +[verse] +'rbm build' <project> [options] + +DESCRIPTION +----------- + +Build a package for the selected project. + +CONFIGURATION OPTIONS +--------------------- + +The +build+ option is used as the build script. The default value of +the +build+ option is '[% INCLUDE build -%]' which means that you can +create the build script as a +build+ file in the project's directory. + +See link:rbm_config.html[rbm_config(7)] for all other options. + +COMMAND LINE OPTIONS +-------------------- +See link:rbm_cli.html[rbm_cli(7)]. + +SEE ALSO +-------- +link:rbm.html[rbm(1)]

1 0

[rbm/master] Update some URLs in documentation
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 04bef8756754fae67419b13ce7c1e2a081972c62 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 22:46:44 2017 +0200 Update some URLs in documentation --- README.md | 2 +- doc/index.asc | 9 +++++---- doc/rbm.asc | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d7d0e1d..3b6862d 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ to allow reproducing the build. For more information, visit the website : - http://rbm.boklm.eu/ + https://people.torproject.org/~boklm/rbm/ diff --git a/doc/index.asc b/doc/index.asc index 0a2ed92..735c246 100644 --- a/doc/index.asc +++ b/doc/index.asc @@ -26,16 +26,17 @@ include::documentation.asc[] Download and installation ------------------------- -The sources are available https://github.com/boklm/rbm[on github]. +The sources are available on https://gitweb.torproject.org/builders/rbm.git/. -Packages will soon be available for various distributions. +The recommanded way to use rbm to build your project is to use it as a +git submodule so you can pick the commit to use. Examples -------- -An example of package templates and configuration is available in -https://github.com/boklm/burps-workspace[this git repository]. +You can look at the https://gitweb.torproject.org/builders/tor-browser-build.git/[Tor Browser build repository] +for an example of how it can be used. License diff --git a/doc/rbm.asc b/doc/rbm.asc index 50df8f4..4c6a0a6 100644 --- a/doc/rbm.asc +++ b/doc/rbm.asc @@ -31,7 +31,7 @@ include::documentation.asc[] EXAMPLES -------- -Some examples of package templates and configuration are available in -the git repository at the following address : -https://github.com/boklm/burps-workspace +You can look at the Tor Browser build repository for an example of how +it can be used. +https://gitweb.torproject.org/builders/tor-browser-build.git/

1 0

[tor-browser-build/master] Add a torbrowser_build option and use it in the build output directory
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 9d18c95bc22bb3df18c4839d21715ce7df9c1ee8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 19:47:53 2017 +0200 Add a torbrowser_build option and use it in the build output directory --- projects/release/config | 10 +++++----- rbm.conf | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/release/config b/projects/release/config index 3351959..43a36e8 100644 --- a/projects/release/config +++ b/projects/release/config @@ -4,7 +4,7 @@ output_dir: 'release/unsigned' var: today: '[% USE date; date.format(format = "%Y-%m-%d") %]' - publish_dir: '[% c("version") %]' + publish_dir: '[% c("version") %]-[% c("var/torbrowser_build") %]' targets: torbrowser-all: @@ -39,13 +39,13 @@ targets: nightly: output_dir: 'nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: nightly alpha_nightly: output_dir: 'alpha_nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: alpha @@ -56,13 +56,13 @@ targets: testbuild: output_dir: 'testbuild' - version: '.' + publish_dir: '' var: build_target: torbrowser-testbuild hardened_nightly: output_dir: 'hardened_nightly' - version: '[% c("var/today") %]' + publish_dir: '[% c("var/today") %]' var: build_target: hardened diff --git a/rbm.conf b/rbm.conf index 46d487c..13d19a5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -14,6 +14,7 @@ buildconf: var: torbrowser_version: '7.5a4' + torbrowser_build: 'build1' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Refresh keyring/firefox.gpg
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 5ef1e3f8014542af7409ad973601b73a15acf119 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 17:17:08 2017 +0200 Refresh keyring/firefox.gpg --- keyring/firefox.gpg | Bin 11220 -> 13463 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/firefox.gpg b/keyring/firefox.gpg index fa6d1b5..9c71261 100644 Binary files a/keyring/firefox.gpg and b/keyring/firefox.gpg differ

1 0

[tor-browser-build/master] Fix firefox tag
by boklm＠torproject.org 07 Aug '17

07 Aug '17

commit 974f99fdd011255fea5e063396940893b1f40146 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 7 16:50:21 2017 +0200 Fix firefox tag --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 30f89d6..e2cf727 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

1 0

[tor-browser-build/master] Release preparations for 7.5a4
by boklm＠torproject.org 04 Aug '17

04 Aug '17

commit c29deee7324f0b7c7ceea95db9a28a6f44c6c34e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 4 13:24:59 2017 +0200 Release preparations for 7.5a4 Changelog update and version bumps. tor-browser-bundle.git author: Georg Koppen <gk(a)torproject.org> tor-browser-bundle.git commit: 0d192217fc71cccf16bce16e3904460b0991b43d tor-browser-bundle.git commit: 6d54b0e2b8cf45fb817e2bbc822c61e5a4ad78de tor-browser-bundle.git commit: 1a15760dcb3889417809ab4a38bf4b523ecf74a7 tor-browser-bundle.git commit: 8b061ed2d5112c006a80723ea63333d0098b94c4 --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/openssl/config | 9 +--- projects/sandbox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 57 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 2 +- 11 files changed, 69 insertions(+), 17 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..dd96dcd 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 b2400c9..30f89d6 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_version: 52.2.0esr + firefox_version: 52.3.0esr torbrowser_branch: 7.5 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 6ee1ee9..00987b0 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.2.18 +version: 5.2.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/openssl/config b/projects/openssl/config index 4cb9eea..dca3a1c 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2k +version: 1.0.2l filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -7,8 +7,6 @@ var: use_container: 1 targets: - nightly: - version: 1.0.2l linux-x86_64: var: configure_opts: -shared enable-ec_nistp_64_gcc_128 linux-generic64 @@ -27,7 +25,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 - targets: - nightly: - sha256sum: ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c + sha256sum: ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c diff --git a/projects/sandbox/config b/projects/sandbox/config index 017d78d..5dc59bd 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.7 +version: 0.0.12 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 2e52d7c..16c10f5 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,60 @@ +Tor Browser 7.5a4 -- August 9 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.1.5-alpha + * Update OpenSSL to 1.0.2l + * Update Torbutton to 1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Update sandboxed-tor-browser to 0.0.12 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Bug 22829: Remove default obfs4 bridge riemann. + * Windows + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22831: Enable Snowflake for mac + * Linux + * Bug 22832: Don't include monthly timestamp in libwebrtc build output + * Bug 20848: Deploy Selfrando in 32bit Linux builds + * Build system + * 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 + +Tor Browser 7.5a3 -- July 28 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a2 -- July 6 2017 * All Platforms * Update Tor to 0.3.1.4-alpha diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4f708bc..ac6fbb6 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: fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b + sha256sum: ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 2995d08..ea7b2e5 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.12.2 +version: 0.2.12.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 74ae828..2bd33a4 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.1.3-alpha +version: 0.3.1.5-alpha 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 7864a38..fbdc76a 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.7.4 +version: 1.9.8 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 f89fa74..46d487c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -13,7 +13,7 @@ buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' var: - torbrowser_version: '7.5a3' + torbrowser_version: '7.5a4' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 23075: rename RBM_NB_CORES to RBM_NUM_CORES
by boklm＠torproject.org 04 Aug '17

04 Aug '17

commit b466ec4bcf9e534652dd98e0f401309e79a93447 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 4 13:03:52 2017 +0200 Bug 23075: rename RBM_NB_CORES to RBM_NUM_CORES And buildconf/nb_procs to buildconf/num_procs. --- README | 6 +++--- projects/binutils/build | 2 +- projects/cmake/build | 2 +- projects/elfutils/build | 2 +- projects/firefox/build | 2 +- projects/gcc/build | 2 +- projects/gmp/build | 2 +- projects/libdmg-hfsplus/build | 2 +- projects/libevent/build | 2 +- projects/llvm/build | 2 +- projects/mingw-w64/build | 8 ++++---- projects/tor/build | 2 +- projects/yasm/build | 2 +- rbm.conf | 4 ++-- rbm.local.conf.example | 6 +++--- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README b/README index 7a2a671..751ccdd 100644 --- a/README +++ b/README @@ -96,11 +96,11 @@ Number of make processes By default the builds are run with 4 processes simultaneously (with make -j4). If you want to change the number of processes used, you can -set the RBM_NB_PROCS environment variable: +set the RBM_NUM_PROCS environment variable: - $ export RBM_NB_PROCS=8 + $ export RBM_NUM_PROCS=8 -You can also set the buildconf/nb_procs option in rbm.local.conf. +You can also set the buildconf/num_procs option in rbm.local.conf. Automated builds diff --git a/projects/binutils/build b/projects/binutils/build index cdfd045..a7d83d9 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -32,7 +32,7 @@ cd [% project %]-[% c("version") %] patch -p1 < $rootdir/binutils-224-gold.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install [% IF c("var/linux") %] diff --git a/projects/cmake/build b/projects/cmake/build index 4a58896..a5eca23 100644 --- a/projects/cmake/build +++ b/projects/cmake/build @@ -5,7 +5,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/elfutils/build b/projects/elfutils/build index 57adf83..5e24dba 100644 --- a/projects/elfutils/build +++ b/projects/elfutils/build @@ -13,7 +13,7 @@ tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/elfutils') %] cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix="$distdir" -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist diff --git a/projects/firefox/build b/projects/firefox/build index 439369e..8ff265d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -90,7 +90,7 @@ rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" -make -j[% c("buildconf/nb_procs") %] -f client.mk build +make -j[% c("buildconf/num_procs") %] -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] diff --git a/projects/gcc/build b/projects/gcc/build index c7e3ea8..79cc5f7 100644 --- a/projects/gcc/build +++ b/projects/gcc/build @@ -17,7 +17,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 cd /var/tmp/build/[% project %]-[% c("version") %] ./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/gmp/build b/projects/gmp/build index b9ea3bc..2752afe 100644 --- a/projects/gmp/build +++ b/projects/gmp/build @@ -9,7 +9,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # during compile time. ./configure --disable-static --enable-shared --enable-cxx \ [% c("var/configure_opt") %] [% c("var/configure_opt_gmp") %] --prefix=$distdir -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build index 66e4232..80d5f75 100644 --- a/projects/libdmg-hfsplus/build +++ b/projects/libdmg-hfsplus/build @@ -7,7 +7,7 @@ cd [% project %]-[% c('version') %] patch -p1 < ../libdmg.patch cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt cd dmg -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd $distdir [% c('tar', { diff --git a/projects/libevent/build b/projects/libevent/build index d44371d..a38422a 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/llvm/build b/projects/llvm/build index fc72e38..b018ca5 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -21,7 +21,7 @@ export LLVM_HOME=$(pwd) mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 246ade1..0fc4517 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -31,25 +31,25 @@ sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-min # CFLAGS_FOR_TARGET. export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ -make -j[% c("buildconf/nb_procs") %] all-gcc +make -j[% c("buildconf/num_procs") %] all-gcc make install-gcc mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \ --host=i686-w64-mingw32 --prefix=$distdir/i686-w64-mingw32 -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 cd /var/tmp/build/builddir/mingw-w64/widl32 /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \ --prefix=$distdir --target=i686-w64-mingw32 -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/build/gcc -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install mkdir -p $distdir/gcclibs cp i686-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs diff --git a/projects/tor/build b/projects/tor/build index 577c194..86d4384 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -64,7 +64,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install [% IF c("var/osx") -%] unset LD_PRELOAD diff --git a/projects/yasm/build b/projects/yasm/build index b736761..c11924c 100644 --- a/projects/yasm/build +++ b/projects/yasm/build @@ -5,7 +5,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] cd /var/tmp/build/yasm-[% c("version") %] ./configure --prefix="$distdir" -make -j[% c("buildconf/nb_procs") %] +make -j[% c("buildconf/num_procs") %] make install cd /var/tmp/dist [% c('tar', { diff --git a/rbm.conf b/rbm.conf index 327cd39..f89fa74 100644 --- a/rbm.conf +++ b/rbm.conf @@ -10,7 +10,7 @@ pkg_type: build # When adding a new option to buildconf, a default value should be defined # in var/build_id, so that changing this option does not affect the build_id. buildconf: - nb_procs: '[% GET ENV.RBM_NB_PROCS ? ENV.RBM_NB_PROCS : "4" %]' + num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "4" %]' var: torbrowser_version: '7.5a3' @@ -22,7 +22,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt", { buildconf => { nb_procs => 4 } })).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 4 } })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 5e322cf..a4b0212 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -24,10 +24,10 @@ buildconf: buildconf: 1 - ### The buildconf/nb_procs option can be used to select the number of + ### The buildconf/num_procs option can be used to select the number of ### build processes to run simultaneously. You can also use the - ### RBM_NB_PROCS environment variable. The default is 4. - #nb_procs: 8 + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 var: local_conf: 1

1 0

[tor-browser-bundle/master] Fix selfrando tag breakcage
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit cf3625070b1f0703c2e19ec5a8bfc57b4cc870f7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 10:45:27 2017 +0000 Fix selfrando tag breakcage --- gitian/mkbundle-linux.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index d348ca5..cd9a236 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -78,6 +78,7 @@ die_msg() { # the utils both if we verify tags and if we don't. LIBEVENT_TAG_ORIG=$LIBEVENT_TAG +SELFRANDO_TAG_ORIG=$SELFRANDO_TAG if [ "z$VERIFY_TAGS" = "z1" ]; then @@ -112,8 +113,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip -o \ ! -f inputs/go-$GO_VER-linux32-utils.zip -o \ ! -f inputs/go-$GO_VER-linux64-utils.zip -o \ - ! -f inputs/selfrando-$SELFRANDO_TAG-linux32-utils.zip -o \ - ! -f inputs/selfrando-$SELFRANDO_TAG-linux64-utils.zip ]; + ! -f inputs/selfrando-$SELFRANDO_TAG_ORIG-linux32-utils.zip -o \ + ! -f inputs/selfrando-$SELFRANDO_TAG_ORIG-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/7 for Linux) ******" @@ -140,8 +141,8 @@ then ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux32-utils.zip selfrando-linux32-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux32-utils.zip selfrando-linux32-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux64-utils.zip selfrando-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ else @@ -163,8 +164,8 @@ else ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip ln -sf go-$GO_VER-linux32-utils.zip go-linux32-utils.zip ln -sf go-$GO_VER-linux64-utils.zip go-linux64-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux32-utils.zip selfrando-linux32-utils.zip - ln -sf selfrando-$SELFRANDO_TAG-linux64-utils.zip selfrando-linux64-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux32-utils.zip selfrando-linux32-utils.zip + ln -sf selfrando-$SELFRANDO_TAG_ORIG-linux64-utils.zip selfrando-linux64-utils.zip cd .. fi

1 0

[tor-browser-bundle/master] Don't foget to bump the sandboxed tor browser version
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 8b061ed2d5112c006a80723ea63333d0098b94c4 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:13:41 2017 +0000 Don't foget to bump the sandboxed tor browser version --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cb49399..16c10f5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,7 @@ Tor Browser 7.5a4 -- August 9 2017 * Update NoScript to 5.0.8.1 * Bug 22362: Remove workaround for XSS related browser freezing * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Update sandboxed-tor-browser to 0.0.12 * Bug 22610: Avoid crashes when canceling external helper app related downloads * Bug 22472: Fix FTP downloads when external helper app dialog is shown * Bug 22471: Downloading pdf files via the PDF viewer download button is broken diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e202870..e7fc29a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -41,7 +41,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e -SANDBOX_TAG=sandboxed-tor-browser-0.0.9 +SANDBOX_TAG=sandboxed-tor-browser-0.0.12 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101

1 0

[tor-browser-bundle/master] Adapt OPENSSL_HASH to the correct SHA-256 sum
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 1a15760dcb3889417809ab4a38bf4b523ecf74a7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:09:23 2017 +0000 Adapt OPENSSL_HASH to the correct SHA-256 sum --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1e20aa4..e202870 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -110,7 +110,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 +OPENSSL_HASH=ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3

1 0

[tor-browser-bundle/master] 7.5a3 changelog correction
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6d54b0e2b8cf45fb817e2bbc822c61e5a4ad78de Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:02:29 2017 +0000 7.5a3 changelog correction --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8558526..cb49399 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -48,7 +48,6 @@ Tor Browser 7.5a4 -- August 9 2017 Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default - * Bug 22829: Remove default obfs4 bridge riemann. Tor Browser 7.0.3 -- July 27 2017 * Linux

1 0

[tor-browser-bundle/master] Release preparations for 7.5a4
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 0d192217fc71cccf16bce16e3904460b0991b43d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 07:02:07 2017 +0000 Release preparations for 7.5a4 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 47 +++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 22 +++++++++--------- tools/update-responses/config.yml | 11 ++++----- 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 224ccaa..8558526 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,50 @@ +Tor Browser 7.5a4 -- August 9 2017 + * All Platforms + * Update Firefox to 52.3.0esr + * Update Tor to 0.3.1.5-alpha + * Update OpenSSL to 1.0.2l + * Update Torbutton to 1.9.8 + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 22542: Resize slider window to work without scrollbars + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + * Update Tor Launcher to 0.2.12.3 + * Bug 22592: Default bridge settings are not removed + * Translations update + * Update HTTPS-Everywhere to 5.2.21 + * Update NoScript to 5.0.8.1 + * Bug 22362: Remove workaround for XSS related browser freezing + * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 21321: Exempt .onions from HTTP related security warnings + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 22073: Disable GetAddons option on addons page + * Bug 22884: Fix broken about:tor page on higher security levels + * Bug 22829: Remove default obfs4 bridge riemann. + * Windows + * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr) + * OS X + * Bug 22831: Enable Snowflake for mac + * Linux + * Bug 22832: Don't include monthly timestamp in libwebrtc build output + * Bug 20848: Deploy Selfrando in 32bit Linux builds + * Build system + * 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 + Tor Browser 7.5a3 -- July 28 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c35c51b..1e20aa4 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.2.0esr +FIREFOX_VERSION=52.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-1-build2 -TOR_TAG=tor-0.3.1.4-alpha -TORLAUNCHER_TAG=0.2.12.2 -TORBUTTON_TAG=1.9.7.4 -HTTPSE_TAG=5.2.19 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.5-2-build1 +TOR_TAG=tor-0.3.1.5-alpha +TORLAUNCHER_TAG=0.2.12.3 +TORBUTTON_TAG=1.9.8 +HTTPSE_TAG=5.2.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -49,12 +49,12 @@ SNOWFLAKE_TAG=9f2e9a6ecb696149708716ca06ce842df03cf492 UNIURI_TAG=8902c56451e9b58ff940bbe5fec35d5f9c04584a SELFRANDO_TAG=tb-v0.3.2 -GITIAN_TAG=tor-browser-builder-4-4 +GITIAN_TAG=tor-browser-builder-4-5 -OPENSSL_VER=1.0.2k +OPENSSL_VER=1.0.2l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=3.8.0 @@ -77,7 +77,7 @@ ELFUTILS_VER=0.166 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.7.1-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -113,7 +113,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b +NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a4f1f91..e6dcf27 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -19,14 +19,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 7.5a2 + alpha: 7.5a4 release: 6.0.1 versions: - 7.5a2: - platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-75a2-released + 7.5a4: + platformVersion: 52.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-75a4-released incremental_from: - - 7.5a1 + - 7.5a2 + - 7.5a3 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-bundle/master] Fold in 7.5a3 changelog
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6be301f7449f4f320137027a242edcacd7b636c6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 10:47:44 2017 +0000 Fold in 7.5a3 changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2c5c7e8..224ccaa 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.5a3 -- July 28 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.0.3 -- July 27 2017 * Linux * Bug 23044: Don't allow GIO supported protocols by default

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 6bc3048b901d3261f7644751232ecf98fc8680a6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 2 10:46:40 2017 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2e52d7c..2c5c7e8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + * Bug 22829: Remove default obfs4 bridge riemann. + Tor Browser 7.5a2 -- July 6 2017 * All Platforms * Update Tor to 0.3.1.4-alpha

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 0c48149c2a4d4603f066c26c1b54f5e4fe554454 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 20 17:04:44 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. --- .../exthandler/nsExternalHelperAppService.cpp | 162 ++++++++++++++++++--- uriloader/exthandler/nsExternalHelperAppService.h | 3 + .../exthandler/nsIExternalHelperAppService.idl | 47 ++++++ 3 files changed, 195 insertions(+), 17 deletions(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 51a7ee0f6ab6..df08905304fb 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -132,6 +132,9 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] = static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] = "browser.helperApps.neverAsk.openFile"; +static const char WARNING_DIALOG_CONTRACT_ID[] = + "@torproject.org/torbutton-extAppBlocker;1"; + // Helper functions for Content-Disposition headers /** @@ -594,6 +597,107 @@ static const nsDefaultMimeTypeEntry nonDecodableExtensions[] = { { APPLICATION_GZIP, "svgz" } }; +////////////////////////////////////////////////////////////////////////////////////////////////////// +// begin nsExternalLoadURIHandler class definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// +class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher +{ +public: + NS_DECL_THREADSAFE_ISUPPORTS + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER + + nsExternalLoadURIHandler(nsIInterfaceRequestor * aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo); + +protected: + ~nsExternalLoadURIHandler(); + + nsCOMPtr<nsIInterfaceRequestor> mWindowContext; + nsCOMPtr<nsIURI> mURI; + nsCOMPtr<nsIHandlerInfo> mHandlerInfo; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; +}; + +NS_IMPL_ADDREF(nsExternalLoadURIHandler) +NS_IMPL_RELEASE(nsExternalLoadURIHandler) + +NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) +NS_INTERFACE_MAP_END_THREADSAFE + +nsExternalLoadURIHandler::nsExternalLoadURIHandler( + nsIInterfaceRequestor *aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo) +: mWindowContext(aWindowContext) +, mURI(aURI) +, mHandlerInfo(aHandlerInfo) +{ + nsresult rv = NS_OK; + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, aWindowContext); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } +} + +nsExternalLoadURIHandler::~nsExternalLoadURIHandler() +{ +} + +NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() +{ + MOZ_ASSERT(mURI); + MOZ_ASSERT(mHandlerInfo); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + nsHandlerInfoAction preferredAction; + mHandlerInfo->GetPreferredAction(&preferredAction); + bool alwaysAsk = true; + mHandlerInfo->GetAlwaysAskBeforeHandling(&alwaysAsk); + + // if we are not supposed to ask, and the preferred action is to use + // a helper app or the system default, we just launch the URI. + if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || + preferredAction == nsIHandlerInfo::useSystemDefault)) + return mHandlerInfo->LaunchWithURI(mURI, mWindowContext); + + nsresult rv = NS_OK; + nsCOMPtr<nsIContentDispatchChooser> chooser = + do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + + return chooser->Ask(mHandlerInfo, mWindowContext, mURI, + nsIContentDispatchChooser::REASON_CANNOT_HANDLE); +} + +NS_IMETHODIMP nsExternalLoadURIHandler::CancelRequest(nsresult aReason) +{ + NS_ENSURE_ARG(NS_FAILED(aReason)); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + return NS_OK; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////// +// nsExternalHelperAppService definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// NS_IMPL_ISUPPORTS( nsExternalHelperAppService, nsIExternalHelperAppService, @@ -1014,23 +1118,13 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); - nsHandlerInfoAction preferredAction; - handler->GetPreferredAction(&preferredAction); - bool alwaysAsk = true; - handler->GetAlwaysAskBeforeHandling(&alwaysAsk); + RefPtr<nsExternalLoadURIHandler> h = + new nsExternalLoadURIHandler(aWindowContext, uri, handler); + if (!h) { + return NS_ERROR_OUT_OF_MEMORY; + } - // if we are not supposed to ask, and the preferred action is to use - // a helper app or the system default, we just launch the URI. - if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || - preferredAction == nsIHandlerInfo::useSystemDefault)) - return handler->LaunchWithURI(uri, aWindowContext); - - nsCOMPtr<nsIContentDispatchChooser> chooser = - do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - return chooser->Ask(handler, aWindowContext, uri, - nsIContentDispatchChooser::REASON_CANNOT_HANDLE); + return NS_OK; } NS_IMETHODIMP nsExternalHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval) @@ -1198,6 +1292,7 @@ NS_INTERFACE_MAP_BEGIN(nsExternalAppHandler) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIHelperAppLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) NS_INTERFACE_MAP_ENTRY(nsICancelable) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsIBackgroundFileSaverObserver) @@ -1671,6 +1766,29 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo httpInternal->SetChannelIsForDownload(true); } + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, GetDialogParent()); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } + + return NS_OK; +} + +NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest) + mWarningDialog = nullptr; + // now that the temp file is set up, find out if we need to invoke a dialog // asking the user what they want us to do with this content... @@ -1731,6 +1849,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo action = nsIMIMEInfo::saveToDisk; } + nsresult rv = NS_OK; if (alwaysAsk) { // Display the dialog @@ -1786,6 +1905,15 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } +NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest) + mWarningDialog = nullptr; + + return Cancel(aReason); +} + // Convert error info into proper message text and send OnStatusChange // notification to the dialog progress listener or nsITransfer implementation. void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequest *aRequest, const nsAFlatString &path) @@ -2477,7 +2605,7 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) } // Break our reference cycle with the helper app dialog (set up in - // OnStartRequest) + // ContinueRequest) mDialog = nullptr; mRequest = nullptr; diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h index ceec66661dd4..3146407dcbe5 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.h +++ b/uriloader/exthandler/nsExternalHelperAppService.h @@ -210,6 +210,7 @@ private: */ class nsExternalAppHandler final : public nsIStreamListener, public nsIHelperAppLauncher, + public nsIHelperAppWarningLauncher, public nsITimerCallback, public nsIBackgroundFileSaverObserver { @@ -218,6 +219,7 @@ public: NS_DECL_NSISTREAMLISTENER NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIHELPERAPPLAUNCHER + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER NS_DECL_NSICANCELABLE NS_DECL_NSITIMERCALLBACK NS_DECL_NSIBACKGROUNDFILESAVEROBSERVER @@ -478,6 +480,7 @@ protected: nsCOMPtr<nsIChannel> mOriginalChannel; /**< in the case of a redirect, this will be the pre-redirect channel. */ nsCOMPtr<nsIHelperAppLauncherDialog> mDialog; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; /** * Keep request alive in case when helper non-modal dialog shown. diff --git a/uriloader/exthandler/nsIExternalHelperAppService.idl b/uriloader/exthandler/nsIExternalHelperAppService.idl index bfdfff5ceaa8..546252f04ba3 100644 --- a/uriloader/exthandler/nsIExternalHelperAppService.idl +++ b/uriloader/exthandler/nsIExternalHelperAppService.idl @@ -152,3 +152,50 @@ interface nsIHelperAppLauncher : nsICancelable */ readonly attribute int64_t contentLength; }; + +/** + * nsIHelperAppWarningLauncher is implemented by two classes: + * nsExternalLoadURIHandler + * nsExternalAppHandler + */ +[scriptable, uuid(cffd508b-4aaf-43ad-99c6-671d35cbc558)] +interface nsIHelperAppWarningLauncher : nsISupports +{ + /** + * Callback invoked by the external app warning dialog to continue the + * request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + */ + void continueRequest(); + + /** + * Callback invoked by the external app warning dialog to cancel the request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + * + * @param aReason + * Pass a failure code to indicate the reason why this operation is + * being canceled. It is an error to pass a success code. + */ + void cancelRequest(in nsresult aReason); +}; + +/** + * nsIHelperAppWarningDialog is implemented by Torbutton's external app + * blocker (src/components/external-app-blocker.js). + */ +[scriptable, uuid(f4899a3f-0df3-42cc-9db8-bdf599e5a208)] +interface nsIHelperAppWarningDialog : nsISupports +{ + /** + * Possibly show a launch warning dialog (it will not be shown if the user + * has chosen to not see the warning again). + * + * @param aLauncher + * A nsIHelperAppWarningLauncher to be invoked after the user confirms + * or cancels the download. + * @param aWindowContext + * The window associated with the download. + */ + void maybeShow(in nsIHelperAppWarningLauncher aLauncher, + in nsISupports aWindowContext); +};

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 47df7aa33aa1ea4a72ac029169725609f2f518aa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 18 16:22:32 2017 -0400 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." This reverts commit 648d842b127e6ca6457d43e45244c65ee1773aa3. --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 --- netwerk/protocol/http/HttpBaseChannel.h | 1 - netwerk/protocol/http/NullHttpChannel.cpp | 6 --- netwerk/protocol/http/nsIHttpChannel.idl | 9 +--- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ----- .../exthandler/nsExternalHelperAppService.cpp | 57 ---------------------- 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 5ea6a002a40f..e0f7edec05f9 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,13 +1233,6 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } -NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) -{ - NS_ENSURE_ARG_POINTER(aIsPendingUnforced); - *aIsPendingUnforced = mIsPending; - return NS_OK; -} - NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index 3a1a8ba525b0..c8184a601b9e 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,7 +190,6 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; - NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8b362cb24233..8c048a6b5a7e 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,12 +82,6 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -NullHttpChannel::IsPendingUnforced(bool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 0de0676ad156..75ec2c73989a 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] +[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,11 +469,4 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; - - /** - * Returns true if a request is pending due to "natural" causes and - * not just because ForcePending() has been called. See isPending() - * in nsIRequest.idl for more details about pending requests. - */ - boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9f9b89438fba..9ed71c4ef001 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,17 +740,6 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -nsViewSourceChannel::IsPendingUnforced(bool *result) -{ - if (mHttpChannel) { - return mHttpChannel->IsPendingUnforced(result); - } - - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); - return mChannel->IsPending(result); -} - -NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 4a7fd7f92f15..51a7ee0f6ab6 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,7 +41,6 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" -#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -106,7 +105,6 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" -#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -436,22 +434,6 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } -static nsresult shouldCancel(bool *aShouldCancel) -{ - NS_ENSURE_ARG_POINTER(aShouldCancel); - - nsCOMPtr<nsISupportsPRBool> cancelObj = - do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); - cancelObj->SetData(false); - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - if (!obs) - return NS_ERROR_FAILURE; - - obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); - cancelObj->GetData(aShouldCancel); - return NS_OK; -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -1028,14 +1010,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_OK; - } - nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); @@ -1669,37 +1643,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } - // Give other modules, including extensions, a chance to cancel. - // To avoid a problem where OnDataAvailable fires but is not handled - // correctly while a modal dialog displayed by Torbutton is open, we - // suspend and then we either cancel or resume active requests. - // See bugs 21766 and 21886. - bool isPending = false; - nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); - if (httpChan) { - rv = httpChan->IsPendingUnforced(&isPending); - } else { - rv = request->IsPending(&isPending); - } - NS_ENSURE_SUCCESS(rv, rv); - - if (isPending) { - Unused << request->Suspend(); // Best effort: ignore failures. - } - - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - mCanceled = true; - request->Cancel(NS_BINDING_ABORTED); - return NS_OK; - } - - if (isPending) { - Unused << request->Resume(); // Best effort: ignore failures. - } - rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv;

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21830: Copying large test from web console leaks to /tmp
by gk＠torproject.org 04 Aug '17

04 Aug '17

commit 06580161f901dedf60e6dcb9252e7ce6b3e7b37b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 4 05:55:49 2017 +0000 Bug 21830: Copying large test from web console leaks to /tmp Patch written by Neill Miller --- widget/nsTransferable.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp index e99d45401df8..976180c7581e 100644 --- a/widget/nsTransferable.cpp +++ b/widget/nsTransferable.cpp @@ -39,6 +39,7 @@ Notes to self: #include "nsIFile.h" #include "nsILoadContext.h" #include "mozilla/UniquePtr.h" +#include "mozilla/Preferences.h" NS_IMPL_ISUPPORTS(nsTransferable, nsITransferable) @@ -248,6 +249,11 @@ nsTransferable::Init(nsILoadContext* aContext) if (aContext) { mPrivateData = aContext->UsePrivateBrowsing(); + } else { + // without aContext here to provide PrivateBrowsing information, + // we defer to the active configured setting + mPrivateData = + mozilla::Preferences::GetBool("browser.privatebrowsing.autostart"); } #ifdef DEBUG mInitialized = true;

1 0