From b1db2761b2562309c8f64e2fb3612333a6b144fe Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 7 Dec 2020 05:30:32 +0800 Subject: [PATCH] golang: Update to 1.15.6 Signed-off-by: Jeffery To --- lang/golang/golang/Makefile | 4 +- ...e-not-in-security-allowlist-GH-42567.patch | 93 ------------------- 2 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 lang/golang/golang/patches/001-allow-flags-in-CGO_LDFLAGS-environment-variable-not-in-security-allowlist-GH-42567.patch diff --git a/lang/golang/golang/Makefile b/lang/golang/golang/Makefile index f7b2a2d990..8f30a152c9 100644 --- a/lang/golang/golang/Makefile +++ b/lang/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.15 -GO_VERSION_PATCH:=5 +GO_VERSION_PATCH:=6 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=c1076b90cf94b73ebed62a81d802cd84d43d02dea8c07abdc922c57a071c84f1 +PKG_HASH:=890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817 PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause diff --git a/lang/golang/golang/patches/001-allow-flags-in-CGO_LDFLAGS-environment-variable-not-in-security-allowlist-GH-42567.patch b/lang/golang/golang/patches/001-allow-flags-in-CGO_LDFLAGS-environment-variable-not-in-security-allowlist-GH-42567.patch deleted file mode 100644 index 49ca5a5192..0000000000 --- a/lang/golang/golang/patches/001-allow-flags-in-CGO_LDFLAGS-environment-variable-not-in-security-allowlist-GH-42567.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 39f8e98946a0958a4f69ec28c78b8e5d46125e44 Mon Sep 17 00:00:00 2001 -From: Ian Lance Taylor -Date: Fri, 13 Nov 2020 11:05:37 -0800 -Subject: [PATCH] [release-branch.go1.15] cmd/go: permit CGO_LDFLAGS to appear in //go:ldflag - -For #42565 -Fixes #42567 - -Change-Id: If7cf39905d124dbd54dfac6a53ee38270498efed -Reviewed-on: https://go-review.googlesource.com/c/go/+/269818 -Trust: Ian Lance Taylor -Run-TryBot: Ian Lance Taylor -TryBot-Result: Go Bot -Reviewed-by: Jay Conrod -(cherry picked from commit 782cf560db4c919790fdb476d1bbe18e5ddf5ffd) ---- - -diff --git a/src/cmd/go/internal/work/exec.go b/src/cmd/go/internal/work/exec.go -index 13d4c8c..dc0c4fc 100644 ---- a/src/cmd/go/internal/work/exec.go -+++ b/src/cmd/go/internal/work/exec.go -@@ -2766,6 +2766,21 @@ - idx = bytes.Index(src, []byte(cgoLdflag)) - } - } -+ -+ // We expect to find the contents of cgoLDFLAGS in flags. -+ if len(cgoLDFLAGS) > 0 { -+ outer: -+ for i := range flags { -+ for j, f := range cgoLDFLAGS { -+ if f != flags[i+j] { -+ continue outer -+ } -+ } -+ flags = append(flags[:i], flags[i+len(cgoLDFLAGS):]...) -+ break -+ } -+ } -+ - if err := checkLinkerFlags("LDFLAGS", "go:cgo_ldflag", flags); err != nil { - return nil, nil, err - } -diff --git a/src/cmd/go/testdata/script/ldflag.txt b/src/cmd/go/testdata/script/ldflag.txt -new file mode 100644 -index 0000000..6ceb33b ---- /dev/null -+++ b/src/cmd/go/testdata/script/ldflag.txt -@@ -0,0 +1,44 @@ -+# Issue #42565 -+ -+[!cgo] skip -+ -+# We can't build package bad, which uses #cgo LDFLAGS. -+cd bad -+! go build -+stderr no-such-warning -+ -+# We can build package ok with the same flags in CGO_LDFLAGS. -+env CGO_LDFLAGS=-Wno-such-warning -Wno-unknown-warning-option -+cd ../ok -+go build -+ -+# Build a main program that actually uses LDFLAGS. -+cd .. -+go build -ldflags=-v -+ -+# Because we passed -v the Go linker should print the external linker -+# command which should include the flag we passed in CGO_LDFLAGS. -+stderr no-such-warning -+ -+-- go.mod -- -+module ldflag -+ -+-- bad/bad.go -- -+package bad -+ -+// #cgo LDFLAGS: -Wno-such-warning -Wno-unknown-warning -+import "C" -+ -+func F() {} -+-- ok/ok.go -- -+package ok -+ -+import "C" -+ -+func F() {} -+-- main.go -- -+package main -+ -+import _ "ldflag/ok" -+ -+func main() {} -- 2.30.2