commit 0b204f958e0960fab34e09812eb5a3396ed3f1c9
author Elias Naur <mail@eliasnaur.com> Wed Oct 09 11:13:42 2019 +0200
committer Elias Naur <mail@eliasnaur.com> Wed Oct 09 14:03:15 2019 +0000
tree 384c3196e62e5eea07237baadf0ef2e08d3bb05f
parent a38a917aee626a9b9d5ce2b93964f586bf759ea0

go/build: allow ~ and ^ in #cgo directives for sr.ht import paths

Fixes #32260

Change-Id: Ib44ee33b8143d523875cf5a2bc5e36bf082801a4
Reviewed-on: https://go-review.googlesource.com/c/go/+/199918
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Jay Conrod <jayconrod@google.com>

src/go/build/build.go

diff --git a/src/go/build/build.go b/src/go/build/build.go
index 722fead..097ad3c 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1552,7 +1552,8 @@
 // The @ is for OS X. See golang.org/issue/13720.
 // The % is for Jenkins. See golang.org/issue/16959.
 // The ! is because module paths may use them. See golang.org/issue/26716.
-const safeString = "+-.,/0123456789=ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz:$@%! "
+// The ~ and ^ are for sr.ht. See golang.org/issue/32260.
+const safeString = "+-.,/0123456789=ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz:$@%! ~^"
 
 func safeCgoName(s string) bool {
 	if s == "" {

src/go/build/build_test.go

diff --git a/src/go/build/build_test.go b/src/go/build/build_test.go
index cfcb816..cff091f 100644
--- a/src/go/build/build_test.go
+++ b/src/go/build/build_test.go
@@ -295,7 +295,7 @@
 		result                  bool
 	}{
 		{"-I${SRCDIR}/../include", "/projects/src/issue 11868", "-I/projects/src/issue 11868/../include", true},
-		{"-I${SRCDIR}", "wtf$@%", "-Iwtf$@%", true},
+		{"-I${SRCDIR}", "~wtf$@%^", "-I~wtf$@%^", true},
 		{"-X${SRCDIR}/1,${SRCDIR}/2", "/projects/src/issue 11868", "-X/projects/src/issue 11868/1,/projects/src/issue 11868/2", true},
 		{"-I/tmp -I/tmp", "/tmp2", "-I/tmp -I/tmp", true},
 		{"-I/tmp", "/tmp/[0]", "-I/tmp", true},