From 8bef37bf4f2ede5c8ab4f5b1b0ac9ee3710ea612 Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert@pkgsrc.org>
Date: Tue, 16 Apr 2019 18:30:27 +0000
Subject: [PATCH] Update go112 to 1.12.4.

go1.12.2 (released 2019/04/05) includes fixes to the compiler, the go command,
the runtime, and the doc, net, net/http/httputil, and os packages. See the Go
1.12.2 milestone on our issue tracker for details.

go1.12.3 (released 2019/04/08) was accidentally released without its intended
fix. It is identical to go1.12.2, except for its version number. The intended
fix is in go1.12.4.

go1.12.4 (released 2019/04/11) fixes an issue where using the prebuilt binary
releases on older versions of GNU/Linux led to failures when linking programs
that used cgo. Only Linux users who hit this issue need to update.
---
 lang/go/version.mk  |  4 ++--
 lang/go112/Makefile |  3 +--
 lang/go112/PLIST    |  6 +++++-
 lang/go112/distinfo | 10 +++++-----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lang/go/version.mk b/lang/go/version.mk
index d4ed6ec94b16..765c44b9be95 100644
--- a/lang/go/version.mk
+++ b/lang/go/version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.60 2019/04/16 18:13:49 bsiegert Exp $
+# $NetBSD: version.mk,v 1.61 2019/04/16 18:30:27 bsiegert Exp $
 
 CTF_SUPPORTED=		no
 SSP_SUPPORTED=		no
@@ -6,7 +6,7 @@ STRIP_DEBUG_SUPPORTED=	no
 
 .include "../../mk/bsd.prefs.mk"
 
-GO112_VERSION=	1.12.1
+GO112_VERSION=	1.12.4
 GO111_VERSION=	1.11.9
 GO110_VERSION=	1.10.8
 GO19_VERSION=	1.9.7
diff --git a/lang/go112/Makefile b/lang/go112/Makefile
index 0b2703bbc602..ee55c11626fb 100644
--- a/lang/go112/Makefile
+++ b/lang/go112/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2019/03/13 10:40:19 bsiegert Exp $
+# $NetBSD: Makefile,v 1.3 2019/04/16 18:30:27 bsiegert Exp $
 
 .include "../../lang/go/version.mk"
 
 DISTNAME=	go${GO112_VERSION}.src
 PKGNAME=	go112-${GO112_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://storage.googleapis.com/golang/
 EXTRACT_USING=	gtar
diff --git a/lang/go112/PLIST b/lang/go112/PLIST
index 9dbbf6872af6..150e88e20415 100644
--- a/lang/go112/PLIST
+++ b/lang/go112/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/03/16 08:27:56 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/04/16 18:30:27 bsiegert Exp $
 bin/go${GOVERSSUFFIX}
 bin/gofmt${GOVERSSUFFIX}
 go112/AUTHORS
@@ -2561,6 +2561,7 @@ go112/src/cmd/go/testdata/script/list_test_imports.txt
 go112/src/cmd/go/testdata/script/mod_bad_domain.txt
 go112/src/cmd/go/testdata/script/mod_bad_filenames.txt
 go112/src/cmd/go/testdata/script/mod_build_tags.txt
+go112/src/cmd/go/testdata/script/mod_build_versioned.txt
 go112/src/cmd/go/testdata/script/mod_case.txt
 go112/src/cmd/go/testdata/script/mod_case_cgo.txt
 go112/src/cmd/go/testdata/script/mod_clean_cache.txt
@@ -8970,6 +8971,9 @@ go112/test/fixedbugs/issue30061.go
 go112/test/fixedbugs/issue30476.go
 go112/test/fixedbugs/issue30566a.go
 go112/test/fixedbugs/issue30566b.go
+go112/test/fixedbugs/issue30956.go
+go112/test/fixedbugs/issue30956.out
+go112/test/fixedbugs/issue30977.go
 go112/test/fixedbugs/issue3552.dir/one.go
 go112/test/fixedbugs/issue3552.dir/two.go
 go112/test/fixedbugs/issue3552.go
diff --git a/lang/go112/distinfo b/lang/go112/distinfo
index e405e690a261..7ef2d8a77e5d 100644
--- a/lang/go112/distinfo
+++ b/lang/go112/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/03/16 08:27:56 bsiegert Exp $
+$NetBSD: distinfo,v 1.3 2019/04/16 18:30:27 bsiegert Exp $
 
-SHA1 (go1.12.1.src.tar.gz) = af345fe04bfd36fb0783101383bf5ca030f831ca
-RMD160 (go1.12.1.src.tar.gz) = d3a90c404aa0d3dd405c0d86071e42db08b91d5a
-SHA512 (go1.12.1.src.tar.gz) = b3fdfb874e6e0e0b50458085724fbd8e8b9be212df3f777b97db340aa3b80f32ee08d646a57a8a7d52ff6f19657d884dd25018c866c6173473aafa20a58f1975
-Size (go1.12.1.src.tar.gz) = 21963082 bytes
+SHA1 (go1.12.4.src.tar.gz) = b62609f9f98fd2763f770d60e932f7c09fcca7b0
+RMD160 (go1.12.4.src.tar.gz) = 5a36f12307bbb99e56894a59d31bf70b5b1420f9
+SHA512 (go1.12.4.src.tar.gz) = 45ced5fc23a2786a652dbe66de7bbc039efaba29d884d797d6d0a6eaffb61dfb897905f0733ce74704f8760b1fdedb9963e26c1d9d8dee4a4676e74da5df8792
+Size (go1.12.4.src.tar.gz) = 21965966 bytes
 SHA1 (patch-misc_io_clangwrap.sh) = cd91c47ba0fe7b6eb8009dd261c0c26c7d581c29
 SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
 SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 990a54e3baf239916e4c7f0c1d54240e2898601a