From 70d169e633c68a18082e9749c889967faf0dc51d Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 26 Apr 2023 07:00:16 +0200 Subject: [PATCH] overlay profiles: Update accept keywords for dev-util/bpftool The package finally got a keyword for arm64, so we don't need to forcibly enable it for this arch. --- .../profiles/coreos/arm64/package.accept_keywords | 3 --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 6b6ab4b81a..b8bc2cc669 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -12,9 +12,6 @@ =dev-lang/yasm-1.3.0-r1 ~arm64 -# needed to force enable bpftool for arm64 -=dev-util/bpftool-5.19.12 ** - =net-dns/c-ares-1.17.2 ~arm64 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 355f37f9fc..e0651b9d70 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -21,6 +21,9 @@ # Required for CVE-2023-28484 and CVE-2023-29469 =dev-libs/libxml2-2.10.4 ~amd64 ~arm64 +# To keep the same version on both arches +=dev-util/bpftool-6.2.1 ~arm64 + # Required for addressing CVE-2023-0361. =net-libs/gnutls-3.8.0 ~amd64 ~arm64