On 23-10-13 20:05:35, Daniel Jakots wrote:
> Hey,
>
> > go1.21.2 (released 2023-10-05) includes one security fixes to the
> > cmd/go package, as well as bug fixes to the compiler, the go command,
> > the linker, the runtime, and the runtime/metrics package. See the Go
> > 1.21.2 milestone on our issue tracker for details.
> >
> > go1.21.3 (released 2023-10-10) includes a security fix to the
> > net/http package. See the Go 1.21.3 milestone on our issue tracker
> > for details.
>
> Here's a diff to update it to 1.21.3. All tests passed on amd64. I
> don't have access to other arches so make test on them are welcomed.
>
> Comments? OK?
Thanks. I've already got an identical diff which I'll land as soon
as I finish further testing (likely tomorrow).
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/go/Makefile,v
> retrieving revision 1.140
> diff -u -p -r1.140 Makefile
> --- Makefile 19 Sep 2023 17:32:05 -0000 1.140
> +++ Makefile 14 Oct 2023 00:04:02 -0000
> @@ -7,7 +7,7 @@ COMMENT = Go programming language
>
> # increment _MODGO_SYSTEM_VERSION in go.port.mk after updating to a new
> # version, to trigger updates of go-compiled ports
> -VERSION = 1.21.1
> +VERSION = 1.21.3
> DISTNAME = go${VERSION}.src
> PKGNAME = go-${VERSION}
> PKGSPEC = ${FULLPKGNAME:S/go-/go-=/}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/go/distinfo,v
> retrieving revision 1.86
> diff -u -p -r1.86 distinfo
> --- distinfo 8 Sep 2023 04:19:36 -0000 1.86
> +++ distinfo 14 Oct 2023 00:04:02 -0000
> @@ -4,11 +4,11 @@ SHA256 (go-openbsd-arm-bootstrap-1.20.4.
> SHA256 (go-openbsd-arm64-bootstrap-1.20.4.tar.gz) =
> G3sZhx63D+QLEgbwU1+d3ECiVJjVrFD5RqD2/qutXmI=
> SHA256 (go-openbsd-mips64-bootstrap-1.20.4.tar.gz) =
> CaZYJ+pIQp+lp721Ox45Y8uqkbsygcfyDFxQsqabPIs=
> SHA256 (go-openbsd-riscv64-bootstrap-1.20.4.tar.gz) =
> lQv/8KPWi8U3yLG+k3xVDNRVzxa5rmPIIpJUDrwVo0o=
> -SHA256 (go1.21.1.src.tar.gz) = v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k=
> +SHA256 (go1.21.3.src.tar.gz) = GG8rb4yLcE5paCGwmrIEGlwe4T3LwxVqE63PdZMe5Ig=
> SIZE (go-openbsd-386-bootstrap-1.20.4.tar.gz) = 100681343
> SIZE (go-openbsd-amd64-bootstrap-1.20.4.tar.gz) = 107075675
> SIZE (go-openbsd-arm-bootstrap-1.20.4.tar.gz) = 104680775
> SIZE (go-openbsd-arm64-bootstrap-1.20.4.tar.gz) = 102706601
> SIZE (go-openbsd-mips64-bootstrap-1.20.4.tar.gz) = 105352848
> SIZE (go-openbsd-riscv64-bootstrap-1.20.4.tar.gz) = 106167229
> -SIZE (go1.21.1.src.tar.gz) = 26974429
> +SIZE (go1.21.3.src.tar.gz) = 26976568
> cvs server: Diffing patches
> Index: patches/patch-src_cmd_link_internal_ld_lib_go
> ===================================================================
> RCS file: /cvs/ports/lang/go/patches/patch-src_cmd_link_internal_ld_lib_go,v
> retrieving revision 1.21
> diff -u -p -r1.21 patch-src_cmd_link_internal_ld_lib_go
> --- patches/patch-src_cmd_link_internal_ld_lib_go 8 Sep 2023 04:19:36
> -0000 1.21
> +++ patches/patch-src_cmd_link_internal_ld_lib_go 14 Oct 2023 00:04:02
> -0000
> @@ -1,7 +1,7 @@
> Index: src/cmd/link/internal/ld/lib.go
> --- src/cmd/link/internal/ld/lib.go.orig
> +++ src/cmd/link/internal/ld/lib.go
> -@@ -1424,6 +1424,7 @@ func (ctxt *Link) hostlink() {
> +@@ -1428,6 +1428,7 @@ func (ctxt *Link) hostlink() {
> }
> case objabi.Hopenbsd:
> argv = append(argv, "-Wl,-nopie")
> cvs server: Diffing pkg
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/lang/go/pkg/PLIST,v
> retrieving revision 1.71
> diff -u -p -r1.71 PLIST
> --- pkg/PLIST 8 Sep 2023 04:19:37 -0000 1.71
> +++ pkg/PLIST 14 Oct 2023 00:04:03 -0000
> @@ -609,6 +609,7 @@ go/src/cmd/cgo/internal/testerrors/testd
> go/src/cmd/cgo/internal/testerrors/testdata/err1.go
> go/src/cmd/cgo/internal/testerrors/testdata/err2.go
> go/src/cmd/cgo/internal/testerrors/testdata/err4.go
> +go/src/cmd/cgo/internal/testerrors/testdata/err5.go
> go/src/cmd/cgo/internal/testerrors/testdata/issue11097a.go
> go/src/cmd/cgo/internal/testerrors/testdata/issue11097b.go
> go/src/cmd/cgo/internal/testerrors/testdata/issue14669.go
> @@ -723,6 +724,9 @@ go/src/cmd/cgo/internal/testplugin/testd
> go/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/
> go/src/cmd/cgo/internal/testplugin/testdata/issue53989/p/p.go
> go/src/cmd/cgo/internal/testplugin/testdata/issue53989/plugin.go
> +go/src/cmd/cgo/internal/testplugin/testdata/issue62430/
> +go/src/cmd/cgo/internal/testplugin/testdata/issue62430/main.go
> +go/src/cmd/cgo/internal/testplugin/testdata/issue62430/plugin.go
> go/src/cmd/cgo/internal/testplugin/testdata/mangle/
> go/src/cmd/cgo/internal/testplugin/testdata/mangle/plugin.go
> go/src/cmd/cgo/internal/testplugin/testdata/method/
> @@ -5362,7 +5366,7 @@ go/src/debug/elf/testdata/compressed-32.
> go/src/debug/elf/testdata/compressed-64.obj
> go/src/debug/elf/testdata/gcc-386-freebsd-exec
> go/src/debug/elf/testdata/gcc-amd64-linux-exec
> -go/src/debug/elf/testdata/gcc-amd64-openbsd-debug-with-rela.obj
> +go/src/debug/elf/testdata/gcc-${MACHINE_ARCH}-openbsd-debug-with-rela.obj
> go/src/debug/elf/testdata/go-relocation-test-clang-arm.obj
> go/src/debug/elf/testdata/go-relocation-test-clang-x86.obj
> go/src/debug/elf/testdata/go-relocation-test-gcc424-x86-64.obj
> @@ -9365,6 +9369,9 @@ go/src/runtime/syscall_windows_test.go
> go/src/runtime/tagptr.go
> go/src/runtime/tagptr_32bit.go
> go/src/runtime/tagptr_64bit.go
> +go/src/runtime/test_amd64.go
> +go/src/runtime/test_amd64.s
> +go/src/runtime/test_stubs.go
> go/src/runtime/testdata/
> go/src/runtime/testdata/testexithooks/
> go/src/runtime/testdata/testexithooks/testexithooks.go
> @@ -9515,6 +9522,7 @@ go/src/runtime/trace/trace_test.go
> go/src/runtime/trace_cgo_test.go
> go/src/runtime/traceback.go
> go/src/runtime/traceback_test.go
> +go/src/runtime/tracebackx_test.go
> go/src/runtime/type.go
> go/src/runtime/typekind.go
> go/src/runtime/unsafe.go
> @@ -12841,6 +12849,7 @@ go/test/fixedbugs/issue61778.go
> go/test/fixedbugs/issue61908.go
> go/test/fixedbugs/issue61992.go
> go/test/fixedbugs/issue62203.go
> +go/test/fixedbugs/issue62469.go
> go/test/fixedbugs/issue6247.go
> go/test/fixedbugs/issue6269.go
> go/test/fixedbugs/issue6295.dir/
