Re: Update to go-1.18.2

2022-05-17 Thread Stuart Henderson
On 2022/05/16 21:30, Stuart Henderson wrote:
> On 2022/05/17 05:41, Joel Sing wrote:
> > >  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
> > 
> > This chunk needs reverting.
> 
> UPDATE_PLIST_ARGS= -i MACHINE_ARCH

To be clear, adding that to go/Makefile will top this creeping back in



Re: Update to go-1.18.2

2022-05-16 Thread Stuart Henderson
On 2022/05/17 05:41, Joel Sing wrote:
> >  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
> 
> This chunk needs reverting.

UPDATE_PLIST_ARGS= -i MACHINE_ARCH



Re: Update to go-1.18.2

2022-05-16 Thread Joel Sing
On 22-05-16 07:21:12, Daniel Jakots wrote:
> Here's a patch for go-1.18.2
> 
> > go1.18.2 (released 2022-05-10) includes security fixes to the syscall
> > package, as well as bug fixes to the compiler, runtime, the go
> > command, and the crypto/x509, go/types, net/http/httptest, reflect,
> > and sync/atomic packages. See the Go 1.18.2 milestone on our issue
> > tracker for details. 
> https://github.com/golang/go/issues?q=milestone%3AGo1.18.2+label%3ACherryPickApproved
>  
> 
> I looked at it on amd64 on it only, but it looked fine.

I've also tested on arm64 and armv7.

> Comments? OK?

ok jsing@, with one PLIST fix noted below.

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/go/Makefile,v
> retrieving revision 1.110
> diff -u -p -r1.110 Makefile
> --- Makefile  26 Apr 2022 19:42:58 -  1.110
> +++ Makefile  16 May 2022 11:16:00 -
> @@ -5,7 +5,7 @@ BIN_BOOTSTRAP_VERSION = 1.16
>  
>  COMMENT =Go programming language
>  
> -VERSION =1.18.1
> +VERSION =1.18.2
>  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.70
> diff -u -p -r1.70 distinfo
> --- distinfo  26 Apr 2022 19:42:58 -  1.70
> +++ distinfo  16 May 2022 11:16:00 -
> @@ -2,9 +2,9 @@ SHA256 (go-openbsd-386-bootstrap-1.16.ta
>  SHA256 (go-openbsd-arm-bootstrap-1.16.tar.gz) = 
> DjjCEzU/FnndIrKC8gh5PKAZkKp9Lt49aT3XPqhEWNM=
>  SHA256 (go-openbsd-arm64-bootstrap-1.16.tar.gz) = 
> qqc/TtaBfoq5oJcOHoqNZ6+bO+OOIRZoW1zlj19uBVw=
>  SHA256 (go-openbsd-mips64-bootstrap-1.16.tar.gz) = 
> dwojdjHgxrLlKC8QbseRYnOf8s/wN/Wx+UkPhH2aeJY=
> -SHA256 (go1.18.1.src.tar.gz) = 79Q+DxQC4IO3OgPURLe2V2u0xTmsRiCLY6kWtprKQIg=
> +SHA256 (go1.18.2.src.tar.gz) = LETQPqLDQJITerkZumAvLCYaA40I60aFKKPzoo5WZ+I=
>  SIZE (go-openbsd-386-bootstrap-1.16.tar.gz) = 131493298
>  SIZE (go-openbsd-arm-bootstrap-1.16.tar.gz) = 128073881
>  SIZE (go-openbsd-arm64-bootstrap-1.16.tar.gz) = 126892240
>  SIZE (go-openbsd-mips64-bootstrap-1.16.tar.gz) = 129935270
> -SIZE (go1.18.1.src.tar.gz) = 22834149
> +SIZE (go1.18.2.src.tar.gz) = 22837686
> cvs server: Diffing patches
> Index: patches/patch-src_cmd_go_internal_load_pkg_go
> ===
> RCS file: /cvs/ports/lang/go/patches/patch-src_cmd_go_internal_load_pkg_go,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-src_cmd_go_internal_load_pkg_go
> --- patches/patch-src_cmd_go_internal_load_pkg_go 26 Apr 2022 19:42:58 
> -  1.5
> +++ patches/patch-src_cmd_go_internal_load_pkg_go 16 May 2022 11:16:00 
> -
> @@ -1,7 +1,7 @@
>  Index: src/cmd/go/internal/load/pkg.go
>  --- src/cmd/go/internal/load/pkg.go.orig
>  +++ src/cmd/go/internal/load/pkg.go
> -@@ -2498,11 +2498,11 @@ func externalLinkingForced(p *Package) bool {
> +@@ -2513,11 +2513,11 @@ func externalLinkingForced(p *Package) bool {
>   // Some targets must use external linking even inside GOROOT.
>   switch cfg.BuildContext.GOOS {
>   case "android":
> cvs server: Diffing pkg
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/lang/go/pkg/PLIST,v
> retrieving revision 1.58
> diff -u -p -r1.58 PLIST
> --- pkg/PLIST 26 Apr 2022 19:42:58 -  1.58
> +++ pkg/PLIST 16 May 2022 11:16:01 -
> @@ -2246,6 +2246,7 @@ go/src/cmd/compile/internal/types2/testd
>  go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue51593.go2
>  go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue51607.go2
>  go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue51658.go2
> +go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue52529.go2
>  go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue6977.src
>  go/src/cmd/compile/internal/types2/testdata/manual.go2
>  go/src/cmd/compile/internal/types2/testdata/spec/
> @@ -2877,6 +2878,7 @@ go/src/cmd/go/testdata/script/bug.txt
>  go/src/cmd/go/testdata/script/build_GOTMPDIR.txt
>  go/src/cmd/go/testdata/script/build_acl_windows.txt
>  go/src/cmd/go/testdata/script/build_arm.txt
> +go/src/cmd/go/testdata/script/build_buildvcs_auto.txt
>  go/src/cmd/go/testdata/script/build_cache_arch_mode.txt
>  go/src/cmd/go/testdata/script/build_cache_compile.txt
>  go/src/cmd/go/testdata/script/build_cache_disabled.txt
> @@ -3300,6 +3302,7 @@ go/src/cmd/go/testdata/script/mod_retrac
>  go/src/cmd/go/testdata/script/mod_retract_rename.txt
>  go/src/cmd/go/testdata/script/mod_retract_replace.txt
>  go/src/cmd/go/testdata/script/mod_retract_versions.txt
> +go/src/cmd/go/testdata/script/mod_run_issue52331.txt
>  go/src/cmd/go/testdata/script/mod_run_nonmain.txt
>  go/src/cmd/go/testdata/script/mod_run_path.txt
>  

Update to go-1.18.2

2022-05-16 Thread Daniel Jakots
Hi,

Here's a patch for go-1.18.2

> go1.18.2 (released 2022-05-10) includes security fixes to the syscall
> package, as well as bug fixes to the compiler, runtime, the go
> command, and the crypto/x509, go/types, net/http/httptest, reflect,
> and sync/atomic packages. See the Go 1.18.2 milestone on our issue
> tracker for details. 
https://github.com/golang/go/issues?q=milestone%3AGo1.18.2+label%3ACherryPickApproved
 

I looked at it on amd64 on it only, but it looked fine.

Comments? OK?

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/lang/go/Makefile,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile
--- Makefile26 Apr 2022 19:42:58 -  1.110
+++ Makefile16 May 2022 11:16:00 -
@@ -5,7 +5,7 @@ BIN_BOOTSTRAP_VERSION = 1.16
 
 COMMENT =  Go programming language
 
-VERSION =  1.18.1
+VERSION =  1.18.2
 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.70
diff -u -p -r1.70 distinfo
--- distinfo26 Apr 2022 19:42:58 -  1.70
+++ distinfo16 May 2022 11:16:00 -
@@ -2,9 +2,9 @@ SHA256 (go-openbsd-386-bootstrap-1.16.ta
 SHA256 (go-openbsd-arm-bootstrap-1.16.tar.gz) = 
DjjCEzU/FnndIrKC8gh5PKAZkKp9Lt49aT3XPqhEWNM=
 SHA256 (go-openbsd-arm64-bootstrap-1.16.tar.gz) = 
qqc/TtaBfoq5oJcOHoqNZ6+bO+OOIRZoW1zlj19uBVw=
 SHA256 (go-openbsd-mips64-bootstrap-1.16.tar.gz) = 
dwojdjHgxrLlKC8QbseRYnOf8s/wN/Wx+UkPhH2aeJY=
-SHA256 (go1.18.1.src.tar.gz) = 79Q+DxQC4IO3OgPURLe2V2u0xTmsRiCLY6kWtprKQIg=
+SHA256 (go1.18.2.src.tar.gz) = LETQPqLDQJITerkZumAvLCYaA40I60aFKKPzoo5WZ+I=
 SIZE (go-openbsd-386-bootstrap-1.16.tar.gz) = 131493298
 SIZE (go-openbsd-arm-bootstrap-1.16.tar.gz) = 128073881
 SIZE (go-openbsd-arm64-bootstrap-1.16.tar.gz) = 126892240
 SIZE (go-openbsd-mips64-bootstrap-1.16.tar.gz) = 129935270
-SIZE (go1.18.1.src.tar.gz) = 22834149
+SIZE (go1.18.2.src.tar.gz) = 22837686
cvs server: Diffing patches
Index: patches/patch-src_cmd_go_internal_load_pkg_go
===
RCS file: /cvs/ports/lang/go/patches/patch-src_cmd_go_internal_load_pkg_go,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_cmd_go_internal_load_pkg_go
--- patches/patch-src_cmd_go_internal_load_pkg_go   26 Apr 2022 19:42:58 
-  1.5
+++ patches/patch-src_cmd_go_internal_load_pkg_go   16 May 2022 11:16:00 
-
@@ -1,7 +1,7 @@
 Index: src/cmd/go/internal/load/pkg.go
 --- src/cmd/go/internal/load/pkg.go.orig
 +++ src/cmd/go/internal/load/pkg.go
-@@ -2498,11 +2498,11 @@ func externalLinkingForced(p *Package) bool {
+@@ -2513,11 +2513,11 @@ func externalLinkingForced(p *Package) bool {
// Some targets must use external linking even inside GOROOT.
switch cfg.BuildContext.GOOS {
case "android":
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/go/pkg/PLIST,v
retrieving revision 1.58
diff -u -p -r1.58 PLIST
--- pkg/PLIST   26 Apr 2022 19:42:58 -  1.58
+++ pkg/PLIST   16 May 2022 11:16:01 -
@@ -2246,6 +2246,7 @@ go/src/cmd/compile/internal/types2/testd
 go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue51593.go2
 go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue51607.go2
 go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue51658.go2
+go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue52529.go2
 go/src/cmd/compile/internal/types2/testdata/fixedbugs/issue6977.src
 go/src/cmd/compile/internal/types2/testdata/manual.go2
 go/src/cmd/compile/internal/types2/testdata/spec/
@@ -2877,6 +2878,7 @@ go/src/cmd/go/testdata/script/bug.txt
 go/src/cmd/go/testdata/script/build_GOTMPDIR.txt
 go/src/cmd/go/testdata/script/build_acl_windows.txt
 go/src/cmd/go/testdata/script/build_arm.txt
+go/src/cmd/go/testdata/script/build_buildvcs_auto.txt
 go/src/cmd/go/testdata/script/build_cache_arch_mode.txt
 go/src/cmd/go/testdata/script/build_cache_compile.txt
 go/src/cmd/go/testdata/script/build_cache_disabled.txt
@@ -3300,6 +3302,7 @@ go/src/cmd/go/testdata/script/mod_retrac
 go/src/cmd/go/testdata/script/mod_retract_rename.txt
 go/src/cmd/go/testdata/script/mod_retract_replace.txt
 go/src/cmd/go/testdata/script/mod_retract_versions.txt
+go/src/cmd/go/testdata/script/mod_run_issue52331.txt
 go/src/cmd/go/testdata/script/mod_run_nonmain.txt
 go/src/cmd/go/testdata/script/mod_run_path.txt
 go/src/cmd/go/testdata/script/mod_run_pkg_version.txt
@@ -5463,7 +5466,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