[tbb-commits] [tor-browser-bundle/master] Bug 16150: Take care of whitespace in filenames

gk at torproject.org gk at torproject.org
Tue Jun 16 11:54:24 UTC 2015


commit e35d7c08cc2d9dbbe9c963573858dc49eb5ba563
Author: Georg Koppen <gk at 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





More information about the tbb-commits mailing list