flatcar · krnowak · Oct 2, 2024 · Sep 16, 2024 · Sep 16, 2024 · Sep 16, 2024
diff --git a/changelog/security/2024-09-18-weekly-updates.md b/changelog/security/2024-09-18-weekly-updates.md
@@ -0,0 +1 @@
+- expat ([CVE-2024-45490](https://nvd.nist.gov/vuln/detail/CVE-2024-45490))
diff --git a/changelog/updates/2024-09-18-weekly-updates.md b/changelog/updates/2024-09-18-weekly-updates.md
@@ -0,0 +1,12 @@
+- audit ([4.0.1](https://github.com/linux-audit/audit-userspace/releases/tag/v4.0.1) (includes [4.0](https://github.com/linux-audit/audit-userspace/releases/tag/v4.0)))
+- azure, gce, sysext-python: python ([3.11.10](https://docs.python.org/3.11/whatsnew/3.11.html#notable-changes-in-3-11-10))
+- bind-tools ([9.16.50](https://bind9.readthedocs.io/en/v9.16.50/notes.html#notes-for-bind-9-16-50) (includes [9.16.49](https://bind9.readthedocs.io/en/v9.16.49/notes.html#notes-for-bind-9-16-49)))
+- bpftool (7.5.0 (includes [7.4.0](https://github.com/libbpf/bpftool/releases/tag/v7.4.0), [7.3.0](https://github.com/libbpf/bpftool/releases/tag/v7.3.0), [7.2.0](https://github.com/libbpf/bpftool/releases/tag/v7.2.0), [7.1.0](https://github.com/libbpf/bpftool/releases/tag/v7.1.0), [7.0.0](https://github.com/libbpf/bpftool/releases/tag/v7.0.0)))
+- expat ([2.6.3](https://github.com/libexpat/libexpat/blob/R_2_6_3/expat/Changes))
+- dev: gentoolkit ([0.6.7](https://gitweb.gentoo.org/proj/gentoolkit.git/log/?h=gentoolkit-0.6.7))
+- libffi ([3.4.6](https://github.com/libffi/libffi/releases/tag/v3.4.6) (includes [3.4.5](https://github.com/libffi/libffi/releases/tag/v3.4.5)))
+- pinentry ([1.3.0](https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=blob;f=NEWS;h=1ea7e76f836fe15fe7c59b954d7aab768bd090e6;hb=24833c9ef2bf93d9f6c0583a9ecfefa6747473bc))
+- sysext-python: idna ([3.8](https://github.com/kjd/idna/releases/tag/v3.8))
+- sysext-python: jaraco-context ([6.0.1](https://github.com/jaraco/jaraco.context/blob/v6.0.1/NEWS.rst))
+- sysext-python: setuptools ([73.0.1](https://github.com/pypa/setuptools/blob/v73.0.1/NEWS.rst))
+- sysext-python: truststore ([0.9.2](https://github.com/sethmlarson/truststore/blob/v0.9.2/CHANGELOG.md))
diff --git a/...ner/src/third_party/coreos-overlay/coreos-base/misc-files/files/audit/audit-rules.service b/...ner/src/third_party/coreos-overlay/coreos-base/misc-files/files/audit/audit-rules.service
diff --git a/...os-base/misc-files/misc-files-0-r5.ebuild → ...os-base/misc-files/misc-files-0-r6.ebuild b/...os-base/misc-files/misc-files-0-r5.ebuild → ...os-base/misc-files/misc-files-0-r6.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
         >=app-shells/bash-5.2_p15-r2
         ntp? ( >=net-misc/ntp-4.2.8_p17 )
         policycoreutils? ( >=sys-apps/policycoreutils-3.6 )
-        audit? ( >=sys-process/audit-3.1.1 )
+        audit? ( >=sys-process/audit-4.0.1-r1 )
 "
 
 declare -A CORE_BASH_SYMLINKS
@@ -166,10 +166,7 @@ src_install() {
             # Upstream wants these to have restrictive perms.
             fperms 0640 "/etc/audit/rules.d/${name}"
         done
-        # Install a service that loads the rules (it's possibly
-        # something that a deamon does, but in our case the daemon is
-        # disabled by default).
-        systemd_dounit "${FILESDIR}/audit/audit-rules.service"
+        # Enable audit-rules.service by default.
         systemd_enable_service multi-user.target audit-rules.service
     fi
 

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-process/audit b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-process/audit
@@ -1,11 +1,11 @@
 # Do not install Gentoo-provided audit rules, we will install our own
-# in coreos-base/misc-files.
+# in coreos-base/misc-files. Also skip installing legacy initscripts
+# stuff in /usr/libexec.
 INSTALL_MASK+="
 /etc/audit/audit.rules*
+/usr/libexec
 "
-
-# Do not install legacy initscripts stuff
-INSTALL_MASK+="
-/usr/libexec/audit-functions
-/usr/libexec/initscripts
+PKG_INSTALL_MASK+="
+/etc/audit/audit.rules*
+/usr/libexec
 "
diff --git a/...iner/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/gcc/README.md b/...iner/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/gcc/README.md
@@ -1,4 +1,2 @@
-The ESYSROOT patch is pending inclusion into Gentoo's gcc patch set. Once
-merged, this will most likely be applied from 14.1 or 14.2 onwards. Check the
-[GitHub pull request](https://github.com/gentoo/gcc-patches/pull/3) for the
-current situation.
+The ESYSROOT patch can be dropped when updating sys-devel/gcc to at
+least 14.2.1_p20240817-r1.
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
@@ -53,13 +53,12 @@ USE="${USE} bindist"
 
 # Additional licenses accepted for Flatcar builds.
 #
-# netperf - license for net-analyzer/netperf
 # no-source-code - license for sys-kernel/coreos-firmware
 # linux-fw-redistributable - license for sys-kernel/coreos-firmware
 # freedist - license for sys-kernel/coreos-kernel
 # BSD-2-Clause-Patent - license for sys-firmware/edk2-aarch64
 # intel-ucode - license for sys-firmware/intel-microcode
-ACCEPT_LICENSE="${ACCEPT_LICENSE} netperf no-source-code
+ACCEPT_LICENSE="${ACCEPT_LICENSE} no-source-code
     linux-fw-redistributable freedist BSD-2-Clause-Patent intel-ucode"
 
 # Favor our own mirrors over Gentoo's

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
@@ -38,40 +38,33 @@
 =app-emulation/open-vmdk-1.0 *
 
 # Keep versions on both arches in sync.
-=dev-build/cmake-3.30.2 ~arm64
 =dev-cpp/abseil-cpp-20230125.3-r4 ~arm64
 
 # Keep versions on both arches in sync.
 =dev-cpp/glog-0.6.0 ~arm64
 =dev-lang/perl-5.40.0 ~arm64
 
-# Accept unstable host Rust compilers.
-=dev-lang/rust-1.80.1 ~amd64 ~arm64
-
 # Needed by arm64-native SDK.
 =dev-lang/yasm-1.3.0-r1 ~arm64
 
 # Keep versions on both arches in sync.
 =dev-libs/ding-libs-0.6.2-r1 ~arm64
 
-# Needed to fix CVE-2023-52425 and CVE-2024-28757.
-=dev-libs/expat-2.6.2 ~amd64 ~arm64
-
 # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet.
 =dev-libs/jose-12 **
 
 # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet.
 =dev-libs/luksmeta-9-r1 **
 
-# Keep versions on both arches in sync.
-=dev-libs/protobuf-23.3-r4 ~arm64
-
 # These seem to be the versions we initially got, but the
 # modifications made to the ebuilds were clobbered, so these are here
 # to keep using the same version. Can be dropped when these or newer
 # get stabilized in Gentoo.
 =dev-libs/yajl-2.1.0-r5 ~amd64 ~arm64
 
+# Keep versions on both arches in sync.
+=dev-util/bpftool-7.5.0-r1 ~arm64
+
 # Catalyst 4 is not stable yet, but earlier versions are masked now.
 dev-util/catalyst ~amd64 ~arm64
 
@@ -105,24 +98,14 @@ dev-util/catalyst ~amd64 ~arm64
 # Upgrade to latest version for secureboot
 =sys-boot/mokutil-0.6.0 ~amd64
 
-# Needed to address CVE-2023-42667, CVE-2023-49141, CVE-2024-24853,
-# CVE-2024-24980, CVE-2024-25939.
-=sys-firmware/intel-microcode-20240813_p20240815 ~amd64
-
-# Keep versions on both arches in sync.
-=sys-fs/zfs-2.2.5 ~arm64
-=sys-fs/zfs-kmod-2.2.5 ~arm64
-
 # Enable ipvsadm for arm64.
 =sys-cluster/ipvsadm-1.31-r1 ~arm64
 
 # Keep versions on both arches in sync.
+=sys-process/audit-4.0.1-r1 ~arm64
 =virtual/perl-Data-Dumper-2.189.0 ~arm64
 =virtual/perl-Encode-3.210.0-r1 ~arm64
 =virtual/perl-Getopt-Long-2.570.0-r1 ~arm64
 =virtual/perl-Exporter-5.780.0 ~arm64
 =virtual/perl-File-Spec-3.900.0 ~arm64
 =virtual/perl-IO-1.550.0 ~arm64
-
-# Accept unstable host Rust compilers.
-=virtual/rust-1.80.1 ~amd64 ~arm64
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use
@@ -156,10 +156,6 @@ sys-libs/libsemanage -python
 
 sys-fs/zfs minimal -rootfs
 
-# Do not pull in LLVM into production images. Also, we didn't use it
-# before anyway.
-dev-util/bpftool -llvm
-
 # Do not tinker with /boot partition at installation time.
 sys-firmware/intel-microcode -initramfs
 sys-fs/zfs-kmod -initramfs
diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.26-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.26-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 # coreutils for realpath

diff --git a/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.27-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/eselect/eselect-1.4.27-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 # coreutils for realpath

diff --git a/...ntainer/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild b/...ntainer/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-2.31-r2.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-2.31.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-2.31.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-4.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/awk/awk-4.ebuild
@@ -13,7 +13,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/bc/bc-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/bc/bc-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bc symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<sys-devel/bc-1.07.1-r6

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/bzip2/bzip2-1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/bzip2/bzip2-1.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="bzip2 symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/cpio/cpio-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/cpio/cpio-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="CPIO symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gzip symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/gzip/gzip-1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="gzip symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/lex/lex-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/lex/lex-0-r1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="lex symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<sys-devel/flex-2.6.4-r5

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/ninja-1.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/ninja/ninja-1.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="ninja symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="!<dev-build/ninja-1.11.1-r3"
 

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/sh/sh-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/sh/sh-0.ebuild
@@ -15,7 +15,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="/bin/sh (POSIX shell) symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!app-eselect/eselect-sh

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/tar/tar-0.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/tar/tar-0.ebuild
@@ -11,7 +11,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="Tar symlink"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="split-usr"
 
 RDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-alternatives/yacc/yacc-1-r2.ebuild
@@ -12,7 +12,7 @@ ALTERNATIVES=(
 inherit app-alternatives
 
 DESCRIPTION="yacc symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-util/yacc-1.9.1-r7

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-1.0.8-r5.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
 fi
 
 LICENSE="BZIP2"

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.13-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.15.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.13-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/gzip/gzip-1.13-r1.ebuild
@@ -31,7 +31,7 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ ${PV} != *_p* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="pic static"
 

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lbzip2/lbzip2-2.5_p20181227-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/05/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug static"
 
 PATCHES=(

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.7.4.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/libarchive/libarchive-3.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd

diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.10.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lz4/lz4-1.10.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2"
 SLOT="0/1.10.0-meson"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"