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 d674bfb879..1d572ea428 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 @@ -2,8 +2,8 @@ # Keep these in alphabetical order. # needed by arm64-native SDK -=app-emulation/open-vmdk-1.0 * =app-crypt/rhash-1.4.2 ~arm64 +=app-emulation/open-vmdk-1.0 * =dev-embedded/u-boot-tools-2021.04_rc2 ~arm64 @@ -12,6 +12,9 @@ =dev-lang/yasm-1.3.0-r1 ~arm64 +# Overwrite portage-stable mask - enable ding-libs for ARM64 +=dev-libs/ding-libs-0.6.1-r1 ~arm64 + =net-dns/c-ares-1.17.2 ~arm64 =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 @@ -24,8 +27,8 @@ =sec-policy/selinux-virt-2.20200818-r2 ~arm64 =sys-apps/checkpolicy-3.1 ~arm64 -=sys-apps/policycoreutils-3.1-r3 ~arm64 =sys-apps/kexec-tools-2.0.24 ~arm64 +=sys-apps/policycoreutils-3.1-r3 ~arm64 =sys-apps/semodule-utils-3.1 ~arm64 @@ -36,6 +39,3 @@ =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.1-r1 ~arm64 =sys-libs/libsepol-3.1 ~arm64 - -# Overwrite portage-stable mask - enable ding-libs for ARM64 -=dev-libs/ding-libs-0.6.1-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 4d86200e84..07d0210557 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 @@ -2,6 +2,8 @@ # Copyright (c) 2013 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 +=app-crypt/adcli-0.9.2 ~amd64 ~arm64 + # Required for addressing CVE-2022-3715. =app-shells/bash-5.2_p15-r2 ~amd64 ~arm64 @@ -9,7 +11,6 @@ # Accept unstable host Rust compilers =dev-lang/rust-1.69.0 ~amd64 ~arm64 -=virtual/rust-1.69.0 ~amd64 ~arm64 # Keep versions on both arches in sync. =dev-libs/libbsd-0.11.7-r2 ~arm64 @@ -24,25 +25,27 @@ # Required for addressing CVE-2023-28319, CVE-2023-28320, CVE-2023-28321 and CVE-2023-28322 =net-misc/curl-8.1.0 ~amd64 ~arm64 -=sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64 +=sys-apps/nvme-cli-2.4-r2 ~amd64 ~arm64 -# To keep the same version on both arches -=sys-fs/multipath-tools-0.9.4-r1 ~amd64 +=sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64 # FIPS support is still being tested =sys-fs/cryptsetup-2.4.3-r1 ~amd64 ~arm64 +# To keep the same version on both arches +=sys-fs/multipath-tools-0.9.4-r1 ~amd64 + # Needed to address CVE-2023-2602 and CVE-2023-2603 =sys-libs/libcap-2.69 ~amd64 ~arm64 -=sys-power/acpid-2.0.33 ~amd64 ~arm64 +# Overwrite portage-stable mask - use latest liburing -r2 for ARM64 and AMD64 +=sys-libs/liburing-2.1-r2 ~amd64 ~arm64 # A dependency of app-shells/bash version that we need for security # fixes. =sys-libs/readline-8.2_p1 ~amd64 ~arm64 -# Overwrite portage-stable mask - use latest liburing -r2 for ARM64 and AMD64 -=sys-libs/liburing-2.1-r2 ~amd64 ~arm64 +=sys-power/acpid-2.0.33 ~amd64 ~arm64 -=app-crypt/adcli-0.9.2 ~amd64 ~arm64 -=sys-apps/nvme-cli-2.4-r2 ~amd64 ~arm64 +# Accept unstable host Rust compilers +=virtual/rust-1.69.0 ~amd64 ~arm64