May 2018 - tor-commits - lists.torproject.org

[tor-browser-build/master] Disable checking the hashes of the language packs for Firefox 60 ESR
by gk＠torproject.org 29 May '18

29 May '18

commit a80e0d5b49e827b613b624c5516b087b3c402f73 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:59:06 2018 -0400 Disable checking the hashes of the language packs for Firefox 60 ESR ... pending https://bugzilla.mozilla.org/show_bug.cgi?id=1463749 is fixed. --- projects/firefox-langpacks/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 6bc1810..cbbc9ca 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -4,8 +4,8 @@ [% FOREACH lang = c('var/locales') %] [% SET lang = tmpl(lang) %] [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] - shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') - echo "$shasum [% filename %]" | sha512sum -c + #shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + #echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %]

1 0

[tor-browser-build/master] Use mach configure to pass build configuration arguments
by gk＠torproject.org 29 May '18

29 May '18

commit 74e8c6a9803cc778b73dfa08c23ab7c75bb40718 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 11:05:32 2018 -0400 Use mach configure to pass build configuration arguments --- projects/firefox/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index cfef91d..7f74c9c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -111,10 +111,10 @@ fi 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/num_procs") %] -f client.mk build -make -C obj-* package INNER_MAKE_PACKAGE=true +./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts +./mach build +./mach package [% IF c("var/osx") %] cp -a obj-macos/dist/firefox/* $distdir

1 0

[tor-browser-build/master] Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR
by gk＠torproject.org 29 May '18

29 May '18

commit ed1e40688ca502e1adc1819024c430c24aebebb0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 28 09:48:35 2018 -0400 Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR --- projects/firefox/config | 1 + projects/firefox/mozconfig-linux-i686 | 4 ++-- projects/firefox/mozconfig-linux-x86_64 | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c53ea7e..77ae405 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -37,6 +37,7 @@ targets: var: arch_deps: - libgtk2.0-dev + - libgtk-3-dev - libdbus-glib-1-dev - libxt-dev - hardening-wrapper diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index a7d75fa..b677df3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -17,8 +17,8 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -# Let's support GTK2 for ESR52 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 7d9ab1c..2e8e2fa 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -9,8 +9,8 @@ ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding -# Let's support GTK2 for ESR52 -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Let's support GTK3 for ESR60 +ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar

1 0

[tor-browser-build/master] Use Rust and LLVM for Stylo bindgen in Firefox
by gk＠torproject.org 29 May '18

29 May '18

commit b5a67ed318c316c1c5258e2f5e793abbe8bf84ee Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 28 09:54:37 2018 -0400 Use Rust and LLVM for Stylo bindgen in Firefox --- projects/firefox/build | 9 +++++++++ projects/firefox/config | 6 ++++++ projects/llvm/config | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 88bffc2..a9d5125 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -48,6 +48,15 @@ EOF # export SELFRANDO_skip_shuffle= #[% END -%] +[% IF c("var/linux") %] + 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" + # 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" +[% END -%] + tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] diff --git a/projects/firefox/config b/projects/firefox/config index 0692ead..d6b8313 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -97,3 +97,9 @@ input_files: enable: '[% c("var/windows") %]' - filename: STL_win64.patch enable: '[% c("var/windows-x86_64") %]' + - project: rust + name: rust + enable: '[% c("var/linux") %]' + - project: llvm + name: llvm + enable: '[% c("var/linux") %]' diff --git a/projects/llvm/config b/projects/llvm/config index daa779d..44252b4 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.8.0 +version: 3.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] new certutil location for firefox 60
by gk＠torproject.org 29 May '18

29 May '18

commit 66c38da52239e4d8c408f793ce6178f4131cf0cb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 8 20:12:18 2018 -0700 new certutil location for firefox 60 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index a9d5125..62186d1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -169,7 +169,7 @@ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ - cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil_certutil/certutil $MARTOOLS/ NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do

1 0

[tor-browser-build/master] Use a more recent version of gcc
by gk＠torproject.org 29 May '18

29 May '18

commit 77b52782bc81b00a7cd702fa50459cd56a0752e8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:06:40 2018 -0400 Use a more recent version of gcc --- projects/llvm/build | 7 +++++++ projects/llvm/config | 3 +++ 2 files changed, 10 insertions(+) diff --git a/projects/llvm/build b/projects/llvm/build index b018ca5..0958a4c 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -4,6 +4,13 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" +[% IF c("var/linux") %] + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), + hardened_gcc => 0 }) %] + ln -s gcc /var/tmp/dist/gcc/bin/cc +[% END -%] mkdir -p /var/tmp/build cd /var/tmp/build tar -xf $rootdir/[% c('input_files_by_name/llvm') %] diff --git a/projects/llvm/config b/projects/llvm/config index 44252b4..76fb2c0 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -8,6 +8,9 @@ var: input_files: - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz'

1 0

[tor-browser-build/master] disable selfrando
by gk＠torproject.org 29 May '18

29 May '18

commit d3339fe091e96daa6fb1918880a3eef82c068cad Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 3 22:51:38 2018 -0700 disable selfrando --- projects/firefox/build | 14 +++++++------- projects/firefox/config | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 7f74c9c..88bffc2 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 -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/firefox/config b/projects/firefox/config index 77ae405..0692ead 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

1 0

[tor-browser-build/master] Update NoScript to 10.1.8.1
by gk＠torproject.org 29 May '18

29 May '18

commit 4398ed2d7050c8539068d0e6e3ed4a3ca7ff93a7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 10:16:46 2018 -0400 Update NoScript to 10.1.8.1 Revert the download URL to Mozilla Add-ons (AMO) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index dec5648..62ed70c 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792 + sha256sum: 63a8a6a582af6e28084fae3bc72ebc5c5c2437467f8d445c8ea69d1061a3f7b2 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Update signing key for llvm
by gk＠torproject.org 29 May '18

29 May '18

commit 21b610639107c66bcd49cd219c26560261257aa4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue May 15 10:37:50 2018 -0400 Update signing key for llvm LLVM 3.9.1 is signed with 0x02119294 --- keyring/llvm.gpg | Bin 2507 -> 3335 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg index 9911f65..a94f435 100644 Binary files a/keyring/llvm.gpg and b/keyring/llvm.gpg differ

1 0

[tor-browser-build/master] Bug 26073: Migrate general.useragent.locale to intl.locale.requested
by gk＠torproject.org 29 May '18

29 May '18

commit 473342eefe9e19dde3a7548b16b29fcfc1f13855 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed May 23 12:12:01 2018 -0300 Bug 26073: Migrate general.useragent.locale to intl.locale.requested intl.locale.requested is the new way that Gecko handles locales. --- 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 c542818..4d1be00 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -194,7 +194,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir rm -rf chrome [% END %] # Set the locale of the bundle. -echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js +echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/000-tor-browser.js [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults @@ -325,7 +325,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ mkdir -p defaults/preferences cp $rootdir/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. - echo "pref(\"general.useragent.locale\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js + echo "pref(\"intl.locale.requested\", \"[% lang %]\");" >> defaults/preferences/000-tor-browser.js [% c("var/touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults

1 0