mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

go: Upgrade 1.11.1 -> 1.11.4 minor release

Browse Source 
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>
This commit is contained in:
Khem Raj
2018-12-16 21:54:40 -08:00
committed by Richard Purdie
parent 94bacd598d
commit d89c54ee99
3 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/go/go-1.11.inc
+3 -4
View File
@@ -1,7 +1,7 @@
require go-common.inc require go-common.inc
GO_BASEVERSION = "1.11" GO_BASEVERSION = "1.11"
GO_MINOR = ".1" GO_MINOR = ".4"
PV .= "${GO_MINOR}" PV .= "${GO_MINOR}"
FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:"
@@ -17,8 +17,7 @@ SRC_URI += "\
file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \
file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ file://0008-use-GOBUILDMODE-to-set-buildmode.patch \
" "
SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch"
SRC_URI[main.md5sum] = "eb9e9792247143705a7aacea9398cde0" SRC_URI[main.md5sum] = "a77697673215be465d1b583680ef2318"
SRC_URI[main.sha256sum] = "558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117" SRC_URI[main.sha256sum] = "4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15"
meta/recipes-devtools/go/go-1.11/0007-cmd-go-make-GOROOT-precious-by-default.patch
+3 -3
View File
@@ -65,8 +65,8 @@ Index: go/src/cmd/go/internal/work/exec.go
=================================================================== ===================================================================
--- go.orig/src/cmd/go/internal/work/exec.go --- go.orig/src/cmd/go/internal/work/exec.go
+++ go/src/cmd/go/internal/work/exec.go +++ go/src/cmd/go/internal/work/exec.go
@@ -440,6 +440,23 @@ func (b *Builder) build(a *Action) (err @@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err
return fmt.Errorf("module requires Go %s", p.Module.GoVersion) return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target)
} }
+ if goRootPrecious && (a.Package.Standard || a.Package.Goroot) { + if goRootPrecious && (a.Package.Standard || a.Package.Goroot) {
@@ -89,7 +89,7 @@ Index: go/src/cmd/go/internal/work/exec.go
if err := b.Mkdir(a.Objdir); err != nil { if err := b.Mkdir(a.Objdir); err != nil {
return err return err
} }
@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act @@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act
return nil return nil
} }
meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch
+5 -8
View File
@@ -18,11 +18,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
src/cmd/go/internal/work/build.go | 6 +++++- src/cmd/go/internal/work/build.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go Index: go/src/cmd/go/internal/work/build.go
index 145b875..595d703 100644 ===================================================================
--- a/src/cmd/go/internal/work/build.go --- go.orig/src/cmd/go/internal/work/build.go
+++ b/src/cmd/go/internal/work/build.go +++ go/src/cmd/go/internal/work/build.go
@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { @@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) {
cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "")
cmd.Flag.Var(buildCompiler{}, "compiler", "") cmd.Flag.Var(buildCompiler{}, "compiler", "")
@@ -35,6 +35,3 @@ index 145b875..595d703 100644
cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGcflags, "gcflags", "")
cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "")
cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "")
--
2.7.4