April 2017 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 21240: Bump mingw-w64 commit for ESR52 compilation
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 580dad39db54fcd8d0f6e9f418bd791d02b1e8b3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:24:37 2017 +0200 Bug 21240: Bump mingw-w64 commit for ESR52 compilation tor-browser-bundle.git commit: b5beb33b57643ff83838337ded870511599d45f5 --- projects/mingw-w64/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index 425e125..3065df7 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: a0cd5afeb60be3be0860e9a203314c10485bb9b8 +git_hash: 9c7c7122401cfd932e599bec5b4b7ca846deb5c0 version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0

[tor-browser-build/master] Bump noscript version
by boklm＠torproject.org 07 Apr '17

07 Apr '17

commit 846dae993e531b638e981540ed0136c7d225a0e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 7 13:37:19 2017 +0200 Bump noscript version --- 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 f2c1d72..87cc6b2 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -52,9 +52,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd + sha256sum: 31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

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

07 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-build/master] Update mozconfig files
by boklm＠torproject.org 07 Apr '17

07 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/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: build tor for Windows using faketime
by boklm＠torproject.org 06 Apr '17

06 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

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

06 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 21754: remove the old GCC-based toolchain for macOS
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 916f99775b4eabf50983441d95f65c7e149dbab9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:08:19 2017 +0200 Bug 21754: remove the old GCC-based toolchain for macOS --- projects/macosx-toolchain-gcc/build | 7 ------ projects/macosx-toolchain-gcc/config | 41 ------------------------------------ 2 files changed, 48 deletions(-) diff --git a/projects/macosx-toolchain-gcc/build b/projects/macosx-toolchain-gcc/build deleted file mode 100644 index 4a8f0db..0000000 --- a/projects/macosx-toolchain-gcc/build +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -destdir='[% dest_dir _ '/' _ c('filename') %]' -mkdir -p "$destdir" -mv -f [% c('input_files_by_name/SDK') %] "$destdir"/apple-uni-sdk.deb -mv -f [% c('input_files_by_name/SDK_10_7') %] "$destdir"/MacOSX10.7.sdk.tar.gz -mv -f [% c('input_files_by_name/toolchain') %] "$destdir"/toolchain.tar.xz diff --git a/projects/macosx-toolchain-gcc/config b/projects/macosx-toolchain-gcc/config deleted file mode 100644 index 31ac46f..0000000 --- a/projects/macosx-toolchain-gcc/config +++ /dev/null @@ -1,41 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -version: 1 -remote_docker: 1 -var: - setup: | - macosx_toolchain_gcc_dir=/var/tmp/dist/macosx-toolchain-gcc - mkdir -p $macosx_toolchain_gcc_dir - tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/toolchain.tar.xz - export PATH="$macosx_toolchain_gcc_dir/apple-osx/bin:$PATH" - # For OpenSSL - ln -s $macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-cc - #For gmp, need to trick it so it knows we're doing a 64 bit build - for i in $macosx_toolchain_gcc_dir/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - - - [% IF pc(c('origin_project'), "var/10_7_SDK") %] - export AR=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-ar - export CC=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-gcc - export CXX=$macosx_toolchain_gcc_dir/apple-osx/bin/apple-osx-g++ - tar -C $macosx_toolchain_gcc_dir -xf [% c("compiler_tarfile") %]/MacOSX10.7.sdk.tar.gz - export CFLAGS="-isysroot $macosx_toolchain_gcc_dir/MacOSX10.7.sdk" - [% ELSE %] - dpkg-deb -x [% c("compiler_tarfile") %]/apple-uni-sdk.deb $macosx_toolchain_gcc_dir - # XXX Clean up these flags? - export CFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I$macosx_toolchain_gcc_dir/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L$macosx_toolchain_gcc_dir/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - [% END %] - -input_files: - - name: SDK - URL: https://launchpad.net/~flosoft/+archive/cross-apple/+files/apple-uni-sdk-10… - sha256sum: 6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - - name: SDK_10_7 - URL: https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar… - sha256sum: da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf - - name: toolchain - URL: https://people.torproject.org/~mikeperry/mirrors/sources/multiarch-darwin11… - sha256sum: 65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 - - project: docker-image

1 0

[tor-browser-build/master] Bug 21328: Updating to clang 3.8.0
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 1dbc75556c4dac73438338d2c9267fe084e724af Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:13:05 2017 +0200 Bug 21328: Updating to clang 3.8.0 We use the new compiler Mozilla is using for Firefox 52 cross-builds as well. clang now requires GCC 4.8.5 for compiling which is not available in Debian Wheezy. We therefore build the macOS parts on Debian Jessie now. --- keyring/llvm.gpg | Bin 0 -> 2507 bytes projects/clang/build | 8 -------- projects/clang/config | 5 ----- projects/llvm/build | 15 ++++++++++++--- projects/llvm/config | 30 +++++++++++++++++++++++++----- projects/tor/build | 2 +- rbm.conf | 2 +- 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg new file mode 100644 index 0000000..9911f65 Binary files /dev/null and b/keyring/llvm.gpg differ diff --git a/projects/clang/build b/projects/clang/build deleted file mode 100644 index ac0f21b..0000000 --- a/projects/clang/build +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/clang/config b/projects/clang/config deleted file mode 100644 index 92b8d51..0000000 --- a/projects/clang/config +++ /dev/null @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -version: r247539 -git_url: https://github.com/llvm-mirror/clang -git_hash: 592b43b609b42cffd1531a700c140e10766bf049 -filename: '[% project %]-src-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/llvm/build b/projects/llvm/build index 3773cfd..5241944 100644 --- a/projects/llvm/build +++ b/projects/llvm/build @@ -5,10 +5,19 @@ mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz -cd /var/tmp/build/[% project %]-[% c("version") %] +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/llvm') %] +tar -xf $rootdir/[% c('input_files_by_name/cfe') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] +tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] +mv cfe-* clang +mv libcxx-* libcxx +mv libcxxabi-* libcxxabi +mv clang llvm-*/tools +mv libcxx llvm-*/projects +mv libcxxabi llvm-*/projects +cd llvm-* export LLVM_HOME=$(pwd) -tar -C $LLVM_HOME/tools -xf $rootdir/[% c('input_files_by_name/clang') %] mkdir build cd build cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME diff --git a/projects/llvm/config b/projects/llvm/config index 89ee637..81f7aaa 100644 --- a/projects/llvm/config +++ b/projects/llvm/config @@ -1,7 +1,5 @@ # vim: filetype=yaml sw=2 -version: 8f188e0ea735ac9383a65a0d1c846eb790c2ec74 -git_url: https://github.com/llvm-mirror/llvm -git_hash: '[% c("version") %]' +version: 3.8.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -9,5 +7,27 @@ input_files: - project: docker-image - project: cmake name: cmake - - project: clang - name: clang + - URL: 'http://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: llvm + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/[% c("version") %]/cfe-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: cfe + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: libcxx + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg + - URL: 'http://releases.llvm.org/[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' + # no proper HTTPS + name: libcxxabi + sig_ext: sig + file_gpg_id: 1 + gpg_keyring: llvm.gpg diff --git a/projects/tor/build b/projects/tor/build index c56cddc..064ff44 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -61,7 +61,7 @@ find -type f -print0 | xargs -0 [% c("var/touch") %] [% IF c("var/osx") %]--enable-static-openssl[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") -%] - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" [% END -%] make -j4 diff --git a/rbm.conf b/rbm.conf index 868c30a..d7c8b34 100644 --- a/rbm.conf +++ b/rbm.conf @@ -166,7 +166,7 @@ targets: torbrowser-osx-x86_64: - osx-x86_64 osx-x86_64: - distribution: Debian-7.11 + distribution: Debian-8.7 arch: x86_64 var: osx: 1

1 0

[tor-browser-build/master] macosx-toolchain setup: export LDFLAGS and CC
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit 0bad542a31e3353c29132454342c6d8c5af9c914 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 15:54:01 2017 +0200 macosx-toolchain setup: export LDFLAGS and CC --- projects/macosx-toolchain/config | 2 ++ rbm.conf | 1 + 2 files changed, 3 insertions(+) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 6458485..b237e4d 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -11,6 +11,8 @@ var: export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib + export CC="$clangdir/helpers/clang [% c('var/FLAGS') %]" + export LDFLAGS="[% c('var/LDFLAGS') %]" input_files: - name: llvm diff --git a/rbm.conf b/rbm.conf index e206193..868c30a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -174,6 +174,7 @@ targets: compiler: 'macosx-toolchain' configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac deps: - build-essential

1 0