- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 26234: add update_responses option to specify rewrite rules
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit 3cab74acf8a2f2a311c133544ccc8c00a43e00a2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 11 17:49:03 2018 +0200 Bug 26234: add update_responses option to specify rewrite rules Add the htaccess_rewrite_rules option which can be used to specify rewrite rules to be added to the generated .htaccess files. --- tools/update-responses/update_responses | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1df35b3..77b9c96 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -376,6 +376,7 @@ sub write_htaccess { my $flags = "[last]"; foreach my $channel (@channels) { my $htaccess = "RewriteEngine On\n"; + $htaccess .= $config->{htaccess_rewrite_rules}{$channel} // ''; my $version = $config->{channels}{$channel}; my $migrate_langs = $config->{versions}{$version}{migrate_langs} // {}; my $files = $config->{versions}{$version}{files};

1 0

[tor-browser-build/maint-7.5] Release preparations for 7.5.5
by gk＠torproject.org 08 Jun '18

08 Jun '18

commit d0e565d00e236e331f8ebf040b4225b6875d471f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 8 21:25:47 2018 +0000 Release preparations for 7.5.5 Changelog update and versions bump --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ rbm.conf | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 886cfdc..e91d1ca 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # 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") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.8.0 + firefox_platform_version: 52.8.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7f5a736..5d52b10 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 7.5.5 -- June 10 2018 + * All platforms + * Update Firefox to 52.8.1esr + * Bug 26098: Remove amazon-meek + Tor Browser 7.5.4 -- May 9 2018 * All platforms * Update Firefox to 52.8.0esr diff --git a/rbm.conf b/rbm.conf index ca427f9..4329958 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5.4' + torbrowser_version: '7.5.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5.3 + - 7.5.4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 24632: Install xz-utils for macOS MAR file creation
by gk＠torproject.org 07 Jun '18

07 Jun '18

commit aabed936170b9ea88df2037e8d452dc5d9915f20 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 7 10:39:48 2018 +0000 Bug 24632: Install xz-utils for macOS MAR file creation --- projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 62ed70c..225a0bb 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,6 +24,7 @@ targets: - python - bzip2 - faketime + - xz-utils windows: var: arch_deps:

1 0

[tor-browser-build/master] Bug 24632: Make sure to use "Tor Browser.app" for `browserdir` on macOS
by gk＠torproject.org 07 Jun '18

07 Jun '18

commit fcb2a3707af71bcd564bf0dd8a563835eeea6b9b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 7 10:40:47 2018 +0000 Bug 24632: Make sure to use "Tor Browser.app" for `browserdir` on macOS --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d807633..19aa657 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -311,7 +311,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ SET xpi = '$rootdir/' _ c('input_files_by_name/firefox-langpacks') _ '/' _ lang _ '.xpi'; SET tbdir = '$distdir/tor-browser_' _ lang; IF c("var/osx"); - SET browserdir = tbdir _ '/TorBrowser.app'; + SET browserdir = tbdir _ '/Tor Browser.app'; ELSIF c("var/windows"); SET browserdir = tbdir _ '/Tor Browser/Browser'; ELSE;

1 0

[tor-browser-build/master] Bug 26153: Enable selfrando for 64bit only for now
by gk＠torproject.org 07 Jun '18

07 Jun '18

commit 8b30ee00debb11a1c165435d304a406c8408f216 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 7 06:02:16 2018 +0000 Bug 26153: Enable selfrando for 64bit only for now The 32bit toolchain is not able to link libxul anymore with selfrando enabled as the linker is running out of address space. We therefore disable selfrando for 32bit for now. --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index b3dd729..de5102d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -165,7 +165,7 @@ targets: # We only build snowflake for linux on the alpha and nightly channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 - selfrando: '[% ! c("var/release") %]' + selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]' container: suite: wheezy deps:

1 0

[tor-browser-build/master] Bug 22242: use chrpath to remove RUNPATH added by selfrando
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit 6063d5c6433a294176593a070138350cc723dbfa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed May 23 16:39:25 2018 +0200 Bug 22242: use chrpath to remove RUNPATH added by selfrando At the same time we add a var/selfrando variable to make it easier to enable/disable selfrando. --- projects/firefox/build | 6 +++++- projects/firefox/config | 4 +++- rbm.conf | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..ea3826d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -23,7 +23,7 @@ mkdir -p /var/tmp/build export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% IF c("var/linux") && ! c("var/release") -%] +[% IF c("var/selfrando") -%] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] # Selfrando wrapper export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" @@ -161,6 +161,10 @@ cd $distdir objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB + [% IF c("var/selfrando") -%] + # remove RUNPATH added by selfrando (see #22242) + chrpath -d $LIB + [% END -%] done [% END %] diff --git a/projects/firefox/config b/projects/firefox/config index 4458d48..21efac7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -48,6 +48,8 @@ targets: - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 + # needed to remove RUNPATH added by selfrando (see #22242) + - chrpath linux-x86_64: var: martools_filename: mar-tools-linux64.zip @@ -82,7 +84,7 @@ input_files: enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' + enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll diff --git a/rbm.conf b/rbm.conf index bb53bcb..c1b49f0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -166,6 +166,7 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 + selfrando: '[% ! c("var/release") %]' container: suite: wheezy deps:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_22242'
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit 2dfbef2eecb1ca19467b095b16c18f9c78d28445 Merge: 4074cbc 6063d5c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 6 19:09:08 2018 +0000 Merge remote-tracking branch 'boklm/bug_22242' projects/firefox/build | 6 +++++- projects/firefox/config | 4 +++- rbm.conf | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --cc projects/firefox/config index 97efc7b,21efac7..6cb17c7 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -83,11 -84,9 +85,11 @@@ input_files enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' + enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]' diff --cc rbm.conf index 28ce6f9,c1b49f0..b3dd729 --- a/rbm.conf +++ b/rbm.conf @@@ -162,9 -162,11 +162,10 @@@ targets var: linux: 1 compiler: gcc - # We only build snowflake for linux and osx on the alpha and nightly - # channels for now. + # We only build snowflake for linux on the alpha and nightly channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 + selfrando: '[% ! c("var/release") %]' container: suite: wheezy deps:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sukhe/bug-26153'
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit 4074cbc2a727daf51ff9fdab29e0a0da3ec078aa Merge: e76952c d161cb7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 6 19:02:02 2018 +0000 Merge remote-tracking branch 'sukhe/bug-26153' projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- projects/selfrando/config | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --cc projects/firefox/build index 8278c14,cbd9250..83a7691 --- a/projects/firefox/build +++ b/projects/firefox/build @@@ -40,15 -40,15 +40,15 @@@ EO export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] - #[% IF c("var/linux") && ! c("var/release") -%] - # tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] - # # Selfrando wrapper - # export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" - # # We need to avoid the shuffling while building as this breaks compilation - # export SELFRANDO_skip_shuffle= - #[% END -%] + [% IF c("var/linux") && ! c("var/release") -%] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] + # Selfrando wrapper + export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= + [% END -%] -[% IF c("var/linux") %] +[% IF ! c("var/windows") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" diff --cc projects/firefox/config index 927fb0b,418daa3..97efc7b --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -81,13 -81,11 +81,13 @@@ input_files - project: binutils name: binutils enable: '[% c("var/linux") %]' - # - project: selfrando - # name: selfrando - # enable: '[% c("var/linux") && ! c("var/release") %]' + - project: selfrando + name: selfrando + enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]'

1 0

[tor-browser-build/master] Bug 26153: Selfrando builds broken for Firefox 60 ESR
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit d161cb720ea36ccd547acd385752fe353279761f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 6 11:01:19 2018 -0400 Bug 26153: Selfrando builds broken for Firefox 60 ESR This commit fixes #26153 by bumping the selfrando version to 0.4.2 --- projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- projects/selfrando/config | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 62186d1..cbd9250 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -40,13 +40,13 @@ EOF export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -#[% IF c("var/linux") && ! c("var/release") -%] -# tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] -# # Selfrando wrapper -# export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" -# # We need to avoid the shuffling while building as this breaks compilation -# export SELFRANDO_skip_shuffle= -#[% END -%] +[% IF c("var/linux") && ! c("var/release") -%] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] + # Selfrando wrapper + export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" + # We need to avoid the shuffling while building as this breaks compilation + export SELFRANDO_skip_shuffle= +[% END -%] [% IF c("var/linux") %] mkdir -p /var/tmp/dist diff --git a/projects/firefox/config b/projects/firefox/config index d6b8313..418daa3 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,9 +81,9 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' -# - project: selfrando -# name: selfrando -# enable: '[% c("var/linux") && ! c("var/release") %]' + - project: selfrando + name: selfrando + enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll diff --git a/projects/selfrando/config b/projects/selfrando/config index 07195f7..82acc23 100644 --- a/projects/selfrando/config +++ b/projects/selfrando/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.4.1 +version: 0.4.2 git_hash: 'tb-v[% c("version") %]' git_url: https://github.com/immunant/selfrando.git gpg_keyring: selfrando.gpg

1 0

[tor-browser-build/master] Bug 24632: Adapt firefox and tor-browser to new macOS toolchain
by gk＠torproject.org 06 Jun '18

06 Jun '18

commit e76952c389487d657c3f52fede5e9ca56ec02397 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 6 18:22:41 2018 +0000 Bug 24632: Adapt firefox and tor-browser to new macOS toolchain After building Firefox we now get a 'Tor Browser.app' instead of a 'TorBrowser.app'. This patch makes sure the additional whitespace in the app name is correctly handled by the build script and the one that deals with packaging the final bundle. We need to ship a fix for the Firefox packaging step as well as |./mach package| wants to build the final .dmg in that step, too, which breaks: there is no .dmg creation tool available. Setting `INNER_MAKE_PACKAGE` to `true` does not seem to work anymore. That part of this patch is currently only a workaround to get the nightly builds going. We should come up with a better solution that allows us to skip that part of the Firefox packaging step on all supported platforms. --- projects/firefox/build | 25 ++++++++++------ projects/firefox/config | 4 ++- projects/firefox/no-dmg.patch | 29 ++++++++++++++++++ projects/tor-browser/build | 70 +++++++++++++++++++++---------------------- 4 files changed, 83 insertions(+), 45 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 62186d1..8278c14 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -48,10 +48,13 @@ EOF # export SELFRANDO_skip_shuffle= #[% END -%] -[% IF c("var/linux") %] +[% IF ! c("var/windows") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" +[% END -%] + +[% IF c("var/linux") %] # Add llvm so stylo can build tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] export LLVM_CONFIG="/var/tmp/dist/llvm/bin/llvm-config" @@ -60,7 +63,7 @@ EOF tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] - mkdir -p $distdir/TorBrowser.app/Contents/MacOS + mkdir -p "$distdir/Tor Browser.app/Contents/MacOS" [% ELSE %] mkdir -p $distdir/Browser [% END %] @@ -118,6 +121,10 @@ fi patch -p1 < $rootdir/STL_win64.patch [% END -%] +[% IF c("var/osx") %] + patch -p1 < $rootdir/no-dmg.patch +[% END -%] + rm -f configure rm -f js/src/configure @@ -128,12 +135,12 @@ rm -f js/src/configure [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir # Remove firefox-bin (we don't use it, see ticket #10126) - rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin + rm -f "$distdir/Tor Browser.app/Contents/MacOS/firefox-bin" # Adjust the Info.plist file - INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist - mv $INFO_PLIST tmp.plist - python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST + INFO_PLIST="$distdir/Tor Browser.app/Contents/Info.plist" + mv "$INFO_PLIST" tmp.plist + python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > "$INFO_PLIST" rm -f tmp.plist [% END %] @@ -198,8 +205,8 @@ cd $distdir [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] [% ELSIF c("var/osx") %] - [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] - [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/browser/omni.ja' }) %] + [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/omni.ja"' }) %] + [% c("var/rezip", { rezip_file => '"Tor Browser.app/Contents/Resources/browser/omni.ja"' }) %] [% END %] [% IF c("var/windows") %] @@ -211,7 +218,7 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/osx"); - SET browserdir='TorBrowser.app/Contents'; + SET browserdir='"Tor Browser.app/Contents"'; ELSE; SET browserdir='Browser'; END; diff --git a/projects/firefox/config b/projects/firefox/config index d6b8313..927fb0b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -86,6 +86,8 @@ input_files: # enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]' @@ -99,7 +101,7 @@ input_files: enable: '[% c("var/windows-x86_64") %]' - project: rust name: rust - enable: '[% c("var/linux") %]' + enable: '[% ! c("var/windows") %]' - project: llvm name: llvm enable: '[% c("var/linux") %]' diff --git a/projects/firefox/no-dmg.patch b/projects/firefox/no-dmg.patch new file mode 100644 index 0000000..1e722af --- /dev/null +++ b/projects/firefox/no-dmg.patch @@ -0,0 +1,29 @@ +From 7204fc9191a55dbbd3b94ee2d64ece8d9910cf23 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 31 May 2018 19:15:18 +0000 +Subject: [PATCH] Don't create a .dmg yet + + +diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk +index 8ace9703a160..82df89d1f431 100644 +--- a/toolkit/mozapps/installer/upload-files.mk ++++ b/toolkit/mozapps/installer/upload-files.mk +@@ -216,14 +216,7 @@ ifeq ($(MOZ_PKG_FORMAT),DMG) + + _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) + PKG_DMG_SOURCE = $(MOZ_PKG_DIR) +- INNER_MAKE_PACKAGE = \ +- $(call py_action,make_dmg, \ +- $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ +- $(if $(MOZ_PKG_MAC_BACKGROUND),--background '$(MOZ_PKG_MAC_BACKGROUND)') \ +- $(if $(MOZ_PKG_MAC_ICON),--icon '$(MOZ_PKG_MAC_ICON)') \ +- --volume-name '$(MOZ_APP_DISPLAYNAME)' \ +- '$(PKG_DMG_SOURCE)' '$(PACKAGE)' \ +- ) ++ INNER_MAKE_PACKAGE = true + INNER_UNMAKE_PACKAGE = \ + $(call py_action,unpack_dmg, \ + $(if $(MOZ_PKG_MAC_DSSTORE),--dsstore '$(MOZ_PKG_MAC_DSSTORE)') \ +-- +2.17.0 + diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4d1be00..d807633 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -14,7 +14,7 @@ mkdir -p $OUTDIR TB_STAGE_DIR=$distdir/tor-browser-stage [% IF c("var/osx") %] - TBDIR=$TB_STAGE_DIR/TorBrowser.app + TBDIR="$TB_STAGE_DIR/Tor Browser.app" DOCSPATH=Contents/Resources/TorBrowser/Docs EXTSPATH=Contents/Resources/distribution/extensions @@ -34,11 +34,11 @@ TB_STAGE_DIR=$distdir/tor-browser-stage EXTOVERRIDESPATH=TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper - mkdir -p $TBDIR/TorBrowser/Data/Browser/Caches + mkdir -p "$TBDIR/TorBrowser/Data/Browser/Caches" [% END %] -mkdir -p $TBDIR/$EXTSPATH -mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions +mkdir -p "$TBDIR/$EXTSPATH" +mkdir -p "$TBDIR/$MEEKPROFILEPATH/extensions" # Extract the MAR tools. unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip @@ -49,23 +49,23 @@ MARTOOLS=$rootdir/mar-tools unzip -d $rootdir $rootdir/mar-tools-linux32.zip [% END -%] -mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi -mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi -mv [% c('input_files_by_name/https-everywhere') %] $TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi -mv [% c('input_files_by_name/noscript') %] $TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +mv [% c('input_files_by_name/tor-launcher') %] "$TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi" +mv [% c('input_files_by_name/torbutton') %] "$TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi" +mv [% c('input_files_by_name/https-everywhere') %] "$TBDIR/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi" +mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" -tar -C $TBDIR -xf [% c('input_files_by_name/obfs4') %] -tar -C $TBDIR -xf [% c('input_files_by_name/meek') %] -mv $TBDIR/meek-http-helper(a)bamsoftware.com.xpi $TBDIR/$MEEKPROFILEPATH/extensions/ +tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] +tar -C "$TBDIR" -xf [% c('input_files_by_name/meek') %] +mv "$TBDIR/meek-http-helper(a)bamsoftware.com.xpi" "$TBDIR/$MEEKPROFILEPATH/extensions/" [% IF c("var/snowflake") %] - tar -C $TBDIR -xf [% c('input_files_by_name/snowflake') -%] + tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] [% END -%] [% IF c("var/fteproxy") -%] - tar -C $TBDIR -xf [% c('input_files_by_name/fteproxy') %] + tar -C "$TBDIR" -xf [% c('input_files_by_name/fteproxy') %] [% END -%] -tar -C $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %] -xf [% c('input_files_by_name/fonts') %] +tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] [% IF c("var/linux") %] cp RelativeLink/* ${TB_STAGE_DIR}/Browser/ @@ -77,7 +77,7 @@ RBM_TB_EOF [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz -tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_by_name/tor') %]/tor.tar.gz +tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz [% IF c("var/linux"); SET bundledata_osname = 'linux'; @@ -107,8 +107,8 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b mv $SKELETON_TMP Bundle-Data/mac # Install a "tor" shim that sets the working directory. See #10030. - mv $TBDIR/$TORBINPATH/tor $TBDIR/$TORBINPATH/tor.real - cp Bundle-Data/mac-tor.sh $TBDIR/$TORCONFIGPATH/tor + mv "$TBDIR/$TORBINPATH/tor" "$TBDIR/$TORBINPATH/tor.real" + cp Bundle-Data/mac-tor.sh "$TBDIR/$TORCONFIGPATH/tor" [% IF ! c("var/release") -%] SANDBOX_FOLDER="$TB_STAGE_DIR/Sandboxed Tor Browser" @@ -118,17 +118,17 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %] -mkdir -p $TBDIR/$DOCSPATH -cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH -tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x +mkdir -p "$TBDIR/$DOCSPATH" +cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" +tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x -cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults +cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" [% IF c("var/linux") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> $TBDIR/$EXTOVERRIDESPATH + >> "$TBDIR/$EXTOVERRIDESPATH" [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$TBDIR/$EXTOVERRIDESPATH" [% END %] [% END -%] [% IF c("var/windows") -%] @@ -136,18 +136,18 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB # We don't have fte available on Windows x86_64 yet grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ - >> $TBDIR/$EXTOVERRIDESPATH + >> "$TBDIR/$EXTOVERRIDESPATH" [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> $TBDIR/$EXTOVERRIDESPATH + >> "$TBDIR/$EXTOVERRIDESPATH" [% END -%] -cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js +cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" [% IF c("var/osx") %] - pushd $TBDIR + pushd "$TBDIR" # Create the meek-template-sha256sum.txt file by generating a list # of hashes (one for each file within the meek-http-helper profile) and # and then generating one final hash from the contents of the list. @@ -156,8 +156,8 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us [% END %] [% IF ! c("var/multi_lingual") %] - echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> $TBDIR/$EXTOVERRIDESPATH - echo 'pref("intl.locale.matchOS", false);' >> $TBDIR/$EXTOVERRIDESPATH + echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$TBDIR/$EXTOVERRIDESPATH" + echo 'pref("intl.locale.matchOS", false);' >> "$TBDIR/$EXTOVERRIDESPATH" [% END %] [% IF c("var/linux") %] @@ -178,7 +178,7 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/us [% END %] -pushd $TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/ +pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/" # For the proper search engines in our language packs unzip omni.ja chrome/en-US/locale/browser/searchplugins* || [ $? -lt 3 ] mv chrome/en-US/locale/browser/searchplugins $rootdir @@ -223,7 +223,7 @@ popd }) %] # If we are building a multi-lingual package, add all of the language packs. [% IF c("var/multi_lingual") %] - cp [% xpi %] $TBDIR/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi + cp [% xpi %] "$TBDIR/$EXTSPATH/langpack-[% lang %](a)firefox.mozilla.org.xpi" [% END %] cd .. rm -rf prep_[% lang %] @@ -232,7 +232,7 @@ popd [% IF c("var/multi_lingual") %] # Set the update.locale (it is used to replace %LOCALE% within # app.update.url). - pushd $TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %] + pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]" echo ${PKG_LOCALE} > update.locale [% c("var/touch") %] update.locale zip -Xm omni.ja update.locale @@ -253,11 +253,11 @@ popd cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR [% IF c("var/windows") %] - TBDIR=$distdir/$PKG_DIR/"Tor Browser"/Browser + TBDIR="$distdir/$PKG_DIR/Tor Browser/Browser" [% ELSIF c("var/osx") %] - TBDIR=$distdir/$PKG_DIR/TorBrowser.app + TBDIR="$distdir/$PKG_DIR/Tor Browser.app" [% ELSE %] - TBDIR=$distdir/$PKG_DIR/Browser + TBDIR="$distdir/$PKG_DIR/Browser" [% END %] pushd "$TBDIR[% IF c("var/osx") %]/Contents/Resources/[% END %]"

1 0