- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.0] Bug 29081: Harden libwinpthread
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 2da5df458e3aa88a578210a1dc22a46387e39fba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 14 08:22:40 2019 +0000 Bug 29081: Harden libwinpthread --- projects/mingw-w64/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 1e25290..b2117c5 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -43,8 +43,8 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ - LDFLAGS="-Wl,--no-insert-timestamp" \ - --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 + LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install

1 0

[tor-browser-build/maint-8.0] Prepare -build2 for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 8487e3a1e498dcb5604d884d422ab999957877f8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:47:08 2019 +0000 Prepare -build2 for 8.0.7 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ projects/torbutton/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6a941a1..4d533ce 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,10 @@ Tor Browser 8.0.7 -- March 19 2019 * Update Firefox to 60.6.0esr * Update Tor to 0.3.5.8 * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Update Torbutton to 2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + * Windows + * Bug 29081: Harden libwinpthread * Linux * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy diff --git a/projects/torbutton/config b/projects/torbutton/config index c262950..0d66ae0 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.10 +version: 2.0.11 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 49166f2..3de1879 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.6 project_name: tor-browser

1 0

[torbutton/maint-2.0] Release preparations for 2.0.11
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 70d44df529402368ec599955a7eef033ecb9b0e0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:42:24 2019 +0000 Release preparations for 2.0.11 Version bump and CHANGELOG update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 2b0d2db0..b8d462ac 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + 2.0.10 * Bug 29035: Clean up our donation campaign and add newsletter sign-up link * Bug 27175: Add pref to allow users to persist custom noscript settings diff --git a/src/install.rdf b/src/install.rdf index c39fbfb8..1aa768b4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.10</em:version> + <em:version>2.0.11</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.0] Bug 29021: Tell NoScript it is running within Tor Browser
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 9ad542c9a851ee531ff75773c763a17758867bdb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 09:58:54 2019 +0000 Bug 29021: Tell NoScript it is running within Tor Browser --- src/modules/noscript-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 275f9dba..e164510b 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -78,6 +78,7 @@ let noscriptSettings = safetyLevel => ( "enforced": true, "autoAllowTop": false }, + "isTorBrowser": true, "tabId": -1 });

1 0

[torbutton/master] Bug 29021: Tell NoScript it is running within Tor Browser
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 3187dd92b4804c20fa08e225e629c3ec94eead03 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 09:58:54 2019 +0000 Bug 29021: Tell NoScript it is running within Tor Browser --- src/modules/noscript-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 895889c8..31ee98c2 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -78,6 +78,7 @@ let noscriptSettings = safetyLevel => ( "enforced": true, "autoAllowTop": false }, + "isTorBrowser": true, "tabId": -1 });

1 0

[tor-browser-build/master] Bug 29758: Build firefox debug symbols for linux-i686
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 4097d931d0fd5a0376ca57437c2cdd76adf62d57 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 13 12:25:19 2019 +0100 Bug 29758: Build firefox debug symbols for linux-i686 This reverts commit 7dc74d1652c560e193d1a4c3331efcfb08ee67b0. --- projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 3 ++- projects/tor-browser/build | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index f3d3c27..9bc025a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -259,7 +259,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir -[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container Browser/updater @@ -303,7 +303,7 @@ END; tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', }) %] -[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] [% c('tar', { tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index abc7b0e..ef952aa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -27,9 +27,10 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug -ac_add_options --disable-debug-symbols ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4661f7a..fc64ee1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -316,10 +316,8 @@ 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") -%] - cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz -[% END -%] [% IF c("var/linux") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%]

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit b68bceab5040b9d48808295add017b83b4788b7d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 08:17:25 2019 +0000 Release preparations for 8.0.7 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ rbm.conf | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c6d2a6a..9476cac 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: 60.5.1 + firefox_platform_version: 60.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 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 e1dbaa3..6a941a1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 8.0.7 -- March 19 2019 + * All platforms + * Update Firefox to 60.6.0esr + * Update Tor to 0.3.5.8 + * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Linux + * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy + Tor Browser 8.0.6 -- February 12 2019 * All platforms * Update Firefox to 60.5.1esr diff --git a/rbm.conf b/rbm.conf index 2983684..49166f2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.6' + torbrowser_version: '8.0.7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.5 + - 8.0.6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 5c5b8b1fa1940bf85f0fbbd10229ec97ae617d07 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 14 19:11:20 2019 +0100 Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy --- projects/fteproxy/build | 2 ++ projects/fteproxy/config | 2 ++ projects/fteproxy/fteproxy.wrapper | 10 ++++++++++ projects/libfte/build | 4 ++-- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 310c9a5..6b6a82f 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -22,6 +22,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs rm -Rf $pydir [% ELSE -%] + cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper + chmod +x $PTDIR/fteproxy.wrapper cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ [% END -%] diff --git a/projects/fteproxy/config b/projects/fteproxy/config index d58095e..06ea149 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -28,3 +28,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' enable: '[% c("var/windows") %]' + - filename: fteproxy.wrapper + enable: '[% c("var/linux") %]' diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper new file mode 100644 index 0000000..ca10086 --- /dev/null +++ b/projects/fteproxy/fteproxy.wrapper @@ -0,0 +1,10 @@ +#!/bin/sh +basedir=$(dirname "$0") +libdir=$(cd "$basedir"/fteproxy-lib ; pwd) +if test -z "$LD_LIBRARY_PATH" +then + export LD_LIBRARY_PATH="$libdir" +else + export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH" +fi +exec "$basedir/fteproxy.bin" "$@" diff --git a/projects/libfte/build b/projects/libfte/build index 4f3455f..5d62453 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -28,8 +28,8 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] export PYTHON=python2 make cp -ra fte $PTDIR/ - mkdir -p $distdir/TorBrowser/Tor - cp /var/tmp/dist/gmp/lib/libgmp.so.10 $distdir/TorBrowser/Tor/ + mkdir -p $PTDIR/fteproxy-lib + cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib [% END -%] cp -a {LICENSE,README.md} $DOCSDIR/ cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 12b8aad..d9988fb 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,5 +1,5 @@ ## fteproxy configuration -ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed +ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy

1 0

[tor-browser-build/master] Bug 26323: remove wheezy-i386 from debootstrap-image
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit 8d4bbf894e3b0c380d4240a61fdd83caeb0c030d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 12 21:30:46 2019 +0100 Bug 26323: remove wheezy-i386 from debootstrap-image --- projects/debootstrap-image/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 4dbbfef..9499eb8 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -57,14 +57,6 @@ targets: suite: wheezy arch: amd64 - wheezy-i386: - var: - # Missing apt packages for i386: - # http://deb.freexian.com/extended-lts/pool/main/a/apt/ - container: - suite: wheezy - arch: i386 - jessie-amd64: var: minimal_apt_version: 1.0.9.8.5

1 0

[tor-browser-build/master] Bug 26323: Build 32bit Linux bundles on 64bit Debian Wheezy
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit a76388bf16a6ff28f4427b47198c20c4aa8c113a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 1 14:09:53 2019 +0100 Bug 26323: Build 32bit Linux bundles on 64bit Debian Wheezy --- projects/binutils/build | 2 -- projects/firefox/config | 23 +++++++++++++++++++---- projects/firefox/mozconfig-linux-i686 | 2 ++ projects/gcc/config | 15 ++------------- projects/go-webrtc/config | 7 ++++++- projects/go/config | 3 +++ projects/libfte/build | 7 ++++++- projects/libfte/config | 21 ++++++++++++++++++++- projects/pycrypto/build | 4 ++-- projects/pycrypto/config | 20 +++++++++++++++++++- projects/rust/config | 14 ++++++++++---- projects/snowflake/config | 7 ++++++- projects/tor/build | 7 ++++--- projects/tor/config | 13 ++++++++----- projects/twisted/build | 12 ++++++++---- projects/twisted/config | 22 ++++++++++++++++++++-- projects/webrtc/config | 30 ++++++++++++++++++++++-------- rbm.conf | 16 ++++++---------- 18 files changed, 163 insertions(+), 62 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index ee22a1c..6c01d27 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -8,8 +8,6 @@ distdir=/var/tmp/dist/binutils export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 -[% END -%] -[% IF c("var/linux-x86_64") %] # The libstdc++ shipped by default is non-PIC which breaks the binutils build # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND # make sure it gets used before the non-PIC one would. diff --git a/projects/firefox/config b/projects/firefox/config index 2f40fe2..a56f3f9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -58,8 +58,9 @@ targets: arch_deps: - openjdk-8-jdk - linux: + linux-x86_64: var: + martools_filename: mar-tools-linux64.zip arch_deps: - libgtk2.0-dev - libgtk-3-dev @@ -76,13 +77,27 @@ targets: - libmpc2 # needed to remove RUNPATH added by selfrando (see #22242) - chrpath - linux-x86_64: - var: - martools_filename: mar-tools-linux64.zip linux-i686: var: martools_filename: mar-tools-linux32.zip + sort_deps: 0 + arch_deps: + - libgtk2.0-dev:i386 + - libgtk-3-dev:i386 + - libdbus-glib-1-dev:i386 + - libxt-dev:i386 + # To pass configure since ESR 31. + - libpulse-dev:i386 + # To pass configure since ESR 45. + - libgconf2-dev:i386 + # To pass configure since ESR 52 + - libx11-xcb-dev:i386 + # We built GCC but not the libmpc2, thus we need to install it + - libmpc2 + # needed to remove RUNPATH added by selfrando (see #22242) + - chrpath + - hardening-wrapper osx-x86_64: var: diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ee5082a..abc7b0e 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -11,7 +11,9 @@ export CXXFLAGS=-m32 export LDFLAGS=-m32 export XLDOPTS=-m32 export ASFLAGS=-m32 +export BINDGEN_CFLAGS='-m32 --gcc-toolchain=/var/tmp/dist/gcc' +ac_add_options --target=i686-linux-gnu ac_add_options --host=i686-linux-gnu ac_add_options --enable-optimize diff --git a/projects/gcc/config b/projects/gcc/config index b13a738..88dabdd 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -12,11 +12,7 @@ var: mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export PATH="/var/tmp/dist/gcc/bin:$PATH" - [% IF c("var/osname") == "linux-i686" -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib - [% ELSE -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 - [% END -%] + export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64:/var/tmp/dist/gcc/lib32 [% IF c("hardened_gcc") -%] # Config options for hardening-wrapper @@ -47,19 +43,12 @@ targets: - zlib1g-dev linux: hardened_gcc: 1 - linux-i686: - var: - configure_opt: --enable-multilib --enable-languages=c,c++ --with-system-zlib - arch_deps: - - hardening-wrapper - - libc6-dev - - zlib1g-dev - linux-x86_64: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 arch_deps: - hardening-wrapper - libc6-dev-i386 + input_files: - project: container-image - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.xz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 8136122..5dbee5f 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -35,7 +35,12 @@ var: [% END -%] targets: - linux: + linux-i686: + var: + arch_deps: + - pkg-config + - libx11-dev:i386 + linux-x86_64: var: arch_deps: - pkg-config diff --git a/projects/go/config b/projects/go/config index be9f84d..ab0a6d3 100644 --- a/projects/go/config +++ b/projects/go/config @@ -15,6 +15,9 @@ var: export GOARCH=[% c("var/GOARCH") %] export GOPATH=/var/tmp/dist/gopath export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" + [% IF c("var/linux-i686") -%] + export CGO_ENABLED=1 + [% END -%] # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. diff --git a/projects/libfte/build b/projects/libfte/build index 5d62453..3eaeadb 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -12,6 +12,11 @@ tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/gmp') %] ln -s /var/tmp/dist/gmp thirdparty/gmp mkdir -p $distdir tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] +[% IF c("var/linux-i686") -%] + export CFLAGS=-m32 + export CXXFLAGS=-m32 + export LDFLAGS=-m32 +[% END -%] [% IF c("var/windows") -%] patch -p1 < $rootdir/bug20302.patch pydir=$distdir/python @@ -25,7 +30,7 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] $PYTHON setup.py install --prefix=$(wine winepath -w "$pydir") $PYTHON setup.py install [% ELSE -%] - export PYTHON=python2 + export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] make cp -ra fte $PTDIR/ mkdir -p $PTDIR/fteproxy-lib diff --git a/projects/libfte/config b/projects/libfte/config index 2079040..415544f 100644 --- a/projects/libfte/config +++ b/projects/libfte/config @@ -9,11 +9,30 @@ var: use_container: 1 targets: - linux: + linux-x86_64: var: arch_deps: - python-setuptools - python-dev + + linux-i686: + var: + pre_pkginst: | + dpkg --add-architecture i386 + # python2.7:i386 cannot be installed because the mime-support package + # in wheezy is not marked "Multi-Arch: foreign": + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 + # We fix this by installing the jessie mime-support package. + wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… + echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c + dpkg -i mime-support_3.58_all.deb + post_pkginst: | + export DEBIAN_FRONTEND=noninteractive + apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 + apt-get install -q -y hardening-wrapper + apt-get download -q -y python-setuptools python-pkg-resources + dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb + windows-i686: var: compiler: winpython diff --git a/projects/pycrypto/build b/projects/pycrypto/build index 084939f..ecb9bb8 100644 --- a/projects/pycrypto/build +++ b/projects/pycrypto/build @@ -29,9 +29,9 @@ cd /var/tmp/build/[% project %]-[% c('version') %] $PYTHON setup.py build_ext -c mingw32 $PYTHON setup.py install --prefix=$(wine winepath -w $pydir) [% ELSE -%] - export PYTHON=python2 + export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] ./configure --build=i686-linux-gnu [% c("var/configure_opt") %] - python2 setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ [% END -%] cd $distdir diff --git a/projects/pycrypto/config b/projects/pycrypto/config index c55844b..879484f 100644 --- a/projects/pycrypto/config +++ b/projects/pycrypto/config @@ -6,12 +6,30 @@ var: use_container: 1 targets: - linux: + linux-x86_64: var: arch_deps: - python-dev - python-setuptools + linux-i686: + var: + pre_pkginst: | + dpkg --add-architecture i386 + # python2.7:i386 cannot be installed because the mime-support package + # in wheezy is not marked "Multi-Arch: foreign": + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 + # We fix this by installing the jessie mime-support package. + wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… + echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c + dpkg -i mime-support_3.58_all.deb + post_pkginst: | + export DEBIAN_FRONTEND=noninteractive + apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 + apt-get install -q -y hardening-wrapper + apt-get download -q -y python-setuptools python-pkg-resources + dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb + windows-i686: var: compiler: winpython diff --git a/projects/rust/config b/projects/rust/config index 3d78ad3..0c3b280 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: '[% c("input_file_var/rust_version") %]' # those values can be changed from the input_files section of other @@ -32,10 +32,16 @@ targets: linux: var: - arch_deps: - - hardening-wrapper + rust_arch: x86_64 + deps: + - libc6-dev-i386 + - lib32stdc++6 + - build-essential + - python + - automake - libssl-dev - pkg-config + - hardening-wrapper # We use # `--enable-local-rust` to avoid downloading the required compiler during # build time @@ -62,7 +68,7 @@ targets: # version mismatch. We avoid that with this configure option. We need to # build our own GCC in the first place as 4.7.2 is too old to get all the # 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 + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc osx-x86_64: var: diff --git a/projects/snowflake/config b/projects/snowflake/config index c9a84b3..7043c12 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -9,7 +9,12 @@ var: use_container: 1 targets: - linux: + linux-i686: + var: + arch_deps: + - pkg-config + - libx11-dev:i386 + linux-x86_64: var: arch_deps: - pkg-config diff --git a/projects/tor/build b/projects/tor/build index d6018d9..0860b6f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -44,6 +44,9 @@ openssldir=/var/tmp/dist/openssl $gcclibs/*.dll $mingwlibs/libwinpthread-1.dll $distdir/Tor/ [% END %] +[% IF c("var/linux-i686") && c("var/nightly") -%] + export TOR_RUST_TARGET=i686-unknown-linux-gnu +[% END -%] [% IF c("var/linux") %] mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" @@ -64,9 +67,7 @@ openssldir=/var/tmp/dist/openssl chmod 700 "$distdir"/Tor/*.so* chmod 700 "$distdir"/Tor/libstdc++/*.so* # This is needed to make RPATH unavailable. See bug 9150. - export LD_LIBRARY_PATH="$distdir/Tor/" - # Add libstdc++ to LD_LIBRARY_PATH to avoid rust link issue (bug 27101) - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$distdir/Tor/libstdc++/" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$distdir/Tor/" [% END %] [% IF c("var/osx") %] diff --git a/projects/tor/config b/projects/tor/config index ffdb200..9eb4c16 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -22,18 +22,21 @@ targets: git_hash: master tag_gpg_id: 0 - linux: + linux-i686: var: + libdir: lib32 + sort_deps: 0 arch_deps: - libtool - - zlib1g-dev + - zlib1g-dev:i386 - hardening-wrapper - linux-i686: - var: - libdir: lib linux-x86_64: var: libdir: lib64 + arch_deps: + - libtool + - zlib1g-dev + - hardening-wrapper osx-x86_64: var: arch_deps: diff --git a/projects/twisted/build b/projects/twisted/build index 077143c..9aebe24 100644 --- a/projects/twisted/build +++ b/projects/twisted/build @@ -1,15 +1,19 @@ #!/bin/bash [% c("var/set_default_env") -%] distdir="/var/tmp/dist/[% project %]" -[% IF c("var/windows") -%] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% ELSE -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% IF ! c("var/windows") -%] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR [% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf $rootdir/Twisted-[% c('version') %].tar.bz2 cd /var/tmp/build/Twisted-[% c('version') %] +[% IF c("var/linux-i686") -%] + export CFLAGS=-m32 + export CXXFLAGS=-m32 + export LDFLAGS=-m32 +[% END -%] [% IF c("var/windows") -%] pydir="$distdir/python" export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" @@ -27,7 +31,7 @@ cd /var/tmp/build/Twisted-[% c('version') %] export PYTHONPATH="$(wine winepath -w $pydir)\\Lib\\site-packages" LD_PRELOAD= $PYTHON setup.py install --single-version-externally-managed --record /dev/null --prefix=$(wine winepath -w $pydir) [% ELSE -%] - export PYTHON=python2 + export PYTHON=python2[% IF c("var/linux-i686") %].7[% END %] $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ [% END -%] diff --git a/projects/twisted/config b/projects/twisted/config index 4dbbb26..d9a7eeb 100644 --- a/projects/twisted/config +++ b/projects/twisted/config @@ -7,11 +7,30 @@ var: use_container: 1 targets: - linux: + linux-x86_64: var: arch_deps: - python-setuptools - python-dev + + linux-i686: + var: + pre_pkginst: | + dpkg --add-architecture i386 + # python2.7:i386 cannot be installed because the mime-support package + # in wheezy is not marked "Multi-Arch: foreign": + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695357 + # We fix this by installing the jessie mime-support package. + wget http://ftp.debian.org/debian/pool/main/m/mime-support/mime-support_3.58_all… + echo 'c05ebe8f38da4ff19d028c9f4680414149e5c7a746de13bc9db0a562796ed213 mime-support_3.58_all.deb' | sha256sum -c + dpkg -i mime-support_3.58_all.deb + post_pkginst: | + export DEBIAN_FRONTEND=noninteractive + apt-get install -q -y libpython2.7:i386 python2.7:i386 python2.7-minimal:i386 python2.7-dev:i386 + apt-get install -q -y hardening-wrapper + apt-get download -q -y python-setuptools python-pkg-resources + dpkg -i --force-depends python-setuptools*.deb python-pkg-resources*.deb + windows-i686: var: compiler: winpython @@ -26,4 +45,3 @@ input_files: sha256sum: 095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/windows") %]' diff --git a/projects/webrtc/config b/projects/webrtc/config index 37b4615..2846765 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -28,6 +28,28 @@ targets: var: webrtc: os: linux + linux-i686: + var: + webrtc: + lib_path: lib/libwebrtc-linux-386-magic.a + sort_deps: 0 + arch_deps: + - lib32asound2-dev + - lib64expat1 + - libexpat1-dev:i386 + - libglib2.0-dev:i386 + - libgtk2.0-dev:i386 + - libgtk-3-dev:i386 + - libudev-dev:i386 + - libx11-dev:i386 + - libxext-dev:i386 + - libxrandr-dev:i386 + - pkg-config + - hardening-wrapper + linux-x86_64: + var: + webrtc: + lib_path: lib/libwebrtc-linux-amd64-magic.a arch_deps: - libasound2-dev - libexpat1-dev @@ -39,14 +61,6 @@ targets: - libxext-dev - libxrandr-dev - pkg-config - linux-i686: - var: - webrtc: - lib_path: lib/libwebrtc-linux-386-magic.a - linux-x86_64: - var: - webrtc: - lib_path: lib/libwebrtc-linux-amd64-magic.a osx-x86_64: var: webrtc: diff --git a/rbm.conf b/rbm.conf index df31741..d39316c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -215,21 +215,13 @@ targets: var: linux-x86_64: 1 osname: linux-x86_64 - container: - arch: amd64 linux-i686: arch: i686 var: linux-i686: 1 osname: linux-i686 - container: - arch: i386 - setarch: | - if test -z "$RBM_SETARCH" - then - export RBM_SETARCH=1 - exec setarch i686 ./build - fi + configure_opt_i686: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' + configure_opt: '[% c("var/configure_opt_i686") %]' linux: var: linux: 1 @@ -241,7 +233,11 @@ targets: selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]' container: suite: wheezy + arch: amd64 + pre_pkginst: dpkg --add-architecture i386 deps: + - libc6-dev-i386 + - lib32stdc++6 - build-essential - python - bison

1 0

[tor-browser-build/master] Bug 26323: Set BINDGEN_CFLAGS in mozconfig-linux-x86_64
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit 84e07663467ea304503f6a2e93d7d5930ad78cde Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 26 18:00:28 2019 +0100 Bug 26323: Set BINDGEN_CFLAGS in mozconfig-linux-x86_64 Make sure we use the includes from our build of gcc instead of the ones from /usr/lib/gcc: https://trac.torproject.org/projects/tor/ticket/26323#comment:7 --- projects/firefox/mozconfig-linux-x86_64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 917e32c..75fba50 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -6,6 +6,8 @@ mk_add_options MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 +export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' + ac_add_options --enable-optimize #ac_add_options --disable-optimize ac_add_options --enable-official-branding

1 0

[tor-browser-build/master] Bug 25876: Generate source tarballs during build
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit 1b79a12ecc1b918c379c29b58954d2680672e201 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 25 15:10:30 2018 +0200 Bug 25876: Generate source tarballs during build We now generate source tarballs for firefox, torbutton and tor-launcher during stable, alpha and nightly builds. We don't generate them with |make testbuild|, but they can be generated with |make testbuild-src|. --- Makefile | 15 +++++++++++++++ README.MAKEFILE | 11 ++++++++--- projects/firefox/config | 12 ++++++++++++ projects/release/build | 6 ++++++ projects/release/config | 32 ++++++++++++++++++++++++++++++++ projects/tor-launcher/config | 8 ++++++++ projects/torbutton/config | 8 ++++++++ rbm.conf | 9 +++++++++ 8 files changed, 98 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d419422..285b49d 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,9 @@ release-windows-x86_64: submodule-update release-osx-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-osx-x86_64 +release-src: submodule-update + $(rbm) build release --target release --target torbrowser-src + alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all @@ -56,6 +59,9 @@ alpha-windows-x86_64: submodule-update alpha-osx-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-osx-x86_64 +alpha-src: submodule-update + $(rbm) build release --target alpha --target torbrowser-src + nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all @@ -83,6 +89,9 @@ nightly-windows-x86_64: submodule-update nightly-osx-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-osx-x86_64 +nightly-src: submodule-update + $(rbm) build release --target nightly --target torbrowser-src + alpha_nightly: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-all @@ -107,6 +116,9 @@ alpha_nightly-windows-x86_64: submodule-update alpha_nightly-osx-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 +alpha_nightly-src: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-src + testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all @@ -134,6 +146,9 @@ testbuild-windows-i686: submodule-update testbuild-osx-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-osx-x86_64 +testbuild-src: submodule-update + $(rbm) build release --target testbuild --target torbrowser-src-testbuild + signtag-release: submodule-update $(rbm) build release --step signtag --target release diff --git a/README.MAKEFILE b/README.MAKEFILE index 1514780..7351c5f 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -46,14 +46,19 @@ The same as alpha_nightly, for the selected platform only. testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US -locale is created, without mar files. By default it is based on the -alpha channel, but you can change that by editing rbm.local.conf. -The resulting build can be found in directory testbuild. +locale is created, without mar files, and without the source tarballs. +By default it is based on the alpha channel, but you can change that by +editing rbm.local.conf. The resulting build can be found in directory +testbuild. {release,alpha,nightly,testbuild}-linux-x86_64-debug ---------------------------------------------------- Create a debug build for Linux x86_64 with debug features such as ASan. +{release,alpha,nightly,testbuild}-src +------------------------------------- +Create source tarballs for firefox, torbutton and tor-launcher. + fetch ----- Fetch new commits from all components. This is useful when you want to diff --git a/projects/firefox/config b/projects/firefox/config index 4d68969..2f40fe2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -28,6 +28,18 @@ var: # used by projects/firefox-locale-bundle l10n-changesets.json: '[% exec("cat mobile/locales/l10n-changesets.json") %]' +steps: + src-tarballs: + filename: 'src-[% project %]-[% c("version") %].tar.xz' + version: '[% c("git_hash") %]' + input_files: [] + var: + container: + use_container: 0 + targets: + nightly: + version: '[% c("abbrev") %]' + targets: release: var: diff --git a/projects/release/build b/projects/release/build index ca7b26d..af9d673 100644 --- a/projects/release/build +++ b/projects/release/build @@ -27,6 +27,12 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-src") -%] + mv [% c('input_files_by_name/src-firefox') %] \ + [% c('input_files_by_name/src-torbutton') %] \ + [% c('input_files_by_name/src-tor-launcher') %] \ + "$destdir"/ +[% END -%] cd "$destdir" cat > .htaccess <<EOF RewriteEngine On diff --git a/projects/release/config b/projects/release/config index 1a742ac..52a416a 100644 --- a/projects/release/config +++ b/projects/release/config @@ -16,6 +16,7 @@ targets: - torbrowser-osx-x86_64 - torbrowser-android-armv7 - torbrowser-android-x86 + - torbrowser-src torbrowser-android-armv7: var: torbrowser-android-armv7: 1 @@ -41,6 +42,12 @@ targets: torbrowser-osx-x86_64: var: torbrowser-osx-x86_64: 1 + torbrowser-src: + var: + torbrowser-src: '[% ! c("var/testbuild") %]' + torbrowser-src-testbuild: + var: + torbrowser-src: 1 notarget: - release @@ -74,6 +81,7 @@ targets: testbuild: output_dir: 'testbuild' var: + testbuild: 1 build_target: torbrowser-testbuild publish_dir: '' @@ -153,6 +161,30 @@ input_files: - torbrowser-windows-x86_64 - expert-bundle + - name: src-firefox + project: firefox + enable: '[% c("var/torbrowser-src") %]' + pkg_type: src-tarballs + target: + - '[% c("var/build_target") %]' + - torbrowser-src + + - name: src-torbutton + project: torbutton + enable: '[% c("var/torbrowser-src") %]' + pkg_type: src-tarballs + target: + - '[% c("var/build_target") %]' + - torbrowser-src + + - name: src-tor-launcher + project: tor-launcher + enable: '[% c("var/torbrowser-src") %]' + pkg_type: src-tarballs + target: + - '[% c("var/build_target") %]' + - torbrowser-src + steps: signtag: build_log: '-' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 4f2d2b7..8087727 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -11,6 +11,14 @@ var: input_files: - project: container-image +steps: + src-tarballs: + filename: 'src-[% project %]-[% c("version") %].tar.xz' + input_files: [] + var: + container: + use_container: 0 + targets: nightly: version: '[% c("abbrev") %]' diff --git a/projects/torbutton/config b/projects/torbutton/config index 5d42fc5..369d7e4 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -11,6 +11,14 @@ var: input_files: - project: container-image +steps: + src-tarballs: + filename: 'src-[% project %]-[% c("version") %].tar.xz' + input_files: [] + var: + container: + use_container: 0 + targets: nightly: version: '[% c("abbrev") %]' diff --git a/rbm.conf b/rbm.conf index 1b82e60..df31741 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,6 +7,15 @@ build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %] pkg_type: build +steps: + src-tarballs: + compress_tar: xz + src-tarballs: | + #!/bin/bash + set -e + mkdir -p '[% dest_dir %]' + mv -vf '[% project %]-[% c("version") %].tar.xz' '[% dest_dir %]/[% c("filename") %]' + # buildconf contains build options that the user can change in rbm.local.conf # 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.

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25876_v9'
by gk＠torproject.org 12 Mar '19

12 Mar '19

commit f44c5d73cfe8d47a6394939e9c237cfbd45a0c5f Merge: 93a114b 1b79a12 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 12 14:05:21 2019 +0000 Merge remote-tracking branch 'boklm/bug_25876_v9' Makefile | 15 +++++++++++++++ README.MAKEFILE | 11 ++++++++--- projects/firefox/config | 12 ++++++++++++ projects/release/build | 6 ++++++ projects/release/config | 32 ++++++++++++++++++++++++++++++++ projects/tor-launcher/config | 8 ++++++++ projects/torbutton/config | 8 ++++++++ rbm.conf | 9 +++++++++ 8 files changed, 98 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/master] Update testsuite_git_commit for bug 29667 and bug 29675
by boklm＠torproject.org 11 Mar '19

11 Mar '19

commit 93a114bcb49f72c7131344cc67e47ce90bd81c77 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 11 18:42:30 2019 +0100 Update testsuite_git_commit for bug 29667 and bug 29675 --- 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 26820a9..2a4cc6e 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ 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/user/boklm/tor-browser-bundle-testsuite.git -testsuite_git_commit: 7b1e23e06761c7336795d2b2a6fa40f5914b0aef +testsuite_git_commit: 9283635ace22c3a7f629b5bc60e8fec0af4dc13c nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-build/master] Pick up fix for bug 29572
by gk＠torproject.org 11 Mar '19

11 Mar '19

commit 5a4f0853b634daa93e099ad613257f069635bb93 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 11 10:53:59 2019 +0000 Pick up fix for bug 29572 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index c61e694..70d1ff3 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit c61e6940a1824462648064898be0759dd1600414 +Subproject commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a

1 0

[rbm/master] Bug 29572: Update the test before running git checkout --detach
by gk＠torproject.org 11 Mar '19

11 Mar '19

commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 11 11:26:48 2019 +0100 Bug 29572: Update the test before running git checkout --detach The reason we don't run |git checkout --detach| in all cases is that it fails when we cloned a repository without a master branch. To avoid running it in this case, we were checking if HEAD is pointing to a branch which has a corresponding file in the .git directory. However it seems there are other cases where HEAD is pointing to a branch which does not have a corresponding file in the .git directory. Instead we now check that |git rev-parse --verify HEAD| does not return an error, in which case we assume that |git checkout --detach| will not produce an error too. --- lib/RBM.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 3ef20ae..1400700 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -397,9 +397,8 @@ sub git_clone_fetch_chdir { if (git_need_fetch($project, $options)) { system('git', 'remote', 'set-url', 'origin', $git_url) == 0 || exit_error "Error setting git remote"; - my ($ref, undef, $success) = capture_exec('git', 'symbolic-ref', 'HEAD'); - chomp $ref; - if ($success && -e ".git/$ref") { + my (undef, undef, $success) = capture_exec('git', 'rev-parse', '--verify', 'HEAD'); + if ($success) { system('git', 'checkout', '-q', '--detach') == 0 || exit_error "Error running git checkout --detach"; }

1 0

[tor-launcher/master] Bug 22402: Improve "For assistance" link.
by gk＠torproject.org 07 Mar '19

07 Mar '19

commit e4c4622a8e443a36480dacae3eee18d55a55a7ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 7 09:34:00 2019 -0500 Bug 22402: Improve "For assistance" link. Instead of pointing users to the Tor Project contact page, point them to support.torproject.org/#connectingtotor. --- src/chrome/content/network-settings.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 1599c28..ef7571e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2019, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -35,9 +35,7 @@ const kPrefBridgeDBType = "extensions.torlauncher.bridgedb_bridge_type"; // extensions.torlauncher.bridgedb_bridge.1, and so on. const kPrefBranchBridgeDBBridge = "extensions.torlauncher.bridgedb_bridge."; -// As of April 2016, no one is responding to help desk email. Hopefully this will change soon. -//const kSupportAddr = "help(a)rt.torproject.org"; -const kSupportURL = "torproject.org/about/contact.html#support"; +const kSupportURL = "support.torproject.org/#connectingtotor"; const kTorProcessReadyTopic = "TorProcessIsReady"; const kTorProcessExitedTopic = "TorProcessExited";

1 0

[tor-browser-build/master] Fold in stable Changelog
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit f160a7e0c63758e6e90ba3ece59c7130a603f2e0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:41:09 2019 +0000 Fold in stable Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 83d0f4b..a68ff69 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,6 +11,15 @@ Tor Browser 8.5a8 -- February 13 2019 * Linux * Bug 29183: Use linux-x86_64 langpacks on linux-x86_64 +Tor Browser 8.0.6 -- February 12 2019 + * All platforms + * Update Firefox to 60.5.1esr + * Update HTTPS Everywhere to 2019.1.31 + * Bug 29378: Remove 83.212.101.3 from default bridges + * Build System + * All Platforms + * Bug 29235: Build our own version of python3.6 for HTTPS Everywhere + Tor Browser 8.5a7 -- January 29 2019 * All Platforms * Update Firefox to 60.5.0esr

1 0

[tor-browser-build/maint-8.0] Bump tor version to 0.3.5.8
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit fbd366f2f0a0b1b58642cf5f860d98ba768ebe78 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:32:59 2019 +0000 Bump tor version to 0.3.5.8 Fixes #29660 and similar bugs where tor mishandled empty SOCKS auth. See #29175 for more details. --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index f5e2515..9301818 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.5.7 +version: 0.3.5.8 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser-build/master] Bump tor version to 0.4.0.2-alpha
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit 864a167a1cdef48560b52c5f3ba559f343eddae0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 6 07:30:53 2019 +0000 Bump tor version to 0.4.0.2-alpha Fixes #29660 and similar bugs where tor mishandled empty SOCKS auth. See #29175 for more details. --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index af90885..ffdb200 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.4.0.1-alpha +version: 0.4.0.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 29445: Enable support for enterprise policies
by gk＠torproject.org 06 Mar '19

06 Mar '19

commit 7ce43156780e3b91f35481cce1eb4afed56a4b0f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 5 13:58:52 2019 -0500 Bug 29445: Enable support for enterprise policies Enable enterprise policies for all update channels, including "release" (which Tor Browser uses instead of "esr"). --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 7c864f5fbc43..1380c0c228a4 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = { } if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) { - log.error(`Policy ${policyName} is only allowed on ESR`); + log.error(`Enterprise policy ${policyName} is not allowed`); continue; } @@ -314,10 +314,6 @@ let DisallowedFeatures = {}; * Checks whether the policies marked as enterprise_only in the * schema are allowed to run on this browser. * - * This is meant to only allow policies to run on ESR, but in practice - * we allow it to run on channels different than release, to allow - * these policies to be tested on pre-release channels. - * * @returns {Bool} Whether the policy can run. */ function areEnterpriseOnlyPoliciesAllowed() { @@ -328,12 +324,7 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; } - if (AppConstants.MOZ_UPDATE_CHANNEL != "release" || - Cu.isInAutomation) { - return true; - } - - return false; + return true; } /*

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_27210_v3'
by boklm＠torproject.org 05 Mar '19

05 Mar '19

commit ba9064e4b5a369b9c70201e335ef706db25f2815 Merge: 799ccf0 f4b5f7b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 5 21:45:55 2019 +0100 Merge remote-tracking branch 'gk/bug_27210_v3' Conflicts: projects/orbot/build Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++++++++ projects/orbot/config | 2 +- projects/release/build | 3 +++ projects/release/config | 11 ++++++++ projects/rust/build | 5 +++- projects/rust/config | 12 ++++++--- projects/tor-browser/config | 2 +- rbm.conf | 15 ++++++++++- 11 files changed, 115 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Bug 27210: Add support for x86 on Android
by boklm＠torproject.org 05 Mar '19

05 Mar '19

commit f4b5f7b3b38679456d97b71904b0c59d4e4600d9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 8 10:49:13 2019 +0000 Bug 27210: Add support for x86 on Android --- Makefile | 15 +++++++++++ projects/android-toolchain/build | 10 +++++-- projects/firefox/config | 2 +- projects/firefox/mozconfig-android-x86 | 48 ++++++++++++++++++++++++++++++++++ projects/orbot/build | 7 ++++- projects/orbot/config | 2 +- projects/release/build | 3 +++ projects/release/config | 11 ++++++++ projects/rust/build | 5 +++- projects/rust/config | 12 ++++++--- projects/tor-browser/config | 2 +- rbm.conf | 15 ++++++++++- 12 files changed, 121 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 8ec5d0c..d419422 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ release: submodule-update release-android-armv7: submodule-update $(rbm) build release --target release --target torbrowser-android-armv7 +release-android-x86: submodule-update + $(rbm) build release --target release --target torbrowser-android-x86 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -32,6 +35,9 @@ alpha: submodule-update alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target torbrowser-android-armv7 +alpha-android-x86: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-x86 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -56,6 +62,9 @@ nightly: submodule-update nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target torbrowser-android-armv7 +nightly-android-x86: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-x86 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -80,6 +89,9 @@ alpha_nightly: submodule-update alpha_nightly-android-armv7: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 +alpha_nightly-android-x86: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -101,6 +113,9 @@ testbuild: submodule-update testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-armv7 +testbuild-android-x86: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-x86 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a9d3139..ff899d2 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -17,8 +17,14 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -# API 16 is the minimum we currently support for Tor Browser on Android -./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm + +# The architectures we support +archs="arm x86" +for arch in $archs; do + # API 16 is the minimum we currently support for Tor Browser on Android for + # 32bit. + ./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch +done # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/config b/projects/firefox/config index 68f2326..4d68969 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -41,7 +41,7 @@ targets: torbrowser_update_channel: default branding_directory: browser/branding/nightly - android-armv7: + android: var: arch_deps: - openjdk-8-jdk diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 new file mode 100644 index 0000000..1fe0b93 --- /dev/null +++ b/projects/firefox/mozconfig-android-x86 @@ -0,0 +1,48 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=i386-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle +ac_add_options --with-android-version=16 +ac_add_options --with-branding=mobile/android/branding/torbrowser + +# Android NDK does not contain llvm-config so set clang path in options +ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/bin/clang + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme diff --git a/projects/orbot/build b/projects/orbot/build index 4e222a9..22667b5 100644 --- a/projects/orbot/build +++ b/projects/orbot/build @@ -23,7 +23,12 @@ done # Build OrbotService Native Libraries pushd /var/tmp/build/[% project %]-[% c('version') %]/orbotservice/src/main /var/tmp/dist/android-toolchain/android-ndk/ndk-build -mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so +[% IF c("var/android-armv7") %] + arch=armeabi-v7a +[% ELSE %] + arch=x86 +[% END %] +mv libs/$arch/pdnsd libs/$arch/pdnsd.so popd # Build Android Libraries and Apps diff --git a/projects/orbot/config b/projects/orbot/config index 1bedbdb..5ad5bfc 100644 --- a/projects/orbot/config +++ b/projects/orbot/config @@ -24,7 +24,7 @@ var: gradle_dependencies_version: 1 targets: - android-armv7: + android: var: arch_deps: - openjdk-8-jdk diff --git a/projects/release/build b/projects/release/build index cf190a6..ca7b26d 100644 --- a/projects/release/build +++ b/projects/release/build @@ -7,6 +7,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-x86") -%] + mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ +[% END -%] [% 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"/ diff --git a/projects/release/config b/projects/release/config index 65e297d..1a742ac 100644 --- a/projects/release/config +++ b/projects/release/config @@ -15,9 +15,13 @@ targets: - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 - torbrowser-android-armv7 + - torbrowser-android-x86 torbrowser-android-armv7: var: torbrowser-android-armv7: 1 + torbrowser-android-x86: + var: + torbrowser-android-x86: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -91,6 +95,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-armv7 + - name: android-x86 + project: tor-browser + enable: '[% c("var/torbrowser-android-x86") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-x86 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]' diff --git a/projects/rust/build b/projects/rust/build index 3c1d130..0df84a1 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -67,8 +67,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src [% END %] [% IF c("var/android") %] - patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch patch -p1 < $rootdir/replace_pagesize_in_mmap.patch + # The additional Rust patch is not necessary for x86. + [% IF c("var/android-armv7") %] + patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + [% END %] [% END %] mkdir build diff --git a/projects/rust/config b/projects/rust/config index 48912ab..3d78ad3 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -15,15 +15,21 @@ var: use_container: 1 targets: - android-armv7: + android: var: rust_arch: x86_64 arch_deps: - libssl-dev - pkg-config - zlib1g-dev + android-armv7: + var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc + android-x86: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + linux: var: arch_deps: @@ -92,7 +98,7 @@ input_files: enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]' - filename: unwind_128.patch enable: '[% c("input_file_var/unwind_128") %]' - - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch - enable: '[% c("var/android") %]' - filename: replace_pagesize_in_mmap.patch enable: '[% c("var/android") %]' + - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + enable: '[% c("var/android-armv7") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c4f25ff..9b26bc8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -41,7 +41,7 @@ targets: windows-x86_64: var: mar_osname: win64 - android-armv7: + android: build: '[% INCLUDE build.android %]' var: arch_deps: diff --git a/rbm.conf b/rbm.conf index 03c105e..1b82e60 100644 --- a/rbm.conf +++ b/rbm.conf @@ -159,11 +159,23 @@ targets: torbrowser-android-armv7: - android-armv7 + - android android-armv7: arch: armv7 var: - android: 1 + android-armv7: 1 osname: android-armv7 + torbrowser-android-x86: + - android-x86 + - android + android-x86: + arch: x86 + var: + android-x86: 1 + osname: android-x86 + android: + var: + android: 1 compiler: android-toolchain snowflake: 0 fteproxy: 0 @@ -178,6 +190,7 @@ targets: - libtool - zip - unzip + torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 27486 Avoid about:blank tabs when opening onboarding pages.
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit 3a69f6697799d7c6d0ed408df8aa28239b430556 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Feb 13 11:32:13 2019 -0500 Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". --- browser/extensions/onboarding/bootstrap.js | 17 +++++++------- .../extensions/onboarding/content/onboarding.js | 26 +++++++++++++--------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index 0762249ba1e9..a90bef0faaa2 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -91,16 +91,17 @@ function setPrefs(prefs) { }); } -function openTorCircuitDisplayPage() { - let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; - const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo +function openTorTab(aURL, aFrameScript) { let win = Services.wm.getMostRecentWindow('navigator:browser'); if (win) { let tabBrowser = win.gBrowser; - let tab = tabBrowser.addTab(kOnionURL); + let tab = tabBrowser.addTab(aURL); tabBrowser.selectedTab = tab; - let b = tabBrowser.getBrowserForTab(tab); - b.messageManager.loadFrameScript(kFrameScript, true); + + if (aFrameScript) { + let b = tabBrowser.getBrowserForTab(tab); + b.messageManager.loadFrameScript(aFrameScript, true); + } } } @@ -177,8 +178,8 @@ function initContentMessageListener() { isLoggedIn: syncTourChecker.isLoggedIn() }); break; - case "tor-open-circuit-display-page": - openTorCircuitDisplayPage(); + case "tor-open-tab": + openTorTab(msg.data.params.url, msg.data.params.frameScriptURL); break; #if 0 // No telemetry in Tor Browser. diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 9d03a6fc82d8..5cb81852bb73 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -195,12 +195,9 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-expect-differences.title", "onboarding.tour-tor-expect-differences.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-expect-differences.png"); - let button = createOnboardingTourButton(div, + createOnboardingTourButton(div, "onboarding-tour-tor-expect-differences-button", - "onboarding.tour-tor-expect-differences.button", "a"); - let anchor = button.querySelector("a"); - anchor.setAttribute("href", "https://support.torproject.org/#faq"); - anchor.setAttribute("target", "_blank"); + "onboarding.tour-tor-expect-differences.button"); return div; }, @@ -214,12 +211,9 @@ var onboardingTourset = { createOnboardingTourDescription(div, "onboarding.tour-tor-onion-services.title", "onboarding.tour-tor-onion-services.description"); createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-onion-services.png"); - let button = createOnboardingTourButton(div, + createOnboardingTourButton(div, "onboarding-tour-tor-onion-services-button", - "onboarding.tour-tor-onion-services.button", "a"); - let anchor = button.querySelector("a"); - anchor.setAttribute("href", "https://3g2upl4pq6kufc4m.onion/"); - anchor.setAttribute("target", "_blank"); + "onboarding.tour-tor-onion-services.button"); return div; }, @@ -836,6 +830,7 @@ class Onboarding { ({ id, classList } = target.firstChild); } + const kOnionURL = "https://3g2upl4pq6kufc4m.onion/"; // DuckDuckGo let handledTourActionClick = false; switch (id) { case "onboarding-overlay-button": @@ -918,7 +913,16 @@ class Onboarding { handledTourActionClick = true; break; case "onboarding-tour-tor-circuit-display-button": - sendMessageToChrome("tor-open-circuit-display-page"); + let kFrameScript = "resource://onboarding/onboarding-tor-circuit-display.js"; + sendMessageToChrome("tor-open-tab", + {url: kOnionURL, frameScriptURL: kFrameScript}); + break; + case "onboarding-tour-tor-expect-differences-button": + const kFAQURL = "https://support.torproject.org/#faq"; + sendMessageToChrome("tor-open-tab", {url: kFAQURL}); + break; + case "onboarding-tour-tor-onion-services-button": + sendMessageToChrome("tor-open-tab", {url: kOnionURL}); break; } if (classList.contains("onboarding-tour-item")) {

1 0

[tor-browser-build/master] Bug 29194: Set DEBIAN_FRONTEND=noninteractive
by gk＠torproject.org 05 Mar '19

05 Mar '19

commit a4689ee18278443aaf10f72da623efba657a970a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 16:17:15 2019 +0100 Bug 29194: Set DEBIAN_FRONTEND=noninteractive Update rbm to set DEBIAN_FRONTEND=noninteractive when using apt-get in install_package. Also set DEBIAN_FRONTEND=noninteractive for the other apt-get commands we use in debootstrap-image and container-image. We now also use the -q (quiet) argument. --- projects/container-image/config | 5 +++-- projects/debootstrap-image/config | 5 +++-- rbm | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/container-image/config b/projects/container-image/config index 95d7557..68c401a 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -17,11 +17,12 @@ pre: | #!/bin/sh # [% c('var/container/suite') %] set -e + export DEBIAN_FRONTEND=noninteractive [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] [% pc(c('origin_project'), 'var/pre_pkginst') %] [% END -%] - apt-get update -y - apt-get upgrade -y + apt-get update -y -q + apt-get upgrade -y -q [% deps = []; IF pc(c('origin_project'), 'var/deps'); diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index ba34032..4dbbfef 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -14,10 +14,11 @@ var: pre: | #!/bin/sh set -e + export DEBIAN_FRONTEND=noninteractive # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462) dpkg -i ./apt_1.6.6ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.6.6ubuntu0.1_amd64.deb - apt-get update -y - apt-get install -y debian-archive-keyring ubuntu-keyring debootstrap + apt-get update -y -q + apt-get install -y -q debian-archive-keyring ubuntu-keyring debootstrap debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %] [% IF c("var/apt_package_filename") || c("var/apt_utils_package_filename") || c("var/libapt_inst_package_filename") || c("var/libapt_pkg_package_filename") -%] mkdir ./base-image/apt-update diff --git a/rbm b/rbm index eb500fa..c61e694 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit eb500fa9467fb4d7229c9ca87f202ef18603d023 +Subproject commit c61e6940a1824462648064898be0759dd1600414

1 0