[tor-commits] [tor-browser-bundle/master] Switch to obfs4proxy-0.0.4, and remove references to go.crypto.
gk at torproject.org
gk at torproject.org
Wed Feb 18 12:41:56 UTC 2015
commit dd5f93f2fc8721ee83f1dbe650a877fe68b1b43a
Author: Yawning Angel <yawning at schwanenlied.me>
Date: Tue Feb 17 12:41:24 2015 +0000
Switch to obfs4proxy-0.0.4, and remove references to go.crypto.
The new version of obfs4proxy uses golang.org/x/crypto, which has been
already integrated as part of the nightly build process, so this is a
tag change and removal of the deprecated library only.
---
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 | 5 ++---
gitian/verify-tags.sh | 2 +-
gitian/versions.alpha | 5 +----
gitian/versions.nightly | 3 ---
7 files changed, 4 insertions(+), 47 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index d180f97..9596b7f 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -54,7 +54,6 @@ files:
- "gmp-linux64-utils.zip"
- "openssl-linux32-utils.zip"
- "openssl-linux64-utils.zip"
-- "go.crypto.tar.bz2"
- "go.net.tar.bz2"
script: |
INSTDIR="$HOME/install"
@@ -254,17 +253,6 @@ script: |
go install golang.org/x/crypto/nacl/secretbox
cd ..
- # Building go.crypto (obfs4proxy <= 0.0.3)
- 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
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index 9a86b1a..a1bdff9 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -50,7 +50,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.crypto.tar.bz2"
- "go.net.tar.bz2"
- "gmp-mac64-utils.zip"
- "openssl-mac64-utils.zip"
@@ -282,17 +281,6 @@ script: |
go install golang.org/x/crypto/nacl/secretbox
cd ..
- # Building go.crypto (obfs4proxy <= 0.0.3)
- 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
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 6e3c3a7..4ca477e 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -57,7 +57,6 @@ files:
- "openssl-win32-utils.zip"
- "gmp-win32-utils.zip"
- "gcclibs-win32-utils.zip"
-- "go.crypto.tar.bz2"
- "go.net.tar.bz2"
script: |
# Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file.
@@ -360,17 +359,6 @@ script: |
go install golang.org/x/crypto/nacl/secretbox
cd ..
- # Building go.crypto (obfs4proxy <= 0.0.3)
- 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
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index fdbbc69..e58c4d3 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -165,7 +165,7 @@ done
# XXX/Yawning. As far as I can tell, this gitian thing doesn't support
# fetching from hg repositories.
-for i in GOCRYPTO GONET
+for i in GONET
do
PACKAGE="${i}_PACKAGE"
URL="${MIRROR_URL_YAWNING}${!PACKAGE}"
@@ -178,7 +178,7 @@ 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 GOCRYPTO GONET
+for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET
do
PACKAGE="${i}_PACKAGE"
HASH="${i}_HASH"
@@ -233,7 +233,6 @@ 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
-ln -sf "$GOCRYPTO_PACKAGE" go.crypto.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 df30143..eb1e057 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -140,7 +140,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 GOCRYPTO GONET
+for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET
do
PACKAGE="${i}_PACKAGE"
HASH="${i}_HASH"
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index e5668f2..0e258aa 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -30,7 +30,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
-OBFS4_TAG=obfs4proxy-0.0.3
+OBFS4_TAG=obfs4proxy-0.0.4
GITIAN_TAG=tor-browser-builder-3.x-7
@@ -78,7 +78,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
-GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2
GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2
# Hashes for packages with weak sigs or no sigs
@@ -101,7 +100,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff
GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
-GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827
GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
## Non-git package URLs
@@ -128,5 +126,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS
LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}
PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PACKAGE}
GO_URL=http://golang.org/dl/${GO_PACKAGE}
-GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE}
GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE}
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 16519f5..a619cad 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -82,7 +82,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
-GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2
GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2
# Hashes for packages with weak sigs or no sigs
@@ -105,7 +104,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff
GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
-GOCRYPTO_HASH=a8e301714f5724999321f0397b867a5670a5e5c4f808ba157bdd93ee0d028827
GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353
## Non-git package URLs
@@ -132,5 +130,4 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUPTOOLS
LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE}
PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PACKAGE}
GO_URL=http://golang.org/dl/${GO_PACKAGE}
-GOCRYPTO_URL=https://people.torproject.org/~yawning/mirrors/sources/${GOCRYPTO_PACKAGE}
GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE}
More information about the tor-commits
mailing list