From patchwork Fri May 31 23:30:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 165556 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1413686ili; Fri, 31 May 2019 16:31:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzMzYVYbG5L8iraz8kcieB+KvnUpAtxrvDH5+rlbolQIyY0qIgr8E1srfurbobzEictW09c X-Received: by 2002:a17:90a:d98b:: with SMTP id d11mr6607542pjv.87.1559345514941; Fri, 31 May 2019 16:31:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559345514; cv=none; d=google.com; s=arc-20160816; b=051f7uEE6ZyRvtOEMaGKou9LY7I+eXUq5LRw/iKZZzyaQEIfeiImlmxTztj/MlfRe7 k8/tGJSMDgUogvF05hmw+OLVLhOyVq3WdY0E2srcSTyJpWy4WGhUYfIw68Ncvay8vD3R H5yFG15baeKv2rHItv/pLaftLtSsXXEgRH2udlWg2rt/Ypgrjm2G5FavAQZjY0GnU7Nk 9TyH9irOWaCFmRTnZ/uxe0tU5wCRMdz3D61Xh43ZRVPkNrYF5wMmsQGyGvRLA12pTYYT Xd+pTKjI4gLFwadg5wxvUnQpTO2JJSYvRHnKepwjIpeIbT3nbEJ0HLisqttySGxohCui Pw5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=AwxmwZmmJ9MkT1QS9sUvOnUUHACbnf5eQ6LaM62T2ho=; b=oLrfjOfNCVUT3GLfuqZCxovsxnw+Nu1uR89IDRzPBIBkXshet7UBP8iUIzwuyPnpih dBz+hDC43MENggKYCYZ8JXo8Ql3bP7izq94JKYlKcQFi9rgasNfY7IceLSqT2BDi4jaA 4KCWPfrcqqDQeIZKFqu5AZ+g97AZiTHBKK0lVOcNZKFon/xftkK5jgTsTiCvM/YbRVYs 0eB4Z6vqdNmefwBXd5lT0CP5hUrst/GbVa6p/Zw/h6c4dTpUz+PNslGjEIMaaR8Mf2zK izZYLkcqqsRUKCgpkD0mpMIvvIk8v7eZ1AKeE0SDL6tgBmrSo7/0BokpQPKTNgKK0Hex 1NyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HA9cfexQ; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id k18si8771762pfd.233.2019.05.31.16.31.54; Fri, 31 May 2019 16:31:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HA9cfexQ; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 615B07E64F; Fri, 31 May 2019 23:31:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by mail.openembedded.org (Postfix) with ESMTP id 5AD227E5D4 for ; Fri, 31 May 2019 23:30:21 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id v11so4849017pgl.5 for ; Fri, 31 May 2019 16:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/PqzRCWbRuGCUsqn7iPg/Jia+82kZtI7JHv6EhO+m+A=; b=HA9cfexQ/s9LQMSopsOE0eD9gxq9ebiBH9Mj8BM9zcUzwaURlSCN0MuNVJXHjWAQ19 uR7NAMoMDpT1SQy+XOuIKW5OolwBkGK02a3QZuOknfl/LyZVVvLf/aZI4FJaUV8n7bRf KlYe6tcd7rgKotZXEWzDL5IvmSlMDmBPcvLQIKMIKxiizvEwLD1VVQ+IxHVrFGtYOfGu fifWfODUngb+29yRSmCCp8O83570SE2zjR2KHcCzATZDe4zUawWD5Rf11lK/r9eAxFy4 OowJOb5Nptqmb+IC7ogOIQr6Xe4V88OADR2ohFX9aByVSRc3iS1EzgH0MUM600iy1tcT 7Ipg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/PqzRCWbRuGCUsqn7iPg/Jia+82kZtI7JHv6EhO+m+A=; b=mYQnUWQKWrp+wD53ZYlZiYld7pYUpfH+WXX0M54HvUPuYFZLFt5aW6JVs5+auO0RQF x3Ay8q+g3tZ7fV9Q0sW+JdywHpot1sRPQBasG6GZoIPr890si27gIw16gwZ78FRYQkMQ gO92litpXJxn/87ppyn7rt0CISCt8cGUexGnwTZq2ODSbVolR79gYByz5lDpzl8hPyBh 8qTp6jIg3RnWNWKfuiaEkHIkswfQTwHdGpe8FyDncSQi1UIAz2tL8yeIL6GERXaH3sXz HIjr2eqrMhP2dhmkZbzeONwbsQm5xn4rDracPr28qzwX86S3FWGLqCDE7Dp+WilTGYbC QHEA== X-Gm-Message-State: APjAAAUHuBuHGghCkoZkjNp3SBNK9FpF4SIfaIsbUMJJlosCx3G71zwb LI+hKIkshbnxHcBbjgP1YAa+4c5i X-Received: by 2002:a17:90a:350d:: with SMTP id q13mr12841211pjb.20.1559345422005; Fri, 31 May 2019 16:30:22 -0700 (PDT) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:c33:d8eb:da43:9914:3fc9]) by smtp.gmail.com with ESMTPSA id u1sm7199631pfh.85.2019.05.31.16.30.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 May 2019 16:30:21 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Fri, 31 May 2019 16:30:16 -0700 Message-Id: <1559345417-17830-3-git-send-email-akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1559345417-17830-1-git-send-email-akuster808@gmail.com> References: <1559345417-17830-1-git-send-email-akuster808@gmail.com> Cc: Armin Kuster Subject: [OE-core] [thud][PATCH 3/4] go: Upgrade 1.11.1 -> 1.11.4 minor release X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Khem Raj 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie [Bug fix only update] Signed-off-by: Armin Kuster --- meta/recipes-devtools/go/go-1.11.inc | 7 +++---- .../0007-cmd-go-make-GOROOT-precious-by-default.patch | 6 +++--- .../go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch | 13 +++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/go/go-1.11.inc b/meta/recipes-devtools/go/go-1.11.inc index d626514..d03e26c 100644 --- a/meta/recipes-devtools/go/go-1.11.inc +++ b/meta/recipes-devtools/go/go-1.11.inc @@ -1,7 +1,7 @@ require go-common.inc GO_BASEVERSION = "1.11" -GO_MINOR = ".1" +GO_MINOR = ".4" PV .= "${GO_MINOR}" FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/go-${GO_BASEVERSION}:" @@ -17,8 +17,7 @@ SRC_URI += "\ file://0007-cmd-go-make-GOROOT-precious-by-default.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[main.md5sum] = "eb9e9792247143705a7aacea9398cde0" -SRC_URI[main.sha256sum] = "558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117" +SRC_URI[main.md5sum] = "a77697673215be465d1b583680ef2318" +SRC_URI[main.sha256sum] = "4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15" 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 f317e48..29ef947 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 =================================================================== --- go.orig/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 - return fmt.Errorf("module requires Go %s", p.Module.GoVersion) +@@ -436,6 +436,23 @@ func (b *Builder) build(a *Action) (err + return fmt.Errorf("missing or invalid binary-only package; expected file %q", a.Package.Target) } + 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 { return err } -@@ -1435,6 +1452,14 @@ func BuildInstallFunc(b *Builder, a *Act +@@ -1438,6 +1455,14 @@ func BuildInstallFunc(b *Builder, a *Act return nil } diff --git a/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch index b6ab504..225cf43 100644 --- a/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch +++ b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -18,11 +18,11 @@ Signed-off-by: Hongxu Jia src/cmd/go/internal/work/build.go | 6 +++++- 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 145b875..595d703 100644 ---- a/src/cmd/go/internal/work/build.go -+++ b/src/cmd/go/internal/work/build.go -@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { +Index: go/src/cmd/go/internal/work/build.go +=================================================================== +--- go.orig/src/cmd/go/internal/work/build.go ++++ go/src/cmd/go/internal/work/build.go +@@ -223,7 +223,11 @@ func AddBuildFlags(cmd *base.Command) { cmd.Flag.Var(&load.BuildAsmflags, "asmflags", "") cmd.Flag.Var(buildCompiler{}, "compiler", "") @@ -35,6 +35,3 @@ index 145b875..595d703 100644 cmd.Flag.Var(&load.BuildGcflags, "gcflags", "") cmd.Flag.Var(&load.BuildGccgoflags, "gccgoflags", "") cmd.Flag.StringVar(&cfg.BuildMod, "mod", "", "") --- -2.7.4 -