[tor-browser-bundle/master] Bug 15265: Pull in golang.org/x/net

23 Mar 2015

commit 474bbb5e54acae925a849e77b8ef590e58ee0820
Author: Yawning Angel <yawning@schwanenlied.me>
Date:   Sat Mar 21 14:34:06 2015 +0000

    Bug 15265: Pull in golang.org/x/net
    
    The new official home for "go.net" is on golang.org, which also uses
    git instead of hg (yay!).  As of the *next* obfs4proxy release the old
    go.net tarball stuff can be ripped out (leaving it in for the while).
---
 gitian/descriptors/linux/gitian-pluggable-transports.yml   |   12 +++++++++++-
 gitian/descriptors/mac/gitian-pluggable-transports.yml     |   12 +++++++++++-
 gitian/descriptors/windows/gitian-pluggable-transports.yml |   12 +++++++++++-
 gitian/fetch-inputs.sh                                     |    1 +
 gitian/mkbundle-linux.sh                                   |    2 +-
 gitian/mkbundle-mac.sh                                     |    2 +-
 gitian/mkbundle-windows.sh                                 |    2 +-
 gitian/verify-tags.sh                                      |    1 +
 gitian/versions.alpha                                      |    1 +
 gitian/versions.nightly                                    |    1 +
 10 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 9596b7f..1ae9c0c 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -38,6 +38,8 @@ remotes:
   "dir": "siphash"
 - "url": "https://go.googlesource.com/crypto"
   "dir": "goxcrypto"
+- "url": "https://go.googlesource.com/net"
+  "dir": "goxnet"
 - "url": "https://git.torproject.org/pluggable-transports/obfs4.git"
   "dir": "obfs4"
 files:
@@ -253,7 +255,15 @@ script: |
   go install golang.org/x/crypto/nacl/secretbox
   cd ..
 
-  # Building go.net
+  # Building golang.org/x/net (obfs4proxy > 0.0.4)
+  cd goxnet
+  find -type f | xargs 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
+  cd ..
+
+  # Building go.net (obfs4proxy <= 0.0.4)
   tar xjf go.net.tar.bz2
   cd go.net
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index a1bdff9..e2693e1 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -36,6 +36,8 @@ remotes:
   "dir": "siphash"
 - "url": "https://go.googlesource.com/crypto"
   "dir": "goxcrypto"
+- "url": "https://go.googlesource.com/net"
+  "dir": "goxnet"
 - "url": "https://git.torproject.org/pluggable-transports/obfs4.git"
   "dir": "obfs4"
 files:
@@ -281,7 +283,15 @@ script: |
   go install golang.org/x/crypto/nacl/secretbox
   cd ..
 
-  # Building go.net
+  # Building golang.org/x/net (obfs4proxy > 0.0.4)
+  cd goxnet
+  find -type f | xargs 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
+  cd ..
+
+  # Building go.net (obfs4proxy <= 0.0.4)
   tar xjf go.net.tar.bz2
   cd go.net
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 4ca477e..0f5ec84 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -35,6 +35,8 @@ remotes:
   "dir": "siphash"
 - "url": "https://go.googlesource.com/crypto"
   "dir": "goxcrypto"
+- "url": "https://go.googlesource.com/net"
+  "dir": "goxnet"
 - "url": "https://git.torproject.org/pluggable-transports/obfs4.git"
   "dir": "obfs4"
 files:
@@ -359,7 +361,15 @@ script: |
   go install golang.org/x/crypto/nacl/secretbox
   cd ..
 
-  # Building go.net
+  # Building golang.org/x/net (obfs4proxy > 0.0.4)
+  cd goxnet
+  find -type f | xargs 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
+  cd ..
+
+  # Building go.net (obfs4proxy <= 0.0.4)
   tar xjf go.net.tar.bz2
   cd go.net
   find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 3b3c43a..e86ad6d 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -269,6 +269,7 @@ faketime              https://github.com/wolfcw/libfaketime $FAKETIME_TAG
 ed25519               https://github.com/agl/ed25519.git $GOED25519_TAG
 siphash               https://github.com/dchest/siphash.git $GOSIPHASH_TAG
 goxcrypto             https://go.googlesource.com/crypto  $GO_X_CRYPTO_TAG
+goxnet                https://go.googlesource.com/net  $GO_X_NET_TAG
 obfs4                 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG
 EOF
 
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index f1ef984..15e1384 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -224,7 +224,7 @@ then
   echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******"
   echo
 
-  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_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 309b1a8..01a9d1b 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -190,7 +190,7 @@ then
   echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******"
   echo
 
-  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_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 0e2f87f..e7bdc87 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -194,7 +194,7 @@ then
   echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******"
   echo
 
-  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
+  ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,goxnet=$GO_X_NET_TAG,obfs4=$OBFS4_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`
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index eb1e057..79c452b 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -117,6 +117,7 @@ faketime                $FAKETIME_TAG
 ed25519                 $GOED25519_TAG
 siphash                 $GOSIPHASH_TAG
 goxcrypto               $GO_X_CRYPTO_TAG
+goxnet                  $GO_X_NET_TAG
 EOF
 
 # Verify signatures on signed packages
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 0f49a23..648027a 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -30,6 +30,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
 GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
+GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
 OBFS4_TAG=obfs4proxy-0.0.4
 
 GITIAN_TAG=tor-browser-builder-3.x-7
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 8bbba6e..fba4d87 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -34,6 +34,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
 GO_X_CRYPTO_TAG=master
+GO_X_NET_TAG=master
 OBFS4_TAG=master
 
 GITIAN_TAG=tor-browser-builder-3.x-7

    

gk＠torproject.org

tags

participants (1)