summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-12-16 21:54:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-27 18:05:18 +0100
commitd89c54ee995f48dd0d4e866f94826f64b7538cd2 (patch)
treeded57e1f80314926ab8afa614a12ba93a581cf65 /meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
parent94bacd598ddf879ceb781f7780935a83f0d1a305 (diff)
downloadpoky-d89c54ee995f48dd0d4e866f94826f64b7538cd2.tar.gz
go: Upgrade 1.11.1 -> 1.11.4 minor release
Source: OpenEmbedded.org MR: 98328, 98329, 98330 Type: Security Fix Disposition: Backport from https://git.openembedded.org/openembedded-core/commit/meta/recipes-devtools/go?h=warrior&id=b964551a0d08aa921d4e0ceea2f1e28a5e83510e ChangeID: 0b4cc69c357ba14c4e7a6c7ff926cfc6f09489b2 Description: include: CVE-2018-16873 CVE-2018-16874 CVE-2018-16875 Changes: https://golang.org/doc/devel/release.html#go1.11 (From OE-Core rev: 69964488112899371b7fd88b6e86e533d968b457) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Bug fix only update] Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch')
-rw-r--r--meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch b/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
index f317e48a33..29ef947abd 100644
--- a/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
+++ b/meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
@@ -65,8 +65,8 @@ Index: go/src/cmd/go/internal/work/exec.go
65=================================================================== 65===================================================================
66--- go.orig/src/cmd/go/internal/work/exec.go 66--- go.orig/src/cmd/go/internal/work/exec.go
67+++ go/src/cmd/go/internal/work/exec.go 67+++ go/src/cmd/go/internal/work/exec.go
68@@ -440,6 +440,23 @@ func (b *Builder) build(a *Action) (err 68@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err
69 return fmt.Errorf("module requires Go %s", p.Module.GoVersion) 69 return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)
70 } 70 }
71 71
72+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) { 72+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {
@@ -89,7 +89,7 @@ Index: go/src/cmd/go/internal/work/exec.go
89 if err := b.Mkdir(a.Objdir); err != nil { 89 if err := b.Mkdir(a.Objdir); err != nil {
90 return err 90 return err
91 } 91 }
92@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act 92@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act
93 return nil 93 return nil
94 } 94 }
95 95