diff --git a/0056-fix-test-error-about-mod_insecure_issue63845.patch b/0056-fix-test-error-about-mod_insecure_issue63845.patch new file mode 100644 index 0000000000000000000000000000000000000000..e53244cdd70b2995a6b80f3846c81910e3b62d3c --- /dev/null +++ b/0056-fix-test-error-about-mod_insecure_issue63845.patch @@ -0,0 +1,43 @@ +From 2a04aee674284f178b179f738a23a6ed3dd50b8c Mon Sep 17 00:00:00 2001 +From: wangshuo +Date: Fri, 22 Dec 2023 07:54:36 +0800 +Subject: [PATCH] fix test error about mod_insecure_issue63845 + +--- + .../go/testdata/script/mod_insecure_issue63845.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/cmd/go/testdata/script/mod_insecure_issue63845.txt b/src/cmd/go/testdata/script/mod_insecure_issue63845.txt +index 5fa6a4f..a2d5c07 100644 +--- a/src/cmd/go/testdata/script/mod_insecure_issue63845.txt ++++ b/src/cmd/go/testdata/script/mod_insecure_issue63845.txt +@@ -8,19 +8,19 @@ + # in cmd/go/internal/vcs. + + [!net] skip +-[!git] skip ++[!exec:git] skip + [short] skip 'tries to access a nonexistent external Git repo' + +-env GOPRIVATE=golang.org ++env GOPRIVATE=goproxy.cn + env CURLOPT_TIMEOUT_MS=100 + env GIT_SSH_COMMAND=false + +-! go get -x golang.org/nonexist.git@latest +-stderr '^git ls-remote https://golang.org/nonexist$' +-stderr '^git ls-remote git\+ssh://golang.org/nonexist' +-stderr '^git ls-remote ssh://golang.org/nonexist$' ++! go get -x goproxy.cn/nonexist.git@latest ++stderr '^git ls-remote https://goproxy.cn/nonexist$' ++stderr '^git ls-remote git\+ssh://goproxy.cn/nonexist' ++stderr '^git ls-remote ssh://goproxy.cn/nonexist$' + ! stderr 'git://' +-stderr '^go: golang.org/nonexist.git@latest: no secure protocol found for repository$' ++stderr '^go get goproxy.cn/nonexist.git@latest: no secure protocol found for repository$' + + -- go.mod -- + module example +-- +2.27.0 + diff --git a/golang.spec b/golang.spec index 7ca13c133af20c6699c99cd65f97ae18cf45a04e..1d0c3b44eeec789a27ddfc35972a78654121106f 100644 --- a/golang.spec +++ b/golang.spec @@ -63,7 +63,7 @@ Name: golang Version: 1.17.3 -Release: 26 +Release: 27 Summary: The Go Programming Language License: BSD and Public Domain URL: https://golang.org/ @@ -205,6 +205,7 @@ Patch6052: 0052-Backport-cmd-compile-use-absolute-file-name-in-isCgo.patch Patch6053: 0053-CVE-2023-39325-net-http-regenerate-h2_bundle.go.patch Patch6054: 0054-CVE-2023-39326-net-http-limit-chunked-data-overhead.patch Patch6055: 0055-CVE-2023-45285-cmd-go-internal-vcs-error-out-if-the-reques.patch +Patch6056: 0056-fix-test-error-about-mod_insecure_issue63845.patch ExclusiveArch: %{golang_arches} @@ -443,6 +444,12 @@ fi %files devel -f go-tests.list -f go-misc.list -f go-src.list %changelog +* Tue Jan 16 2024 wangshuo - 1.17.3-27 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix test error about mod_insecure_issue63845 + * Fri Dec 15 2023 hanchao - 1.17.3-26 - Type:CVE - CVE:CVE-2023-39326,CVE-2023-45285