From 39b7edb4b2cab5a7febbe9bc4aa95df6218e963a Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 1 Jun 2021 10:21:25 +0200 Subject: [PATCH 1/2] app-arch/torcx: fix Go import path Go import path of torcx has changed from coreos to flatcar-linux, https://github.com/kinvolk/torcx/pull/5/commits/aef371c76bb1099383256c45e93e9818e8f9d387 So we need to fix the import path also in torcx ebuilds. Otherwise build will simply fail due to wrong import paths. --- .../coreos-overlay/app-arch/torcx/torcx-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild index 780ccbaf58..22d8e40807 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/torcx" CROS_WORKON_LOCALNAME="torcx" CROS_WORKON_REPO="git://github.com" -COREOS_GO_PACKAGE="github.com/coreos/torcx" +COREOS_GO_PACKAGE="github.com/flatcar-linux/torcx" COREOS_GO_GO111MODULE="off" if [[ "${PV}" == 9999 ]]; then @@ -18,7 +18,7 @@ fi inherit coreos-go cros-workon systemd DESCRIPTION="torcx is a boot-time addon manager for immutable systems" -HOMEPAGE="https://github.com/coreos/torcx" +HOMEPAGE="https://github.com/flatcar-linux/torcx" LICENSE="Apache-2.0" SLOT="0" From 84a931cb50d2552a3637a36ff99e4edf6b9b93b4 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 1 Jun 2021 10:29:08 +0200 Subject: [PATCH 2/2] app-arch/torcx: update to 0.2.0-r4 Pulls in https://github.com/kinvolk/torcx/pull/10 . It is mainly to address security issues like CVE-2020-29652 and CVE-2021-31525 . --- .../torcx/{torcx-0.2.0-r3.ebuild => torcx-0.2.0-r4.ebuild} | 0 .../third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-arch/torcx/{torcx-0.2.0-r3.ebuild => torcx-0.2.0-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-0.2.0-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild index 22d8e40807..4f67a46749 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-arch/torcx/torcx-9999.ebuild @@ -11,7 +11,7 @@ COREOS_GO_GO111MODULE="off" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="6cae861af82f28357b4c06923c7a6374b223c6f9" # flatcar-master + CROS_WORKON_COMMIT="13042171585a28260486237ddf67e63ed88dce3f" # flatcar-master KEYWORDS="amd64 arm64" fi