commit 735a29c864e424287ac348899b90e2643998c4ec Author: Mike Perry mikeperry-git@torproject.org Date: Thu Jan 16 17:05:54 2014 -0800
Switch pluggable transports back to openssl tarballs. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 6 +++--- gitian/descriptors/mac/gitian-pluggable-transports.yml | 6 +++--- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 7d6a8b9..9aafc57 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -16,8 +16,6 @@ packages: - "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" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" @@ -25,6 +23,7 @@ remotes: - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" files: +- "openssl.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -94,7 +93,8 @@ script: | cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf ./config -shared --prefix=$INSTDIR/openssl diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 1824fcd..d44193c 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -15,8 +15,6 @@ packages: #- "libssl0.9.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" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" @@ -24,6 +22,7 @@ remotes: - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" files: +- "openssl.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -111,7 +110,8 @@ script: | cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cd .. # - cd openssl + tar xzf openssl.tar.gz + 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 make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 534a2f0..a8535c6 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -15,8 +15,6 @@ packages: - "libtool" 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" - "url": "https://git.torproject.org/pluggable-transports/obfsproxy.git" @@ -24,6 +22,7 @@ remotes: - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" files: +- "openssl.tar.gz" - "setuptools.tar.gz" - "pycrypto.tar.gz" - "zope.interface.zip" @@ -163,7 +162,8 @@ script: | cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. # - cd openssl + tar xzf openssl.tar.gz + cd openssl-* find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl make diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 62d433d..960d33c 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -129,7 +129,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,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_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` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 1eebfb8..21e88d2 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -126,7 +126,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_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` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 4f27840..3760b01 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -127,7 +127,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo
- ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`