[tbb-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'tjr/tjr-64bit'

[mikeperry at torproject.org]

commit 912a8305b26ce0b1cbc80c4014b4de3ada898991
Merge: af7bd8e f1f4a2a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Oct 29 15:14:09 2014 -0700

    Merge remote-tracking branch 'tjr/tjr-64bit'
    
    Conflicts:
    	gitian/descriptors/mac/gitian-pluggable-transports.yml

 Bundle-Data/mac-tor.sh                             |    1 -
 gitian/descriptors/mac/gitian-bundle.yml           |    9 +++-----
 gitian/descriptors/mac/gitian-firefox.yml          |    3 ---
 .../mac/gitian-pluggable-transports.yml            |   16 ++++++-------
 gitian/descriptors/mac/gitian-tor.yml              |   16 ++++++-------
 gitian/descriptors/mac/gitian-utils.yml            |   16 +++++++------
 gitian/mkbundle-mac.sh                             |   24 ++++++++++----------
 7 files changed, 40 insertions(+), 45 deletions(-)

diff --cc gitian/descriptors/mac/gitian-pluggable-transports.yml
index 4c25f07,17aef86..6201230
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@@ -48,10 -42,8 +48,10 @@@ 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"
  - "dzip.sh"
- - "gmp-mac32-utils.zip"
- - "openssl-mac32-utils.zip"
 +- "go.crypto.tar.bz2"
 +- "go.net.tar.bz2"
+ - "gmp-mac64-utils.zip"
+ - "openssl-mac64-utils.zip"
  script: |
    INSTDIR="$HOME/install"
    TBDIR="$INSTDIR/TorBrowserBundle.app/TorBrowser"
@@@ -253,53 -245,7 +253,53 @@@
    cp -a README doc/*.1 $TBDIR/Docs/meek
    cd ..
  
 +  # Building go ed25519
 +  cd ed25519
 +  find -type f | xargs 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
 +  cd ..
 +
 +  # Building go siphash
 +  cd siphash
 +  find -type f | xargs 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
 +  cd ..
 +
 +  # Building go.crypto
 +  tar xjf go.crypto.tar.bz2
 +  cd go.crypto
 +  find -type f | xargs touch --date="$REFERENCE_DATETIME"
 +  mkdir -p "$GOPATH/src/code.google.com/p/"
 +  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.crypto"
 +  go install code.google.com/p/go.crypto/curve25519
 +  go install code.google.com/p/go.crypto/hkdf
 +  go install code.google.com/p/go.crypto/nacl/secretbox
 +  cd ..
 +
 +  # Building go.net
 +  tar xjf go.net.tar.bz2
 +  cd go.net
 +  find -type f | xargs touch --date="$REFERENCE_DATETIME"
 +  mkdir -p "$GOPATH/src/code.google.com/p/"
 +  ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net"
 +  go install code.google.com/p/go.net/proxy
 +  cd ..
 +
 +  # Building obfs4proxy
 +  cd obfs4
 +  find -type f | xargs 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
 +  go build -ldflags '-s'
 +  cp -a obfs4proxy $PTDIR
 +  cd ../..
 +
    # Grabbing the result
    cd $INSTDIR
-   ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app
-   cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/
+   ~/build/dzip.sh pluggable-transports-mac64-gbuilt.zip TorBrowserBundle.app
+   cp pluggable-transports-mac64-gbuilt.zip $OUTDIR/