- tbb-commits - lists.torproject.org

[tor-browser-build/master] Update Firefox to 60.0.1esr (tor-browser-60.0.1esr-8.0-1)
by gk＠torproject.org 30 May '18

30 May '18

commit a4ed53bb203f03b76853f42efc0564a75cc7e562 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 28 09:44:02 2018 -0400 Update Firefox to 60.0.1esr (tor-browser-60.0.1esr-8.0-1) --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4458d48..c53ea7e 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_platform_version: 52.8.0 + firefox_platform_version: 60.0.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha

1 0

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

30 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 30 May '18

30 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

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

30 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] Bug 26165: make it possible to use gcc:var/setup without hardening wrapper
by gk＠torproject.org 29 May '18

29 May '18

commit 2b3a35530ece4f61f86786bc524d18448bc009eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 22 18:21:28 2018 +0200 Bug 26165: make it possible to use gcc:var/setup without hardening wrapper This allows us to use it to setup the gcc host compiler for the Windows build in projects/firefox/build. --- projects/firefox/build | 10 ++-------- projects/gcc/config | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..aa5fd73 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -2,16 +2,10 @@ [% c("var/setarch") -%] [% c("var/set_default_env") -%] [% IF c("var/windows") -%] - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gcc') %] - hgccdir=/var/tmp/dist/gcc + [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] # We need a link to our GCC, otherwise the system cc gets used which points to # /usr/bin/gcc. - ln -s gcc $hgccdir/bin/cc - # Make sure our GCC (as host compiler) get used. We do that before - # compiler setup so that mingw is first in the PATH. - export LD_LIBRARY_PATH=$hgccdir/lib64 - export PATH=$hgccdir/bin:$PATH + ln -s gcc /var/tmp/dist/gcc/bin/cc [% END -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/[% project %] diff --git a/projects/gcc/config b/projects/gcc/config index 1d74a0a..b13a738 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -18,23 +18,25 @@ var: export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 [% END -%] - # Config options for hardening-wrapper - export DEB_BUILD_HARDENING=1 - export DEB_BUILD_HARDENING_STACKPROTECTOR=1 - export DEB_BUILD_HARDENING_FORTIFY=1 - export DEB_BUILD_HARDENING_FORMAT=1 - export DEB_BUILD_HARDENING_PIE=1 + [% IF c("hardened_gcc") -%] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 - # Make sure we use the hardening wrapper - pushd /var/tmp/dist/gcc/bin - cp /usr/bin/hardened-cc ./ - mv gcc gcc.real - mv c++ c++.real - mv g++ g++.real - ln -sf hardened-cc gcc - ln -sf hardened-cc c++ - ln -sf hardened-cc g++ - popd + # Make sure we use the hardening wrapper + pushd /var/tmp/dist/gcc/bin + cp /usr/bin/hardened-cc ./ + mv gcc gcc.real + mv c++ c++.real + mv g++ g++.real + ln -sf hardened-cc gcc + ln -sf hardened-cc c++ + ln -sf hardened-cc g++ + popd + [% END -%] targets: windows: @@ -43,6 +45,8 @@ targets: arch_deps: - libc6-dev - zlib1g-dev + linux: + hardened_gcc: 1 linux-i686: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26165_v2'
by gk＠torproject.org 29 May '18

29 May '18

commit b1e6dd922f17555ad153cd9e05997ca41e50417a Merge: 8fd3d1d 2b3a355 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 29 07:48:51 2018 +0000 Merge remote-tracking branch 'boklm/bug_26165_v2' projects/firefox/build | 10 ++-------- projects/gcc/config | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-)

1 0

[torbutton/master] Bug 26129: Show our about:tor page on startup
by gk＠torproject.org 29 May '18

29 May '18

commit 07bdf93e5a4545d33e9204192eab60fd508a02da Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 28 09:24:37 2018 +0000 Bug 26129: Show our about:tor page on startup --- src/chrome/content/locale/non-localized.properties | 6 ++++++ src/defaults/preferences/preferences.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/locale/non-localized.properties b/src/chrome/content/locale/non-localized.properties new file mode 100644 index 0000000..dca7863 --- /dev/null +++ b/src/chrome/content/locale/non-localized.properties @@ -0,0 +1,6 @@ +# This file must be located in a subdirectory named "locale" so that +# about:config will display the correct value for browser.startup.homepage. +# See fetchPref() inside toolkit/components/viewconfig/content/config.js + +# Default home page +browser.startup.homepage=about:tor diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index f51c7db..f61cb89 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -53,7 +53,7 @@ pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); // Browser home page: -pref("browser.startup.homepage", "about:tor"); +pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Fix MAR generation bashism
by gk＠torproject.org 27 May '18

27 May '18

commit b135c59f65dba827b61379a4945251e148c43291 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 27 11:46:56 2018 +0000 Fix MAR generation bashism --- tools/update-packaging/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index 388d6b186367..79548dd4aa19 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -218,7 +218,7 @@ list_files() { continue; fi eval "${1}[$count]=\"$file\"" - (( count++ )) + count=$((count + 1)) done <"${tmpfile}" rm -f "${tmpfile}" }

1 0

[tor-browser-build/master] Bug 25862: move mingw helper scripts to firefox
by gk＠torproject.org 25 May '18

25 May '18

commit 8fd3d1dc7f27a96129328af98b69e18d161cef97 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 20 18:41:15 2018 +0200 Bug 25862: move mingw helper scripts to firefox Stop using mingw helper scripts everywhere except for the firefox build. At the same time as we move them to firefox, we simplify the helper scripts by using var/CFLAGS and var/LDFLAGS from rbm.conf instead of redefining the flags. We are also now building firefox with -fstack-protector-strong instead of -fstack-protector. --- projects/firefox/build | 23 +++++++++++++++++++++++ projects/mingw-w64/build | 19 ------------------- projects/mingw-w64/config | 2 +- projects/nsis/build | 2 -- rbm.conf | 2 +- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index a7441bd..c3536c6 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -17,6 +17,29 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build +[% IF c("var/windows") -%] + mingwdir=/var/tmp/dist/mingw-w64 + mkdir -p $mingwdir/helpers + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ [% c("var/LDFLAGS") %] [% c("var/CFLAGS") %] "$@" +EOF + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc [% c("var/LDFLAGS") %] [% c("var/CFLAGS") %] "$@" +EOF + + cat > $mingwdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' +#!/bin/sh +/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld [% c("var/LDFLAGS") %] "$@" +EOF + + chmod +x $mingwdir/helpers/* + export PATH="$mingwdir/helpers:$PATH" +[% END -%] + [% IF c("var/linux") %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 8ce5048..a142c38 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -55,25 +55,6 @@ mkdir -p $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libgcc/shlib/[% c("var/libgcc_dll") %] $distdir/gcclibs -mkdir -p $distdir/helpers - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-g++ << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" -EOF - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-gcc << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" -EOF - -cat > $distdir/helpers/[% c("arch") %]-w64-mingw32-ld << 'EOF' -#!/bin/sh -/var/tmp/dist/mingw-w64/bin/[% c("arch") %]-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section -lssp -L$gcclibs "$@" -EOF - -chmod +x $distdir/helpers/* - cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 01d0c37..fb9ef21 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -15,7 +15,7 @@ var: [% c("var/setarch") -%] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export PATH="/var/tmp/dist/mingw-w64/helpers:/var/tmp/dist/mingw-w64/bin:$PATH" + export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" export gcclibs=/var/tmp/dist/mingw-w64/gcclibs targets: windows-i686: diff --git a/projects/nsis/build b/projects/nsis/build index af19dd7..81ed4d4 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -1,8 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -# remove hardening wrappers -rm -Rf /var/tmp/dist/mingw-w64/helpers mkdir -p /var/tmp/dist mkdir -p /var/tmp/build tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 diff --git a/rbm.conf b/rbm.conf index bb53bcb..6adcd6f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -216,7 +216,7 @@ targets: container: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' + CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' flag_mwindows: '-mwindows' compiler: mingw-w64

1 0

[tor-browser-build/master] Bug 25975: Get a Rust cross-compiler for macOS
by gk＠torproject.org 25 May '18

25 May '18

commit e7f9f6f11e45d1ba15fbbb183ef1ae8b0c3b20c5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 25 06:53:05 2018 +0000 Bug 25975: Get a Rust cross-compiler for macOS --- projects/rust/build | 39 +++++++++++++++++++++++++++++++++++++-- projects/rust/config | 12 +++++++++--- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index e20df55..4c81ad8 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -10,10 +10,45 @@ cd /var/tmp/dist/rust-[% c('var/prev_version') %]-[% c('arch') %]-unknown-linux- ./install.sh --prefix=$distdir-rust-old export PATH="$distdir-rust-old/bin:$PATH" -[% IF c("var/linux") %] - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc') }) %] +[% IF ! c("var/windows") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] [% END -%] +[% IF c("var/osx") %] + # We need to clear `CC` and `LDFLAGS` as they are used for the host platform + # (i.e. Linux). + unset CC + unset LDFLAGS + # Target 10.6 as our toolchain does. Without this explicit declaration Bad + # Things will happen, as a lot of dependent code then assumes that the + # official macOS target, x86_64-apple-darwin, essentially means 10.4. + export MACOSX_DEPLOYMENT_TARGET=10.6 + # The Rust target for macOS is x86_64-apple-darwin, yet our toolchain is built + # for x86_64-apple-darwin10. We can't mix those targets as clang gets confused + # that way. Changing the Rust target to x86_64-apple-darwin10 would require a + # fair amount of patching, thus we create symlinks to prvoide Rust with the + # necessary tools while using our toolchain underneath, targeting 10.6. + cd $cctoolsdir + for f in `ls x86_64-apple-darwin10-*`; do + ln -s $f ${f//x86_64-apple-darwin10/x86_64-apple-darwin} + done + cd .. + ln -s x86_64-apple-darwin10 x86_64-apple-darwin + mkdir -p $distdir/helper + + # We need to adapt our CFLAGS and make sure our flags are passed down to all + # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort + # to a wrapper script. + cat > $distdir/helper/x86_64-apple-darwin-clang << 'EOF' +#!/bin/sh +BASEDIR=/var/tmp/dist/macosx-toolchain +$BASEDIR/cctools/bin/x86_64-apple-darwin-clang -target x86_64-apple-darwin -mlinker-version=136 -B $BASEDIR/cctools/bin -isysroot $BASEDIR/SDK/ -Wl,-syslibroot,$BASEDIR/SDK/ -Wl,-dead_strip -Wl,-pie "$@" +EOF + + chmod +x $distdir/helper/x86_64-apple-darwin-clang + export PATH=$distdir/helper:$PATH +[% END %] + cd $rootdir mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] diff --git a/projects/rust/config b/projects/rust/config index 49fc3ab..ae2290b 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -41,13 +41,19 @@ targets: # Rust pieces compiled. configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=[% c("arch") %]-unknown-linux-gnu --set=target.[% c("arch") %]-unknown-linux-gnu.cc=gcc + osx-x86_64: + var: + arch_deps: + - libssl-dev + - pkg-config + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-apple-darwin --set=target.x86_64-apple-darwin.cc=x86_64-apple-darwin-clang + input_files: - project: container-image - project: cmake name: cmake - - project: gcc - name: gcc - enable: '[% c("var/linux") %]' + - project: '[% c("var/compiler") %]' + name: '[% c("var/compiler") %]' - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' name: rust sig_ext: asc

1 0