A pretty large release. https://github.com/util-linux/util-linux/blob/v2.42/Documentation/releases/v2.42-ReleaseNotes
Plugs CVEs: CVE-2026-27456 - mount(8) TOCTOU symlink attack via loop device. * Rearrange options, again. * After resorting, plug some missing options. Signed-off-by: Christian Melki <[email protected]> --- rules/util-linux.make | 249 ++++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 121 deletions(-) diff --git a/rules/util-linux.make b/rules/util-linux.make index 303164191..ae365eee2 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.41.4 -UTIL_LINUX_MD5 := 1c24de6a3cfba18b554a44d33a593fb5 +UTIL_LINUX_VERSION := 2.42 +UTIL_LINUX_MD5 := 9cda1bdbf25b9f6119403994be1d2ae3 UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION) UTIL_LINUX_SUFFIX := tar.gz UTIL_LINUX_URL := https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX) @@ -48,155 +48,162 @@ endif UTIL_LINUX_CONF_TOOL := meson UTIL_LINUX_CONF_OPT := \ $(CROSS_MESON_USR) \ - -Dallow-32bit-time=$(call ptx/falsetrue, PTXDIST_Y2038) \ + -Dtinfo=disabled \ + -Dncursesw=$(call ptx/endis, PTXCONF_UTIL_LINUX_USES_NCURSESW)d \ + -Dncurses=$(call ptx/endis, UTIL_LINUX_USES_NCURSES)d \ + -Dslang=disabled \ + -Dcryptsetup=disabled \ + -Dcryptsetup-dlopen=disabled \ + -Dzlib=disabled \ + -Dreadline=disabled \ + -Dnls=disabled \ + -Dlibutil=$(call ptx/disen, PTXCONF_GLIBC_2_34)d \ + -Dlibutempter=disabled \ + -Dlibpcre2-posix=disabled \ + -Dlibuser=disabled \ + -Dselinux=disabled \ -Daudit=disabled \ + -Dsmack=disabled \ + -Dmagic=disabled \ + -Deconf=disabled \ + -Dsystemd=disabled \ + -Dsysvinit=disabled \ -Dbtrfs=disabled \ - -Dbuild-agetty=$(call ptx/endis, PTXCONF_UTIL_LINUX_AGETTY)d \ - -Dbuild-bash-completion=disabled \ - -Dbuild-bfs=disabled \ - -Dbuild-bits=disabled \ - -Dbuild-blkdiscard=$(call ptx/endis, PTXCONF_UTIL_LINUX_BLKDISCARD)d \ - -Dbuild-blkpr=disabled \ - -Dbuild-blkzone=disabled \ - -Dbuild-blockdev=disabled \ - -Dbuild-cal=disabled \ + -Dwidechar=$(call ptx/disen, UTIL_LINUX_USES_NCURSES)d \ + -Dtranslate-docs=disabled \ + -Dbuild-python=disabled \ + -Dpython=false \ + -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \ + -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \ + -Dbuild-liblastlog2=disabled \ + -Dbuild-pam-lastlog2=disabled \ + -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \ + -Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \ + -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \ + -Dbuild-fdisks=$(call ptx/endis, PTXCONF_UTIL_LINUX_FDISKS)d \ + -Dbuild-mount=$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNT)d \ + -Dbuild-swapon=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)d \ + -Dbuild-swapoff=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)d \ -Dbuild-chcpu=disabled \ - -Dbuild-chfn-chsh=disabled \ - -Dbuild-chmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_CHMEM)d \ - -Dbuild-choom=disabled \ + -Dbuild-losetup=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOSETUP)d \ + -Dbuild-zramctl=$(call ptx/endis, PTXCONF_UTIL_LINUX_ZRAMCTL)d \ + -Dbuild-lsns=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSNS)d \ + -Dbuild-mkfs=$(call ptx/endis, PTXCONF_UTIL_LINUX_MKFS)d \ + -Dbuild-fsck=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSCK)d \ + -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \ + -Dbuild-script=disabled \ + -Dbuild-scriptutils=disabled \ + -Dbuild-bits=disabled \ -Dbuild-col=disabled \ -Dbuild-colcrt=disabled \ -Dbuild-colrm=disabled \ - -Dbuild-cramfs=disabled \ - -Dbuild-ctrlaltdel=disabled \ - -Dbuild-dmesg=$(call ptx/endis, PTXCONF_UTIL_LINUX_DMESG)d \ - -Dbuild-eject=disabled \ - -Dbuild-enosys=disabled \ - -Dbuild-exch=disabled \ - -Dbuild-fadvise=disabled \ + -Dbuild-rev=disabled \ + -Dbuild-uuidd=$(call ptx/endis, PTXCONF_UTIL_LINUX_UUIDD)d \ + -Dbuild-choom=disabled \ + -Dbuild-isosize=disabled \ + -Dbuild-waitpid=$(call ptx/endis, PTXCONF_UTIL_LINUX_WAITPID)d \ + -Dbuild-wipefs=$(call ptx/endis, PTXCONF_UTIL_LINUX_WIPEFS)d \ + -Dbuild-mountpoint=$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNTPOINT)d \ -Dbuild-fallocate=disabled \ + -Dbuild-unshare=disabled \ + -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \ + -Dbuild-setpriv=$(call ptx/endis, PTXCONF_UTIL_LINUX_SETPRIV)d \ + -Dbuild-hardlink=disabled \ + -Dbuild-eject=disabled \ + -Dbuild-agetty=$(call ptx/endis, PTXCONF_UTIL_LINUX_AGETTY)d \ + -Dbuild-cramfs=disabled \ + -Dbuild-bfs=disabled \ + -Dbuild-minix=disabled \ -Dbuild-fdformat=disabled \ - -Dbuild-fdisks=$(call ptx/endis, PTXCONF_UTIL_LINUX_FDISKS)d \ - -Dbuild-findfs=$(call ptx/endis, PTXCONF_UTIL_LINUX_FINDFS)d \ + -Dbuild-blockdev=disabled \ + -Dbuild-hwclock=$(call ptx/endis, PTXCONF_UTIL_LINUX_HWCLOCK)d \ + -Dbuild-lslogins=disabled \ + -Dbuild-wdctl=$(call ptx/endis, PTXCONF_UTIL_LINUX_WDCTL)d \ + -Dbuild-cal=disabled \ + -Dbuild-logger=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGGER)d \ + -Dbuild-look=disabled \ + -Dbuild-mcookie=$(call ptx/endis, PTXCONF_UTIL_LINUX_MCOOKIE)d \ + -Dbuild-namei=disabled \ + -Dbuild-whereis=disabled \ + -Dbuild-lsblk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSBLK)d \ + -Dbuild-lslocks=disabled \ -Dbuild-findmnt=$(call ptx/endis, PTXCONF_UTIL_LINUX_FINDMNT)d \ + -Dbuild-lsfd=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSFD)d \ + -Dbuild-switch_root=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWITCH_ROOT)d \ + -Dbuild-pivot_root=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIVOT_ROOT)d \ -Dbuild-flock=$(call ptx/endis, PTXCONF_UTIL_LINUX_FLOCK)d \ - -Dbuild-fsck=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSCK)d \ - -Dbuild-fsfreeze=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSFREEZE)d \ - -Dbuild-fstrim=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSTRIM)d \ - -Dbuild-getopt=$(call ptx/endis, PTXCONF_UTIL_LINUX_GETOPT)d \ - -Dbuild-hardlink=disabled \ - -Dbuild-hexdump=$(call ptx/endis, PTXCONF_UTIL_LINUX_HEXDUMP)d \ - -Dbuild-hwclock=$(call ptx/endis, PTXCONF_UTIL_LINUX_HWCLOCK)d \ + -Dbuild-lsmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSMEM)d \ + -Dbuild-lsirq=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)d \ + -Dbuild-irqtop=$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)d \ + -Dbuild-chmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_CHMEM)d \ -Dbuild-ipcmk=disabled \ -Dbuild-ipcrm=$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCRM)d \ -Dbuild-ipcs=$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)d \ - -Dbuild-irqtop=$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)d \ - -Dbuild-isosize=disabled \ + -Dbuild-rfkill=$(call ptx/endis, PTXCONF_UTIL_LINUX_RFKILL)d \ + -Dbuild-tunelp=disabled \ + -Dbuild-fstrim=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSTRIM)d \ + -Dbuild-dmesg=$(call ptx/endis, PTXCONF_UTIL_LINUX_DMESG)d \ + -Dbuild-ctrlaltdel=disabled \ + -Dbuild-exch=disabled \ + -Dbuild-fsfreeze=$(call ptx/endis, PTXCONF_UTIL_LINUX_FSFREEZE)d \ + -Dbuild-blkdiscard=$(call ptx/endis, PTXCONF_UTIL_LINUX_BLKDISCARD)d \ + -Dbuild-blkzone=disabled \ + -Dbuild-blkpr=disabled \ + -Dbuild-ldattach=$(call ptx/endis, PTXCONF_UTIL_LINUX_LDATTACH)d \ + -Dbuild-rtcwake=disabled \ + -Dbuild-setarch=disabled \ -Dbuild-kill=disabled \ -Dbuild-last=disabled \ - -Dbuild-ldattach=$(call ptx/endis, PTXCONF_UTIL_LINUX_LDATTACH)d \ - -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \ - -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \ - -Dbuild-liblastlog2=disabled \ - -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \ - -Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \ - -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \ + -Dbuild-utmpdump=disabled \ -Dbuild-line=$(call ptx/endis, PTXCONF_UTIL_LINUX_LINE)d \ - -Dbuild-logger=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGGER)d \ - -Dbuild-login=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGIN)d \ - -Dbuild-look=disabled \ - -Dbuild-losetup=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOSETUP)d \ - -Dbuild-lsblk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSBLK)d \ - -Dbuild-lsclocks=disabled \ - -Dbuild-lsfd=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSFD)d \ - -Dbuild-lsirq=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)d \ - -Dbuild-lslocks=disabled \ - -Dbuild-lslogins=disabled \ - -Dbuild-lsmem=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSMEM)d \ - -Dbuild-lsns=$(call ptx/endis, PTXCONF_UTIL_LINUX_LSNS)d \ - -Dbuild-mcookie=$(call ptx/endis, PTXCONF_UTIL_LINUX_MCOOKIE)d \ -Dbuild-mesg=disabled \ - -Dbuild-minix=disabled \ - -Dbuild-mkfs=$(call ptx/endis, PTXCONF_UTIL_LINUX_MKFS)d \ - -Dbuild-more=disabled \ - -Dbuild-mount=$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNT)d \ - -Dbuild-mountpoint=$(call ptx/endis, PTXCONF_UTIL_LINUX_MOUNTPOINT)d \ - -Dbuild-namei=disabled \ + -Dbuild-raw=disabled \ + -Dbuild-rename=disabled \ + -Dbuild-vipw=disabled \ -Dbuild-newgrp=disabled \ + -Dbuild-chfn-chsh=disabled \ + -Dbuild-login=$(call ptx/endis, PTXCONF_UTIL_LINUX_LOGIN)d \ -Dbuild-nologin=disabled \ - -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \ - -Dbuild-pam-lastlog2=disabled \ - -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \ + -Dbuild-sulogin=$(call ptx/endis, PTXCONF_UTIL_LINUX_SULOGIN)d \ + -Dbuild-su=disabled \ + -Dbuild-runuser=disabled \ + -Dbuild-ul=disabled \ + -Dbuild-more=disabled \ -Dbuild-pg=disabled \ -Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \ - -Dbuild-pivot_root=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIVOT_ROOT)d \ - -Dbuild-plymouth-support=disabled \ - -Dbuild-pylibmount=disabled \ - -Dbuild-python=disabled \ - -Dbuild-raw=disabled \ - -Dbuild-rename=disabled \ - -Dbuild-rev=disabled \ - -Dbuild-rfkill=$(call ptx/endis, PTXCONF_UTIL_LINUX_RFKILL)d \ - -Dbuild-rtcwake=disabled \ - -Dbuild-runuser=disabled \ - -Dbuild-schedutils=$(call ptx/endis, PTXCONF_UTIL_LINUX_SCHEDUTILS)d \ - -Dbuild-script=disabled \ - -Dbuild-scriptutils=disabled \ - -Dbuild-setarch=disabled \ - -Dbuild-setpriv=$(call ptx/endis, PTXCONF_UTIL_LINUX_SETPRIV)d \ + -Dbuild-fadvise=disabled \ + -Dbuild-enosys=disabled \ + -Dbuild-lsclocks=disabled \ + -Dbuild-getopt=$(call ptx/endis, PTXCONF_UTIL_LINUX_GETOPT)d \ -Dbuild-setterm=$(call ptx/endis, PTXCONF_UTIL_LINUX_SETTERM)d \ - -Dbuild-su=disabled \ - -Dbuild-sulogin=$(call ptx/endis, PTXCONF_UTIL_LINUX_SULOGIN)d \ - -Dbuild-swapoff=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)d \ - -Dbuild-swapon=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWAPON)d \ - -Dbuild-switch_root=$(call ptx/endis, PTXCONF_UTIL_LINUX_SWITCH_ROOT)d \ - -Dbuild-tunelp=disabled \ - -Dbuild-ul=disabled \ - -Dbuild-unshare=disabled \ - -Dbuild-utmpdump=disabled \ - -Dbuild-uuidd=$(call ptx/endis, PTXCONF_UTIL_LINUX_UUIDD)d \ - -Dbuild-vipw=disabled \ - -Dbuild-waitpid=$(call ptx/endis, PTXCONF_UTIL_LINUX_WAITPID)d \ + -Dbuild-schedutils=$(call ptx/endis, PTXCONF_UTIL_LINUX_SCHEDUTILS)d \ -Dbuild-wall=disabled \ - -Dbuild-wdctl=$(call ptx/endis, PTXCONF_UTIL_LINUX_WDCTL)d \ - -Dbuild-whereis=disabled \ - -Dbuild-wipefs=$(call ptx/endis, PTXCONF_UTIL_LINUX_WIPEFS)d \ -Dbuild-write=disabled \ - -Dbuild-zramctl=$(call ptx/endis, PTXCONF_UTIL_LINUX_ZRAMCTL)d \ + -Dbuild-bash-completion=disabled \ + -Dbuild-pylibmount=disabled \ + -Dbuild-hexdump=$(call ptx/endis, PTXCONF_UTIL_LINUX_HEXDUMP)d \ + -Dbuild-findfs=$(call ptx/endis, PTXCONF_UTIL_LINUX_FINDFS)d \ + -Dbuild-getino=disabled \ + -Dbuild-copyfilerange=disabled \ + -Dstatic-programs= \ + -Dprogram-tests=false \ -Dchfn-chsh-password=true \ -Dchsh-only-listed=true \ + -Duse-tty-group=false \ + -Dbuild-plymouth-support=disabled \ + -Duse-tls=true \ + -Dpg-bell=false \ -Dcolors-default=true \ - -Dcryptsetup=disabled \ - -Dcryptsetup-dlopen=disabled \ - -Deconf=disabled \ + -Dallow-32bit-time=$(call ptx/falsetrue, PTXDIST_Y2038) \ -Dfs-search-path=/usr/sbin \ -Dfs-search-path-extra= \ - -Dlibpcre2-posix=disabled \ - -Dlibuser=disabled \ - -Dlibutempter=disabled \ - -Dlibutil=$(call ptx/disen, PTXCONF_GLIBC_2_34)d \ - -Dlogin-lastlogin=false \ - -Dmagic=disabled \ - -Dncurses=$(call ptx/endis, UTIL_LINUX_USES_NCURSES)d \ - -Dncursesw=$(call ptx/endis, PTXCONF_UTIL_LINUX_USES_NCURSESW)d \ - -Dnls=disabled \ - -Dpg-bell=false \ - -Dprogram-tests=false \ - -Dpython=false \ - -Dreadline=disabled \ - -Dselinux=disabled \ - -Dslang=disabled \ - -Dsmack=disabled \ - -Dstatic-programs= \ - -Dsystemd=disabled \ - -Dsysvinit=disabled \ - -Dtinfo=disabled \ - -Dtty-setgid=false \ - -Duse-tls=true \ - -Duse-tty-group=false \ + -Dbuild-libmount-udev-support=auto \ + -Dntfs-mounttype=ntfs3 \ -Dvendordir= \ - -Dwidechar=$(call ptx/disen, UTIL_LINUX_USES_NCURSES)d \ - -Dzlib=disabled + -Dlogin-lastlogin=false \ + -Dlogin-stat-mail=false \ + -Dhwclock-gplv3=true \ + -Dtty-setgid=false ifndef PTXCONF_GLIBC_2_34 UTIL_LINUX_LDFLAGS := -lutil -- 2.43.0
