- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 18831: Use own Yasm for Firefox cross-compilation
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit f9b9039a8b7f5ed8b1bd823f4f3a9f8fc6302287 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:22:31 2017 +0200 Bug 18831: Use own Yasm for Firefox cross-compilation Starting with Firefox ESR52 Yasm < 1.2.0 is not sufficient anymore to compile our browser part for Windows. Ubuntu Precise still ships with such a version, though. We compile our own version until we get off of Precise. tor-browser-bundle.git commit: 910094fc33ae4e75e10fee754bec106e83e0eac5 --- projects/firefox/build | 4 ++++ projects/firefox/config | 3 +++ projects/yasm/build | 14 ++++++++++++++ projects/yasm/config | 10 ++++++++++ 4 files changed, 31 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index abd699b..1dce495 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -11,6 +11,10 @@ # compiler setup so that mingw is first in the PATH. export LD_LIBRARY_PATH=$hgccdir/lib64 export PATH=$hgccdir/bin:$PATH + + # Firefox ESR52 needs Yasm >= 1.2.0 which Ubuntu Precise does not ship. + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/yasm') %] + export PATH="/var/tmp/dist/yasm/bin:$PATH" [% 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/firefox/config b/projects/firefox/config index f7e89e5..c71025d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -92,3 +92,6 @@ input_files: - project: gcc name: gcc enable: '[% c("var/windows") %]' + - project: yasm + name: yasm + enable: '[% c("var/windows") %]' diff --git a/projects/yasm/build b/projects/yasm/build new file mode 100644 index 0000000..82d037a --- /dev/null +++ b/projects/yasm/build @@ -0,0 +1,14 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/yasm') %] +cd /var/tmp/build/yasm-[% c("version") %] +./configure --prefix="$distdir" +make -j4 +make install +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/yasm/config b/projects/yasm/config new file mode 100644 index 0000000..3d8a28a --- /dev/null +++ b/projects/yasm/config @@ -0,0 +1,10 @@ +# vim: filetype=yaml sw=2 +version: 1.2.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +input_files: + - project: docker-image + - URL: 'https://www.tortall.net/projects/yasm/releases/yasm-[% c("version") %].tar.gz' + name: yasm + sha256sum: 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31

1 0

[tor-browser-build/master] Adapt OSX Firefox descriptor to ESR52
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit 449a330e2cb43e6eb9420987cf68fdd87561ff75 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:34:52 2017 +0200 Adapt OSX Firefox descriptor to ESR52 In tor-browser-bundle.git this change was done as part of commit cd4465477ac10d2b740d5a32505cdab5a197e405. --- projects/firefox/build | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 8b36428..4d83b28 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -152,7 +152,6 @@ done [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] [% ELSIF c("var/osx") %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] - [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/browser/omni.ja' }) %] [% END %]

1 0

[tor-browser-build/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit 67fbf56501a186f0934db144c7087834229d5da4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:33:19 2017 +0200 Bug 21239: Adapt Linux Firefox descriptor to ESR52 tor-browser-bundle.git commit: f279b94f424c1c7eeabaa0119ccfc8fea326bed6 --- projects/firefox/build | 8 +++----- projects/firefox/config | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1dce495..8b36428 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -35,8 +35,7 @@ mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/components -mkdir -p $distdir/Debug/Browser/browser/components +mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -124,7 +123,7 @@ 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/ -NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" +NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/ @@ -136,7 +135,7 @@ cd $distdir [% 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/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater +for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB @@ -151,7 +150,6 @@ done [% IF c("var/windows") || c("var/linux") %] [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %] - [% IF c("var/linux") %][% c("var/rezip", { rezip_file => 'Browser/webapprt/omni.ja' }) %][% END %] [% ELSIF c("var/osx") %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %] [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %] diff --git a/projects/firefox/config b/projects/firefox/config index c71025d..83307d0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -33,14 +33,14 @@ targets: arch_deps: - libgtk2.0-dev - libdbus-glib-1-dev - - libasound2-dev - - libgstreamer-plugins-base0.10-dev - libxt-dev - hardening-wrapper # To pass configure since ESR 31. - libpulse-dev # To pass configure since ESR 45. - libgconf2-dev + # To pass configure since ESR 52 + - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 @@ -52,14 +52,13 @@ targets: - libc6-dev-i386 - libgtk2.0-dev:i386 - libdbus-glib-1-dev:i386 - - lib32asound2-dev - - libasound2-dev:i386 - - libgstreamer-plugins-base0.10-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 - hardening-wrapper

1 0

[tor-browser-build/master] Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit ec86de4f618aa28c3694a5af1fb941cde802cae6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:12:44 2017 +0200 Bug 21723: Fix inconsistent generation of MOZ_MACBUNDLE_ID Use org.torproject as the MOZ_DISTRIBUTION_ID. This results in a bundle ID of org.torproject.torbrowser. tor-browser-bundle.git commit: 50b6e6fff4a535044f9b506854535df757125267 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 496c215..abd699b 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -73,7 +73,7 @@ export CC='gcc -m32' rm -f configure rm -f js/src/configure -make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" +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 -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true

1 0

[tor-browser-build/master] Bug 21709: Upgrade Go to 1.7.5.
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit 949c0d9e83d911b2fa80279edddb06c7e6299c80 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:11:41 2017 +0200 Bug 21709: Upgrade Go to 1.7.5. tor-browser-bundle.git commit: 1942f7b2f6e5f82c64dcfeab82713604866cb26f --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index dbd7aab..89b4b45 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.7.4 +version: 1.7.5 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -75,7 +75,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc + sha256sum: 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Update mozconfig files
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit e6fb26f57bd0aca191e55798f63a533ea82675cd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:41:03 2017 +0200 Update mozconfig files Update the mozconfig files with the changes from the versions in tor-browser.git. We are currently not using the mozconfig files from tor-browser.git directly as we need to modify some of them. --- projects/firefox/mozconfig-linux-i686 | 11 ++++------- projects/firefox/mozconfig-linux-x86_64 | 11 ++++------- projects/firefox/mozconfig-osx-x86_64 | 4 +--- projects/firefox/mozconfig-windows-i686 | 5 +---- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 306b674..8b4ecb3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -5,10 +5,6 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -# Use jemalloc 4.x. In 52ESR, we should use -# the --enable-jemalloc=4 flag instead: -export MOZ_JEMALLOC4=1 - export CFLAGS=-m32 export CXXFLAGS=-m32 export LDFLAGS=-m32 @@ -21,8 +17,10 @@ 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 + ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -34,7 +32,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --disable-loop +ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index a419808..cde5b49 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -5,16 +5,14 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 -# Use jemalloc 4.x. In 52ESR, we should use -# the --enable-jemalloc=4 flag instead: -export MOZ_JEMALLOC4=1 - 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 + ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -26,7 +24,6 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc # Let's not compile EME at least until we can enable ClearKey and only Clearkey. -# (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes -ac_add_options --disable-loop +ac_add_options --enable-jemalloc=4 diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 259e745..c75b2f5 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -18,7 +18,7 @@ export AR=${TOOLCHAIN_PREFIX}ar export RANLIB=${TOOLCHAIN_PREFIX}ranlib export STRIP=${TOOLCHAIN_PREFIX}strip export OTOOL=${TOOLCHAIN_PREFIX}otool -export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil +export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" export HOST_CC="$TOOLCHAIN_DIR/clang/helpers/clang" export HOST_CXX="$TOOLCHAIN_DIR/clang/helpers/clang++" @@ -43,7 +43,6 @@ ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -55,4 +54,3 @@ ac_add_options --disable-tests # (Apart from that there is no Adobe CRM module for OS X right now) ac_add_options --disable-eme # ac_add_options --disable-ctypes -ac_add_options --disable-loop diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index 33ea6d4..de86c49 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -2,6 +2,7 @@ CROSS_COMPILE=1 ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" @@ -14,7 +15,6 @@ ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update -ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -27,6 +27,3 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests - -#ac_add_options --disable-ctypes -ac_add_options --disable-loop

1 0

[tor-browser-build/master] Switch to ESR52
by boklm＠torproject.org 08 Apr '17

08 Apr '17

commit cd08d1ab0fb638daed52ee5e7452dd78b07591c6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 15:53:53 2017 +0200 Switch to ESR52 --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index dd96dcd..a645b92 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 83307d0..7e685e7 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +## There is no signed tag yet, so we use a fixed commit +git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +#git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +#tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git -tag_gpg_id: 1 gpg_keyring: torbutton.gpg remote_docker: 1 var: - firefox_version: 45.8.0esr + firefox_version: 52.0.2esr torbrowser_branch: 7.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' @@ -22,7 +24,7 @@ var: targets: nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21849: Don't allow SSL key logging
by gk＠torproject.org 07 Apr '17

07 Apr '17

commit 47fa36dc780f4962102205b390e18ce9ef74b1b9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 6 17:09:09 2017 -0700 Bug 21849: Don't allow SSL key logging --- config/external/nss/Makefile.in | 2 +- security/nss/lib/ssl/ssl.gyp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 939529e..3f31d3b 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -241,7 +241,7 @@ DEFAULT_GMAKE_FLAGS += \ endif DEFAULT_GMAKE_FLAGS += FREEBL_NO_DEPEND=0 $(FREEBL_LOWHASH_FLAG) -DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=1 +DEFAULT_GMAKE_FLAGS += NSS_ALLOW_SSLKEYLOGFILE=0 ifdef MOZ_NO_WLZDEFS DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG= diff --git a/security/nss/lib/ssl/ssl.gyp b/security/nss/lib/ssl/ssl.gyp index 0306ab6..5c025d2 100644 --- a/security/nss/lib/ssl/ssl.gyp +++ b/security/nss/lib/ssl/ssl.gyp @@ -89,7 +89,7 @@ ], 'target_defaults': { 'defines': [ - 'NSS_ALLOW_SSLKEYLOGFILE=1' + 'NSS_ALLOW_SSLKEYLOGFILE=0' ] }, 'variables': {

1 0

[tor-browser-build/master] Bug 20426: set timestamp on files included in the Windows bundle
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 2a15e10d49e437dd3637136692a86a9473c78e6d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 6 15:52:25 2017 +0200 Bug 20426: set timestamp on files included in the Windows bundle --- projects/tor-browser/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 814f7af..7134367 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -257,6 +257,7 @@ cd $distdir dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_${PKG_LOCALE}.dmg', }) %] [% ELSIF c("var/windows") %] + find "${TB_STAGE_DIR}" -exec [% c("var/touch") %] {} \; pushd "${TB_STAGE_DIR}" makensis torbrowser.nsi # Working around NSIS braindamage @@ -324,6 +325,7 @@ rm -rf $distdir/${PKG_DIR} dmg_out => '$OUTDIR/TorBrowser-' _ c("var/torbrowser_version") _ '-osx64_' _ lang _ '.dmg', }) %] [% ELSIF c("var/windows") %] + find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" makensis torbrowser.nsi # Working around NSIS braindamage

1 0

[tor-browser-build/master] Bug 20426: build tor for Windows using faketime
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 8cc61d29d348e154f43474b47a0b0746301602a9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 6 15:50:11 2017 +0200 Bug 20426: build tor for Windows using faketime --- projects/tor/build | 4 ++-- projects/tor/config | 4 ++++ rbm.conf | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index 064ff44..c1296fe 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -60,8 +60,8 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] -[% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 +[% IF c("var/osx") || c("var/windows") -%] + export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/projects/tor/config b/projects/tor/config index 55637dc..961c1f3 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -40,6 +40,10 @@ targets: var: arch_deps: - faketime + windows-i686: + var: + arch_deps: + - faketime expert-bundle: var: expert_bundle: 1 diff --git a/rbm.conf b/rbm.conf index d7c8b34..355c593 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/faketime/libfaketime.so.1 torbrowser-osx-x86_64: - osx-x86_64 @@ -184,6 +185,7 @@ targets: - libtool - zip - unzip + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to

1 0