Merge pull request #1078 from microsoft/dev/auto-sync/microsoft/relea…

…se-branch.go1.21 Update submodule to latest `release-branch.go1.21` in `microsoft/release-branch.go1.21`
microsoft · Nov 7, 2023 · 2a58c29 · 2a58c29
2 parents 56fdab8 + 3379a17
commit 2a58c29
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-go1.21.3
+go1.21.4
diff --git a/go b/go
diff --git a/patches/0004-Add-OpenSSL-crypto-backend.patch b/patches/0004-Add-OpenSSL-crypto-backend.patch
@@ -106,7 +106,7 @@ index 4aaf46b5d0f0dc..e2ac54f96db1e8 100644
 
  go list -f '{{.Dir}}' vendor/golang.org/x/net/http2/hpack
 diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
-index d9e5774b6021d1..6a433d2ec7d45f 100644
+index 5e5d255b058414..10efb50bd55ad5 100644
 --- a/src/cmd/link/internal/ld/lib.go
 +++ b/src/cmd/link/internal/ld/lib.go
 @@ -1151,6 +1151,7 @@ var hostobj []Hostobj
@@ -580,7 +580,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
  package x509
 
 diff --git a/src/go.mod b/src/go.mod
-index 25829e17f2dd9e..d128b580b6445f 100644
+index 3b24053b94da17..7037a89880f11a 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -3,6 +3,7 @@ module std
@@ -589,20 +589,20 @@ index 25829e17f2dd9e..d128b580b6445f 100644
  require (
 +	github.com/microsoft/go-crypto-openssl v0.2.8
  	golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
- 	golang.org/x/net v0.12.1-0.20230712162946-57553cbff163
+ 	golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c
  )
 diff --git a/src/go.sum b/src/go.sum
-index e474b8be318c84..ee90dede95cd4d 100644
+index caf8ff010daafd..a9054cd98bd29f 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,3 +1,5 @@
 +github.com/microsoft/go-crypto-openssl v0.2.8 h1:16B6DVeBCimOAG0B92PSySOnVDq6Qr/siI3TyyMHXoI=
 +github.com/microsoft/go-crypto-openssl v0.2.8/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw=
  golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
  golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
- golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
+ golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
-index f213bd91903a71..b494e234d1fe1e 100644
+index 63751beca3892b..a158d645f30368 100644
 --- a/src/go/build/deps_test.go
 +++ b/src/go/build/deps_test.go
 @@ -425,6 +425,8 @@ var depsRules = `

diff --git a/patches/0005-Add-CNG-crypto-backend.patch b/patches/0005-Add-CNG-crypto-backend.patch
@@ -1024,7 +1024,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
  package x509
 
 diff --git a/src/go.mod b/src/go.mod
-index d128b580b6445f..fde1cd866ab8f4 100644
+index 7037a89880f11a..1dfa2df1f0ca79 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -4,6 +4,7 @@ go 1.21
@@ -1033,10 +1033,10 @@ index d128b580b6445f..fde1cd866ab8f4 100644
  	github.com/microsoft/go-crypto-openssl v0.2.8
 +	github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e
  	golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
- 	golang.org/x/net v0.12.1-0.20230712162946-57553cbff163
+ 	golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c
  )
 diff --git a/src/go.sum b/src/go.sum
-index ee90dede95cd4d..88246d9a2e2442 100644
+index a9054cd98bd29f..4839faec6628bd 100644
 --- a/src/go.sum
 +++ b/src/go.sum
 @@ -1,5 +1,7 @@
@@ -1046,9 +1046,9 @@ index ee90dede95cd4d..88246d9a2e2442 100644
 +github.com/microsoft/go-crypto-winnative v0.0.0-20230502061212-6eb98854418e/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4=
  golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM=
  golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
- golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860=
+ golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw=
 diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
-index b494e234d1fe1e..dc92957a4ff1a1 100644
+index a158d645f30368..1dd4e398e9b2be 100644
 --- a/src/go/build/deps_test.go
 +++ b/src/go/build/deps_test.go
 @@ -425,6 +425,10 @@ var depsRules = `
+2 −2		VERSION
+32 −0		src/cmd/cgo/internal/testcarchive/carchive_test.go
+12 −28		src/cmd/compile/internal/typecheck/func.go
+0 −3		src/cmd/compile/internal/types/fmt.go
+8 −0		src/cmd/compile/internal/types2/call.go
+44 −0		src/cmd/compile/internal/types2/issues_test.go
+0 −2		src/cmd/internal/moddeps/moddeps_test.go
+13 −6		src/cmd/link/internal/ld/data.go
+1 −1		src/cmd/link/internal/ld/ld_test.go
+1 −1		src/go.mod
+2 −2		src/go.sum
+1 −1		src/go/build/deps_test.go
+8 −0		src/go/types/call.go
+44 −0		src/go/types/issues_test.go
+72 −26		src/internal/safefilepath/path_windows.go
+1 −0		src/net/http/h2_bundle.go
+1 −16		src/path/filepath/path.go
+9 −0		src/path/filepath/path_nonwindows.go
+65 −2		src/path/filepath/path_test.go
+121 −73		src/path/filepath/path_windows.go
+6 −1		src/runtime/cgo/asm_386.s
+6 −1		src/runtime/cgo/asm_amd64.s
+6 −1		src/runtime/cgo/asm_arm.s
+6 −1		src/runtime/cgo/asm_arm64.s
+6 −1		src/runtime/cgo/asm_loong64.s
+6 −1		src/runtime/cgo/asm_mips64x.s
+6 −1		src/runtime/cgo/asm_mipsx.s
+6 −1		src/runtime/cgo/asm_ppc64x.s
+6 −1		src/runtime/cgo/asm_riscv64.s
+6 −1		src/runtime/cgo/asm_s390x.s
+5 −15		src/runtime/mgcscavenge.go
+1 −1		src/vendor/modules.txt
+13 −0		test/fixedbugs/issue62498.dir/a.go
+18 −0		test/fixedbugs/issue62498.dir/main.go
+7 −0		test/fixedbugs/issue62498.go