From patchwork Sun Jul 21 14:25:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Kuster X-Patchwork-Id: 169319 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp6411288ilk; Sun, 21 Jul 2019 07:28:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoSKJJEc/zd52xIrYD2jwCZYHQwzl3A0C7Cr6vaCAPhdPLPy9CovYFhg/KFcGl8W2vgAX5 X-Received: by 2002:a63:ce45:: with SMTP id r5mr41764141pgi.435.1563719302259; Sun, 21 Jul 2019 07:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563719302; cv=none; d=google.com; s=arc-20160816; b=l5je7UJPKvoIgAxUIDfWZF54U25D+0k9HNiB0lOF5aWStRpjn57tWcB0lMiqPYx8qr rYZMEHc0pCxwbPsHxZwpwPk+V+kBGGpDI+9XIS2U0HMTL+p62zQvCNwmlFZzCTry9fWZ AY8SnvlRT2cqQ2P0oDHe6IvKO4DcGEgCfahwUcat0BHNI4HwdcktkRl0m8giTuRfRHCM EH1SRZnaUVO8SVDSzgMQSmMBg+MLpBGUpAsySp34x1S8EKiN6HdmFzLCppSZEkomA3SO o0VF4WJPAzROAMVofpvDxUxYEXsNu3/2KuyJ67u0h1NJkSph/Iwwfcx92LAQ0YC5FrAM qoUg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=C762qdSTprZSUuxTojBRY1klpBENI8J/mlxg2B3pSM8=; b=wLIrKC1u98y4GQY+8qbGp1tK5OERvhGNwl0jY25cY5O60idyDPcEejmnVsX1bEkfNR LT6u+KHiVCpFI3mAe5XzK45m1VmeqE8Pylmmw/Zw8O3CFybvfo0c9gkdZH36lS0oo/Gp hTaWLrnBpDTgqNW7k0L5/jBPrJ4ABoAA29cfnVepymKduyChPqVofGYuP9tuBnL4y0q/ 6YgOiw2zi10WknzM6c3YsSnfl1CY6BF7gCAkS6nasfRf2ywJmaqlQMNfz7kGH5GY1ADd A4yNgNDJVi995pXUywdnHcctp/V/OVVMElCSRBhUwdUohzldhF+401WSrmnJANaz9Ijm veBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Pim+A29L; 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 q4si8101031pfg.286.2019.07.21.07.28.22; Sun, 21 Jul 2019 07:28:22 -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=Pim+A29L; 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 72F347EF45; Sun, 21 Jul 2019 14:26:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mail.openembedded.org (Postfix) with ESMTP id 526177EE43 for ; Sun, 21 Jul 2019 14:25:37 +0000 (UTC) Received: by mail-pl1-f179.google.com with SMTP id m9so17807933pls.8 for ; Sun, 21 Jul 2019 07:25:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=XgIIpTrPFZRWDDI5Vh7TOrm71k3GSVjkWjKa7LmZbr8=; b=Pim+A29L/3fZ1S5rJEMiJnwUU09wKeKfai5yKQvPcHpnTnDFNcRsgvY+9J0zdpKcly 8zARnZQN+kdc4Y0Bn/LFLlZWC8WMfWT4ZezG2FCJmEBmMAk7JCX6WVisEucs3NZcNIIE IZ3Bc7rZf6JGnXPb4es8PHjSnZEOgKhgaeWsWWVAxASv9TxGh78sy6IwqDH1RrRVrLVI KQn4MIR8+FHBAPDWGAOYISYGPz2WI5aJ1ORrm81UFWoOplmnTP5/O3BixQFyY7ONecD8 XfQ44qLcQ9yho/2XxdFeKGR+YJItQQn1i295+swBG40+xvSmlKYH6769RCgeS5ccfW7y tLNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XgIIpTrPFZRWDDI5Vh7TOrm71k3GSVjkWjKa7LmZbr8=; b=JQAocyhwKGKurZMv4oYMYQRdsM9o5p422sNJV9JGSMKxw3SPIPDvOlD1tYDHzUYtG8 4D1AKHwMa242K7mWzmJcm/i8zuQL1qd4THcooXkSS3tdaf/VvglLWNJHeEh3iPqf2q31 RBiELqOLqhqOZ8kVxdC16WgOCa9VBL948iufwjrOvXEKzgKtSF+tG1dIAOrV1i54Z93/ zQSnziyb2BoYGN5UvLOLYdTXvr4J12EaGhg50Nk45drzxRq/TGhy21FGGocYgg5M2eUS dwdSR6ggSOQaxCXqsL5aLuZh3tClUrpKKVLlyvA0L//t23y4jtoDGK1QaCfpgoaSRhoJ vqaQ== X-Gm-Message-State: APjAAAVlV1HR+L1Z9xbDG1Kr5MA/VJ8TwI0F7zldC03hSxm3KVcT/qfI EeDRlplo6YbTDYeKjsJXqrQuQGWt X-Received: by 2002:a17:902:8649:: with SMTP id y9mr68844650plt.289.1563719138318; Sun, 21 Jul 2019 07:25:38 -0700 (PDT) Received: from akuster-ThinkPad-T460s.hsd1.ca.comcast.net ([2601:202:4180:c33:bd4d:a6f4:da99:27b4]) by smtp.gmail.com with ESMTPSA id a3sm28807750pfc.70.2019.07.21.07.25.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 Jul 2019 07:25:37 -0700 (PDT) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sun, 21 Jul 2019 07:25:03 -0700 Message-Id: <69964488112899371b7fd88b6e86e533d968b457.1563719003.git.akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [OE-core] [thud] 14/30] 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 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 -