[tbb-commits] [tor-browser-bundle/master] Bug 21710: Upgrade Go to 1.8.1.

[gk at torproject.org]

commit 9d546f20ae711e7df9c574d9bdfccf34ddf1b650
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Mar 13 17:19:30 2017 -0700

    Bug 21710: Upgrade Go to 1.8.1.
    
    Remove workaround for fixed upstream bug, GitHub #17732
    (__MAC_OS_X_VERSION_MAX_ALLOWED).
    
    I wasn't able to remove the cc-for-target workaround for GitHub #15457
    (CC_FOR_TARGET). Even though according to
    https://github.com/golang/go/issues/15457 it has been
    been fixed, make.bash still seems to lose all but the first argument of
    CC_FOR_TARGET somewhere.
---
 gitian/descriptors/mac/gitian-pluggable-transports.yml | 3 ---
 gitian/versions                                        | 4 ++--
 gitian/versions.alpha                                  | 4 ++--
 gitian/versions.beta                                   | 4 ++--
 gitian/versions.nightly                                | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index c430bb8..75ad899 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -93,9 +93,6 @@ script: |
   export GOARCH=amd64
   tar xvf go.tar.gz
   cd go/src
-  # Remove a preprocessor directive that causes problems when building with the 10.7 SDK.
-  # https://github.com/golang/go/issues/17732
-  sed -i -e '/^#cgo CFLAGS:/s/-D__MAC_OS_X_VERSION_MAX_ALLOWED=1060//' crypto/x509/root_cgo_darwin.go
   CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
   cd ../..
   export PATH="$PATH:$PWD/go/bin"
diff --git a/gitian/versions b/gitian/versions
index e64baa4..8cb2278 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -65,7 +65,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.7.5
+GO_VER=1.8.1
 NSIS_VER=2.51
 YASM_VER=1.2.0
 
@@ -119,7 +119,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815
+GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index d1ea48b..adb9dbf 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -68,7 +68,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.7.5
+GO_VER=1.8.1
 NSIS_VER=2.51
 YASM_VER=1.2.0
 
@@ -122,7 +122,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815
+GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad
diff --git a/gitian/versions.beta b/gitian/versions.beta
index ed7c124..7d843c7 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -54,7 +54,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.7.5
+GO_VER=1.8.1
 
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
@@ -99,7 +99,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815
+GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57
 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8
 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5
 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 9142915..4e1618c 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -75,7 +75,7 @@ SETUPTOOLS_VER=1.4
 PARSLEY_VER=1.2
 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14
 GO14_VER=1.4.3
-GO_VER=1.7.5
+GO_VER=1.8.1
 NSIS_VER=2.51
 YASM_VER=1.2.0
 
@@ -129,7 +129,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c
 SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23
 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
-GO_HASH=4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815
+GO_HASH=33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57
 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7
 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a
 GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad