January 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Install pluggable-transports into linux bundle.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 380c6037fca9c191badb685d95a7ac1d9110ce4f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 6 06:52:39 2013 +0000 Install pluggable-transports into linux bundle. --- gitian/descriptors/linux/gitian-bundle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7dc1104..508123a 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -27,6 +27,8 @@ files: - "tor-browser-linux64-gbuilt.zip" - "tor-linux32-gbuilt.zip" - "tor-linux64-gbuilt.zip" +- "pluggable-transports-linux32-gbuilt.zip" +- "pluggable-transports-linux64-gbuilt.zip" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -96,6 +98,7 @@ script: | cd tor-browser unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip + unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip chmod 700 Data/Browser

1 0

[tor-browser-bundle/master] Call gitian-pluggable-transports.yml from mkbundle-linux.sh.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 827fc3c5ff278646a8b0ba4aaf27ba39db8f9735 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 6 06:03:36 2013 +0000 Call gitian-pluggable-transports.yml from mkbundle-linux.sh. --- gitian/mkbundle-linux.sh | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 182b1b6..628cd86 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -79,7 +79,7 @@ cd $GITIAN_DIR if [ ! -f $GITIAN_DIR/inputs/tor-linux32-gbuilt.zip -o ! -f $GITIAN_DIR/inputs/tor-linux64-gbuilt.zip ]; then echo - echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******" + echo "****** Starting Tor Component of Linux Bundle (1/4 for Linux) ******" echo ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml @@ -94,7 +94,7 @@ then #cp -a result/tor-linux-res.yml $GITIAN_DIR/inputs/ else echo - echo "****** SKIPPING already built Tor Component of Linux Bundle (1/3 for Linux) ******" + echo "****** SKIPPING already built Tor Component of Linux Bundle (1/4 for Linux) ******" echo fi @@ -103,7 +103,7 @@ fi if [ ! -f $GITIAN_DIR/inputs/tor-browser-linux32-gbuilt.zip -o ! -f $GITIAN_DIR/inputs/tor-browser-linux64-gbuilt.zip ]; then echo - echo "****** Starting TorBrowser Component of Linux Bundle (2/3 for Linux) ******" + echo "****** Starting TorBrowser Component of Linux Bundle (2/4 for Linux) ******" echo ./bin/gbuild -j $NUM_PROCS --commit tor-browser=$TORBROWSER_TAG $DESCRIPTOR_DIR/linux/gitian-firefox.yml @@ -118,14 +118,36 @@ then #cp -a result/torbrowser-linux-res.yml $GITIAN_DIR/inputs/ else echo - echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (2/3 for Linux) ******" + echo "****** SKIPPING already built TorBrowser Component of Linux Bundle (2/4 for Linux) ******" + echo +fi + +if [ ! -f $GITIAN_DIR/inputs/pluggable-transports-linux32-gbuilt.zip -o ! -f $GITIAN_DIR/inputs/pluggable-transports-linux64-gbuilt.zip ]; +then + echo + echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" + echo + + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_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` + exit 1 + fi + + cp -a build/out/pluggable-transports-linux*-gbuilt.zip $GITIAN_DIR/inputs/ + cp -a build/out/pluggable-transports-linux*-debug.zip $GITIAN_DIR/inputs/ + #cp -a result/pluggable-transports-linux-res.yml $GITIAN_DIR/inputs/ +else + echo + echo "****** SKIPPING already built Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo fi if [ ! -f $GITIAN_DIR/inputs/bundle-linux.gbuilt ]; then echo - echo "****** Starting Bundling+Localization of Linux Bundle (3/3 for Linux) ******" + echo "****** Starting Bundling+Localization of Linux Bundle (4/4 for Linux) ******" echo cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR @@ -143,7 +165,7 @@ then touch $GITIAN_DIR/inputs/bundle-linux.gbuilt else echo - echo "****** SKIPPING already built Bundling+Localization of Linux Bundle (3/3 for Linux) ******" + echo "****** SKIPPING already built Bundling+Localization of Linux Bundle (4/4 for Linux) ******" echo fi

1 0

[tor-browser-bundle/master] Build pyptlib for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 8c2f691dd0f06742cb4570b559bd36b95b2da210 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 13 22:09:29 2013 -0800 Build pyptlib for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 11 ++++++++++- gitian/mkbundle-linux.sh | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 104bb14..b328214 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -8,12 +8,15 @@ architectures: packages: - "git-core" - "zip" +- "python-setuptools" - "faketime" - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/nmathewson/openssl.git" "dir": "openssl" +- "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" + "dir": "pyptlib" files: - "dzip.sh" script: | @@ -33,9 +36,15 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - mkdir -p $PTDIR/ + mkdir -p $PTDIR mkdir -p $INSTDIR/Debug/ # + cd pyptlib + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/pyptlib $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 628cd86..edb272b 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 $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_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`

1 0

[tor-browser-bundle/master] Build pycrypto for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit fa14fa6a85aed619ae86f795b62bd2ce0509b149 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 04:07:59 2013 +0000 Build pycrypto for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index b328214..4455cf7 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -9,6 +9,7 @@ packages: - "git-core" - "zip" - "python-setuptools" +- "python-dev" - "faketime" - "hardening-wrapper" reference_datetime: "2000-01-01 00:00:00" @@ -18,6 +19,7 @@ remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" "dir": "pyptlib" files: +- "pycrypto.tar.gz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -45,6 +47,13 @@ script: | cp -a build/pyptlib $PTDIR/ cd .. # + tar xzf pycrypto.tar.gz + cd pycrypto-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/Crypto $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf

1 0

[tor-browser-bundle/master] Build zope.interface for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 79f90b134236be8eae586c42ec39038c4b1c9e0a Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 05:02:28 2013 +0000 Build zope.interface for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 7b18eef..cbb7c5a 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -7,6 +7,7 @@ architectures: - "amd64" packages: - "git-core" +- "unzip" - "zip" - "python-setuptools" - "python-dev" @@ -21,6 +22,7 @@ remotes: files: - "pycrypto.tar.gz" - "argparse.tar.gz" +- "zope.interface.zip" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -62,6 +64,13 @@ script: | cp -a build/argparse.py $PTDIR/ cd .. # + unzip zope.interface.zip + cd zope.interface-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/zope $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf

1 0

[tor-browser-bundle/master] Build argparse for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit a90b16940ae6fb05d4ea3876cd490965a3a52c5f Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 04:37:16 2013 +0000 Build argparse for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 4455cf7..7b18eef 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -20,6 +20,7 @@ remotes: "dir": "pyptlib" files: - "pycrypto.tar.gz" +- "argparse.tar.gz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -54,6 +55,13 @@ script: | cp -a build/Crypto $PTDIR/ cd .. # + tar xzf argparse.tar.gz + cd argparse-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/argparse.py $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf

1 0

[tor-browser-bundle/master] Build obfsproxy for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 975121dc2e44ed310b3fe2553e382f5a2f382267 Author: David Fifield <david(a)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`

1 0

[tor-browser-bundle/master] Build twisted for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 75270c68f7bdae9609142a8b5e8303d739fb47c0 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Nov 7 05:26:08 2013 +0000 Build twisted for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index cbb7c5a..4af0f77 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -23,6 +23,7 @@ files: - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" +- "twisted.tar.bz2" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -71,6 +72,13 @@ script: | cp -a build/zope $PTDIR/ cd .. # + tar xjf twisted.tar.bz2 + cd Twisted-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/twisted $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf

1 0

[tor-browser-bundle/master] Build m2crypto for linux.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit 78f53686c7b704305ee1ef8a2d9ca65832b3ab88 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 11 06:41:57 2013 +0000 Build m2crypto for linux. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9803066..85c5bc9 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -9,6 +9,7 @@ packages: - "git-core" - "unzip" - "zip" +- "swig" - "python-setuptools" - "python-dev" - "faketime" @@ -26,6 +27,7 @@ files: - "argparse.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" +- "m2crypto.tar.gz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -98,6 +100,14 @@ script: | make install cd .. # + tar xzf m2crypto.tar.gz + cd M2Crypto-* + find -type f | xargs 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/ + cd .. + # cd $INSTDIR # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/

1 0

[tor-browser-bundle/master] Build pyptlib for mac.
by mikeperry＠torproject.org 21 Jan '14

21 Jan '14

commit dbdb86c6d3e7d936169bbf61d217a3e694d396cb Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 12 06:27:35 2013 +0000 Build pyptlib for mac. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 9 +++++++++ gitian/mkbundle-mac.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 1a6b933..08885ee 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -7,6 +7,7 @@ architectures: packages: - "git-core" - "zip" +- "python-setuptools" - "faketime" - "libtool" #- "libssl0.9.8" @@ -14,6 +15,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/nmathewson/openssl.git" "dir": "openssl" +- "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" + "dir": "pyptlib" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -47,6 +50,12 @@ script: | # For OpenSSL sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc # + cd pyptlib + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/pyptlib $PTDIR/ + cd .. + # cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 3b40142..debc170 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -124,7 +124,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0