Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update submodule to latest release-branch.go1.21 in microsoft/release-branch.go1.21 #1220

Merged
merged 2 commits into from
May 7, 2024
Merged

Update submodule to latest release-branch.go1.21 in microsoft/release-branch.go1.21 #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d56e380
Update submodule to latest release-branch.go1.21 (752b0090): [release…
microsoft-golang-bot May 7, 2024
4231589
Fix patch conflicts: go.mod nearby line
dagood May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
go1.21.9
go1.21.10
2 changes: 1 addition & 1 deletion go
Open in desktop
Submodule go updated 8 files
+2 −2 VERSION
+15 −4 src/cmd/go/internal/work/security.go
+17 −0 src/cmd/go/testdata/script/darwin_lto_library_ldflag.txt
+0 −2 src/cmd/internal/moddeps/moddeps_test.go
+1 −1 src/go.mod
+2 −2 src/go.sum
+15 −7 src/net/http/h2_bundle.go
+1 −1 src/vendor/modules.txt
8 changes: 4 additions & 4 deletions patches/0004-Add-OpenSSL-crypto-backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644
package x509

diff --git a/src/go.mod b/src/go.mod
index b6470514f12796..fd10cbd7e17b05 100644
index 01d759c800d4b5..bd3320498ec5d0 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,6 +3,7 @@ module std
Expand All @@ -590,18 +590,18 @@ index b6470514f12796..fd10cbd7e17b05 100644
require (
+ github.com/microsoft/go-crypto-openssl v0.2.9
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536
golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5
)
diff --git a/src/go.sum b/src/go.sum
index 670b76cde031bd..0e293cc0379d0a 100644
index f83343a0a1ac9f..2bc44ee9e1bf8b 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,5 @@
+github.com/microsoft/go-crypto-openssl v0.2.9 h1:pzWgU+PLq61DzuhfZM7L7nyr3DrQoa4Ln75gCwsvvjs=
+github.com/microsoft/go-crypto-openssl v0.2.9/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.20240327214420-1a2eef3ba536 h1:QEPT0Le4+itOUqHbs7yUz5y7FoAOuK1ibDlfTcVguHM=
golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5 h1:BIx9jz/hjPE1CesqfHzRaf2JsOjDxZrKAVr//XXJh0U=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index 63751beca3892b..a158d645f30368 100644
--- a/src/go/build/deps_test.go
Expand Down
8 changes: 4 additions & 4 deletions patches/0005-Add-CNG-crypto-backend.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644
package x509

diff --git a/src/go.mod b/src/go.mod
index fd10cbd7e17b05..46f2993a48ff1a 100644
index bd3320498ec5d0..9ba1ae4256d5ff 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,6 +4,7 @@ go 1.21
Expand All @@ -1037,10 +1037,10 @@ index fd10cbd7e17b05..46f2993a48ff1a 100644
github.com/microsoft/go-crypto-openssl v0.2.9
+ github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103
golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d
golang.org/x/net v0.12.1-0.20240327214420-1a2eef3ba536
golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5
)
diff --git a/src/go.sum b/src/go.sum
index 0e293cc0379d0a..04e31422bde5aa 100644
index 2bc44ee9e1bf8b..ea6d7868d4a7d0 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,5 +1,7 @@
Expand All @@ -1050,7 +1050,7 @@ index 0e293cc0379d0a..04e31422bde5aa 100644
+github.com/microsoft/go-crypto-winnative v0.0.0-20240109184443-a968e40d3103/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.20240327214420-1a2eef3ba536 h1:QEPT0Le4+itOUqHbs7yUz5y7FoAOuK1ibDlfTcVguHM=
golang.org/x/net v0.12.1-0.20240412193743-ef58d90fdfc5 h1:BIx9jz/hjPE1CesqfHzRaf2JsOjDxZrKAVr//XXJh0U=
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index a158d645f30368..1dd4e398e9b2be 100644
--- a/src/go/build/deps_test.go
Expand Down
Loading