Skip to content

Commit 420c84f

Browse files
authored
Merge pull request #3641 from flatcar/buildbot/weekly-portage-stable-package-updates-2026-01-12
Weekly portage-stable package updates 2026-01-12
2 parents 3d5a167 + 107ab58 commit 420c84f

File tree

1,458 files changed

+40016
-19449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,458 files changed

+40016
-19449
lines changed

.github/workflows/portage-stable-packages-list

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
acct-group/adm
44
acct-group/audio
55
acct-group/cdrom
6+
acct-group/cuse
67
acct-group/dialout
78
acct-group/disk
89
acct-group/dnsmasq
@@ -11,6 +12,7 @@ acct-group/floppy
1112
acct-group/incus
1213
acct-group/incus-admin
1314
acct-group/input
15+
acct-group/jobserver
1416
acct-group/kmem
1517
acct-group/kvm
1618
acct-group/lp
@@ -303,7 +305,6 @@ dev-libs/yajl
303305

304306
dev-perl/File-Slurper
305307
dev-perl/Parse-Yapp
306-
dev-perl/PerlIO-utf8_strict
307308

308309
dev-python/backports-tarfile
309310
dev-python/cachecontrol
@@ -392,6 +393,7 @@ dev-util/pkgcheck
392393
dev-util/pkgconf
393394
dev-util/re2c
394395
dev-util/xdelta
396+
dev-util/xxd
395397

396398
dev-vcs/git
397399

@@ -401,6 +403,7 @@ eclass/alternatives.eclass
401403
eclass/app-alternatives.eclass
402404
eclass/autotools.eclass
403405
eclass/bash-completion-r1.eclass
406+
eclass/branding.eclass
404407
eclass/cargo.eclass
405408
eclass/check-reqs.eclass
406409
eclass/cmake-multilib.eclass
@@ -750,7 +753,6 @@ virtual/perl-Carp
750753
virtual/perl-Encode
751754
virtual/perl-Exporter
752755
virtual/perl-ExtUtils-MakeMaker
753-
virtual/perl-XSLoader
754756
virtual/pkgconfig
755757
virtual/resolvconf
756758
virtual/service-manager

build_library/catalyst_toolchains.sh

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,37 @@ build_target_toolchain() {
2828
local ROOT="/build/${board}"
2929
local SYSROOT="/usr/$(get_board_chost "${board}")"
3030

31-
mkdir -p "${ROOT}/usr"
32-
cp -at "${ROOT}" "${SYSROOT}"/lib*
33-
cp -at "${ROOT}"/usr "${SYSROOT}"/usr/include "${SYSROOT}"/usr/lib*
31+
function btt_emerge() {
32+
# --root is required because run_merge overrides ROOT=
33+
PORTAGE_CONFIGROOT="$ROOT" run_merge --root="$ROOT" --sysroot="$ROOT" "${@}"
34+
}
3435

35-
# --root is required because run_merge overrides ROOT=
36-
PORTAGE_CONFIGROOT="$ROOT" \
37-
run_merge -u --root="$ROOT" --sysroot="$ROOT" "${TOOLCHAIN_PKGS[@]}"
36+
# install baselayout first so we have the basic directory
37+
# structure for libraries and binaries copied from sysroot
38+
btt_emerge --oneshot --nodeps sys-apps/baselayout
39+
40+
# copy libraries, binaries and header files from sysroot to root -
41+
# sysroot may be using split-usr, whereas root does not, so take
42+
# this into account
43+
(
44+
shopt -s nullglob
45+
local d f
46+
local -a files
47+
for d in "${SYSROOT}"/{,usr/}{bin,sbin,lib*}; do
48+
if [[ ! -d ${d} ]]; then
49+
continue
50+
fi
51+
files=( "${d}"/* )
52+
if [[ ${#files[@]} -gt 0 ]]; then
53+
f=${d##*/}
54+
cp -at "${ROOT}/usr/${f}" "${files[@]}"
55+
fi
56+
done
57+
cp -at "${ROOT}"/usr "${SYSROOT}"/usr/include
58+
)
59+
60+
btt_emerge --update "${TOOLCHAIN_PKGS[@]}"
61+
unset -f btt_emerge
3862
}
3963

4064
configure_crossdev_overlay / /usr/local/portage/crossdev

build_library/toolchain_util.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,14 @@ binutils_set_latest_profile() {
490490
# The extra flag can be blank, hardenednopie, and so on. See gcc-config -l
491491
# Usage: gcc_get_latest_profile chost [extra]
492492
gcc_get_latest_profile() {
493-
local prefix="${1}-"
494-
local suffix="${2+-$2}"
493+
local prefix=${1}
494+
local suffix=${2+-${2}}
495495
local status
496-
gcc-config -l | cut -d' ' -f3 | grep "^${prefix}[0-9\\.]*${suffix}$" | tail -n1
496+
gcc-config --list-profiles --nocolor | \
497+
sed -e 's/^\s*//' | \
498+
cut -d' ' -f2 | \
499+
grep "^${prefix}-[0-9\\.]*${suffix}$" | \
500+
tail -n1
497501

498502
# return 1 if anything in the above pipe failed
499503
for status in ${PIPESTATUS[@]}; do

build_packages

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,18 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
269269
# systemd[cryptsetup] -> cryptsetup[udev] -> virtual/udev -> systemd
270270
# systemd[tpm] -> tpm2-tss -> util-linux[udev] -> virtual/udev -> systemd
271271
# curl[http2] -> nghttp2[systemd] -> systemd[curl] -> curl
272-
# sys-libs/pam[systemd] -> sys-apps/system[pam] -> sys-libs/pam
273-
# not dropping pam from sys-apps/systemd, otherwise we would need
274-
# to drop pam from sys-auth/pambase
275-
break_dep_loop sys-apps/util-linux udev,systemd,cryptsetup \
272+
# sys-libs/pam[systemd] -> sys-apps/systemd[pam] -> sys-libs/pam
273+
# dropping USE=pam from sys-apps/systemd requires dropping
274+
# USE=systemd from sys-auth/pambase
275+
# sys-auth/pambase[sssd] -> sys-auth/sssd -> sys-apps/shadow[pam] -> sys-auth/pambase
276+
break_dep_loop sys-apps/util-linux cryptsetup,systemd,udev \
276277
sys-fs/cryptsetup udev \
277-
sys-fs/lvm2 udev,systemd \
278-
sys-apps/systemd cryptsetup,tpm \
278+
sys-fs/lvm2 systemd,udev \
279+
sys-apps/systemd cryptsetup,pam,tpm \
279280
net-misc/curl http2 \
280281
net-libs/nghttp2 systemd \
281-
sys-libs/pam systemd
282+
sys-libs/pam systemd \
283+
sys-auth/pambase sssd,systemd
282284
fi
283285

284286
if [[ "${FLAGS_only_resolve_circular_deps}" -eq "${FLAGS_TRUE}" ]]; then
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- bind ([CVE-2025-40778](https://www.cve.org/CVERecord?id=CVE-2025-40778), [CVE-2025-40780](https://www.cve.org/CVERecord?id=CVE-2025-40780), [CVE-2025-8677](https://www.cve.org/CVERecord?id=CVE-2025-8677))
2+
- gnutls ([CVE-2025-9820](https://www.cve.org/CVERecord?id=CVE-2025-9820))
3+
- go ([CVE-2025-61727](https://www.cve.org/CVERecord?id=CVE-2025-61727), [CVE-2025-61729](https://www.cve.org/CVERecord?id=CVE-2025-61729))
4+
- libarchive ([CVE-2025-60753](https://www.cve.org/CVERecord?id=CVE-2025-60753))
5+
- podman ([CVE-2025-9566](https://www.cve.org/CVERecord?id=CVE-2025-9566), [CVE-2025-52881](https://www.cve.org/CVERecord?id=CVE-2025-52881))
6+
- urllib3 ([CVE-2025-66418](https://www.cve.org/CVERecord?id=CVE-2025-66418), [CVE-2025-66471](https://www.cve.org/CVERecord?id=CVE-2025-66471))
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
- SDK: cmake ([4.1.4](https://cmake.org/cmake/help/v4.1/release/4.1.html#updates))
2+
- SDK: crossdev ([20251214](https://gitweb.gentoo.org/proj/crossdev.git/log/?h=20251214))
3+
- SDK: go ([1.25.5](https://go.dev/doc/devel/release#go1.25.minor))
4+
- SDK: perl ([5.42.0](https://perldoc.perl.org/perl5420delta))
5+
- SDK: rust ([1.91.0](https://blog.rust-lang.org/2025/10/30/Rust-1.91.0/) (includes [1.90.0](https://blog.rust-lang.org/2025/09/18/Rust-1.90.0/)))
6+
- azure, dev, sysext-python: urllib3 ([2.6.3](https://raw.githubusercontent.com/urllib3/urllib3/refs/tags/2.6.3/CHANGES.rst))
7+
- base, dev: bash ([5.3_p9](https://cgit.git.savannah.gnu.org/cgit/bash.git/log/?id=637f5c8696a6adc9b4519f1cd74aa78492266b7f))
8+
- base, dev: bind ([9.18.42](https://bind9.readthedocs.io/en/v9.18.42/notes.html#notes-for-bind-9-18-42))
9+
- base, dev: binutils-config ([5.6](https://gitweb.gentoo.org/proj/binutils-config.git/log/?h=v5.6))
10+
- base, dev: btrfs-progs ([6.17.1](https://github.com/kdave/btrfs-progs/releases/tag/v6.17.1))
11+
- base, dev: coreutils ([9.9](https://lists.gnu.org/archive/html/coreutils-announce/2025-11/msg00000.html))
12+
- base, dev: cri-tools ([1.33.0](https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.33.0))
13+
- base, dev: curl ([8.17.0](https://curl.se/ch/8.17.0.html))
14+
- base, dev: elfutils ([0.194](https://inbox.sourceware.org/elfutils-devel/CAJDtP-S0rYAOZQeDZvMtPkQztgK9RboWtYwpqNLCNGNdaSGn-A@mail.gmail.com/T/#u))
15+
- base, dev: git ([2.52.0](https://raw.githubusercontent.com/git/git/refs/tags/v2.52.0/Documentation/RelNotes/2.52.0.adoc))
16+
- base, dev: gnutls ([3.8.11](https://lists.gnu.org/archive/html/info-gnu/2025-11/msg00003.html))
17+
- base, dev: kexec-tools ([2.0.32](https://github.com/horms/kexec-tools/commits/v2.0.32/))
18+
- base, dev: libarchive ([3.8.5](https://github.com/libarchive/libarchive/releases/tag/v3.8.5) (includes [3.8.4](https://github.com/libarchive/libarchive/releases/tag/v3.8.4), [3.8.3](https://github.com/libarchive/libarchive/releases/tag/v3.8.3), [3.8.2](https://github.com/libarchive/libarchive/releases/tag/v3.8.2)))
19+
- base, dev: libcap ([2.77](https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.mr55t4z9vzea))
20+
- base, dev: libnftnl ([1.3.1](https://lwn.net/Articles/1049279/))
21+
- base, dev: libnl ([3.11.0](https://lists.infradead.org/pipermail/libnl/2024-October/002441.html))
22+
- base, dev: libnvme ([1.16.1](https://github.com/linux-nvme/libnvme/releases/tag/v1.16.1) (includes [1.16](https://github.com/linux-nvme/libnvme/releases/tag/v1.16)))
23+
- base, dev: libpcre2 ([10.47](https://github.com/PCRE2Project/pcre2/releases/tag/pcre2-10.47))
24+
- base, dev: libxml2 ([2.15.1](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.15.1) (includes [2.15.0](https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.15.0)))
25+
- base, dev: nvme-cli ([2.16](https://github.com/linux-nvme/nvme-cli/releases/tag/v2.16))
26+
- base, dev: pambase ([20251104](https://gitweb.gentoo.org/proj/pambase.git/log/?h=pambase-20251104))
27+
- base, dev: readline ([8.3_p3](https://cgit.git.savannah.gnu.org/cgit/readline.git/log/?id=553d6bb272f26400d6d4d1cac7c1df84c447449b))
28+
- base, dev: selinux-base ([2.20250618](https://github.com/SELinuxProject/refpolicy/releases/tag/RELEASE_2_20250618))
29+
- base, dev: systemd ([257.10](https://github.com/systemd/systemd/commits/v257.10/))
30+
- base, dev: thin-provisioning-tools ([1.3.1](https://raw.githubusercontent.com/device-mapper-utils/thin-provisioning-tools/refs/tags/v1.3.1/CHANGES))
31+
- base, dev: usbutils ([019](https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/plain/NEWS?h=v019))
32+
- base, dev: userspace-rcu ([0.15.5](https://lwn.net/Articles/1046059/))
33+
- base, dev: xfsprogs ([6.17.0](https://web.git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/plain/doc/CHANGES?h=v6.17.0))
34+
- dev, sysext-incus: squashfs-tools ([4.7.4](https://github.com/plougher/squashfs-tools/releases?q=4.7.4))
35+
- dev: bash-completion ([2.17.0](https://github.com/scop/bash-completion/releases/tag/2.17.0))
36+
- dev: binutils ([2.45.1](https://sourceware.org/pipermail/binutils/2025-November/145592.html))
37+
- dev: cJSON ([1.7.19](https://github.com/DaveGamble/cJSON/releases/tag/v1.7.19))
38+
- dev: gcc-config ([2.12.2](https://gitweb.gentoo.org/proj/gcc-config.git/log/?h=v2.12.2))
39+
- dev: portage ([3.0.72](https://gitweb.gentoo.org/proj/portage.git/plain/NEWS?h=portage-3.0.72) (includes [3.0.71](https://gitweb.gentoo.org/proj/portage.git/plain/NEWS?h=portage-3.0.71), [3.0.70](https://gitweb.gentoo.org/proj/portage.git/plain/NEWS?h=portage-3.0.70)))
40+
- sysext-containerd: containerd ([2.2.0](https://github.com/containerd/containerd/releases/tag/v2.2.0))
41+
- sysext-containerd: runc ([1.4.0](https://github.com/opencontainers/runc/releases/tag/v1.4.0))
42+
- sysext-docker: docker ([28.2.2](https://github.com/moby/moby/releases/tag/v28.2.2) (includes [28.2.1](https://github.com/moby/moby/releases/tag/v28.2.1), [28.2.0](https://github.com/moby/moby/releases/tag/v28.2.0), [28.1.1](https://github.com/moby/moby/releases/tag/v28.1.1), [28.1.0](https://github.com/moby/moby/releases/tag/v28.1.0)))
43+
- sysext-docker: docker-cli ([28.4.0](https://github.com/moby/moby/releases/tag/v28.4.0) (includes [28.3.0](https://github.com/moby/moby/releases/tag/v28.3.0), [28.2.0](https://github.com/moby/moby/releases/tag/v28.2.0), [28.1.0](https://github.com/moby/moby/releases/tag/v28.1.0)))
44+
- sysext-incus: incus ([6.0.5](https://discuss.linuxcontainers.org/t/incus-6-0-5-lts-has-been-released/24445))
45+
- sysext-incus: lxc ([6.0.5](https://discuss.linuxcontainers.org/t/lxc-6-0-5-lts-has-been-released/24438))
46+
- sysext-incus: lxcfs ([6.0.5](https://discuss.linuxcontainers.org/t/lxcfs-6-0-5-lts-has-been-released/24437))
47+
- sysext-nvidia-drivers-570, sysext-nvidia-drivers-570-open: nvidia-drivers (570.207)
48+
- sysext-podman: containers-image ([5.35.0](https://github.com/containers/image/releases/tag/v5.35.0))
49+
- sysext-podman: podman ([5.7.0](https://github.com/containers/podman/releases/tag/v5.7.0) (includes [5.6.0](https://github.com/containers/podman/releases/tag/v5.6.0)))
50+
- sysext-python: charset-normalizer ([3.4.4](https://github.com/jawah/charset_normalizer/releases/tag/3.4.4))
51+
- sysext-python: idna ([3.11](https://github.com/kjd/idna/releases/tag/v3.11))
52+
- sysext-python: msgpack ([1.1.2](https://github.com/msgpack/msgpack-python/releases/tag/v1.1.2))
53+
- sysext-python: pip ([25.3](https://github.com/pypa/pip/blob/25.3/NEWS.rst))
54+
- sysext-python: setuptools-scm ([9.2.2](https://github.com/pypa/setuptools-scm/releases/tag/v9.2.2))
55+
- sysext-python: trove-classifiers ([2025.11.14.15](https://github.com/pypa/trove-classifiers/releases/tag/2025.11.14.15))
56+
- sysext-zfs: zfs ([2.3.4](https://github.com/openzfs/zfs/releases/tag/zfs-2.3.4))
Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1-
cros_pre_src_compile_pkgconfig() {
2-
export PKG_CONFIG="$(tc-getPKG_CONFIG)"
1+
# https://codeberg.org/gentoo/gentoo/pulls/36
2+
cros_post_src_compile_move_agent_binaries() {
3+
local bindir="_dist/bin"
4+
local host_arch=$(go-env_goarch "${CBUILD}")
5+
if [[ "${GOARCH}" = "${host_arch}" ]]; then
6+
# nothing to fix
7+
return 0
8+
fi
9+
local correct_bindir="_dist/bin/linux_${GOARCH}"
10+
mv '_dist/bin/incus-agent.'* "${correct_bindir}" || die
11+
}
12+
13+
# https://codeberg.org/gentoo/gentoo/pulls/36
14+
cros_post_src_install_move_agent_binaries() {
15+
if use amd64; then
16+
# nothing to fix
17+
return 0
18+
fi
19+
dodir '/usr/libexec/incus/agents'
20+
mv "${ED}/usr/libexec/incus/incus-agent."* "${ED}/usr/libexec/incus/agents" || die
321
}

0 commit comments

Comments
 (0)