Skip to content

Commit aee0cd0

Browse files
authored
Merge pull request #2807 from flatcar/buildbot/weekly-portage-stable-package-updates-2025-04-07
Weekly portage-stable package updates 2025-04-07
2 parents b3b9f07 + d467002 commit aee0cd0

225 files changed

Lines changed: 8649 additions & 5352 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- curl ([curl-20250205](https://github.com/curl/curl/issues/16197))
2+
- iperf ([CVE-2024-53580](https://www.cve.org/CVERecord?id=CVE-2024-53580))
3+
- xz-utils ([CVE-2025-31115](https://www.cve.org/CVERecord?id=CVE-2025-31115))
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- base, dev: curl ([8.13.0](https://curl.se/ch/8.13.0.html))
2+
- base, dev: libarchive ([3.7.9](https://github.com/libarchive/libarchive/releases/tag/v3.7.9))
3+
- containerd: runc ([1.2.5](https://github.com/opencontainers/runc/releases/tag/v1.2.5))
4+
- dev: iperf ([3.18](https://github.com/esnet/iperf/releases/tag/3.18))
5+
- dev: minicom ([2.10](https://salsa.debian.org/minicom-team/minicom/-/releases/2.10))
6+
- docker: docker-buildx ([0.20.1](https://github.com/docker/buildx/releases/tag/v0.20.1) (includes [0.20.0](https://github.com/docker/buildx/releases/tag/v0.20.0), [0.19.3](https://github.com/docker/buildx/releases/tag/v0.19.3), [0.19.2](https://github.com/docker/buildx/releases/tag/v0.19.2)))
7+
- sysext-podman: conmon ([2.1.11](https://github.com/containers/conmon/releases/tag/v2.1.11))
8+
- sysext-python: platformdirs ([4.3.7](https://github.com/tox-dev/platformdirs/releases/tag/4.3.7))
9+
- sysext-python: setuptools-scm ([8.2.1](https://github.com/pypa/setuptools-scm/blob/v8.2.1/CHANGELOG.md))
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
https://bugs.gentoo.org/953060
2+
https://gitlab.kitware.com/cmake/cmake/-/issues/26754
3+
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449
4+
5+
From 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd Mon Sep 17 00:00:00 2001
6+
From: Brad King <brad.king@kitware.com>
7+
Date: Mon, 10 Mar 2025 11:08:42 -0400
8+
Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC
9+
values
10+
11+
Since upstream curl commit `2ec00372a1` (curl.h: change some enums to
12+
defines with L suffix, 2025-02-25), the `CURL_NETRC_*` constants are
13+
integer literals instead of `enum CURL_NETRC_OPTION`. It turns out
14+
that `curl_easy_setopt` has always expected a `long` anyway, and
15+
that `CURL_NETRC_OPTION` is not documented for public use.
16+
17+
Fixes: #26754
18+
---
19+
Source/cmCurl.cxx | 2 +-
20+
1 file changed, 1 insertion(+), 1 deletion(-)
21+
22+
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
23+
index b9133ed7d47..0cf8a71a72d 100644
24+
--- a/Source/cmCurl.cxx
25+
+++ b/Source/cmCurl.cxx
26+
@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level,
27+
const std::string& netrc_file)
28+
{
29+
std::string e;
30+
- CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST;
31+
+ long curl_netrc_level = CURL_NETRC_LAST;
32+
::CURLcode res;
33+
34+
if (!netrc_level.empty()) {
35+
--
36+
GitLab
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
The `0001-fix-build-with-curl-8-13-0.patch` was taken from Gentoo -
2+
the patched cmake is 3.31.6-r1, so if we get updated to that version
3+
or later, we can drop the patch.

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ CONFIG_PROTECT="
8585
# Do not install default repos.conf, we always put repository configuration in /etc.
8686
INSTALL_MASK="
8787
/usr/lib*/*.la
88-
/etc/init.d /etc/conf.d
88+
/etc/init.d /etc/conf.d /etc/user/conf.d /etc/user/init.d
8989
/usr/lib/debug/.build-id
9090
/etc/acpi
9191
/usr/share/portage/config/repos.conf

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@
5858
=net-libs/libnetfilter_cthelper-1.0.1-r1 ~arm64
5959
=net-libs/libnetfilter_cttimeout-1.0.1 ~arm64
6060

61+
# Needed to address curl-20250205 (https://github.com/curl/curl/issues/16197)
62+
=net-misc/curl-8.13.0 ~amd64 ~arm64
63+
64+
# Needed to address CVE-2024-53580.
65+
=net-misc/iperf-3.18 ~amd64 ~arm64
66+
6167
# Needed to address CVE-2024-54661
6268
=net-misc/socat-1.8.0.3 ~amd64 ~arm64
6369

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
DIST gzip-1.13.tar.xz 838248 BLAKE2B f0e3b4c28bafcd3b59b65ac2d71218dc58d81b52c6921c1be038757c99e99184178c5d0e9674caa5099713b8b64e8c85cf061f4abfa20b73b478288f121fb05d SHA512 e3d4d4aa4b2e53fdad980620307257c91dfbbc40bcec9baa8d4e85e8327f55e2ece552c9baf209df7b66a07103ab92d4954ac53c86c57fbde5e1dd461143f94c
22
DIST gzip-1.13.tar.xz.sig 833 BLAKE2B 42e38fa7b3a6b6d21a18308cf662844ed84e1a142a945f3f3142db0a14212c0e642de514abb1307ec12ee7bb9644472cc3aed40582d9c266ab24808acbca0215 SHA512 f95e016f61f4a67cb4cec6cede2510af6bb5567d72bbd3d70210a6d5cf3ee5fea8f0cbf8f7b612fa52f2ecfd9dba050d9cd4494075ce5ac4abac7b74eaa7ccbc
3+
DIST gzip-1.13_p20250405.tar.xz 892960 BLAKE2B a3b52fbc4db6594ebc98d0f49d04f18073036bd2b29ac1aedb77ce124f8ac232e502450763d260d9d836066d21106b4770561f67dbe833bf43ed9b6c12987389 SHA512 8c439fbb15924eb38e421b04919fc2013e5a814445c83b665e4538f34f9b4b8c73dfe1910aba8c38ef98ee4bd57f01082798e6056802a12aa95d0c82e4a08412
4+
DIST gzip-1.13_p20250405.tar.xz.sig 833 BLAKE2B b47479ee151f093e6fa81abfe9587c887994562bb19631da9b3506a020ec8ccbc34eb79df29f61e4e441b46fb3e7b5e603357d75edf5d13973ca52737967f897 SHA512 162488d2085664514f8893128fbe6227860e8c8e152a979196c311f68706781c058fdada3fe659e41059aaaf281f0539b035f358e5e633d59e9c5634edbefadb
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Copyright 1999-2025 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
6+
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gzip.asc
7+
inherit eapi9-ver flag-o-matic verify-sig
8+
9+
DESCRIPTION="Standard GNU compressor"
10+
HOMEPAGE="https://www.gnu.org/software/gzip/"
11+
if [[ ${PV} == *_p* ]] ; then
12+
# Note: could put this in devspace, but if it's gone, we don't want
13+
# it in tree anyway. It's just for testing.
14+
MY_SNAPSHOT="$(ver_cut 1-2).56-e549"
15+
SRC_URI="
16+
https://meyering.net/gzip/gzip-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz
17+
verify-sig? (
18+
https://meyering.net/gzip/gzip-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig
19+
)
20+
"
21+
S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
22+
else
23+
SRC_URI="
24+
mirror://gnu/gzip/${P}.tar.xz
25+
verify-sig? (
26+
mirror://gnu/gzip/${P}.tar.xz.sig
27+
)
28+
"
29+
fi
30+
31+
LICENSE="GPL-3+"
32+
SLOT="0"
33+
if [[ ${PV} != *_p* ]] ; then
34+
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"
35+
fi
36+
IUSE="pic static"
37+
38+
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-gzip )"
39+
RDEPEND="!app-arch/pigz[symlink(-)]"
40+
PDEPEND="
41+
app-alternatives/gzip
42+
"
43+
44+
PATCHES=(
45+
"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
46+
)
47+
48+
src_configure() {
49+
use static && append-flags -static
50+
51+
# Avoid text relocation in gzip
52+
use pic && export DEFS="NO_ASM"
53+
54+
# embeds the path to grep detected at build time into installed scripts;
55+
# use the canonical USE="split-usr" agnostic path. bug #935721
56+
export GREP="${EPREFIX}/bin/grep"
57+
58+
# bug #663928
59+
econf --disable-gcc-warnings
60+
}
61+
62+
src_install() {
63+
default
64+
65+
docinto txt
66+
dodoc algorithm.doc gzip.doc
67+
68+
# Avoid conflict with app-arch/ncompress
69+
rm "${ED}"/usr/bin/uncompress || die
70+
71+
# keep most things in /usr, just the fun stuff in /
72+
# also rename them to avoid conflict with app-alternatives/gzip
73+
dodir /bin
74+
local x
75+
for x in gunzip gzip zcat; do
76+
mv "${ED}/usr/bin/${x}" "${ED}/bin/${x}-reference" || die
77+
done
78+
mv "${ED}"/usr/share/man/man1/gzip{,-reference}.1 || die
79+
rm "${ED}"/usr/share/man/man1/{gunzip,zcat}.1 || die
80+
}
81+
82+
pkg_postinst() {
83+
if ver_replacing -lt "1.12-r2"; then
84+
ewarn "This package no longer installs 'uncompress'."
85+
ewarn "Please use 'gzip -d' to decompress .Z files."
86+
fi
87+
88+
# ensure to preserve the symlinks before app-alternatives/gzip
89+
# is installed
90+
local x
91+
for x in gunzip gzip zcat; do
92+
if [[ ! -h ${EROOT}/bin/${x} ]]; then
93+
ln -s "${x}-reference" "${EROOT}/bin/${x}" || die
94+
fi
95+
done
96+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
DIST libarchive-3.7.8.tar.xz 5493312 BLAKE2B ba058b2fa2afbfe53127d6ffd0a7ab00d9e8faf62340ae2eb8871a0ca232c2de482dbff2c4eedf2c45d944eb555123d765c462818158046bb72951f6421d9ea0 SHA512 a2b6c8c337e75bcce73126c30a3b564dc586df973780d9c7d5a9eed693dbe3779bf762b64c49c47203c2768c92a4a7d2dc8c0445b1dc398eafd2d58b0ba5aae6
22
DIST libarchive-3.7.8.tar.xz.asc 659 BLAKE2B 2050214592b0add7cbd758b815c4289a8760bfb2e5b5db581afdbe741d348252b73f99919641cacd908b586cf4f8fc30a591d88b869bd607adc837251d8fbd4e SHA512 3f1d70318f5e2369fa59e94f91bf8473630a448ded11e2ff3502657380221b9e11e849dc98ba0806c3110c7267cee251f7d681db27751e2a45a948f6ad558404
3+
DIST libarchive-3.7.9.tar.xz 5494688 BLAKE2B 7bcfb3fe8ffd9452f3d71cdc738144069594030278572ebba0bb247ad74fd68ec19822f281364878228ee311976e216614d4764e56c5fb7f98801695ab7aa7f4 SHA512 d8918445e2536eb29c2d6a6c8cd3671a8525be1619009a2e7c3a9c2a821b51939172dfccc25bfd62fec2a17fb01796b4f522b0ba72b31e3de9b9658c44c46345
4+
DIST libarchive-3.7.9.tar.xz.asc 659 BLAKE2B 1de2d5af2422c8220983d7e5aa76fae1fcf12c008e7a99ec193b82145a03506fddabc7d5b89efce609e3b807511ebf719fce2f81f2150ccc0a57b4248ad3c5cb SHA512 e60bf9b6c8c58a6fd8977df0ccdd375e42db03f99623412897711dfcbfa4fb4a5b8707e8643c30e25e8b2946df58d1367f67c6ef99223a2739dabbce387f83c5
Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
# Copyright 1999-2025 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
inherit libtool multilib-minimal toolchain-funcs verify-sig
6+
7+
DESCRIPTION="Multi-format archive and compression library"
8+
HOMEPAGE="
9+
https://www.libarchive.org/
10+
https://github.com/libarchive/libarchive/
11+
"
12+
SRC_URI="
13+
https://www.libarchive.de/downloads/${P}.tar.xz
14+
verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
15+
"
16+
17+
LICENSE="BSD BSD-2 BSD-4 public-domain"
18+
SLOT="0/13"
19+
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"
20+
IUSE="
21+
acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
22+
static-libs test xattr +zstd
23+
"
24+
RESTRICT="!test? ( test )"
25+
26+
RDEPEND="
27+
sys-libs/zlib:=[${MULTILIB_USEDEP}]
28+
acl? ( virtual/acl:=[${MULTILIB_USEDEP}] )
29+
blake2? ( app-crypt/libb2:=[${MULTILIB_USEDEP}] )
30+
bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
31+
expat? ( dev-libs/expat:=[${MULTILIB_USEDEP}] )
32+
!expat? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
33+
iconv? ( virtual/libiconv:=[${MULTILIB_USEDEP}] )
34+
dev-libs/openssl:=[${MULTILIB_USEDEP}]
35+
lz4? ( >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] )
36+
lzma? ( >=app-arch/xz-utils-5.2.5-r1:=[${MULTILIB_USEDEP}] )
37+
lzo? ( >=dev-libs/lzo-2:=[${MULTILIB_USEDEP}] )
38+
nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
39+
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
40+
"
41+
DEPEND="${RDEPEND}
42+
kernel_linux? (
43+
virtual/os-headers
44+
e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
45+
)
46+
test? (
47+
app-arch/lrzip
48+
app-arch/lz4
49+
app-arch/lzip
50+
app-arch/lzop
51+
app-arch/xz-utils
52+
app-arch/zstd
53+
lzma? ( app-arch/xz-utils[extra-filters(+)] )
54+
)
55+
"
56+
BDEPEND="
57+
verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
58+
elibc_musl? ( sys-libs/queue-standalone )
59+
"
60+
61+
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc
62+
63+
# false positives (checks for libc-defined hash functions)
64+
QA_CONFIG_IMPL_DECL_SKIP=(
65+
SHA256_Init SHA256_Update SHA256_Final
66+
SHA384_Init SHA384_Update SHA384_Final
67+
SHA512_Init SHA512_Update SHA512_Final
68+
)
69+
70+
PATCHES=(
71+
# https://github.com/libarchive/libarchive/issues/2069
72+
# (we can simply update the command since we don't support old lrzip)
73+
"${FILESDIR}/${PN}-3.7.2-lrzip.patch"
74+
)
75+
76+
src_prepare() {
77+
default
78+
79+
# Needed for flags to be respected w/ LTO
80+
elibtoolize
81+
}
82+
83+
multilib_src_configure() {
84+
export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
85+
86+
local myconf=(
87+
$(use_enable acl)
88+
$(use_enable static-libs static)
89+
$(use_enable xattr)
90+
$(use_with blake2 libb2)
91+
$(use_with bzip2 bz2lib)
92+
$(use_with expat)
93+
$(use_with !expat xml2)
94+
$(use_with iconv)
95+
$(use_with lz4)
96+
$(use_with lzma)
97+
$(use_with lzo lzo2)
98+
$(use_with nettle)
99+
--with-zlib
100+
$(use_with zstd)
101+
102+
# Windows-specific
103+
--without-cng
104+
)
105+
if multilib_is_native_abi ; then
106+
myconf+=(
107+
--enable-bsdcat="$(tc-is-static-only && echo static || echo shared)"
108+
--enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)"
109+
--enable-bsdtar="$(tc-is-static-only && echo static || echo shared)"
110+
--enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)"
111+
)
112+
else
113+
myconf+=(
114+
--disable-bsdcat
115+
--disable-bsdcpio
116+
--disable-bsdtar
117+
--disable-bsdunzip
118+
)
119+
fi
120+
121+
ECONF_SOURCE="${S}" econf "${myconf[@]}"
122+
}
123+
124+
multilib_src_compile() {
125+
if multilib_is_native_abi ; then
126+
emake
127+
else
128+
emake libarchive.la
129+
fi
130+
}
131+
132+
src_test() {
133+
mkdir -p "${T}"/bin || die
134+
# tests fail when lbzip2[symlink] is used in place of ref bunzip2
135+
ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
136+
# workaround lrzip broken on 32-bit arches with >= 10 threads
137+
# https://bugs.gentoo.org/927766
138+
cat > "${T}"/bin/lrzip <<-EOF || die
139+
#!/bin/sh
140+
exec "$(type -P lrzip)" -p1 "\${@}"
141+
EOF
142+
chmod +x "${T}/bin/lrzip" || die
143+
local -x PATH=${T}/bin:${PATH}
144+
multilib-minimal_src_test
145+
}
146+
147+
multilib_src_test() {
148+
# sandbox is breaking long symlink behavior
149+
local -x SANDBOX_ON=0
150+
local -x LD_PRELOAD=
151+
# some locales trigger different output that breaks tests
152+
local -x LC_ALL=C.UTF-8
153+
emake check
154+
}
155+
156+
multilib_src_install() {
157+
if multilib_is_native_abi ; then
158+
emake DESTDIR="${D}" install
159+
else
160+
local install_targets=(
161+
install-includeHEADERS
162+
install-libLTLIBRARIES
163+
install-pkgconfigDATA
164+
)
165+
emake DESTDIR="${D}" "${install_targets[@]}"
166+
fi
167+
168+
# Libs.private: should be used from libarchive.pc instead
169+
find "${ED}" -type f -name "*.la" -delete || die
170+
# https://github.com/libarchive/libarchive/issues/1766
171+
sed -e '/Requires\.private/s:iconv::' \
172+
-i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
173+
}

0 commit comments

Comments
 (0)