- tbb-commits - lists.torproject.org

[tor-browser-build/master] Build gmp for OSX using the clang based toolchain
by boklm＠torproject.org 06 Apr '17

06 Apr '17

commit a7545d82294661640369a88fef114066330c3f7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 3 16:04:19 2017 +0200 Build gmp for OSX using the clang based toolchain --- projects/gmp/config | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/gmp/config b/projects/gmp/config index 4c730e5..913f181 100644 --- a/projects/gmp/config +++ b/projects/gmp/config @@ -7,14 +7,6 @@ targets: linux: var: configure_opt_gmp: --enable-fat - osx-x86_64: - var: - arch_deps: - - libc6-i386 - - libstdc++6:i386 - pre_pkginst: dpkg --add-architecture i386 - compiler: macosx-toolchain-gcc - configure_opt: --host=x86_64-apple-darwin11 input_files: - name: gmp

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

[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-bundle/hardened-builds] Remove TOOLCHAIN4_OLD_URL reference
by gk＠torproject.org 06 Apr '17

06 Apr '17

commit bc99d24ed38a47bbea9ea1498298653d7e3c0e66 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 6 08:20:58 2017 +0000 Remove TOOLCHAIN4_OLD_URL reference --- gitian/versions.nightly | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6615219..ddbbc05 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -141,7 +141,6 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} -TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PAC… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 0fecb4a099ce227eca885532cf70cf8b4a4e688b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 20:55:08 2017 +0000 fixup! TB3: Tor Browser's official .mozconfigs. Update the user agent we set to a Windows ESR 52 one. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c3c6b58..e07a5a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -118,7 +118,7 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101");

1 0

[tor-browser-bundle/hardened-builds] Bug 21239: Adapt Linux Firefox descriptor to ESR52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit f76d0980596273327554c96fdb88e0b749552036 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 8d38b3a..904ea3c 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -12,15 +12,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # 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" reference_datetime: "2000-01-01 00:00:00" @@ -80,8 +79,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser mv .mozconfig-asan .mozconfig @@ -123,7 +121,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ 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 +134,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - 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 @@ -144,7 +142,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

[tor-browser-bundle/hardened-builds] Nightly versions bump while switching to ESR 52
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 37d51cdab5ad38bec95d80fa72c1abc595ae9bb7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:13:08 2017 +0000 Nightly versions bump while switching to ESR 52 --- gitian/versions.nightly | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 59bc494..6615219 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=52.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -61,7 +61,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.4.0 CLANG_VER=r247539 @@ -83,8 +83,7 @@ ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi -TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -116,9 +115,7 @@ ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bumping nightly versions for ESR52 switch
by gk＠torproject.org 05 Apr '17

05 Apr '17

commit 0d331f7aee2e13f56dfd91d343b5d45966b331c4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 5 11:13:08 2017 +0000 Bumping nightly versions for ESR52 switch --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a696497..b45e7d6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=52.0.2esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -60,7 +60,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -82,7 +82,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -117,7 +117,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

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

05 Apr '17

commit f279b94f424c1c7eeabaa0119ccfc8fea326bed6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 14 08:36:20 2017 +0000 Bug 21239: Adapt Linux Firefox descriptor to ESR52 --- gitian/descriptors/linux/gitian-firefox.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 4a756b8..d607f6a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -13,15 +13,14 @@ packages: - "libgtk2.0-dev" - "libdbus-glib-1-dev" - "yasm" -- "libasound2-dev" -- "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # 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" reference_datetime: "2000-01-01 00:00:00" @@ -84,8 +83,7 @@ script: | export LD_LIBRARY_PATH=$INSTDIR/gcc/lib$ARCH # mkdir -p $INSTDIR/Browser/ - mkdir -p $INSTDIR/Debug/Browser/components - mkdir -p $INSTDIR/Debug/Browser/browser/components + mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1 cd tor-browser # run get-moz-build-date before removing .git, which is used to get the year @@ -121,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ 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/ @@ -133,7 +131,7 @@ script: | # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - 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 @@ -141,7 +139,6 @@ script: | done # ~/build/re-dzip.sh Browser/omni.ja - ~/build/re-dzip.sh Browser/webapprt/omni.ja ~/build/re-dzip.sh Browser/browser/omni.ja ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/

1 0

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

05 Apr '17

commit b5beb33b57643ff83838337ded870511599d45f5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 30 09:32:17 2017 +0000 Bug 21240: Bump mingw-w64 commit for ESR52 compilation --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index caaa487..48ad666 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0fe1846..2e6fb2c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c0b68f5..a696497 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -30,7 +30,7 @@ NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 -MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 +MINGW_TAG=9c7c7122401cfd932e599bec5b4b7ca846deb5c0 PYPTLIB_TAG=master OBFSPROXY_TAG=master LIBFTE_TAG=master

1 0