You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.6 KiB
53 lines
1.6 KiB
Index: src/cmd/go/internal/cache/default.go |
|
--- src/cmd/go/internal/cache/default.go.orig 2018-08-24 22:38:35.000000000 +0200 |
|
+++ src/cmd/go/internal/cache/default.go 2018-09-01 10:19:03.051060000 +0200 |
|
@@ -5,7 +5,6 @@ |
|
package cache |
|
|
|
import ( |
|
- "fmt" |
|
"io/ioutil" |
|
"os" |
|
"path/filepath" |
|
@@ -35,14 +34,11 @@ |
|
// initDefaultCache does the work of finding the default cache |
|
// the first time Default is called. |
|
func initDefaultCache() { |
|
- dir, showWarnings := defaultDir() |
|
+ dir, _ := defaultDir() |
|
if dir == "off" { |
|
return |
|
} |
|
if err := os.MkdirAll(dir, 0777); err != nil { |
|
- if showWarnings { |
|
- fmt.Fprintf(os.Stderr, "go: disabling cache (%s) due to initialization failure: %s\n", dir, err) |
|
- } |
|
return |
|
} |
|
if _, err := os.Stat(filepath.Join(dir, "README")); err != nil { |
|
@@ -52,9 +48,6 @@ |
|
|
|
c, err := Open(dir) |
|
if err != nil { |
|
- if showWarnings { |
|
- fmt.Fprintf(os.Stderr, "go: disabling cache (%s) due to initialization failure: %s\n", dir, err) |
|
- } |
|
return |
|
} |
|
defaultCache = c |
|
Index: src/crypto/x509/root_unix.go |
|
--- src/crypto/x509/root_unix.go.orig 2018-08-24 22:38:35.000000000 +0200 |
|
+++ src/crypto/x509/root_unix.go 2018-09-01 10:18:42.967825000 +0200 |
|
@@ -14,11 +14,7 @@ |
|
// Possible directories with certificate files; stop after successfully |
|
// reading at least one file from a directory. |
|
var certDirectories = []string{ |
|
- "/etc/ssl/certs", // SLES10/SLES11, https://golang.org/issue/12139 |
|
- "/system/etc/security/cacerts", // Android |
|
- "/usr/local/share/certs", // FreeBSD |
|
- "/etc/pki/tls/certs", // Fedora/RHEL |
|
- "/etc/openssl/certs", // NetBSD |
|
+ "@l_prefix@/etc/x509", |
|
} |
|
|
|
const (
|
|
|