tbb-commits

tbb-commits@lists.torproject.org

1 participants
17657 discussions

[tor-browser-bundle/master] add new default bridge 'JonbesheSabz'
by gk＠torproject.org 28 Jan '16

28 Jan '16

commit 6230f6d4d268326801187654372fc61e7909cd7f Author: Nima Fatemi <nima(a)torproject.org> Date: Sun Jan 24 15:59:28 2016 +0000 add new default bridge 'JonbesheSabz' --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 421e1aa..f2d8c96 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -28,6 +28,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9”, "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com");

1 0

[tor-browser-bundle/hardened-builds] Bump nightly versions for hardened-builds
by gk＠torproject.org 26 Jan '16

26 Jan '16

commit 9b4dfc9dbed50b4012caa70aae56e6b5d3cb9c0d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 13:54:43 2016 +0000 Bump nightly versions for hardened-builds --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d209c6a..44e4ddb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,11 +14,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.5.0esr +FIREFOX_VERSION=38.6.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -48,7 +48,7 @@ GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1q 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.2.0 PYTHON_VER=2.7.5 @@ -67,7 +67,7 @@ NOTOCJKFONT_VER=1.004 ## 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-sm+fx+fn.xpi +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 @@ -97,7 +97,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 +NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/hardened-builds] Version bump and changelog update
by gk＠torproject.org 26 Jan '16

26 Jan '16

commit f2d76bc061d14c15b81b40e744b9bf1826df95d6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 05:23:29 2016 +0000 Version bump and changelog update --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 47897d0..4210100 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,7 +8,7 @@ Tor Browser 6.0a1-hardened -- January 27 2016 * Bug 18004: Remove Tor fundraising donation banner * Code cleanup * Translation updates - * Update Tor Launcher to 0.2.8.2 + * Update Tor Launcher to 0.2.8.3 * Bug 18113: Randomly permutate available default bridges of chosen type * Bug 11773: Setup wizard UI flow improvements * Translation updates diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6b35ce3..f1ef483 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=hardened TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 TOR_TAG=tor-0.2.7.6 -TORLAUNCHER_TAG=0.2.8.2 +TORLAUNCHER_TAG=0.2.8.3 TORBUTTON_TAG=1.9.5 HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 26 Jan '16

26 Jan '16

commit 85091369814453ce5976581c4fac47094b74d350 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 05:21:26 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 4a9944b..5c81e17 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.8.1</em:version> + <em:version>0.2.8.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/hardened-builds] Changelog update; fallback to 3.x-8-gpgsux
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit a212253f22d444618946a497e27f705b3e9b7223 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:07:34 2016 +0000 Changelog update; fallback to 3.x-8-gpgsux --- Bundle-Data/Docs/ChangeLog.txt | 5 +---- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 88cf359..47897d0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -13,15 +13,12 @@ Tor Browser 6.0a1-hardened -- January 27 2016 * Bug 11773: Setup wizard UI flow improvements * Translation updates * Bug 17428: Remove Flashproxy - * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18115+18104+18071+18091: Update/add new obfs4 bridge * Bug 18072: Change recommended pluggable transport type to obfs4 * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser * Bug 16322: Use onion address for DuckDuckGo search engine * Bug 17917: Changelog after update is empty if JS is disabled * Bug 17790: Map the proper SHIFT characters to the digit keys (fix of #15646) - * Build System - * Linux - * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) Tor Browser 5.5a6-hardened -- January 7 2016 * All Platforms diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6c6d566..6b35ce3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,7 +40,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-9 +GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[tor-browser-bundle/hardened-builds] Revert "Bug 15578: drop our Python build"
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit 92d04ecc79e97a3306e12807af289c434be5da00 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:05:35 2016 +0000 Revert "Bug 15578: drop our Python build" This reverts commit 2d57f0452aaa35d1a7e96c9d84af23dd6b785cb2. --- gitian/descriptors/linux/gitian-bundle.yml | 7 ++++++- gitian/descriptors/linux/gitian-firefox.yml | 7 ++++++- gitian/descriptors/linux/gitian-utils.yml | 25 +++++++++++++++++++++++++ gitian/fetch-inputs.sh | 7 +++++-- gitian/mkbundle-linux.sh | 6 ++++++ gitian/verify-tags.sh | 5 +++-- gitian/versions | 5 +++++ gitian/versions.alpha | 5 +++++ gitian/versions.beta | 5 +++++ gitian/versions.nightly | 5 +++++ 10 files changed, 71 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index d2baacf..8f282e0 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -13,7 +13,6 @@ packages: - "libxslt1.1" - "libxml2-utils" - "sqlite3" -- "python-lxml" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -33,6 +32,8 @@ files: - "tor-browser-linux64-gbuilt.zip" - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" +- "python-linux64-utils.zip" +- "lxml-linux64-utils.zip" - "mar-tools-linux64.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" @@ -76,6 +77,10 @@ script: | mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ + # Preparing Python for HTTPS-Everywhere. + unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip + export PATH=$INSTDIR/python/bin:$PATH + unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index c49636a..a0fc8e3 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -16,7 +16,6 @@ packages: - "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" -- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. @@ -30,6 +29,7 @@ remotes: files: - "binutils-linux64-utils.zip" - "gcc-linux64-utils.zip" +- "python-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -47,6 +47,11 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # + # Preparing Python for Tor Browser + unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip + # TODO: We might want to have a smarter solution than hard-coding the version. + ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python + export PATH=$INSTDIR/python/bin:$PATH # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 673dc5a..c581248 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,6 +32,8 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" +- "python.tar.bz2" +- "lxml.tar.gz" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -112,7 +114,29 @@ script: | make install cd .. + # Building Python + # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. + # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... + tar xjf python.tar.bz2 + cd Python-* + ./configure + make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python + cd .. + + # Building lxml + export LD_PRELOAD="" + tar xzf lxml.tar.gz + cd lxml-* + # Make sure we use our freshly built python binary here. Otherwise bad things + # may happen when we do so in the bundle step assembling the HTTPS-Everywhere + # rules. + $INSTDIR/python/bin/python2.7 setup.py build + cd build/lib* + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml export LD_PRELOAD="" + cp *utils.zip $OUTDIR + cd ../../../ # Building GMP tar xjf gmp.tar.bz2 @@ -134,5 +158,6 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent + ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9d6f2f3..206023b 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,11 +112,12 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -225,6 +226,7 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 +ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -234,6 +236,7 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 +ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index a1674dd..5fa3966 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -104,6 +104,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux64-utils.zip -o \ ! -f inputs/gcc-$GCC_VER-linux64-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ + ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ + ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then echo @@ -123,6 +125,8 @@ then ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip + ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip + ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ @@ -137,6 +141,8 @@ else ln -sf gcc-$GCC_VER-linux64-utils.zip gcc-linux64-utils.zip ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip + ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip + ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index fc62344..82a810a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -121,11 +121,12 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ + "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" diff --git a/gitian/versions b/gitian/versions index 522b37f..8e35391 100755 --- a/gitian/versions +++ b/gitian/versions @@ -55,6 +55,7 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -70,6 +71,7 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -79,6 +81,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -116,6 +119,7 @@ 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} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -126,6 +130,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6943f2a..6c6d566 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -56,6 +56,7 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -71,6 +72,7 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -79,6 +81,7 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -115,6 +118,7 @@ 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} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -124,6 +128,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.beta b/gitian/versions.beta index 1bde7e5..43c5fde 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -48,6 +48,7 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -63,6 +64,7 @@ MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -72,6 +74,7 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -108,6 +111,7 @@ 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} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -118,6 +122,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9325e9d..d209c6a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,6 +59,7 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 +LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -74,6 +75,7 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 +PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -82,6 +84,7 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz +LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -118,6 +121,7 @@ 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} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… +PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -127,6 +131,7 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… +LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[tor-browser-bundle/hardened-builds] Revert "Bug 15578: Switch Linux descriptors over to Wheezy"
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit a125e1c1bfc3babae9636750b4722b4ab7010ca3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:05:41 2016 +0000 Revert "Bug 15578: Switch Linux descriptors over to Wheezy" This reverts commit 763784f552779b6dd4e58a76f441a8602b9018ba. --- gitian/Makefile | 2 +- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 41 ++++++++++---------- gitian/descriptors/linux/gitian-bundle.yml | 6 ++- gitian/descriptors/linux/gitian-firefox.yml | 9 +++-- .../linux/gitian-pluggable-transports.yml | 7 ++-- gitian/descriptors/linux/gitian-tor.yml | 7 ++-- gitian/descriptors/linux/gitian-utils.yml | 38 +++++------------- gitian/make-vms.sh | 29 ++++++-------- 9 files changed, 57 insertions(+), 84 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 36b5ec3..5718d76 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -119,7 +119,7 @@ clean-bundle: vmclean: rm -rf ../../gitian-builder/*.qcow2 rm -rf ../../gitian-builder/base-* - rm -rf ../../gitian-builder/target-{lucid,wheezy,precise}* + rm -rf ../../gitian-builder/target-{lucid,precise}* distclean: vmclean rm -rf ../../gitian-builder/inputs/* diff --git a/gitian/README.build b/gitian/README.build index 4d01d6a..f289791 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -177,7 +177,7 @@ Known Issues and Quirks: where 'make vmclean' causes the rebuild of two VMs in a row.. This might trigger weird bugs in python-vm-builder.. To rebuild only one set of VMs, use either 'rm ../../gitian-builder/*precise*' (to remove the Windows/Mac - VMs) or 'rm ../../gitian-builder/*wheezy*' (to remove the Linux VMs). + VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index a5f8393..cc16d0e 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 python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion 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 python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" exit 1 fi else @@ -45,29 +45,28 @@ then echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi + + # python-vm-builder is special as we don't have a Debian package for it. + vmbuilder --help 2>/dev/null >/dev/null + if [ $? -ne 0 ]; + then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' + echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr489" + echo "sudo python setup.py install" + echo "cd .." + exit 1 + fi else echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi -# vmbuilder is special as we don't have a package for it yet. -# XXX: Make sure an already installed vmbuilder is recent enough. -vmbuilder --help 2>/dev/null >/dev/null -if [ $? -ne 0 ]; -then - echo "The VM tool python-vm-builder is missing." - echo - echo "Please run" - echo 'torsocks wget -U "" https://bugs.launchpad.net/ubuntu/+archive/primary/+files/vm-builder_0.12.4…' - echo 'echo "76cbf8c52c391160b2641e7120dbade5afded713afaa6032f733a261f13e6a8e vm-builder_0.12.4+bzr494.orig.tar.gz" | sha256sum -c' - echo "# (verification -- must return OK)" - echo "tar -zxvf vm-builder_0.12.4+bzr494.orig.tar.gz" - echo "cd vm-builder-0.12.4+bzr494" - echo "sudo python setup.py install" - echo "cd .." - exit 1 -fi - update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg @@ -81,7 +80,7 @@ if [ -n "$missing_pkg" ] then echo "You are missing one or more dependencies for the update_responses script" echo "Please run" - echo " sudo torsocks apt-get install $missing_pkg" + echo " sudo apt-get install $missing_pkg" exit 1 fi diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 8f282e0..48c68eb 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -1,8 +1,7 @@ --- name: "bundle-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -107,6 +106,9 @@ script: | cd ../../../ # cd https-everywhere + # Workaround for git not knowing `git submodule -f` in the version shipped in + # 10.04. + sed 's/recursive -f/recursive/' -i makexpi.sh # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 # The solution there does not work for us as doing something like diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index a0fc8e3..3c6c1f1 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -1,8 +1,7 @@ --- name: "torbrowser-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -11,10 +10,9 @@ packages: - "autoconf2.13" - "libgtk2.0-dev" - "libdbus-glib-1-dev" -- "yasm" +- "yasm-1" - "libasound2-dev" - "libgstreamer-plugins-base0.10-dev" -- "libxt-dev" - "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" @@ -47,6 +45,9 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # + mkdir -p $INSTDIR/build/bin/ + ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm + export PATH=$PATH:$INSTDIR/build/bin # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index a886572..25b5a1b 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -1,8 +1,7 @@ --- name: "pluggable-transports-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -55,6 +54,7 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -248,8 +248,7 @@ script: | cp -a obfs4proxy $PTDIR cd ../.. - # Grabbing the results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Grabbing the results cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f8f83e9..630c2e0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -1,8 +1,7 @@ --- name: "tor-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -28,6 +27,7 @@ files: script: | INSTDIR="$HOME/install" source versions + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -90,8 +90,7 @@ script: | objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # Grabbing the results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Grabbing the results ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index c581248..a742c4e 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -1,8 +1,7 @@ --- name: "utils-linux" -distro: "debian" suites: -- "wheezy" +- "lucid" architectures: - "amd64" packages: @@ -22,8 +21,6 @@ packages: - "libxslt-dev" # Needed for passing the Python related part of configure in ESR 31. - "libssl-dev" -# Needed for binutils (64bit) as we are building with PIE enabled. -- "libstdc++6-4.7-pic" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -43,7 +40,6 @@ script: | source versions export TZ=UTC export LC_ALL=C - export FAKETIME=$REFERENCE_DATETIME umask 0022 # Config options for hardening-wrapper @@ -55,14 +51,6 @@ script: | # Building Binutils tar xjf binutils.tar.bz2 - # The libstdc++ shipped by default is non-PIC which breaks the binutils build - # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND - # make sure it gets used before the non-PIC one would. - if [ $GBUILD_BITS == "64" ]; - then - ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a - export LDFLAGS="-L/home/debian -lstdc++" - fi cd binutils* # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from @@ -74,15 +62,6 @@ script: | cd .. export PATH=$INSTDIR/binutils/bin:$PATH - export LDFLAGS="" - # We need to disable `-Werror=format-security` as GCC does not build with it - # anymore. It seems it got audited for those problems already: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. - export DEB_BUILD_HARDENING_FORMAT=0 - # libfaketime gets into our way when building GCC 4.9.x. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we - # avoid it for the toolchain and cross our fingers. - # TODO: Test a newer libfaketime than 0.8. # Building GCC tar xjf gcc.tar.bz2 cd gcc-* @@ -92,7 +71,13 @@ script: | make install cd .. - export DEB_BUILD_HARDENING_FORMAT=1 + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + export FAKETIME=$REFERENCE_DATETIME + # Building Libevent cd libevent ./autogen.sh @@ -103,7 +88,6 @@ script: | cd .. # Building OpenSSL - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 tar xzf openssl.tar.gz cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -124,7 +108,6 @@ script: | cd .. # Building lxml - export LD_PRELOAD="" tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -132,9 +115,7 @@ script: | # rules. $INSTDIR/python/bin/python2.7 setup.py build cd build/lib* - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml - export LD_PRELOAD="" cp *utils.zip $OUTDIR cd ../../../ @@ -151,8 +132,7 @@ script: | make install cd .. - # Grabbing the remaining results and making sure timestamps don't spoil them - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 469a9ca..a3b43b5 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -33,14 +33,7 @@ build_and_test_vm() { export LXC_ARCH=$arch ./bin/make-base-vm --suite $dist --lxc --arch $arch else - if [ "$dist" = "wheezy" ]; - then - export DISTRO=debian - ./bin/make-base-vm --distro debian --suite $dist --arch $arch - else - export DISTRO=ubuntu - ./bin/make-base-vm --suite $dist --arch $arch - fi + ./bin/make-base-vm --suite $dist --arch $arch fi make-clean-vm --suite $dist --arch $arch @@ -63,21 +56,21 @@ build_and_test_vm() { return 0 } -while ! build_and_test_vm wheezy i386 32 +while ! build_and_test_vm lucid i386 32 do - stop-target 32 wheezy - rm ./base-wheezy-i386* + stop-target 32 lucid + rm ./base-lucid-i386* echo - echo "Wheezy i386 VM build failed... Trying again" + echo "Lucid i386 VM build failed... Trying again" echo done -while ! build_and_test_vm wheezy amd64 64 +while ! build_and_test_vm lucid amd64 64 do - stop-target 64 wheezy - rm ./base-wheezy-amd64* + stop-target 64 lucid + rm ./base-lucid-amd64* echo - echo "Wheezy amd64 VM build failed... Trying again" + echo "Lucid amd64 VM build failed... Trying again" echo done @@ -86,7 +79,7 @@ do stop-target 32 precise rm ./base-precise-i386* echo - echo "Precise amd64 VM build failed... Trying again" + echo "Lucid amd64 VM build failed... Trying again" echo done @@ -95,7 +88,7 @@ do stop-target 64 precise rm ./base-precise-amd64* echo - echo "Precise amd64 VM build failed... Trying again" + echo "Lucid amd64 VM build failed... Trying again" echo done

1 0

[tor-browser-bundle/maint-5.5] Fix typo in changelog
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit 9febcedd7263a90d226cfe8b73663fdf64a6ccc2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:08:39 2016 +0000 Fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d08a7bc..dcd0398 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -30,7 +30,7 @@ Tor Browser 5.5 -- January 26 2016 * Bug 16620: Move window.name handling into a Firefox patch * Bug 17220: Support math symbols in font whitelist * Bug 10599+17305: Include updater and build patches needed for hardened builds - * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18115+18104+18071+18091: Update/add new obfs4 bridge * Bug 18072: Change recommended pluggable transport type to obfs4 * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser * Bug 16322: Use onion address for DuckDuckGo search engine

1 0

[tor-browser-bundle/master] Typo fix in changelog
by gk＠torproject.org 25 Jan '16

25 Jan '16

commit 3338773523e13ff85339512235ad9ef8a344874e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 25 08:04:05 2016 +0000 Typo fix in changelog Thanks dcf --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6f85c75..5eabaa4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -13,7 +13,7 @@ Tor Browser 6.0a1 -- January 27 2016 * Bug 11773: Setup wizard UI flow improvements * Translation updates * Bug 17428: Remove Flashproxy - * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18115+18104+18071+18091: Update/add new obfs4 bridge * Bug 18072: Change recommended pluggable transport type to obfs4 * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser * Bug 16322: Use onion address for DuckDuckGo search engine @@ -55,7 +55,7 @@ Tor Browser 5.5 -- January 26 2016 * Bug 16620: Move window.name handling into a Firefox patch * Bug 17220: Support math symbols in font whitelist * Bug 10599+17305: Include updater and build patches needed for hardened builds - * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge + * Bug 18115+18104+18071+18091: Update/add new obfs4 bridge * Bug 18072: Change recommended pluggable transport type to obfs4 * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser * Bug 16322: Use onion address for DuckDuckGo search engine

1 0

[tor-browser-bundle/hardened-builds] Bug 15578: Switch Linux descriptors over to Wheezy
by gk＠torproject.org 24 Jan '16

24 Jan '16

commit 763784f552779b6dd4e58a76f441a8602b9018ba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 7 12:33:16 2015 +0000 Bug 15578: Switch Linux descriptors over to Wheezy Besides using Wheezy for building Linux bundles this patch cleans up our usage of libfaketime as well to make it obvious where exactly we still need it. --- gitian/Makefile | 2 +- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 41 ++++++++++---------- gitian/descriptors/linux/gitian-bundle.yml | 6 +-- gitian/descriptors/linux/gitian-firefox.yml | 9 ++--- .../linux/gitian-pluggable-transports.yml | 7 ++-- gitian/descriptors/linux/gitian-tor.yml | 7 ++-- gitian/descriptors/linux/gitian-utils.yml | 38 +++++++++++++----- gitian/make-vms.sh | 29 ++++++++------ 9 files changed, 84 insertions(+), 57 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 5718d76..36b5ec3 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -119,7 +119,7 @@ clean-bundle: vmclean: rm -rf ../../gitian-builder/*.qcow2 rm -rf ../../gitian-builder/base-* - rm -rf ../../gitian-builder/target-{lucid,precise}* + rm -rf ../../gitian-builder/target-{lucid,wheezy,precise}* distclean: vmclean rm -rf ../../gitian-builder/inputs/* diff --git a/gitian/README.build b/gitian/README.build index f289791..4d01d6a 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -177,7 +177,7 @@ Known Issues and Quirks: where 'make vmclean' causes the rebuild of two VMs in a row.. This might trigger weird bugs in python-vm-builder.. To rebuild only one set of VMs, use either 'rm ../../gitian-builder/*precise*' (to remove the Windows/Mac - VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). + VMs) or 'rm ../../gitian-builder/*wheezy*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index cc16d0e..a5f8393 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 python-vm-builder 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 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 python-vm-builder 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" exit 1 fi else @@ -45,28 +45,29 @@ then echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi - - # python-vm-builder is special as we don't have a Debian package for it. - vmbuilder --help 2>/dev/null >/dev/null - if [ $? -ne 0 ]; - then - echo "The VM tool python-vm-builder is missing." - echo - echo "Please run" - echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' - echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' - echo "# (verification -- must return OK)" - echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" - echo "cd vm-builder-0.12.4+bzr489" - echo "sudo python setup.py install" - echo "cd .." - exit 1 - fi else echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi +# vmbuilder is special as we don't have a package for it yet. +# XXX: Make sure an already installed vmbuilder is recent enough. +vmbuilder --help 2>/dev/null >/dev/null +if [ $? -ne 0 ]; +then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" https://bugs.launchpad.net/ubuntu/+archive/primary/+files/vm-builder_0.12.4…' + echo 'echo "76cbf8c52c391160b2641e7120dbade5afded713afaa6032f733a261f13e6a8e vm-builder_0.12.4+bzr494.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr494.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr494" + echo "sudo python setup.py install" + echo "cd .." + exit 1 +fi + update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl libjson-perl" missing_pkg='' for pkg in $update_responses_pkg @@ -80,7 +81,7 @@ if [ -n "$missing_pkg" ] then echo "You are missing one or more dependencies for the update_responses script" echo "Please run" - echo " sudo apt-get install $missing_pkg" + echo " sudo torsocks apt-get install $missing_pkg" exit 1 fi diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 48c68eb..8f282e0 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -1,7 +1,8 @@ --- name: "bundle-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -106,9 +107,6 @@ script: | cd ../../../ # cd https-everywhere - # Workaround for git not knowing `git submodule -f` in the version shipped in - # 10.04. - sed 's/recursive -f/recursive/' -i makexpi.sh # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 # The solution there does not work for us as doing something like diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3c6c1f1..a0fc8e3 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -1,7 +1,8 @@ --- name: "torbrowser-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -10,9 +11,10 @@ packages: - "autoconf2.13" - "libgtk2.0-dev" - "libdbus-glib-1-dev" -- "yasm-1" +- "yasm" - "libasound2-dev" - "libgstreamer-plugins-base0.10-dev" +- "libxt-dev" - "hardening-wrapper" # To pass configure since ESR 31. - "libpulse-dev" @@ -45,9 +47,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - mkdir -p $INSTDIR/build/bin/ - ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm - export PATH=$PATH:$INSTDIR/build/bin # Preparing Python for Tor Browser unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip # TODO: We might want to have a smarter solution than hard-coding the version. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 25b5a1b..a886572 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -1,7 +1,8 @@ --- name: "pluggable-transports-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -54,7 +55,6 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -248,7 +248,8 @@ script: | cp -a obfs4proxy $PTDIR cd ../.. - # Grabbing the results + # Grabbing the results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 630c2e0..f8f83e9 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -1,7 +1,8 @@ --- name: "tor-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -27,7 +28,6 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C @@ -90,7 +90,8 @@ script: | objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # Grabbing the results + # Grabbing the results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index a742c4e..c581248 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -1,7 +1,8 @@ --- name: "utils-linux" +distro: "debian" suites: -- "lucid" +- "wheezy" architectures: - "amd64" packages: @@ -21,6 +22,8 @@ packages: - "libxslt-dev" # Needed for passing the Python related part of configure in ESR 31. - "libssl-dev" +# Needed for binutils (64bit) as we are building with PIE enabled. +- "libstdc++6-4.7-pic" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -40,6 +43,7 @@ script: | source versions export TZ=UTC export LC_ALL=C + export FAKETIME=$REFERENCE_DATETIME umask 0022 # Config options for hardening-wrapper @@ -51,6 +55,14 @@ script: | # Building Binutils tar xjf binutils.tar.bz2 + # The libstdc++ shipped by default is non-PIC which breaks the binutils build + # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND + # make sure it gets used before the non-PIC one would. + if [ $GBUILD_BITS == "64" ]; + then + ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a + export LDFLAGS="-L/home/debian -lstdc++" + fi cd binutils* # We want to use gold as the linker in our toolchain mainly as it is way # faster when linking Tor Browser code (especially libxul). But apart from @@ -62,6 +74,15 @@ script: | cd .. export PATH=$INSTDIR/binutils/bin:$PATH + export LDFLAGS="" + # We need to disable `-Werror=format-security` as GCC does not build with it + # anymore. It seems it got audited for those problems already: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. + export DEB_BUILD_HARDENING_FORMAT=0 + # libfaketime gets into our way when building GCC 4.9.x. See: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we + # avoid it for the toolchain and cross our fingers. + # TODO: Test a newer libfaketime than 0.8. # Building GCC tar xjf gcc.tar.bz2 cd gcc-* @@ -71,13 +92,7 @@ script: | make install cd .. - # libfaketime gets into our way when building GCC 4.9.x. See: - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61314 for details. Thus, we - # avoid it for the toolchain and cross our fingers. - # TODO: Test a newer libfaketime than 0.8. - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME - + export DEB_BUILD_HARDENING_FORMAT=1 # Building Libevent cd libevent ./autogen.sh @@ -88,6 +103,7 @@ script: | cd .. # Building OpenSSL + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 tar xzf openssl.tar.gz cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" @@ -108,6 +124,7 @@ script: | cd .. # Building lxml + export LD_PRELOAD="" tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -115,7 +132,9 @@ script: | # rules. $INSTDIR/python/bin/python2.7 setup.py build cd build/lib* + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml + export LD_PRELOAD="" cp *utils.zip $OUTDIR cd ../../../ @@ -132,7 +151,8 @@ script: | make install cd .. - # Grabbing the remaining results + # Grabbing the remaining results and making sure timestamps don't spoil them + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 cd $INSTDIR ~/build/dzip.sh binutils-$BINUTILS_VER-linux$GBUILD_BITS-utils.zip binutils ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index a3b43b5..469a9ca 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -33,7 +33,14 @@ build_and_test_vm() { export LXC_ARCH=$arch ./bin/make-base-vm --suite $dist --lxc --arch $arch else - ./bin/make-base-vm --suite $dist --arch $arch + if [ "$dist" = "wheezy" ]; + then + export DISTRO=debian + ./bin/make-base-vm --distro debian --suite $dist --arch $arch + else + export DISTRO=ubuntu + ./bin/make-base-vm --suite $dist --arch $arch + fi fi make-clean-vm --suite $dist --arch $arch @@ -56,21 +63,21 @@ build_and_test_vm() { return 0 } -while ! build_and_test_vm lucid i386 32 +while ! build_and_test_vm wheezy i386 32 do - stop-target 32 lucid - rm ./base-lucid-i386* + stop-target 32 wheezy + rm ./base-wheezy-i386* echo - echo "Lucid i386 VM build failed... Trying again" + echo "Wheezy i386 VM build failed... Trying again" echo done -while ! build_and_test_vm lucid amd64 64 +while ! build_and_test_vm wheezy amd64 64 do - stop-target 64 lucid - rm ./base-lucid-amd64* + stop-target 64 wheezy + rm ./base-wheezy-amd64* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Wheezy amd64 VM build failed... Trying again" echo done @@ -79,7 +86,7 @@ do stop-target 32 precise rm ./base-precise-i386* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Precise amd64 VM build failed... Trying again" echo done @@ -88,7 +95,7 @@ do stop-target 64 precise rm ./base-precise-amd64* echo - echo "Lucid amd64 VM build failed... Trying again" + echo "Precise amd64 VM build failed... Trying again" echo done

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits