- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Merge branch 'bug_16283'
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit f35744d076aa2aeceeb5fd64faf1945b58ba435e Merge: f0f7fdb 8b3ad7a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 17 13:43:47 2015 +0000 Merge branch 'bug_16283' gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor-browser-bundle/master] Bump nightly versions (Firefox/NoScript)
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit f0f7fdbdad8a6ac9fdfea1c00a84deefb816b7df Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:46:00 2015 +0000 Bump nightly versions (Firefox/NoScript) --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 73a5fe7..bea7547 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.6.0esr +FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -60,7 +60,7 @@ GO_VER=1.4.2 ## 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.6.9.21-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.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 @@ -87,7 +87,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16388: Bump OpenSSL to 1.0.1o
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit c779ab8b929c2d800a2e85d36a7f9e8d118eac16 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:37:40 2015 +0000 Bug 16388: Bump OpenSSL to 1.0.1o --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions b/gitian/versions index e1bf555..a073427 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d34f0af..56b46b9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8eb91..73a5fe7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -82,7 +82,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-4.5] Bug 16388: Bump OpenSSL to 1.0.1o
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit 64e129c8755a3cd0e0392cdbd149137ce41e32e1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:32:08 2015 +0000 Bug 16388: Bump OpenSSL to 1.0.1o --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index e1bf555..a073427 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Merge branch 'bug_16150_v2'
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit f1783ba6746b9facbd35273d665cd48a36eb9c2f Merge: c57e340 e35d7c0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 11:53:17 2015 +0000 Merge branch 'bug_16150_v2' gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-)

1 0

[tor-browser-bundle/master] Bug 16150: Take care of whitespace in filenames
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit e35d7c08cc2d9dbbe9c963573858dc49eb5ba563 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 21 13:15:49 2015 +0000 Bug 16150: Take care of whitespace in filenames It turned out that setting the timestamp to 2000-01-01 00:00:00 is breaking with Firefox 38 ESR as we have files with whitespaces there for the first time. The conversion was done with the following Perl snippet: perl -p -i -e 's/find -type f \| xargs/find -type f -print0 \| xargs -0/g' \ `find ./ -name *.yml` --- gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3a144ca..e7c8bfa 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -103,7 +103,7 @@ script: | cd tor-browser # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure # |configure| can't cope with nano seconds faked. And even if we would revert @@ -118,7 +118,7 @@ script: | # comment 13. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="bash,make" - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See # #12461 comments 11 and 12 for details. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 1130cdf..0f123ff 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -90,7 +90,7 @@ script: | # Building pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. @@ -98,7 +98,7 @@ script: | # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. @@ -106,7 +106,7 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. @@ -114,7 +114,7 @@ script: | # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. @@ -122,7 +122,7 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. @@ -130,7 +130,7 @@ script: | # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. @@ -138,7 +138,7 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/parsley.py $PTDIR/ cp -a build/ometa $PTDIR/ @@ -147,7 +147,7 @@ script: | # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -159,7 +159,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin @@ -170,7 +170,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ @@ -178,7 +178,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy @@ -188,7 +188,7 @@ script: | # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make cp -ra fte $PTDIR/ mkdir -p $INSTDIR/Docs/libfte @@ -198,7 +198,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy @@ -207,7 +207,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -215,7 +215,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client go build -ldflags '-s' cp -a meek-client $PTDIR @@ -230,7 +230,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -238,7 +238,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -246,7 +246,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -256,7 +256,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -264,7 +264,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index b218486..617e8df 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -87,7 +87,7 @@ script: | mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0646401..740a22c 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -79,7 +79,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -88,7 +88,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 @@ -125,7 +125,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. # --enable-fat makes the binaries slightly bigger but fixes reproducibility diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index f609268..e7a4dcb 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -59,7 +59,7 @@ script: | # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure # |configure| can't cope with nano seconds faked. And even if we would revert @@ -67,7 +67,7 @@ script: | # reasons. export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12812 comment 6 and #12461 comment 8 and later. diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 30f6444..d483462 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -105,7 +105,7 @@ script: | # Building pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. @@ -113,7 +113,7 @@ script: | # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-apple-darwin11 LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers @@ -124,7 +124,7 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. @@ -132,7 +132,7 @@ script: | # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. @@ -140,7 +140,7 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. @@ -148,7 +148,7 @@ script: | # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers python setup.py build --build-lib build cp -a build/twisted $PTDIR/ @@ -157,7 +157,7 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/parsley.py $PTDIR/ cp -a build/ometa $PTDIR/ @@ -166,7 +166,7 @@ script: | # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -178,7 +178,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin @@ -191,7 +191,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We have to put $INSTDIR/openssl at the beginning of the header and library # search paths (build_ext otherwise puts it at the end, after CFLAGS and # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr @@ -205,7 +205,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $TBDIR/Docs/FlashProxy @@ -214,7 +214,7 @@ script: | # Building libfte cd libfte - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make cp -ra fte $PTDIR/ mkdir -p $TBDIR/Docs/libfte @@ -224,7 +224,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ mkdir -p $TBDIR/Docs/fteproxy @@ -233,7 +233,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -241,7 +241,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. @@ -258,7 +258,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -266,7 +266,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -274,7 +274,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -284,7 +284,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -292,7 +292,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 3d0e0c6..b3e4425 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -65,7 +65,7 @@ script: | mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 6729eeb..6d93817 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -45,7 +45,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -54,7 +54,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on @@ -66,7 +66,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c5f2c41..ab8d7c6 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -73,7 +73,7 @@ script: | # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure # |configure| can't cope with nano seconds faked. And even if we would revert @@ -81,7 +81,7 @@ script: | # reasons. export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/ cp ~/build/i686* ~/build/bin/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 339a63e..1d8caba 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -163,20 +163,20 @@ script: | # Building setuptools tar xzf setuptools.tar.gz cd setuptools-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Bulding pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # This is bogus, that we run the configure script in the build environment, # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for # ac_cv_func_malloc_0_nonnull. @@ -188,14 +188,14 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null # Must create this file in order for py2exe to find the package. @@ -205,14 +205,14 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" # rather than "Python.h". ln -sf Python.h $INSTDIR/python/include/python.h @@ -231,13 +231,13 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -251,7 +251,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe LD_PRELOAD= $INSTPYTHON setup.py install py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip @@ -263,7 +263,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. @@ -273,7 +273,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ @@ -285,7 +285,7 @@ script: | cd libfte ln -s $INSTDIR/gmp thirdparty/gmp cp -a $INSTDIR/gmp/bin/libgmp-10.dll . - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= WINDOWS_BUILD=1 CROSS_COMPILE=1 PYTHON=$INSTPYTHON make LD_PRELOAD= $INSTPYTHON setup.py install mkdir -p $INSTDIR/Docs/libfte @@ -295,7 +295,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ @@ -309,7 +309,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -317,7 +317,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client go build -ldflags '-s' cp -a meek-client.exe $PTDIR @@ -336,7 +336,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -344,7 +344,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -352,7 +352,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -362,7 +362,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -370,7 +370,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 87e1dc2..edcc091 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -68,7 +68,7 @@ script: | export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ make $MAKEOPTS make install diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index bef262d..2b978e3 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -97,7 +97,7 @@ script: | cd .. # Second stage of gcc compilation cd gcc - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS make install mkdir -p $INSTDIR/gcclibs @@ -116,7 +116,7 @@ script: | export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" cd zlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" install cd .. @@ -124,7 +124,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-w64-mingw32 --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -133,7 +133,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl # Using $MAKEOPTS breaks the build. Might be the issue mentioned on @@ -145,7 +145,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared

1 0

[tor-browser-bundle/master] Bug 14387: Make MAR signing process more verbose
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit c57e340382377ccc1f0e376b23b621a1d7eef1d6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 15 13:19:20 2015 +0000 Bug 14387: Make MAR signing process more verbose --- gitian/signmars.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/signmars.sh b/gitian/signmars.sh index ed42971..ea315ea 100755 --- a/gitian/signmars.sh +++ b/gitian/signmars.sh @@ -121,6 +121,7 @@ done TMPMAR="$SIGNED_DIR/tmp.mar" trap "rm -f $TMPMAR" EXIT cd "$UNSIGNED_DIR" +echo "Starting the signing..." COUNT=0 for marfile in *.mar; do if [ ! -f "$marfile" ]; then @@ -130,6 +131,7 @@ for marfile in *.mar; do "$marfile" "$TMPMAR" mv "$TMPMAR" "$SIGNED_DIR/$marfile" COUNT=$((COUNT + 1)) + echo "Signed MAR file $COUNT" done echo "The $COUNT MAR files located in $SIGNED_DIR/ have been signed."

1 0

[tor-browser-bundle/master] Bump release dates to June 15th.
by mikeperry＠torproject.org 11 Jun '15

11 Jun '15

commit 2ae79282688ccd01284fd4bddecc4ff72663c9d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 11 13:34:49 2015 -0700 Bump release dates to June 15th. --- 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 de9fb59..e986e5c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 5.0a2 -- June 12 2015 +Tor Browser 5.0a2 -- June 15 2015 * All Platforms * Update Tor to 0.2.7.1-alpha * Update HTTPS-Everywhere to 5.0.5 @@ -18,7 +18,7 @@ Tor Browser 5.0a2 -- June 12 2015 * Bug 16026: Fix crash in GStreamer * Bug 16083: Update comment in start-tor-browser -Tor Browser 4.5.2 -- June 12 2015 +Tor Browser 4.5.2 -- June 15 2015 * All Platforms * Update Tor to 0.2.6.9 * Update HTTPS-Everywhere to 5.0.5

1 0

[tor-browser-bundle/master] Update versions and changelog for OpenSSL 1.0.1n.
by mikeperry＠torproject.org 11 Jun '15

11 Jun '15

commit c110b4fa7b8be0d6c511698f4c6668901e235c14 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 11 13:14:12 2015 -0700 Update versions and changelog for OpenSSL 1.0.1n. Also bump Tor to 0.2.6.9. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index df35913..de9fb59 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 5.0a2 -- June 12 2015 * All Platforms * Update Tor to 0.2.7.1-alpha * Update HTTPS-Everywhere to 5.0.5 + * Update OpenSSL to 1.0.1n * Update NoScript to 2.6.9.26 * Update meek to 0.19 * Update Torbutton to 1.9.2.7 @@ -19,8 +20,9 @@ Tor Browser 5.0a2 -- June 12 2015 Tor Browser 4.5.2 -- June 12 2015 * All Platforms - * Update Tor to 0.2.6.8 + * Update Tor to 0.2.6.9 * Update HTTPS-Everywhere to 5.0.5 + * Update OpenSSL to 1.0.1n * Update NoScript to 2.6.9.26 * Update Torbutton to 1.9.2.6 * Bug 15984: Disabling Torbutton breaks the Add-ons Manager diff --git a/gitian/versions b/gitian/versions index 9c0aac1..e1bf555 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 -TOR_TAG=tor-0.2.6.8 +TOR_TAG=tor-0.2.6.9 TORLAUNCHER_TAG=0.2.7.5 TORBUTTON_TAG=1.9.2.6 HTTPSE_TAG=5.0.5 @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2b2f6cd..d34f0af 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-launcher/master] Bump version to 0.2.7.6.
by brade＠torproject.org 10 Jun '15

10 Jun '15

commit d35ac816112de384e8e21c1c390e4bc5c1468b7e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 10 10:28:33 2015 -0400 Bump version to 0.2.7.6. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b2ca19c..2e9babc 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.7.4</em:version> + <em:version>0.2.7.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0