commit 975121dc2e44ed310b3fe2553e382f5a2f382267 Author: David Fifield david@bamsoftware.com Date: Thu Nov 7 06:05:16 2013 +0000

Build obfsproxy for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 13 ++++++++++++- gitian/mkbundle-linux.sh | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 4af0f77..9803066 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -19,6 +19,8 @@ remotes: "dir": "openssl" - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" +- "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" + "dir": "obfsproxy" files: - "pycrypto.tar.gz" - "argparse.tar.gz" @@ -79,6 +81,15 @@ script: | cp -a build/twisted $PTDIR/ cd .. # + cd obfsproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/obfsproxy $PTDIR/ + cp -a bin/obfsproxy $PTDIR/obfsproxy.bin + mkdir -p $INSTDIR/Docs/Obfsproxy + cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf @@ -89,7 +100,7 @@ script: | # cd $INSTDIR # - ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ + ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-debug.zip Debug/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ cp pluggable-transports-linux$GBUILD_BITS-debug.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index edb272b..64b3fa4 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -128,7 +128,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo

- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`