[tor-browser-bundle/master] Update obfs4proxy to 0.0.5, remove old go.net. - tbb-commits

16 Apr 2015

commit 10b91ff2b78e0cfe72f432fe661fddb9f5f45fd7
Author: Yawning Angel yawning@schwanenlied.me
Date:   Wed Apr 15 21:31:29 2015 +0000
Update obfs4proxy to 0.0.5, remove old go.net.
Update the obfs4proxy tag to 0.0.5, and remove the go.net tarball
    fetch/build process as that is no longer needed in the latest version.
Fixes #15702.
---
 gitian/descriptors/linux/gitian-pluggable-transports.yml  |   10 ----------
 gitian/descriptors/mac/gitian-pluggable-transports.yml    |   10 ----------
 .../descriptors/windows/gitian-pluggable-transports.yml   |   10 ----------
 gitian/fetch-inputs.sh                                    |   13 +------------
 gitian/verify-tags.sh                                     |    2 +-
 gitian/versions.alpha                                     |    5 +----
 gitian/versions.nightly                                   |    3 ---
 7 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index 1ae9c0c..1130cdf 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -56,7 +56,6 @@ files:
 - "gmp-linux64-utils.zip"
 - "openssl-linux32-utils.zip"
 - "openssl-linux64-utils.zip"
-- "go.net.tar.bz2"
 script: |
   INSTDIR="$HOME/install"
   PTDIR="$INSTDIR/Tor/PluggableTransports"
@@ -263,15 +262,6 @@ script: |
   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"
-  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"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index e2693e1..30f6444 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -52,7 +52,6 @@ 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"
-- "go.net.tar.bz2"
 - "gmp-mac64-utils.zip"
 - "openssl-mac64-utils.zip"
 script: |
@@ -291,15 +290,6 @@ script: |
   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"
-  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"
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 0f5ec84..339a63e 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -59,7 +59,6 @@ files:
 - "openssl-win32-utils.zip"
 - "gmp-win32-utils.zip"
 - "gcclibs-win32-utils.zip"
-- "go.net.tar.bz2"
 script: |
   # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file.
   function py2exe_zip_timestomp {
@@ -369,15 +368,6 @@ script: |
   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"
-  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"
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index e86ad6d..188c702 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -6,7 +6,6 @@
 MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/
 MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/
 MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/
-MIRROR_URL_YAWNING=https://people.torproject.org/~yawning/mirrors/sources/
 set -e
 set -u
 umask 0022
@@ -163,22 +162,13 @@ do
   get "${!PACKAGE}" "${!URL}"
 done
-# XXX/Yawning.  As far as I can tell, this gitian thing doesn't support
-# fetching from hg repositories.
-for i in GONET
-do
-  PACKAGE="${i}_PACKAGE"
-  URL="${MIRROR_URL_YAWNING}${!PACKAGE}"
-  get "${!PACKAGE}" "${MIRROR_URL_YAWNING}${!PACKAGE}"
-done
-
 # NoScript and HTTPS-Everywhere are magikal and special:
 wget -U "" -N ${NOSCRIPT_URL}
 wget -U "" -N ${HTTPSE_URL}
# Verify packages with weak or no signatures via direct sha256 check
 # (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
-for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET
+for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
@@ -232,7 +222,6 @@ ln -sf "$GMP_PACKAGE" gmp.tar.bz2
 ln -sf "$LXML_PACKAGE" lxml.tar.gz
 ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz
 ln -sf "$GO_PACKAGE" go.tar.gz
-ln -sf "$GONET_PACKAGE" go.net.tar.bz2
# Fetch latest gitian-builder itself
 # XXX - this is broken if a non-standard inputs dir is selected using the command line flag.
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 79c452b..846b575 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -141,7 +141,7 @@ done
# Verify packages with weak or no signatures via direct sha256 check
 # (OpenSSL is signed with MD5, and OSXSDK is not signed at all)
-for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET
+for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC
 do
    PACKAGE="${i}_PACKAGE"
    HASH="${i}_HASH"
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index ee69d08..0077361 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -31,7 +31,7 @@ GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
 GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
-OBFS4_TAG=obfs4proxy-0.0.4
+OBFS4_TAG=obfs4proxy-0.0.5
GITIAN_TAG=tor-browser-builder-3.x-7
@@ -79,7 +79,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz
 LXML_PACKAGE=lxml-${LXML_VER}.tar.gz
 PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
-GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2
# Hashes for packages with weak sigs or no sigs
 OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
@@ -101,7 +100,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
 GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
-GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/$%7BOPENSSL_PACKAGE%7D
@@ -127,4 +125,3 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS
 LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D
 PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D
 GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D
-GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/$%7BGONET_PACKAGE%7D
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index cf0aecf..9a1b73f 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -83,7 +83,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz
 LXML_PACKAGE=lxml-${LXML_VER}.tar.gz
 PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
-GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2
# Hashes for packages with weak sigs or no sigs
 OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4
@@ -105,7 +104,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b
 GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
-GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
## Non-git package URLs
 OPENSSL_URL=https://www.openssl.org/source/$%7BOPENSSL_PACKAGE%7D
@@ -131,4 +129,3 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/$%7BSETUPTOOLS
 LXML_URL=https://pypi.python.org/packages/source/l/lxml/$%7BLXML_PACKAGE%7D
 PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/$%7BPARSLEY_PACKAGE%7D
 GO_URL=https://golang.org/dl/$%7BGO_PACKAGE%7D
-GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/$%7BGONET_PACKAGE%7D

    