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

[tor-browser-bundle/master] Bug 18331: Update OS X toolchain for ESR 45
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 128bcfb6f781adb8cfaff2815a191432ce0d62b5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 31 13:52:34 2016 +0000 Bug 18331: Update OS X toolchain for ESR 45 Our old cross-compiler does not cope with ICU changes made in ESR 45. We switch to the tools Mozilla uses itself instead of creating new ones based solely on crosstools-ng. This has a number of advantages. The most important ones are: 1) Using the same toolchain as Mozilla (even if they are not using it in official builds) gives us a high degree of confidence that bugfix releases will work with our cross-compiler. 2) Using clang both as the host and cross-compiler makes building GCC just for being used as host compiler in our Ubuntu Precise environment superfluous. To make it easier compiling clang from source this patch set switches to Debian Wheezy for the Gitian VMs used to build Tor Browser for OS X. This fixes #18690. --- gitian/build-helpers/ddmg.sh | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 4 ++- gitian/descriptors/mac/gitian-firefox.yml | 23 ++++++--------- .../mac/gitian-pluggable-transports.yml | 3 +- gitian/descriptors/mac/gitian-tor.yml | 3 +- gitian/descriptors/mac/gitian-utils.yml | 32 ++++++++++++++------- gitian/fetch-inputs.sh | 15 ++++++++-- gitian/gpg/cmake.gpg | Bin 0 -> 16939 bytes gitian/mkbundle-mac.sh | 9 +++--- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 5 +++- gitian/versions | 3 -- gitian/versions.alpha | 3 -- gitian/versions.beta | 3 -- gitian/versions.nightly | 10 +++++-- 15 files changed, 69 insertions(+), 48 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index c37a1fd..cb513e8 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -15,7 +15,7 @@ cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +genisoimage -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd ~/build diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a7ef7bc..00cd4d1 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -1,7 +1,8 @@ --- name: "bundle-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "amd64" packages: @@ -12,6 +13,7 @@ packages: - "python-lxml" - "libxml2-utils" - "sqlite3" +- "rsync" # Needed for the .dmgs - "genisoimage" - "cmake" diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 1a35eab..601a095 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -1,13 +1,15 @@ --- name: "torbrowser-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "amd64" packages: - "autoconf2.13" - "unzip" - "yasm" +- "rsync" - "zip" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -16,9 +18,9 @@ remotes: - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" files: -- "gcc-linux64-precise-utils.zip" +- "clang-linux64-wheezy-utils.zip" +- "cctools.tar.gz" - "MacOSX10.7.sdk.tar.gz" -- "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" @@ -46,18 +48,11 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. - unzip -d $INSTDIR ~/build/gcc-linux64-precise-utils.zip - # We need a link to our GCC, otherwise the system cc gets used which points to - # /usr/bin/gcc. - ln -s gcc $INSTDIR/gcc/bin/cc - export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 - # XXX: cross-compiler path is needed for ICU - export PATH=/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin:$INSTDIR/gcc/bin:$PATH - - tar xaf x86_64-apple-darwin10.tar.xz - tar xaf MacOSX10.7.sdk.tar.gz - # cd tor-browser + # Extracting all the necessary tools + tar xaf ../MacOSX10.7.sdk.tar.gz + tar xaf ../cctools.tar.gz + unzip ../clang-linux64-wheezy-utils.zip TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 5a578ba..e2b51c4 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -1,7 +1,8 @@ --- name: "pluggable-transports-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "i386" packages: diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index bbcf8c3..94d3eb1 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -1,7 +1,8 @@ --- name: "tor-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "i386" packages: diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index d457fef..5288471 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -1,7 +1,8 @@ --- name: "utils-mac" +distro: "debian" suites: -- "precise" +- "wheezy" architectures: - "i386" - "amd64" @@ -10,18 +11,21 @@ packages: - "automake" - "libtool" - "zip" -# Needed for compiling GCC. -- "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" +- "url": "https://github.com/llvm-mirror/llvm" + "dir": "llvm" +- "url": "https://github.com/llvm-mirror/clang" + "dir": "clang" +- "url": "https://cmake.org/cmake.git" + "dir": "cmake" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" -- "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" - "versions" @@ -36,15 +40,23 @@ script: | if [ $GBUILD_BITS == "64" ]; then - # Building GCC. We need this as Firefox ESR 38 has GCC 4.7 as minimum - # requirement for the host compiler but Ubuntu Precise is only shipping 4.6. - tar xaf gcc.tar.bz2 - cd gcc-* - ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + # Cmake first + cd cmake + ./bootstrap --prefix=$INSTDIR/cmake + make $MAKEOPTS + make install + export PATH=$PATH:$INSTDIR/cmake/bin + # Clang + cd ../llvm + mv ../clang tools/ + export LLVM_HOME=`pwd` + mkdir build + cd build + cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$INSTDIR/clang -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME make $MAKEOPTS make install cd $INSTDIR - ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc + ~/build/dzip.sh clang-$CLANG_VER-linux64-wheezy-utils.zip clang cp *utils.zip $OUTDIR/ else # Building libfaketime. diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c9daee..b423b48 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,6 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~gk/mirrors/sources/ set -e set -u umask 0022 @@ -131,13 +132,20 @@ do fi done -for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 +for i in TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" done +for i in CCTOOLS +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_GK}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_GK}${!PACKAGE}" +done + # XXX: Omit googlecode.com packages because Google won't allow wget -N # and because the download seems to 404 about 50% of the time. for i in ARGPARSE @@ -166,7 +174,7 @@ wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -257,6 +265,9 @@ https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TA torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG +cmake https://cmake.org/cmake.git $CMAKE_TAG +llvm https://github.com/llvm-mirror/llvm $LLVM_TAG +clang https://github.com/llvm-mirror/clang $CLANG_TAG mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG diff --git a/gitian/gpg/cmake.gpg b/gitian/gpg/cmake.gpg new file mode 100644 index 0000000..51f19e7 Binary files /dev/null and b/gitian/gpg/cmake.gpg differ diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 682e02f..eaec986 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -131,11 +131,12 @@ then PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG OBFS4_TAG=refs/tags/$OBFS4_TAG + CMAKE_TAG=refs/tags/$CMAKE_TAG fi cd $GITIAN_DIR -if [ ! -f inputs/gcc-$GCC_VER-linux64-precise-utils.zip -o \ +if [ ! -f inputs/clang-$CLANG_VER-linux64-wheezy-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-mac64-utils.zip ]; @@ -143,7 +144,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG,cmake=$CMAKE_TAG,llvm=$LLVM_TAG,clang=$CLANG_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S` @@ -152,7 +153,7 @@ then cd inputs cp -a ../build/out/*-utils.zip . - ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip + ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip @@ -166,7 +167,7 @@ else # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. cd inputs - ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip + ln -sf clang-$CLANG_VER-linux64-wheezy-utils.zip clang-linux64-wheezy-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index afcd70d..ac63ba5 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -25,7 +25,7 @@ rm -f bundle.inputs sha256sum $OSXSDK_PACKAGE >> bundle.inputs sha256sum $OPENSSL_PACKAGE >> bundle.inputs -sha256sum $TOOLCHAIN4_PACKAGE >> bundle.inputs +sha256sum $CCTOOLS_PACKAGE >> bundle.inputs echo >> bundle.inputs sha256sum noscript(a)noscript.net.xpi >> bundle.inputs echo >> bundle.inputs diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 7bc2683..95bdaf1 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -102,11 +102,14 @@ goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG +cmake cmake.gpg $CMAKE_TAG EOF while read dir commit; do check_git_hash "$dir" "$commit" done << EOF +llvm $LLVM_TAG +clang $CLANG_TAG mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG @@ -140,7 +143,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) -for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4_OLD CCTOOLS NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED SETUPTOOLS OPENSSL GMP PARSLEY GO GCC STIXMATHFONT NOTOEMOJIFONT NOTOJPFONT NOTOKRFONT NOTOSCFONT NOTOTCFONT do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 101b428..4dd8aa5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -59,7 +59,6 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -88,7 +87,6 @@ OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -112,7 +110,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_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 06584b4..75b3089 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -62,7 +62,6 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -91,7 +90,6 @@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -115,7 +113,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_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 7374d04..9df153b 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -55,7 +55,6 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -84,7 +83,6 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f @@ -109,7 +107,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_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index fe94a04..701962d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -29,6 +29,9 @@ HTTPSE_TAG=master NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable +CMAKE_TAG=v2.8.12.2 +LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 +CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master @@ -54,6 +57,7 @@ FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 +CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -69,8 +73,8 @@ GO_VER=1.4.2 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +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 MSVCR100_PACKAGE=msvcr100.dll @@ -98,8 +102,8 @@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -122,8 +126,8 @@ 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_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… +CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 18331: add /usr/sbin:/sbin to the PATH
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit 8c71dad38b58aa138872d1f8827ea2813763ab1b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 11 19:28:16 2016 +0200 Bug 18331: add /usr/sbin:/sbin to the PATH On Debian wheezy, dpkg -i fails when the PATH does not include /sbin and /usr/sbin, so we add them. As a policy, Debian does not include them by default in regular users PATH. This change is not required when building using LXC as the commands are run using sudo which overrides the PATH with the value in "secure_path" which includes sbin directories. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 ++ gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/mac/gitian-utils.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index e2b51c4..6b1a99e 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -79,6 +79,8 @@ script: | mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # + # dpkg requires sbin directories in the PATH + export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz export PATH="$PATH:$HOME/build/apple-osx/bin/" diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 94d3eb1..687b1d6 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -43,6 +43,8 @@ script: | mkdir -p $TORCONFIGDIR/ mkdir -p $OUTDIR/ # + # dpkg requires sbin directories in the PATH + export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz export PATH="$PATH:$HOME/build/apple-osx/bin/" diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 5288471..cef1533 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -71,6 +71,8 @@ script: | export FAKETIME=$REFERENCE_DATETIME cd .. + # dpkg requires sbin directories in the PATH + export PATH="/usr/sbin:/sbin:$PATH" sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz export PATH="$PATH:$HOME/build/apple-osx/bin/"

1 0

[tor-browser-bundle/master] Bug 18331: drop faketime in mac/gitian-tor.yml
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit da14737254245cfa6b849dc8ac94a52cb3d9a61d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 11 19:30:00 2016 +0200 Bug 18331: drop faketime in mac/gitian-tor.yml After updating the OSX toolchain, faketime is causing an error in tor's configure script. As faketime in mac/gitian-tor.yml is no longer required to get the builds reproducible, we drop it. Following this change, the intermediary archive tor-mac64-gbuilt.zip won't be reproducible because of the timestamp of the included files. However this file is not exposed to users. This should be fixed when we implement #18845. --- gitian/descriptors/mac/gitian-tor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 687b1d6..fdc6afa 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -6,7 +6,6 @@ suites: architectures: - "i386" packages: -- "faketime" - "unzip" - "automake" - "zip" @@ -32,8 +31,6 @@ script: | TORBINDIR="$TBDIR/TorBrowser/Tor" TORCONFIGDIR="$TBDIR/TorBrowser/Data/Tor" fi - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug_18331_v6'
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit dbb924b5d86201bcd8cbc923f1e416c4c62e3036 Merge: bc9d708 da14737 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 19 07:39:11 2016 +0000 Merge remote-tracking branch 'boklm/bug_18331_v6' gitian/build-helpers/ddmg.sh | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 4 ++- gitian/descriptors/mac/gitian-firefox.yml | 23 ++++++-------- .../mac/gitian-pluggable-transports.yml | 5 ++- gitian/descriptors/mac/gitian-tor.yml | 8 ++--- gitian/descriptors/mac/gitian-utils.yml | 34 +++++++++++++++------ gitian/fetch-inputs.sh | 15 +++++++-- gitian/gpg/cmake.gpg | Bin 0 -> 16939 bytes gitian/mkbundle-mac.sh | 9 +++--- gitian/record-inputs.sh | 2 +- gitian/verify-tags.sh | 5 ++- gitian/versions | 3 -- gitian/versions.alpha | 3 -- gitian/versions.beta | 3 -- gitian/versions.nightly | 10 ++++-- 15 files changed, 75 insertions(+), 51 deletions(-) diff --cc gitian/versions.nightly index 17f3476,701962d..a300a51 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@@ -68,9 -72,9 +72,9 @@@ GO_VER=1.4. ## 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.0.4-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.10-sm+fx+fn.xpi - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz + 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 MSVCR100_PACKAGE=msvcr100.dll @@@ -98,9 -102,9 +102,9 @@@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba4940 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +NOSCRIPT_HASH=9861b1e0bf5d12f773f4b26c3268d4257c3dc47a27b732ad4c280cd34bf45dd8 + CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[gitian-builder/tor-browser-builder-4] Bug 18331: install sudo in Debian VMs with KVM too
by gk＠torproject.org 19 Apr '16

19 Apr '16

commit ae90ac520dbdf6b1267b099b654b58352ee86ef0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 8 13:45:55 2016 +0200 Bug 18331: install sudo in Debian VMs with KVM too --- bin/make-base-vm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index fe1df94..59f0734 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -118,11 +118,12 @@ if [ $DISTRO = "ubuntu" ]; then GRUB_PKG=grub-pc fi +if [ $DISTRO = "debian" ]; then + addpkg=$addpkg,sudo +fi + if [ $LXC = "1" ]; then addpkg=$addpkg,lxc - if [ $DISTRO = "debian" ]; then - addpkg=$addpkg,sudo - fi else # Lack of comma after KERNEL_PKG is not a typo addpkg=$addpkg,${KERNEL_PKG}${GRUB_PKG},openssh-server

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: Add LXC support for building with Debian guest VMs
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit f02e6d9110b390f97af0dd8c0ee3b525f6e5d8b8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 7 12:59:46 2016 +0100 Bug 18127: Add LXC support for building with Debian guest VMs --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/linux/gitian-pluggable-transports.yml | 2 +- gitian/make-vms.sh | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fdc1bf6..b9bf0f9 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -14,6 +14,7 @@ packages: - "libxml2-utils" - "sqlite3" - "python-lxml" +- "rsync" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a886572..3aaec92 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -146,7 +146,7 @@ script: | # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to # missing __version__ and __sha__ . - mkdir vcversioner-1.14.1.1-py2.6.egg + mkdir vcversioner-1.14.1.1-py2.7.egg $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..554cc27 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,13 +25,20 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch.qcow2 ]; + if [ ! -f ./base-$dist-$arch ]; then if [ "z$USE_LXC" = "z1" ]; then export LXC_SUITE=$dist export LXC_ARCH=$arch - ./bin/make-base-vm --suite $dist --lxc --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --lxc --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --lxc --arch $arch + fi else if [ "$dist" = "wheezy" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: use $GITIAN_TAG in fetch-inputs.sh
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 954e6d2d88c49fe7f243aa90b47e56ff616daf7f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 16 19:30:02 2016 +0100 Bug 18127: use $GITIAN_TAG in fetch-inputs.sh --- gitian/fetch-inputs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 5aed842..7c9daee 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -243,8 +243,7 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-3 -git merge origin/tor-browser-builder-3 +git checkout "$GITIAN_TAG" cd inputs while read dir url tag; do

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: install debian-archive-keyring on Ubuntu
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 770346a8468f18bbb395c695208118c1dc6c6f2d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 1 12:39:33 2016 +0100 Bug 18127: install debian-archive-keyring on Ubuntu The Debian keyring is required by debootstrap when generating a Debian chroot. --- gitian/check-prerequisites.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..6b88a90 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -17,7 +17,7 @@ then VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1` if [ "$VERSION" -ge "14" ]; then - dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null if [ $? -ne 0 ]; then @@ -25,7 +25,7 @@ then echo echo "Please run:" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring" exit 1 fi else

1 0

[tor-browser-bundle/hardened-builds] Bug 18127: fix base-vm file name when using KVM
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit eb7ae40c498029994daa38d48a64a152ca1129e1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 29 17:27:41 2016 +0200 Bug 18127: fix base-vm file name when using KVM The base-vm file name is different if we are using LXC or KVM. --- gitian/make-vms.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 554cc27..089865b 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -25,7 +25,8 @@ build_and_test_vm() { local arch="$1"; shift local bits="$1"; shift - if [ ! -f ./base-$dist-$arch ]; + if [ "z$USE_LXC" = "z1" -a ! -f ./base-$dist-$arch ] \ + || [ "z$USE_LXC" != "z1" -a ! -f ./base-$dist-$arch.qcow2 ]; then if [ "z$USE_LXC" = "z1" ]; then

1 0

[tor-browser-bundle/hardened-builds] Bug 18698: Include libgconf2-dev for our Linux builds
by gk＠torproject.org 11 Apr '16

11 Apr '16

commit 988566ec934df8b440bc83cee5b6ac34a21149fe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 1 01:16:09 2016 +0000 Bug 18698: Include libgconf2-dev for our Linux builds --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index c49636a..d21b342 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -19,6 +19,8 @@ packages: - "python-dev" # To pass configure since ESR 31. - "libpulse-dev" +# To pass configure since ESR 45. +- "libgconf2-dev" # We built GCC but not the libmpc2, thus we need to install it. - "libmpc2" reference_datetime: "2000-01-01 00:00:00"

1 0