From 7f928f70591b19d4e78b02c18c90ced858e67ecd Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 7 Nov 2023 12:08:29 -0600 Subject: [PATCH] Fix patch conflicts: nearby version update --- patches/0005-Add-OpenSSL-crypto-backend.patch | 12 ++++++------ patches/0006-Add-CNG-crypto-backend.patch | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/0005-Add-OpenSSL-crypto-backend.patch b/patches/0005-Add-OpenSSL-crypto-backend.patch index 22de08e3610..f38a454c1da 100644 --- a/patches/0005-Add-OpenSSL-crypto-backend.patch +++ b/patches/0005-Add-OpenSSL-crypto-backend.patch @@ -116,7 +116,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 03b9f11608d3de..487c3fb41d2613 100644 +index 6eae9002b58de8..57783b101e25ea 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -1115,6 +1115,7 @@ var hostobj []Hostobj @@ -627,7 +627,7 @@ index c83a7272c9f01f..a0548a7f9179c5 100644 package x509 diff --git a/src/go.mod b/src/go.mod -index 4697da201c0b4e..7f04074bee8337 100644 +index 7a15940c8896b0..a6aa641e8ca024 100644 --- a/src/go.mod +++ b/src/go.mod @@ -3,6 +3,7 @@ module std @@ -636,10 +636,10 @@ index 4697da201c0b4e..7f04074bee8337 100644 require ( + github.com/microsoft/go-crypto-openssl v0.2.8 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a - golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d + golang.org/x/net v0.4.1-0.20231027154331-b8c2abfc1559 ) diff --git a/src/go.sum b/src/go.sum -index 625f2070b34874..c4ccaf47f984e9 100644 +index 3ab018e39e5512..9f22fa9f954901 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,3 +1,5 @@ @@ -647,9 +647,9 @@ index 625f2070b34874..c4ccaf47f984e9 100644 +github.com/microsoft/go-crypto-openssl v0.2.8/go.mod h1:xOSmQnWz4xvNB2+KQN2g2UUwMG9vqDHBk9nk/NdmyRw= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a h1:diz9pEYuTIuLMJLs3rGDkeaTsNyRs6duYdFyPAxzE/U= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= - golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d h1:KHU/KRz6+/yWyRHEC24m7T5gou5VSh62duch955ktBY= + golang.org/x/net v0.4.1-0.20231027154331-b8c2abfc1559 h1:ZYA0bvgfxBB+JecyQpRCT/HUR/bSwdk6OJUhJ3CNLxg= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go -index f2a28eb4c32e6f..f54ceeaff8a478 100644 +index c7255cba9a5bc5..c2a8422db79fe9 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go @@ -398,6 +398,8 @@ var depsRules = ` diff --git a/patches/0006-Add-CNG-crypto-backend.patch b/patches/0006-Add-CNG-crypto-backend.patch index 2b4edb4a0aa..86ec32e7910 100644 --- a/patches/0006-Add-CNG-crypto-backend.patch +++ b/patches/0006-Add-CNG-crypto-backend.patch @@ -1048,7 +1048,7 @@ index a0548a7f9179c5..ae6117a1554b7f 100644 package x509 diff --git a/src/go.mod b/src/go.mod -index 7f04074bee8337..4a2aa569d6ad58 100644 +index a6aa641e8ca024..e267b55d07af47 100644 --- a/src/go.mod +++ b/src/go.mod @@ -4,6 +4,7 @@ go 1.20 @@ -1057,10 +1057,10 @@ index 7f04074bee8337..4a2aa569d6ad58 100644 github.com/microsoft/go-crypto-openssl v0.2.8 + github.com/microsoft/go-crypto-winnative v0.0.0-20230125071228-ef6c7cb780c6 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a - golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d + golang.org/x/net v0.4.1-0.20231027154331-b8c2abfc1559 ) diff --git a/src/go.sum b/src/go.sum -index c4ccaf47f984e9..4536afc24d5a86 100644 +index 9f22fa9f954901..e6dffe246212cc 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,5 +1,7 @@ @@ -1070,9 +1070,9 @@ index c4ccaf47f984e9..4536afc24d5a86 100644 +github.com/microsoft/go-crypto-winnative v0.0.0-20230125071228-ef6c7cb780c6/go.mod h1:fveERXKbeK+XLmOyU24caKnIT/S5nniAX9XCRHfnrM4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a h1:diz9pEYuTIuLMJLs3rGDkeaTsNyRs6duYdFyPAxzE/U= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= - golang.org/x/net v0.4.1-0.20230214201333-88ed8ca3307d h1:KHU/KRz6+/yWyRHEC24m7T5gou5VSh62duch955ktBY= + golang.org/x/net v0.4.1-0.20231027154331-b8c2abfc1559 h1:ZYA0bvgfxBB+JecyQpRCT/HUR/bSwdk6OJUhJ3CNLxg= diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go -index f54ceeaff8a478..88afc10099c8a3 100644 +index c2a8422db79fe9..639f3fd7045b6d 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go @@ -398,6 +398,10 @@ var depsRules = `