From df58b799d7ef8bd7e5e85db1eaf1a24b56ea8f28 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 23 Sep 2021 10:48:10 +0200 Subject: [PATCH 1/5] dev-lang/go: delete Go 1.15 As Go 1.15 is not being used any more, we can clean it up completely. --- .../src/third_party/coreos-overlay/dev-lang/go/Manifest | 1 - .../coreos-overlay/dev-lang/go/go-1.15.11.ebuild | 8 -------- 2 files changed, 9 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.15.11.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest index 04582881d7..a2f2f8a18c 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest @@ -1,3 +1,2 @@ DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274 SHA512 069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6 -DIST go1.15.11.src.tar.gz 23029946 BLAKE2B b937a8e350b6a30e71427d8cbc52edb73e11f055c16890c81ba4bf2f6aa90fd223f0af9517021741e791c22b78f840b3485ea8df4853865dceae354f4803c55d SHA512 52a107220f02197f07c0d3afef403c3762428c1f69107fa7123bc6cdf6b47dd4e65f2ab3979ad7d12a265b0c9bd0b66e6e50eb91f7fa994ba22882f117afe289 DIST go1.16.8.src.tar.gz 20922236 BLAKE2B 0c845ccb9f84566a4bb87414909a9bef1a7a3f5ecfb885ad48acaacb5fe2d2a9a7df5aface6be6e3e6b9b45f79667179aa5e7b37a8461170a7fc8fe76bc72b8c SHA512 49b3b341ee3dbf2964f8e938a6d797a48e4b46e19c6c6f240038cd48c8668b76982f0c9c61e38bfdc42eb03db72d125457905cba76589d1d7d2f825bc67587e3 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.15.11.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.15.11.ebuild deleted file mode 100644 index 6075ddc2a8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.15.11.ebuild +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2019 Kinvolk GmbH. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit coreos-go-lang - -KEYWORDS="-* amd64 arm64" From 97b3506e4ffa0a03582e447fe187a271972fe368 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 23 Sep 2021 11:14:53 +0200 Subject: [PATCH 2/5] coreos-base/hard-host-depends: delete Go 1.15 from SDK Now that Go 1.15 was deleted, we need to also remove it from the SDK dependency list. --- .../coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index d6c4f3078b..e90ff4216a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -38,7 +38,6 @@ RDEPEND="${RDEPEND} dev-lang/swig dev-lang/yasm dev-lang/go:1.12 - dev-lang/go:1.15 dev-lang/go:1.16 dev-lang/go-bootstrap dev-lang/tcl From 6295868ffaed15e52911045ab41100ccca291367 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 23 Sep 2021 10:49:12 +0200 Subject: [PATCH 3/5] dev-lang/go: Update to 1.17.1, delete 1.16 Update dev-lang/go to 1.17.1, mainly to address CVE-2021-29923. Delete dev-lang/go 1.16, which is not needed any more. --- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../app-emulation/docker-cli/docker-cli-20.10.8.ebuild | 2 +- .../app-emulation/docker-proxy/docker-proxy-9999.ebuild | 2 +- .../app-emulation/docker-runc/docker-runc-1.0.2.ebuild | 2 +- .../app-emulation/docker/docker-20.10.8.ebuild | 6 +++--- .../src/third_party/coreos-overlay/dev-lang/go/Manifest | 2 +- .../dev-lang/go/{go-1.16.8.ebuild => go-1.17.1.ebuild} | 0 .../coreos-overlay/eclass/coreos-go-depend.eclass | 4 ++-- .../coreos-overlay/eclass/coreos-go-utils.eclass | 2 +- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-lang/go/{go-1.16.8.ebuild => go-1.17.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 838c2c9c25..d608d603e6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/containerd/containerd" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.16" +COREOS_GO_VERSION="go1.17" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild index 535e4e2d91..9d34949169 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.8.ebuild @@ -6,7 +6,7 @@ GIT_COMMIT=311fbfaf7d EGO_PN="github.com/docker/cli" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.16" +COREOS_GO_VERSION="go1.17" inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild index 68f37da0a5..e9221e635d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 EGO_PN="github.com/docker/libnetwork" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.16" +COREOS_GO_VERSION="go1.17" COREOS_GO_GO111MODULE="off" if [[ ${PV} == *9999 ]]; then diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild index 99435d5b1a..c1e1b24ea5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.2.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.16" +COREOS_GO_VERSION="go1.17" # the commit of runc that docker uses. # see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4 COMMIT_ID="61ab78b58f2c0c3fbfc63477f2c020e825b9789d" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild index 8885a28ed0..36e851bf36 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.8.ebuild @@ -4,12 +4,12 @@ EAPI=7 EGO_PN=github.com/docker/docker GIT_COMMIT=4662437124 -# Flatcar: force building with go1.16 like upstream does -COREOS_GO_VERSION="go1.16" +# Flatcar: force building with go1.17 like upstream does +COREOS_GO_VERSION="go1.17" COREOS_GO_GO111MODULE="off" inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot -# Flatcar: use coreos-go-depend to force building with go1.16 +# Flatcar: use coreos-go-depend to force building with go1.17 inherit coreos-go-depend DESCRIPTION="The core functions you need to create Docker images and run Docker containers" diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest index a2f2f8a18c..c29cff5c0a 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest @@ -1,2 +1,2 @@ DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274 SHA512 069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6 -DIST go1.16.8.src.tar.gz 20922236 BLAKE2B 0c845ccb9f84566a4bb87414909a9bef1a7a3f5ecfb885ad48acaacb5fe2d2a9a7df5aface6be6e3e6b9b45f79667179aa5e7b37a8461170a7fc8fe76bc72b8c SHA512 49b3b341ee3dbf2964f8e938a6d797a48e4b46e19c6c6f240038cd48c8668b76982f0c9c61e38bfdc42eb03db72d125457905cba76589d1d7d2f825bc67587e3 +DIST go1.17.1.src.tar.gz 22181735 BLAKE2B 77ce952e14c101776935c625aa39596a6b8923ca5ac264c72ed08a578f08fbbbc1825315a5dd84f9fa1412aaa7400b31e73117d5919aeb527c084173d8e11504 SHA512 23d4e003651204c5bcc5cf41437134e07a3fe3c188eb129f2d6366a7445a7919d6a7319c57483e91b3415fd28aa55df8d58eec398434f20ce6accd587925a14b diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.16.8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.17.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.16.8.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.17.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass index 67bbdab763..1fc55c2b51 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass @@ -11,9 +11,9 @@ # # Example: # @CODE -# COREOS_GO_VERSION=go1.16 +# COREOS_GO_VERSION=go1.17 # @CODE -export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.16}" +export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.17}" case "${EAPI:-0}" in 5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass index f5e0421f38..3bdfeef711 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass @@ -95,7 +95,7 @@ go_export() { # Ensure the `go` wrapper calls the version we expect export EGO="${COREOS_GO_VERSION}" - # With Go 1.16, GO111MODULE=on is set by default. + # With Go >= 1.16, GO111MODULE=on is set by default. # Few of our repos still don't support Go modules so we would need to set # GO111MODULE=off for those packages. if [[ "${COREOS_GO_GO111MODULE}" == "off" ]]; then diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index c8becf51e4..4d0df35249 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -30,7 +30,7 @@ # # Example: # @CODE -# COREOS_GO_VERSION=go1.16 +# COREOS_GO_VERSION=go1.17 # @CODE case "${EAPI:-0}" in From e7956fb4c77d8bb90348d779718a2bf9e3a6bcf3 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 23 Sep 2021 10:57:54 +0200 Subject: [PATCH 4/5] coreos-base/hard-host-depends: update Go to 1.17 Update dev-lang/go to 1.17 in the SDK dependency list, and delete the unnecessary dev-lang/go 1.16 from the list. --- .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index e90ff4216a..5d280210e1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -38,7 +38,7 @@ RDEPEND="${RDEPEND} dev-lang/swig dev-lang/yasm dev-lang/go:1.12 - dev-lang/go:1.16 + dev-lang/go:1.17 dev-lang/go-bootstrap dev-lang/tcl dev-libs/dbus-glib From 5525e14081bb618aef3758c9840e185d2b562c08 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 23 Sep 2021 11:09:22 +0200 Subject: [PATCH 5/5] .github: update to Go 1.17 Update the default version of Go to 1.17 in the Github Actions as well. --- .../coreos-overlay/.github/workflows/go-apply-patch.sh | 4 ++-- .../coreos-overlay/.github/workflows/go-releases-main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh index b9f2d739c2..791c1b69c0 100755 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh @@ -16,8 +16,8 @@ fi pushd "${SDK_OUTER_SRCDIR}/third_party/coreos-overlay" >/dev/null || exit # Parse the Manifest file for already present source files and keep the latest version in the current series -# DIST go1.16.src.tar.gz ... => 1.16 -# DIST go1.16.3.src.tar.gz ... => 1.16.3 +# DIST go1.17.src.tar.gz ... => 1.17 +# DIST go1.17.1.src.tar.gz ... => 1.17.1 VERSION_OLD=$(sed -n "s/^DIST go\(${VERSION_SHORT}\.*[0-9]*\)\.src.*/\1/p" dev-lang/go/Manifest | sort -ruV | head -n1) if [[ "${VERSION_NEW}" = "${VERSION_OLD}" ]]; then echo "already the latest Go, nothing to do" diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml index 8891000d47..f0ea344555 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml @@ -13,7 +13,7 @@ jobs: - name: Fetch latest Go release id: fetch-latest-release env: - GO_VERSION: "1.16" + GO_VERSION: "1.17" run: | git clone --depth=1 --no-checkout https://github.com/golang/go versionMain=$(git -C go ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/go${GO_VERSION}\.[0-9]*$/s/^refs\/tags\/go//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -1)