October 2018 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26263: app icon positioned incorrectly in macOS DMG installer window
by gk＠torproject.org 17 Oct '18

17 Oct '18

commit 8043f2546a8b24a6cead0e0e18e8053e490fc4b3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 16 17:29:59 2018 +0000 Bug 26263: app icon positioned incorrectly in macOS DMG installer window Use a new .DS_Store file that has the correct app icon position. Incorporate a new background image with updated Tor Browser branding, including @1x and @2x (Retina) images. Remove the .fseventsd/ directory, which is not needed in a DMG. These changes also fix bug 25151: Update Tor Browser branding on installation. --- .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 15365 bytes .../mac-applications.dmg/.background/background.png | Bin 50020 -> 0 bytes .../.background/background.tiff | Bin 0 -> 36170 bytes .../.fseventsd/0000000000400c60 | Bin 173 -> 0 bytes .../mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 - 5 files changed, 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store index aeb3104..deb29a7 100644 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.png and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff new file mode 100644 index 0000000..5d28d71 Binary files /dev/null and b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.background/background.tiff differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 deleted file mode 100644 index e21068d..0000000 Binary files a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 and /dev/null differ diff --git a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid deleted file mode 100644 index 538367d..0000000 --- a/projects/tor-browser/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid +++ /dev/null @@ -1 +0,0 @@ -B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file

1 0

[tor-browser-build/master] Merge remote-tracking branch 'pc/bug26263-01'
by gk＠torproject.org 17 Oct '18

17 Oct '18

commit 8d7c170ac77f1a9901b1ef3fc36a9144ac3cd4cb Merge: b71d186 8043f25 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 17 11:47:17 2018 +0000 Merge remote-tracking branch 'pc/bug26263-01' .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 15365 bytes .../mac-applications.dmg/.background/background.png | Bin 50020 -> 0 bytes .../.background/background.tiff | Bin 0 -> 36170 bytes .../.fseventsd/0000000000400c60 | Bin 173 -> 0 bytes .../mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 - 5 files changed, 1 deletion(-)

1 0

[tor-browser-build/master] Bug 21704: Abort install if CPU is missing SSE2 support
by boklm＠torproject.org 17 Oct '18

17 Oct '18

commit b71d1862ad5daf9c22edba498a11b9beeeb6c495 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 17 12:06:28 2018 +0200 Bug 21704: Abort install if CPU is missing SSE2 support Update tbb-windows-installer to v0.5, adding patch to abort install if CPU is missing SSE2 support. --- projects/tbb-windows-installer/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index 57c4fda..a990229 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.4 +version: 0.5 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Bug 27218: generate multiple bundles in parallel
by gk＠torproject.org 16 Oct '18

16 Oct '18

commit dfa0cc46fc0ef70f78313a651bffe178b4d1c4ee Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 10 01:33:59 2018 +0200 Bug 27218: generate multiple bundles in parallel --- projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 9e8cddb..250a0e9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -5,6 +5,9 @@ export TORBROWSER_VERSION='[% c("version") %]' mkdir -p $distdir +scripts_dir=/var/tmp/build_scripts +mkdir -p "$scripts_dir" + OUTDIR='[% dest_dir _ "/" _ c("filename") %]' mkdir -p $OUTDIR @@ -260,8 +263,6 @@ popd mv $distdir/tbb-windows-installer ${TB_STAGE_DIR} [% END %] -cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR - [% IF c("var/windows") %] TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" [% ELSIF c("var/osx") %] @@ -270,6 +271,11 @@ cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR TBDIR="$distdir/$PKG_DIR/Browser" [% END %] +cat > "$scripts_dir/create-$PKG_DIR" << SCRIPT_EOF +#!/bin/bash +set -e +cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR + pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" rm -f precomplete python $MARTOOLS/createprecomplete.py @@ -279,8 +285,8 @@ cd $distdir [% IF c("var/build_mar") -%] # Create full MAR file and compressed package. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR" + [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] [% IF c("var/linux") %] @@ -306,6 +312,7 @@ cd $distdir popd [% END %] rm -rf $distdir/${PKG_DIR} +SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] @@ -322,6 +329,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% SET lang = tmpl(lang); SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; + SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_' _ lang _ '.mar'; IF c("var/osx"); SET browserdir = tbdir _ '/Tor Browser.app'; ELSIF c("var/windows"); @@ -330,6 +338,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ SET browserdir = tbdir _ '/Browser'; END; %] + cat > "$scripts_dir/create-tor-browser_[% lang %]" << SCRIPT_EOF +#!/bin/bash + set -e cp -a ${TB_STAGE_DIR} [% tbdir %] cp [% xpi %] "[% browserdir %]/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" @@ -357,9 +368,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $MARTOOLS/createprecomplete.py popd + cd $distdir + # Create full MAR file and compressed package for this locale. - MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_[% lang %].mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "[% browserdir %]" + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" [% IF c("var/linux") %] [% SET tardir = 'tor-browser_' _ lang; c('tar', { @@ -388,5 +400,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ popd [% END %] rm -rf [% tbdir %] +SCRIPT_EOF [% END %] [% END %] + +chmod 775 $rootdir/run_scripts "$scripts_dir"/* +$rootdir/run_scripts [% c("buildconf/num_procs") %] "$scripts_dir" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1647b77..7b44d8f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -6,6 +6,14 @@ var: container: use_container: 1 ddmg: '[% INCLUDE ddmg.sh %]' + deps: + - python + - libparallel-forkmanager-perl + - libfile-slurp-perl + - zip + - unzip + - bzip2 + - xz-utils targets: linux-i686: @@ -17,14 +25,9 @@ targets: osx-x86_64: var: mar_osname: osx64 - deps: + arch_deps: - genisoimage - - zip - - unzip - - python - - bzip2 - faketime - - xz-utils windows: var: arch_deps: @@ -41,6 +44,7 @@ targets: input_files: - project: container-image + - filename: run_scripts - project: firefox name: firefox - project: tor diff --git a/projects/tor-browser/ddmg.sh b/projects/tor-browser/ddmg.sh index a715300..97fddb1 100755 --- a/projects/tor-browser/ddmg.sh +++ b/projects/tor-browser/ddmg.sh @@ -4,8 +4,8 @@ find [% src %] ! -executable -exec chmod 0644 {} \; find [% src %] -exec [% c("var/touch") %] {} \; -dmg_tmpdir=$(mktemp -d) -[% SET filelist = '"$dmg_tmpdir/filelist.txt"' %] +dmg_tmpdir=\$(mktemp -d) +[% SET filelist = '"\$dmg_tmpdir/filelist.txt"' %] pushd [% src %] find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > [% filelist %] find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelist %] @@ -13,9 +13,9 @@ find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> [% filelis export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o "\$dmg_tmpdir/tbb-uncompressed.dmg" -path-list [% filelist %] -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 -dmg dmg "$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] +dmg dmg "\$dmg_tmpdir/tbb-uncompressed.dmg" [% c('dmg_out', { error_if_undef => 1 }) %] popd -rm -Rf "$dmg_tmpdir" +rm -Rf "\$dmg_tmpdir" diff --git a/projects/tor-browser/run_scripts b/projects/tor-browser/run_scripts new file mode 100755 index 0000000..4b85b50 --- /dev/null +++ b/projects/tor-browser/run_scripts @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w +use strict; + +use Parallel::ForkManager; +use File::Slurp; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + chdir '/'; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error "Wrong number of arguments" unless @ARGV == 2; +my ($nb_threads, $scripts_dir) = @ARGV; +exit_error "Could not enter $scripts_dir" unless chdir $scripts_dir; +my $pm = Parallel::ForkManager->new($nb_threads); +$pm->run_on_finish( + sub { + my ($pid, $exit, $id) = @_; + exit_error "Error running $id" unless $exit == 0; + print "Finished $id\n"; + } +); +foreach my $script (sort(read_dir($scripts_dir))) { + $pm->start($script) and next; + print "Running $script\n"; + exit_error "Error running $script" unless system("./$script") == 0; + $pm->finish; +} +$pm->wait_all_children;

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_27218_v4'
by gk＠torproject.org 16 Oct '18

16 Oct '18

commit d0bd427db75d980be121b12f30f59f18c4e47325 Merge: c65b5af dfa0cc4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 16 18:02:12 2018 +0000 Merge remote-tracking branch 'boklm/bug_27218_v4' projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 28022: Use `/usr/bin/env bash` for bash invocation
by boklm＠torproject.org 16 Oct '18

16 Oct '18

commit c65b5af3d9c565d4e274fbd8606f0404623a19e1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 15 17:24:53 2018 +0000 Bug 28022: Use `/usr/bin/env bash` for bash invocation We use `/usr/bin/env` for invocation in other scripts already. Let's use it in `execdesktop` as well. --- projects/tor-browser/RelativeLink/execdesktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/execdesktop b/projects/tor-browser/RelativeLink/execdesktop index 27328b2..fa6dc0a 100755 --- a/projects/tor-browser/RelativeLink/execdesktop +++ b/projects/tor-browser/RelativeLink/execdesktop @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TBB_START_PROG="$(grep '^X-TorBrowser-ExecShell' $1 | tail -1 | sed 's/^X-TorBrowser-ExecShell=//' | sed 's/%.//')"

1 0

[tor-browser-build/master] Bug 6111: Update URL for tor-browser-bundle-testsuite.git
by boklm＠torproject.org 15 Oct '18

15 Oct '18

commit ef8b470dc1a1361438f190844f42e18c7bc36375 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 15 16:37:16 2018 +0200 Bug 6111: Update URL for tor-browser-bundle-testsuite.git --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index d84a161..af7e03d 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -4,7 +4,7 @@ nightly_build_cron_hour: 2 nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" -testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true

1 0

[tor-browser-build/master] Bug 28002: fix the precomplete file in the en-US installer
by gk＠torproject.org 12 Oct '18

12 Oct '18

commit 3fad7f22441cd2e106a2d5bd8ba7e4623fac409a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 11 12:30:18 2018 +0200 Bug 28002: fix the precomplete file in the en-US installer The Windows installer for the en-US bundle was created from the $TB_STAGE_DIR instead of the $PKG_DIR where the precomplete file has been regenerated. --- projects/tor-browser/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 85d7eaa..9e8cddb 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -294,8 +294,8 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] - find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; - pushd "${TB_STAGE_DIR}" + find "$PKG_DIR" -exec [% c("var/touch") %] {} \; + pushd "$PKG_DIR" makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe

1 0

[tor-browser-build/master] Bug 27320: Add certutil and signmar to Windows mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit 6ed7eacc5b6b75fe888c67a7810c6bddad815f09 Author: JeremyRand <biolizard89(a)gmail.com> Date: Wed Oct 10 20:15:05 2018 +0000 Bug 27320: Add certutil and signmar to Windows mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools for Windows are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where they were already being placed for Linux. --- projects/firefox/build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 489d087..da7640a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -201,6 +201,15 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] +[% IF c("var/windows") %] + cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/ + NSS_LIBS="freebl3.dll mozglue.dll nss3.dll nssdbm3.dll softokn3.dll" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done + cp -a $rootdir/msvcr100.dll $MARTOOLS/ +[% END %] cd $distdir

1 0

[tor-browser-build/master] Bug 27320: Add certutil and signmar to macOS mar-tools
by gk＠torproject.org 11 Oct '18

11 Oct '18

commit b40b18fc4b0e87b8536be04383258b2cd4e4c69b Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Sep 8 12:25:01 2018 +0000 Bug 27320: Add certutil and signmar to macOS mar-tools These binaries were already being built but were being discarded. Since reproducible builds of these tools for macOS are likely to be useful to some people (even though they're not required for Tor Browser to operate), it seems like they're worth distributing. They're placed in the mar-tools zip because that's where they were already being placed for Linux. --- projects/firefox/build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index da7640a..1b5a942 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -201,6 +201,14 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/dist/bin/$LIB $MARTOOLS/ done [% END %] +[% IF c("var/osx") %] + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreebl3.dylib libmozglue.dylib libnss3.dylib libnssdbm3.dylib libsoftokn3.dylib" + for LIB in $NSS_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done +[% END %] [% IF c("var/windows") %] cp -p obj-*/modules/libmar/tool/signmar.exe $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil.exe $MARTOOLS/

1 0