commit: 4605fd652f147c1e60c6675d122fba07e20a9d71 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Feb 5 03:49:18 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 5 03:51:49 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4605fd65
sys-libs/musl: backport further patches, including a printf one for systemd I took a look at what Alpine is using and picked up some more patches. Was considering a snapshot like in 2ba8dfe9407383b97485385552cab675a51b8bd5 but Alpine had some seccomp issues (f2036bfe000ab05e1f300c6fce57be3da9db426e in aports.git), maybe we should just do that though. The patch stack is getting a bit much. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/musl/files/musl-isatty.patch | 40 ++++ sys-libs/musl/files/musl-page-size.patch | 48 ++++ sys-libs/musl/files/musl-printf-empty-iovec.patch | 33 +++ sys-libs/musl/musl-1.2.5-r8.ebuild | 267 ++++++++++++++++++++++ 4 files changed, 388 insertions(+) diff --git a/sys-libs/musl/files/musl-isatty.patch b/sys-libs/musl/files/musl-isatty.patch new file mode 100644 index 000000000000..df57e5a01e53 --- /dev/null +++ b/sys-libs/musl/files/musl-isatty.patch @@ -0,0 +1,40 @@ +https://git.musl-libc.org/cgit/musl/commit/?id=c94a0c16f08894ce3be6dafb0fe80baa77a6ff2a + +From c94a0c16f08894ce3be6dafb0fe80baa77a6ff2a Mon Sep 17 00:00:00 2001 +From: Rich Felker <[email protected]> +Date: Tue, 20 Aug 2024 12:34:50 -0400 +Subject: isatty: don't collapse all non-EBADF errors to ENOTTY + +linux puts hung-up ttys in a state where ioctls produce EIO, and may +do the same for other types of devices in error or shutdown states. +such an error clearly does not mean the device is not a tty, but it +also can't reliably establish that the device is a tty, so the only +safe thing to do seems to be reporting the error. programs that don't +check errno will conclude that the device is not a tty, which is no +different from what happens now, but at least they gain the option to +differentiate between the cases. + +commit c84971995b3a6d5118f9357c040572f4c78bcd55 introduced the errno +collapsing behavior, but prior to that, errno was not set at all by +isatty. +--- + src/unistd/isatty.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c +index 75a9c186..21222eda 100644 +--- a/src/unistd/isatty.c ++++ b/src/unistd/isatty.c +@@ -6,8 +6,6 @@ + int isatty(int fd) + { + struct winsize wsz; +- unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); +- if (r == 0) return 1; +- if (errno != EBADF) errno = ENOTTY; +- return 0; ++ /* +1 converts from error status (0/-1) to boolean (1/0) */ ++ return syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz) + 1; + } +-- +cgit v1.2.1 diff --git a/sys-libs/musl/files/musl-page-size.patch b/sys-libs/musl/files/musl-page-size.patch new file mode 100644 index 000000000000..830500c25340 --- /dev/null +++ b/sys-libs/musl/files/musl-page-size.patch @@ -0,0 +1,48 @@ +https://git.musl-libc.org/cgit/musl/commit/?id=6f666231bf51703fadbef10460d462fb573548a1 + +From 6f666231bf51703fadbef10460d462fb573548a1 Mon Sep 17 00:00:00 2001 +From: Rich Felker <[email protected]> +Date: Tue, 7 May 2024 08:18:49 -0400 +Subject: ldso: fix non-functional fix to early dynamic PAGE_SIZE access + +commit f47a8cdd250d9163fcfb39bf4e9d813957c0b187 introduced an +alternate mechanism for access to runtime page size for compatibility +with early stages of dynamic linking, but because pthread_impl.h +indirectly includes libc.h, the condition #ifndef PAGE_SIZE was never +satisfied. + +rather than depend on order of inclusion, use the (baseline POSIX) +macro PAGESIZE, not the (XSI) macro PAGE_SIZE, to determine whether +page size is dynamic. our internal libc.h only provides a dynamic +definition for PAGE_SIZE, not for PAGESIZE. +--- + ldso/dynlink.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ldso/dynlink.c b/ldso/dynlink.c +index 324aa859..42687da2 100644 +--- a/ldso/dynlink.c ++++ b/ldso/dynlink.c +@@ -21,15 +21,17 @@ + #include <sys/membarrier.h> + #include "pthread_impl.h" + #include "fork_impl.h" ++#include "libc.h" + #include "dynlink.h" + + static size_t ldso_page_size; +-#ifndef PAGE_SIZE ++/* libc.h may have defined a macro for dynamic PAGE_SIZE already, but ++ * PAGESIZE is only defined if it's constant for the arch. */ ++#ifndef PAGESIZE ++#undef PAGE_SIZE + #define PAGE_SIZE ldso_page_size + #endif + +-#include "libc.h" +- + #define malloc __libc_malloc + #define calloc __libc_calloc + #define realloc __libc_realloc +-- +cgit v1.2.1 diff --git a/sys-libs/musl/files/musl-printf-empty-iovec.patch b/sys-libs/musl/files/musl-printf-empty-iovec.patch new file mode 100644 index 000000000000..8cfd52c8a034 --- /dev/null +++ b/sys-libs/musl/files/musl-printf-empty-iovec.patch @@ -0,0 +1,33 @@ +https://github.com/systemd/systemd/pull/38825#issue-3386123778 +https://git.musl-libc.org/cgit/musl/commit/?id=fde29c04adbab9d5b081bf6717b5458188647f1c + +From fde29c04adbab9d5b081bf6717b5458188647f1c Mon Sep 17 00:00:00 2001 +From: Casey Connolly <[email protected]> +Date: Wed, 23 Apr 2025 15:06:48 +0200 +Subject: stdio: skip empty iovec when buffering is disabled + +When buffering on a FILE is disabled we still send both iovecs, even +though the first one is always empty. Clean things up by skipping the +empty iovec instead. +--- + src/stdio/__stdio_write.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/stdio/__stdio_write.c b/src/stdio/__stdio_write.c +index d2d89475..5356553d 100644 +--- a/src/stdio/__stdio_write.c ++++ b/src/stdio/__stdio_write.c +@@ -11,6 +11,11 @@ size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len) + size_t rem = iov[0].iov_len + iov[1].iov_len; + int iovcnt = 2; + ssize_t cnt; ++ ++ if (!iov->iov_len) { ++ iov++; ++ iovcnt--; ++ } + for (;;) { + cnt = syscall(SYS_writev, f->fd, iov, iovcnt); + if (cnt == rem) { +-- +cgit v1.2.1 diff --git a/sys-libs/musl/musl-1.2.5-r8.ebuild b/sys-libs/musl/musl-1.2.5-r8.ebuild new file mode 100644 index 000000000000..4dfc2184e140 --- /dev/null +++ b/sys-libs/musl/musl-1.2.5-r8.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit crossdev flag-o-matic toolchain-funcs prefix + +DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety" +HOMEPAGE="https://musl.libc.org"; + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.musl-libc.org/git/musl"; + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc + inherit verify-sig + + SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"; + SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )" +fi + +GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab" +GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" +SRC_URI+=" + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} + https://dev.gentoo.org/~blueness/musl-misc/iconv.c +" + +LICENSE="MIT LGPL-2 GPL-2" +SLOT="0" +IUSE="crypt headers-only split-usr" + +QA_SONAME="usr/lib/libc.so" +QA_DT_NEEDED="usr/lib/libc.so" +# bug #830213 +QA_PRESTRIPPED="usr/lib/crtn.o" + +# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) +# built as part as crossdev. Also, elide the blockers when in cross-*, +# as it doesn't make sense to block the normal CBUILD libxcrypt at all +# there when we're installing into /usr/${CHOST} anyway. +if is_crosspkg ; then + IUSE="${IUSE/crypt/+crypt}" +else + RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" + PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.4-arm64-crti-alignment.patch + "${FILESDIR}"/${PN}-sched.h-reduce-namespace-conflicts.patch + "${FILESDIR}"/${PN}-iconv-out-of-bound-fix.patch + "${FILESDIR}"/${PN}-arm-crti-alignment.patch + "${FILESDIR}"/${PN}-ppc-clobber.patch + "${FILESDIR}"/${PN}-dns-union.patch + "${FILESDIR}"/${PN}-getauxval.patch + "${FILESDIR}"/${PN}-getifaddrs-qemu-workaround.patch + "${FILESDIR}"/${PN}-page-size.patch + "${FILESDIR}"/${PN}-isatty.patch + "${FILESDIR}"/${PN}-printf-empty-iovec.patch +) + +just_headers() { + use headers-only && target_is_not_host +} + +pkg_setup() { + if [[ ${CTARGET} == ${CHOST} ]] ; then + case ${CHOST} in + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi + + # Fix for bug #667126, copied from glibc ebuild: + # make sure host make.conf doesn't pollute us + if target_is_not_host || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # We only verify the release; not the additional (fixed, safe) files + # we download. + # (Seem to get IPC error on verifying in cross?) + ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + default + + mkdir "${WORKDIR}"/misc || die + cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die + cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die + cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die +} + +src_configure() { + strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343 + tc-getCC ${CTARGET} + + just_headers && export CC=true + + local sysroot + target_is_not_host && sysroot=/usr/${CTARGET} + ./configure \ + --target=${CTARGET} \ + --prefix="${EPREFIX}${sysroot}/usr" \ + --syslibdir="${EPREFIX}${sysroot}/lib" \ + --disable-gcc-wrapper || die +} + +src_compile() { + emake obj/include/bits/alltypes.h + just_headers && return 0 + + emake + if ! is_crosspkg ; then + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${WORKDIR}/misc" + fi + + $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die + $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} + just_headers && return 0 + + # musl provides ldd via a sym link to its ld.so + local sysroot= + target_is_not_host && sysroot=/usr/${CTARGET} + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" + + if ! use crypt ; then + # Allow sys-libs/libxcrypt[system] to provide it instead + rm "${ED}${sysroot}/usr/include/crypt.h" || die + rm "${ED}${sysroot}"/usr/*/libcrypt.a || die + fi + + if ! is_crosspkg ; then + # Fish out of config: + # ARCH = ... + # SUBARCH = ... + # and print $(ARCH)$(SUBARCH). + local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) + + # The musl build system seems to create a symlink: + # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) + # During cross or within prefix, there's no guarantee that the host is + # using musl so that file may not exist. Use a relative symlink within + # ${D} instead. + rm "${ED}"/lib/ld-musl-${arch}.so.1 || die + if use split-usr; then + dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1 + # If it's still a dead symlink, OK, we really do need to abort. + [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + else + dosym libc.so /usr/lib/ld-musl-${arch}.so.1 + [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die + fi + + cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die + eprefixify "${T}"/ldconfig + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${T}"/getconf + dobin "${T}"/getent + dobin "${T}"/iconv + newenvd - "00musl" <<-EOF + # 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. + LDPATH="include ld.so.conf.d/*.conf" + EOF + fi + + if target_is_not_host ; then + into /usr/${CTARGET} + dolib.a libssp_nonshared.a + else + dolib.a libssp_nonshared.a + fi +} + +# Simple test to make sure our new musl isn't completely broken. +# Make sure we don't test with statically built binaries since +# they will fail. Also, skip if this musl is a cross compiler. +# +# If coreutils is built with USE=multicall, some of these files +# will just be wrapper scripts, not actual ELFs we can test. +musl_sanity_check() { + cd / #228809 + + # We enter ${ED} so to avoid trouble if the path contains + # special characters; for instance if the path contains the + # colon character (:), then the linker will try to split it + # and look for the libraries in an unexpected place. This can + # lead to unsafe code execution if the generated prefix is + # within a world-writable directory. + # (e.g. /var/tmp/portage:${HOSTNAME}) + pushd "${ED}"/usr/$(get_libdir) >/dev/null + + # first let's find the actual dynamic linker here + # symlinks may point to the wrong abi + local newldso=$(find . -maxdepth 1 -name 'libc.so' -type f -print -quit) + + einfo Last-minute run tests with ${newldso} in /usr/$(get_libdir) ... + + local x striptest + for x in cal date env free ls true uname uptime ; do + x=$(type -p ${x}) + [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue + striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue + case ${striptest} in + *"statically linked"*) continue;; + *"static-pie linked"*) continue;; + *"ASCII text"*) continue;; + esac + # We need to clear the locale settings as the upgrade might want + # incompatible locale data. This test is not for verifying that. + LC_ALL=C \ + ${newldso} --library-path . ${x} > /dev/null \ + || die "simple run test (${x}) failed" + done + + popd >/dev/null +} + +pkg_preinst() { + # Nothing to do if just installing headers + just_headers && return + + # Prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d + + [[ -n ${ROOT} ]] && return 0 + [[ -d ${ED}/usr/$(get_libdir) ]] || return 0 + target_is_not_host && return 0 + musl_sanity_check +} + +pkg_postinst() { + target_is_not_host && return 0 + + [[ -n "${ROOT}" ]] && return 0 + + ldconfig || die +}
