packages/golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!294 fix test error about mod_insecure_issue63845

Browse Source 
From: @fuowang 
Reviewed-by: @hcnbxx, @jing-rui 
Signed-off-by: @jing-rui
This commit is contained in:
openeuler-ci-bot 2024-01-16 03:02:43 +00:00 committed by Gitee
commit 5dc98a1f35
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0112-fix-test-error-about-mod_insecure_issue63845.patch Normal file
View File

@ -0,0 +1,43 @@
From 2a04aee674284f178b179f738a23a6ed3dd50b8c Mon Sep 17 00:00:00 2001
From: wangshuo <wangshuo@kylinos.cn>
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

9
golang.spec
View File

@ -58,7 +58,7 @@
Name: golang
Version: 1.15.7
Release: 37
Release: 38
Summary: The Go Programming Language
License: BSD and Public Domain
URL: https://golang.org/
@ -253,6 +253,7 @@ Patch6108: 0108-Backport-cmd-compile-use-absolute-file-name-in-isCgo.patch
Patch6109: 0109-CVE-2023-39325-and-CVE-2023-44487-net-http-regenerate-h2_bundle.go.patch
Patch6110: 0110-CVE-2023-39326-net-http-limit-chunked-data-overhead.patch
Patch6111: 0111-CVE-2023-45285-cmd-go-internal-vcs-error-out-if-the-reques.patch
Patch6112: 0112-fix-test-error-about-mod_insecure_issue63845.patch
Patch9001: 0001-drop-hard-code-cert.patch
Patch9002: 0002-fix-patch-cmd-go-internal-modfetch-do-not-sho.patch
@ -492,6 +493,12 @@ fi
%files devel -f go-tests.list -f go-misc.list -f go-src.list
%changelog
* Wed Dec 27 2023 wangshuo <wangshuo@kylinos.cn> - 1.15.7-38
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix test error about mod_insecure_issue63845
* Fri Dec 15 2023 hanchao <hanchao63@huawei.com> - 1.15.7-37
- Type:CVE
- CVE:CVE-2023-39326,CVE-2023-45285