go: remove not any more used patch files (#79597)
This commit is contained in:
parent
2b8735bd5f
commit
7956397ec2
@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go
|
|
||||||
index d694990..87fa259 100644
|
|
||||||
--- a/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go
|
|
||||||
+++ b/src/cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go
|
|
||||||
@@ -452,7 +452,7 @@ func TestGetwd(t *testing.T) {
|
|
||||||
defer fd.Close()
|
|
||||||
// These are chosen carefully not to be symlinks on a Mac
|
|
||||||
// (unlike, say, /var, /etc)
|
|
||||||
- dirs := []string{"/", "/usr/bin"}
|
|
||||||
+ dirs := []string{"/"}
|
|
||||||
switch runtime.GOOS {
|
|
||||||
case "android":
|
|
||||||
dirs = []string{"/", "/system/bin"}
|
|
@ -1,35 +0,0 @@
|
|||||||
diff --git a/src/go/build/build.go b/src/go/build/build.go
|
|
||||||
index d8163d0172..dd80a70473 100644
|
|
||||||
--- a/src/go/build/build.go
|
|
||||||
+++ b/src/go/build/build.go
|
|
||||||
@@ -1592,7 +1592,7 @@ func init() {
|
|
||||||
}
|
|
||||||
|
|
||||||
// ToolDir is the directory containing build tools.
|
|
||||||
-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
|
|
||||||
+var ToolDir = runtime.GOTOOLDIR()
|
|
||||||
|
|
||||||
// IsLocalImport reports whether the import path is
|
|
||||||
// a local import path, like ".", "..", "./foo", or "../foo".
|
|
||||||
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
|
|
||||||
index 6e6c674d96..e9f62f96dc 100644
|
|
||||||
--- a/src/runtime/extern.go
|
|
||||||
+++ b/src/runtime/extern.go
|
|
||||||
@@ -223,6 +223,17 @@ func GOROOT() string {
|
|
||||||
return sys.DefaultGoroot
|
|
||||||
}
|
|
||||||
|
|
||||||
+// GOTOOLDIR returns the root of the Go tree.
|
|
||||||
+// It uses the GOTOOLDIR environment variable, if set,
|
|
||||||
+// or else the root used during the Go build.
|
|
||||||
+func GOTOOLDIR() string {
|
|
||||||
+ s := gogetenv("GOTOOLDIR")
|
|
||||||
+ if s != "" {
|
|
||||||
+ return s
|
|
||||||
+ }
|
|
||||||
+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
// Version returns the Go tree's version string.
|
|
||||||
// It is either the commit hash and date at the time of the build or,
|
|
||||||
// when possible, a release tag like "go1.3".
|
|
@ -1,80 +0,0 @@
|
|||||||
diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
|
|
||||||
index 8e80533590..31c0c666ec 100644
|
|
||||||
--- a/src/crypto/x509/root_cgo_darwin.go
|
|
||||||
+++ b/src/crypto/x509/root_cgo_darwin.go
|
|
||||||
@@ -201,11 +201,20 @@ int FetchPEMRoots(CFDataRef *pemRoots, CFDataRef *untrustedPemRoots) {
|
|
||||||
import "C"
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
+ "io/ioutil"
|
|
||||||
+ "os"
|
|
||||||
"unsafe"
|
|
||||||
)
|
|
||||||
|
|
||||||
func loadSystemRoots() (*CertPool, error) {
|
|
||||||
roots := NewCertPool()
|
|
||||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
|
||||||
+ data, err := ioutil.ReadFile(file)
|
|
||||||
+ if err == nil {
|
|
||||||
+ roots.AppendCertsFromPEM(data)
|
|
||||||
+ return roots, nil
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
var data C.CFDataRef = nil
|
|
||||||
var untrustedData C.CFDataRef = nil
|
|
||||||
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
|
|
||||||
index bc35a1cf21..21e52bec51 100644
|
|
||||||
--- a/src/crypto/x509/root_darwin.go
|
|
||||||
+++ b/src/crypto/x509/root_darwin.go
|
|
||||||
@@ -81,18 +81,26 @@ func execSecurityRoots() (*CertPool, error) {
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
- cmd := exec.Command("/usr/bin/security", args...)
|
|
||||||
- data, err := cmd.Output()
|
|
||||||
- if err != nil {
|
|
||||||
- return nil, err
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
var (
|
|
||||||
mu sync.Mutex
|
|
||||||
roots = NewCertPool()
|
|
||||||
numVerified int // number of execs of 'security verify-cert', for debug stats
|
|
||||||
)
|
|
||||||
|
|
||||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
|
||||||
+ data, err := ioutil.ReadFile(file)
|
|
||||||
+ if err == nil {
|
|
||||||
+ roots.AppendCertsFromPEM(data)
|
|
||||||
+ return roots, nil
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ cmd := exec.Command("/usr/bin/security", args...)
|
|
||||||
+ data, err := cmd.Output()
|
|
||||||
+ if err != nil {
|
|
||||||
+ return nil, err
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
blockCh := make(chan *pem.Block)
|
|
||||||
var wg sync.WaitGroup
|
|
||||||
|
|
||||||
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
|
|
||||||
index 65b5a5fdbc..c9c7ac6a74 100644
|
|
||||||
--- a/src/crypto/x509/root_unix.go
|
|
||||||
+++ b/src/crypto/x509/root_unix.go
|
|
||||||
@@ -37,6 +37,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
|
|
||||||
|
|
||||||
func loadSystemRoots() (*CertPool, error) {
|
|
||||||
roots := NewCertPool()
|
|
||||||
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
|
|
||||||
+ data, err := ioutil.ReadFile(file)
|
|
||||||
+ if err == nil {
|
|
||||||
+ roots.AppendCertsFromPEM(data)
|
|
||||||
+ return roots, nil
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
|
|
||||||
files := certFiles
|
|
||||||
if f := os.Getenv(certFileEnv); f != "" {
|
|
Loading…
Reference in New Issue
Block a user