Update Go to 1.5.2, original patch from Kamel Derouiche in PR pkg/50498.

go1.5.2 (released 2015/12/02) includes bug fixes to the compiler,
linker, and the mime/multipart, net, and runtime packages. See the Go
1.5.2 milestone on our issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.5.2

6 files changed, 48 insertions, 13 deletions

diff --git a/lang/go/Makefile b/lang/go/Makefile
index 881f88d06f0..1dd4d786549 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/09/13 19:11:55 fhajny Exp $
+# $NetBSD: Makefile,v 1.35 2015/12/10 20:04:54 bsiegert Exp $
 
 .include "version.mk"
 
@@ -22,10 +22,6 @@ BUILD_DEPENDS+=	bash>=4.2nb3:../../shells/bash
 TMPDIR?=	/tmp
 BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
 
-# bash script may use unportable bash constructs
-CHECK_PORTABILITY_SKIP=	lib/time/update.bash
-CHECK_PORTABILITY_SKIP=	misc/ios/clangwrap.sh
-
 GOROOT_FINAL=	${PREFIX}/go
 INSTALLATION_DIRS= bin
 
diff --git a/lang/go/PLIST b/lang/go/PLIST
index 15990db471b..02e22f84513 100644
--- a/lang/go/PLIST
+++ b/lang/go/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2015/09/13 14:24:58 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/12/10 20:04:54 bsiegert Exp $
 bin/go
 bin/gofmt
 go/AUTHORS
@@ -57,6 +57,7 @@ go/doc/codewalk/popout.png
 go/doc/codewalk/run
 go/doc/codewalk/sharemem.xml
 go/doc/codewalk/urlpoll.go
+go/doc/conduct.html
 go/doc/contrib.html
 go/doc/contribute.html
 go/doc/debugging_with_gdb.html
@@ -216,6 +217,7 @@ go/misc/cgo/test/fpvar.go
 go/misc/cgo/test/helpers.go
 go/misc/cgo/test/issue10303.go
 go/misc/cgo/test/issue11925.go
+go/misc/cgo/test/issue12030.go
 go/misc/cgo/test/issue1222.go
 go/misc/cgo/test/issue1328.go
 go/misc/cgo/test/issue1560.go
@@ -3362,6 +3364,7 @@ go/src/runtime/race/testdata/chan_test.go
 go/src/runtime/race/testdata/comp_test.go
 go/src/runtime/race/testdata/finalizer_test.go
 go/src/runtime/race/testdata/io_test.go
+go/src/runtime/race/testdata/issue12225_test.go
 go/src/runtime/race/testdata/map_test.go
 go/src/runtime/race/testdata/mop_test.go
 go/src/runtime/race/testdata/mutex_test.go
@@ -4773,9 +4776,12 @@ go/test/fixedbugs/issue11656.go
 go/test/fixedbugs/issue11750.go
 go/test/fixedbugs/issue11771.go
 go/test/fixedbugs/issue11790.go
+go/test/fixedbugs/issue11987.go
 go/test/fixedbugs/issue12133.go
 go/test/fixedbugs/issue12226.go
+go/test/fixedbugs/issue12686.go
 go/test/fixedbugs/issue1304.go
+go/test/fixedbugs/issue13160.go
 go/test/fixedbugs/issue2615.go
 go/test/fixedbugs/issue3552.dir/one.go
 go/test/fixedbugs/issue3552.dir/two.go
diff --git a/lang/go/distinfo b/lang/go/distinfo
index b7e3cee9523..b2c4e7929b5 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.28 2015/11/03 22:50:36 agc Exp $
+$NetBSD: distinfo,v 1.29 2015/12/10 20:04:54 bsiegert Exp $
 
-SHA1 (go1.5.1.src.tar.gz) = 0df564746d105f4180c2b576a1553ebca9d9a124
-RMD160 (go1.5.1.src.tar.gz) = 751d078789bcd6ec0d85e09f5f40d9959877e202
-SHA512 (go1.5.1.src.tar.gz) = a3e92058c79502cfcb7d67143db67fef97393a416322b6f8b6c52b70879e7ab56e3cec94a9ca8046cc13b134845cc1e4b53c70d7208850092bf4edf04bf439ff
-Size (go1.5.1.src.tar.gz) = 12049701 bytes
+SHA1 (go1.5.2.src.tar.gz) = c7d78ba4df574b5f9a9bb5d17505f40c4d89b81c
+RMD160 (go1.5.2.src.tar.gz) = 38aec8e0f7f93c4616db58ccfc6152b3b35bbd08
+SHA512 (go1.5.2.src.tar.gz) = 7323ca7845fa4cb03d36240d759b542b142db331953f08bf8220d02465fc434478be3cb1abab52e180f29326379eab518e7b793c70c7cb440c1ab885d36bdfb8
+Size (go1.5.2.src.tar.gz) = 12056199 bytes
+SHA1 (patch-lib_time_update.bash) = d6f8e31dfefc1b4cc07bffb1f8f56d637efbdc1e
+SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
 SHA1 (patch-src_cmd_go_pkg.go) = ccc470577951bd00741c39229599c0c06be52d0a
 SHA1 (patch-src_syscall_syscall__solaris.go) = 436371947897dcba574a6dfecc6bbcd04f6e25b2
diff --git a/lang/go/patches/patch-lib_time_update.bash b/lang/go/patches/patch-lib_time_update.bash
new file mode 100644
index 00000000000..35bc096714b
--- /dev/null
+++ b/lang/go/patches/patch-lib_time_update.bash
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_time_update.bash,v 1.1 2015/12/10 20:04:54 bsiegert Exp $
+
+--- lib/time/update.bash.orig	2015-12-03 00:52:58.000000000 +0000
++++ lib/time/update.bash
+@@ -41,7 +41,7 @@ zip -0 -r ../../zoneinfo.zip *
+ cd ../..
+ 
+ echo
+-if [ "$1" == "-work" ]; then 
++if [ "$1" = "-work" ]; then 
+ 	echo Left workspace behind in work/.
+ else
+ 	rm -rf work
+
+
diff --git a/lang/go/patches/patch-misc_io_clangwrap.sh b/lang/go/patches/patch-misc_io_clangwrap.sh
new file mode 100644
index 00000000000..35760adcc5f
--- /dev/null
+++ b/lang/go/patches/patch-misc_io_clangwrap.sh
@@ -0,0 +1,16 @@
+$NetBSD: patch-misc_io_clangwrap.sh,v 1.1 2015/12/10 20:04:54 bsiegert Exp $
+
+--- misc/ios/clangwrap.sh.orig	2015-12-03 00:52:58.000000000 +0000
++++ misc/ios/clangwrap.sh
+@@ -8,9 +8,9 @@ export IPHONEOS_DEPLOYMENT_TARGET=5.1
+ # cmd/cgo doesn't support llvm-gcc-4.2, so we have to use clang.
+ CLANG=`xcrun --sdk $SDK --find clang`
+ 
+-if [ "$GOARCH" == "arm" ]; then
++if [ "$GOARCH" = "arm" ]; then
+ 	CLANGARCH="armv7"
+-elif [ "$GOARCH" == "arm64" ]; then
++elif [ "$GOARCH" = "arm64" ]; then
+ 	CLANGARCH="arm64"
+ else
+ 	echo "unknown GOARCH=$GOARCH" >&2
diff --git a/lang/go/version.mk b/lang/go/version.mk
index 26d6ebc0a9a..ef974da46ca 100644
--- a/lang/go/version.mk
+++ b/lang/go/version.mk
@@ -1,8 +1,8 @@
-# $NetBSD: version.mk,v 1.9 2015/09/26 17:37:01 bsiegert Exp $
+# $NetBSD: version.mk,v 1.10 2015/12/10 20:04:54 bsiegert Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
-GO_VERSION=	1.5.1
+GO_VERSION=	1.5.2
 GO14_VERSION=	1.4.3
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64 *-*-evbarm