Thu Sep 3 06:47:21 2020 UTC ()
Update go115 to 1.15.1.

go1.15.1 (released 2020/09/01) includes security fixes to the net/http/cgi and
net/http/fcgi packages. See the Go 1.15.1 milestone on our issue tracker for
details.


(bsiegert)
diff -r1.97 -r1.98 pkgsrc/lang/go/version.mk
diff -r1.2 -r1.3 pkgsrc/lang/go115/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/go115/distinfo
cvs diff -r1.97 -r1.98 pkgsrc/lang/go/version.mk (switch to unified diff)

--- pkgsrc/lang/go/version.mk 2020/08/21 19:50:22 1.97
+++ pkgsrc/lang/go/version.mk 2020/09/03 06:47:21 1.98
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1# $NetBSD: version.mk,v 1.97 2020/08/21 19:50:22 bsiegert Exp $ 1# $NetBSD: version.mk,v 1.98 2020/09/03 06:47:21 bsiegert Exp $
2 2
3# 3#
4# If bsd.prefs.mk is included before go-package.mk in a package, then this 4# If bsd.prefs.mk is included before go-package.mk in a package, then this
5# file must be included directly in the package prior to bsd.prefs.mk. 5# file must be included directly in the package prior to bsd.prefs.mk.
6# 6#
7.include "go-vars.mk" 7.include "go-vars.mk"
8 8
9GO115_VERSION= 1.15 9GO115_VERSION= 1.15.1
10GO114_VERSION= 1.14.7 10GO114_VERSION= 1.14.7
11GO113_VERSION= 1.13.15 11GO113_VERSION= 1.13.15
12GO110_VERSION= 1.10.8 12GO110_VERSION= 1.10.8
13GO19_VERSION= 1.9.7 13GO19_VERSION= 1.9.7
14GO14_VERSION= 1.4.3 14GO14_VERSION= 1.4.3
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M6.*} 18.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M6.*}
19# 1.9 is the last Go version to support NetBSD 6 19# 1.9 is the last Go version to support NetBSD 6
20GO_VERSION_DEFAULT?= 19 20GO_VERSION_DEFAULT?= 19
21.elif ${OPSYS} == "Darwin" && ${OS_VERSION:R} < 14 21.elif ${OPSYS} == "Darwin" && ${OS_VERSION:R} < 14
22# go 1.11 removed support for osx 10.8 and 10.9 22# go 1.11 removed support for osx 10.8 and 10.9
23# https://github.com/golang/go/issues/23122 23# https://github.com/golang/go/issues/23122
24# darwin version 13.4 is osx 10.9.5 24# darwin version 13.4 is osx 10.9.5
25GO_VERSION_DEFAULT?= 110 25GO_VERSION_DEFAULT?= 110
26.else 26.else
27GO_VERSION_DEFAULT?= 114 27GO_VERSION_DEFAULT?= 115
28.endif 28.endif
29 29
30.if !empty(GO_VERSION_DEFAULT) 30.if !empty(GO_VERSION_DEFAULT)
31GOVERSSUFFIX= ${GO_VERSION_DEFAULT} 31GOVERSSUFFIX= ${GO_VERSION_DEFAULT}
32.endif 32.endif
33 33
34# How to find the Go tool 34# How to find the Go tool
35GO= ${PREFIX}/go${GOVERSSUFFIX}/bin/go 35GO= ${PREFIX}/go${GOVERSSUFFIX}/bin/go
36 36
37# Build dependency for Go 37# Build dependency for Go
38GO_PACKAGE_DEP= go${GOVERSSUFFIX}-${GO${GOVERSSUFFIX}_VERSION}*:../../lang/go${GOVERSSUFFIX} 38GO_PACKAGE_DEP= go${GOVERSSUFFIX}-${GO${GOVERSSUFFIX}_VERSION}*:../../lang/go${GOVERSSUFFIX}
39 39
40ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-earmv[67]hf *-*-aarch64 40ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-earmv[67]hf *-*-aarch64
41NOT_FOR_PLATFORM= SunOS-*-i386 41NOT_FOR_PLATFORM= SunOS-*-i386
42.if ${MACHINE_ARCH} == "i386" 42.if ${MACHINE_ARCH} == "i386"
43GOARCH= 386 43GOARCH= 386
44GOCHAR= 8 44GOCHAR= 8
45.elif ${MACHINE_ARCH} == "x86_64" 45.elif ${MACHINE_ARCH} == "x86_64"
46GOARCH= amd64 46GOARCH= amd64
47GOCHAR= 6 47GOCHAR= 6
48.elif ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf" 48.elif ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf"
49GOARCH= arm 49GOARCH= arm
50GOCHAR= 5 50GOCHAR= 5
51.elif ${MACHINE_ARCH} == "aarch64" 51.elif ${MACHINE_ARCH} == "aarch64"
52GOARCH= arm64 52GOARCH= arm64
53GOOPT= GOARM=7 53GOOPT= GOARM=7
54# GOHOSTARCH is being misdetected as arm on NetBSD. Unclear why. 54# GOHOSTARCH is being misdetected as arm on NetBSD. Unclear why.
55GOOPT+= GOHOSTARCH=arm64 55GOOPT+= GOHOSTARCH=arm64
56.endif 56.endif
57.if ${MACHINE_ARCH} == "earmv6hf" 57.if ${MACHINE_ARCH} == "earmv6hf"
58GOOPT= GOARM=6 58GOOPT= GOARM=6
59.elif ${MACHINE_ARCH} == "earmv7hf" 59.elif ${MACHINE_ARCH} == "earmv7hf"
60GOOPT= GOARM=7 60GOOPT= GOARM=7
61.endif 61.endif
62GO_PLATFORM= ${LOWER_OPSYS}_${GOARCH} 62GO_PLATFORM= ${LOWER_OPSYS}_${GOARCH}
63PLIST_SUBST+= GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q} 63PLIST_SUBST+= GO_PLATFORM=${GO_PLATFORM:Q} GOARCH=${GOARCH:Q}
64PLIST_SUBST+= GOCHAR=${GOCHAR:Q} 64PLIST_SUBST+= GOCHAR=${GOCHAR:Q}
65 65
66PRINT_PLIST_AWK+= { sub("/${GO_PLATFORM}/", "/$${GO_PLATFORM}/") } 66PRINT_PLIST_AWK+= { sub("/${GO_PLATFORM}/", "/$${GO_PLATFORM}/") }
67 67
68TOOLS_CREATE+= go 68TOOLS_CREATE+= go
69TOOLS_PATH.go= ${GO} 69TOOLS_PATH.go= ${GO}
cvs diff -r1.2 -r1.3 pkgsrc/lang/go115/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/go115/Attic/Makefile 2020/08/31 18:09:50 1.2
+++ pkgsrc/lang/go115/Attic/Makefile 2020/09/03 06:47:21 1.3
@@ -1,108 +1,107 @@ @@ -1,108 +1,107 @@
1# $NetBSD: Makefile,v 1.2 2020/08/31 18:09:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2020/09/03 06:47:21 bsiegert Exp $
2 2
3PKGREVISION= 1 
4.include "../../lang/go/version.mk" 3.include "../../lang/go/version.mk"
5.include "../../lang/go/bootstrap.mk" 4.include "../../lang/go/bootstrap.mk"
6 5
7DISTNAME= go${GO115_VERSION}.src 6DISTNAME= go${GO115_VERSION}.src
8PKGNAME= go115-${GO115_VERSION} 7PKGNAME= go115-${GO115_VERSION}
9CATEGORIES= lang 8CATEGORIES= lang
10MASTER_SITES= https://storage.googleapis.com/golang/ 9MASTER_SITES= https://storage.googleapis.com/golang/
11EXTRACT_USING= gtar 10EXTRACT_USING= gtar
12 11
13MAINTAINER= bsiegert@NetBSD.org 12MAINTAINER= bsiegert@NetBSD.org
14HOMEPAGE= https://golang.org/ 13HOMEPAGE= https://golang.org/
15COMMENT= The Go programming language 14COMMENT= The Go programming language
16LICENSE= modified-bsd 15LICENSE= modified-bsd
17 16
18GOVERSSUFFIX= 115 17GOVERSSUFFIX= 115
19WRKSRC= ${WRKDIR}/go 18WRKSRC= ${WRKDIR}/go
20USE_TOOLS+= bash:run perl:run pax 19USE_TOOLS+= bash:run perl:run pax
21 20
22# cgo compiles under TMPDIR 21# cgo compiles under TMPDIR
23TMPDIR?= /tmp 22TMPDIR?= /tmp
24BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR} 23BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
25 24
26GOROOT_FINAL= ${PREFIX}/go${GOVERSSUFFIX} 25GOROOT_FINAL= ${PREFIX}/go${GOVERSSUFFIX}
27INSTALLATION_DIRS= bin go${GOVERSSUFFIX} 26INSTALLATION_DIRS= bin go${GOVERSSUFFIX}
28 27
29REPLACE_BASH+= lib/time/update.bash 28REPLACE_BASH+= lib/time/update.bash
30REPLACE_BASH+= misc/arm/a 29REPLACE_BASH+= misc/arm/a
31REPLACE_BASH+= misc/cgo/fortran/test.bash 30REPLACE_BASH+= misc/cgo/fortran/test.bash
32REPLACE_BASH+= misc/wasm/go_js_wasm_exec 31REPLACE_BASH+= misc/wasm/go_js_wasm_exec
33REPLACE_BASH+= src/all.bash 32REPLACE_BASH+= src/all.bash
34REPLACE_BASH+= src/bootstrap.bash 33REPLACE_BASH+= src/bootstrap.bash
35REPLACE_BASH+= src/buildall.bash 34REPLACE_BASH+= src/buildall.bash
36REPLACE_BASH+= src/clean.bash 35REPLACE_BASH+= src/clean.bash
37REPLACE_BASH+= src/cmd/compile/internal/ssa/gen/cover.bash 36REPLACE_BASH+= src/cmd/compile/internal/ssa/gen/cover.bash
38REPLACE_BASH+= src/cmd/go/mkalldocs.sh 37REPLACE_BASH+= src/cmd/go/mkalldocs.sh
39REPLACE_BASH+= src/cmd/vendor/golang.org/x/sys/unix/mkall.sh 38REPLACE_BASH+= src/cmd/vendor/golang.org/x/sys/unix/mkall.sh
40REPLACE_BASH+= src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh 39REPLACE_BASH+= src/cmd/vendor/golang.org/x/sys/unix/mkerrors.sh
41REPLACE_BASH+= src/internal/trace/mkcanned.bash 40REPLACE_BASH+= src/internal/trace/mkcanned.bash
42REPLACE_BASH+= src/iostest.bash 41REPLACE_BASH+= src/iostest.bash
43REPLACE_BASH+= src/make.bash 42REPLACE_BASH+= src/make.bash
44REPLACE_BASH+= src/race.bash 43REPLACE_BASH+= src/race.bash
45REPLACE_BASH+= src/run.bash 44REPLACE_BASH+= src/run.bash
46REPLACE_BASH+= src/syscall/mkall.sh 45REPLACE_BASH+= src/syscall/mkall.sh
47REPLACE_BASH+= src/syscall/mkerrors.sh 46REPLACE_BASH+= src/syscall/mkerrors.sh
48REPLACE_BASH+= src/syscall/mksysnum_plan9.sh 47REPLACE_BASH+= src/syscall/mksysnum_plan9.sh
49 48
50REPLACE_PERL+= src/net/http/cgi/testdata/test.cgi 49REPLACE_PERL+= src/net/http/cgi/testdata/test.cgi
51REPLACE_PERL+= src/regexp/syntax/make_perl_groups.pl 50REPLACE_PERL+= src/regexp/syntax/make_perl_groups.pl
52REPLACE_PERL+= src/syscall/*.pl 51REPLACE_PERL+= src/syscall/*.pl
53 52
54# uses own linker, which does not support relro on NetBSD 53# uses own linker, which does not support relro on NetBSD
55CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/bin/go 54CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/bin/go
56CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/bin/gofmt 55CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/bin/gofmt
57CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/asm 56CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/asm
58CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/compile 57CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/compile
59CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/link 58CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/link
60CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/cgo 59CHECK_RELRO_SKIP+= go${GOVERSSUFFIX}/pkg/bootstrap/bin/cgo
61# also does not support SSP at this time 60# also does not support SSP at this time
62CHECK_SSP_SKIP= ${CHECK_RELRO_SKIP} 61CHECK_SSP_SKIP= ${CHECK_RELRO_SKIP}
63 62
64# uses /bin/rc (for Plan 9) 63# uses /bin/rc (for Plan 9)
65CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/include/plan9/mklibc.rc 64CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/include/plan9/mklibc.rc
66CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/all.rc 65CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/all.rc
67CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/clean.rc 66CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/clean.rc
68CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/make.rc 67CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/make.rc
69CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/run.rc 68CHECK_INTERPRETER_SKIP+= go${GOVERSSUFFIX}/src/run.rc
70 69
71PLIST_SUBST+= GOVERSSUFFIX=${GOVERSSUFFIX} 70PLIST_SUBST+= GOVERSSUFFIX=${GOVERSSUFFIX}
72 71
73PLIST_VARS+= pty route 72PLIST_VARS+= pty route
74 73
75.if ${OPSYS} != "SunOS" 74.if ${OPSYS} != "SunOS"
76PLIST.pty= yes 75PLIST.pty= yes
77.endif 76.endif
78 77
79.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS" 78.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
80PLIST.route= yes 79PLIST.route= yes
81.endif 80.endif
82 81
83post-extract: 82post-extract:
84 ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836* 83 ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
85 84
86do-build: 85do-build:
87 cd ${WRKSRC}/src && \ 86 cd ${WRKSRC}/src && \
88 env \ 87 env \
89 GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \ 88 GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} \
90 GOROOT_FINAL=${GOROOT_FINAL:Q} \ 89 GOROOT_FINAL=${GOROOT_FINAL:Q} \
91 ${GOOPT} \ 90 ${GOOPT} \
92 GOCACHE=${WRKDIR}/.cache/go-build \ 91 GOCACHE=${WRKDIR}/.cache/go-build \
93 ${BASH} ./make.bash 92 ${BASH} ./make.bash
94# for RELRO build: 93# for RELRO build:
95# cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash 94# cd ${WRKSRC}/src && env GOROOT_BOOTSTRAP=${GOROOT_BOOTSTRAP:Q} GOROOT_FINAL=${GOROOT_FINAL:Q} GO_LDFLAGS="-buildmode=pie" ${GOOPT} ${BASH} ./make.bash
96 95
97do-install: 96do-install:
98 cd ${WRKSRC} && rm -rf pkg/obj pkg/bootstrap 97 cd ${WRKSRC} && rm -rf pkg/obj pkg/bootstrap
99 cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX} 98 cd ${WRKSRC} && pax -rw . ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX}
100 find ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX} -name \*.orig -exec rm {} \; 99 find ${DESTDIR}${PREFIX}/go${GOVERSSUFFIX} -name \*.orig -exec rm {} \;
101.for cmd in go gofmt 100.for cmd in go gofmt
102 ${LN} -sf ${PREFIX}/go${GOVERSSUFFIX}/bin/${cmd} ${DESTDIR}${PREFIX}/bin/${cmd}${GOVERSSUFFIX} 101 ${LN} -sf ${PREFIX}/go${GOVERSSUFFIX}/bin/${cmd} ${DESTDIR}${PREFIX}/bin/${cmd}${GOVERSSUFFIX}
103.endfor 102.endfor
104 103
105do-test: 104do-test:
106 cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${GOOPT} ${BASH} run.bash --no-rebuild --banner "" 105 cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${GOOPT} ${BASH} run.bash --no-rebuild --banner ""
107 106
108.include "../../mk/bsd.pkg.mk" 107.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/lang/go115/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/go115/Attic/distinfo 2020/08/21 19:50:22 1.1
+++ pkgsrc/lang/go115/Attic/distinfo 2020/09/03 06:47:21 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.1 2020/08/21 19:50:22 bsiegert Exp $ 1$NetBSD: distinfo,v 1.2 2020/09/03 06:47:21 bsiegert Exp $
2 2
3SHA1 (go1.15.src.tar.gz) = a08d95390ed83cc24da48c2672124e4deb864b3f 3SHA1 (go1.15.1.src.tar.gz) = c1777c68f358539e216848ee19e58efeb80532a1
4RMD160 (go1.15.src.tar.gz) = c3854e2d4912723cf761d648e1380290c4ba8b60 4RMD160 (go1.15.1.src.tar.gz) = 5e258cdbf8ae266669f16aadfc040ddabb903d4c
5SHA512 (go1.15.src.tar.gz) = 7d85382bcc6a0625dfa3d07196ab364860846367ed67697a7b1516b0af551a72bc4873882141fc3c7a60d39f2e27b33f6693e8b18b608de76fc9a55b5eac55ea 5SHA512 (go1.15.1.src.tar.gz) = 08728dd7c64467482b1b17d1bd852ae6ca329062da95e10e91535e096b6ddd32d0e34a5e1f7b736175863c5543b6623406fc89b057273afc3f434ea97b343cfe
6Size (go1.15.src.tar.gz) = 23002901 bytes 6Size (go1.15.1.src.tar.gz) = 23009031 bytes
7SHA1 (patch-misc_io_clangwrap.sh) = df5911c430ff6251abab12e5cc233e32fc3cd953 7SHA1 (patch-misc_io_clangwrap.sh) = df5911c430ff6251abab12e5cc233e32fc3cd953
8SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e 8SHA1 (patch-src_cmd_dist_util.go) = 24e6f1b6ded842a8ce322a40e8766f7d344bc47e
9SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 3dfcb5c824d4201fadda0cfb6b48e5938899baf0 9SHA1 (patch-src_cmd_link_internal_ld_elf.go) = 3dfcb5c824d4201fadda0cfb6b48e5938899baf0
10SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d 10SHA1 (patch-src_crypto_x509_root__bsd.go) = 93a2de7c685a0919fe93f5bc99f156e105dace4d
11SHA1 (patch-src_runtime_cgo_gcc__netbsd__arm64.c) = d2fc1cebc104ad2e35f488e5edebcecd6f0323be 11SHA1 (patch-src_runtime_cgo_gcc__netbsd__arm64.c) = d2fc1cebc104ad2e35f488e5edebcecd6f0323be
12SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577 12SHA1 (patch-src_runtime_os__netbsd.go) = 9b80de94667e3f8d8d1ae3648ab1fe43dd55d577
13SHA1 (patch-src_runtime_sys__netbsd__arm64.s) = c8d3dfddd7930794a6ff9b2919c42632aa9358cd 13SHA1 (patch-src_runtime_sys__netbsd__arm64.s) = c8d3dfddd7930794a6ff9b2919c42632aa9358cd
14SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b 14SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b