From 3344d11429dee88f58d900d82faaaee8ef450900 Mon Sep 17 00:00:00 2001 From: Tanish Yadav Date: Wed, 29 May 2024 11:57:45 +0530 Subject: [PATCH] util-linux: update to 2.40.1 --- .../patches/su-common-fix-ptr-truncate.patch | 58 ------------------- srcpkgs/util-linux/template | 19 ++++-- 2 files changed, 13 insertions(+), 64 deletions(-) delete mode 100644 srcpkgs/util-linux/patches/su-common-fix-ptr-truncate.patch diff --git a/srcpkgs/util-linux/patches/su-common-fix-ptr-truncate.patch b/srcpkgs/util-linux/patches/su-common-fix-ptr-truncate.patch deleted file mode 100644 index 24cdb7de3e5..00000000000 --- a/srcpkgs/util-linux/patches/su-common-fix-ptr-truncate.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 77454e58d58f904cfdc02d3ca5bb65f1bd8739fc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Dec 2023 19:59:46 -0800 -Subject: [PATCH] login-utils: include libgen.h for basename API - -musl has removed the non-prototype declaration of basename from string.h [1] which now results in build errors with clang-17+ compiler - -include libgen.h for using the posix declaration of the funciton. - -Fixes - -../util-linux-2.39.2/login-utils/su-common.c:847:20: error: call to undeclared function 'basename'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - 847 | shell_basename = basename(shell); - | ^ - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Signed-off-by: Khem Raj ---- - login-utils/su-common.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/login-utils/su-common.c b/login-utils/su-common.c -index c5c0102e5..06ce5dba2 100644 ---- a/login-utils/su-common.c -+++ b/login-utils/su-common.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #ifdef HAVE_SECURITY_PAM_MISC_H - # include -@@ -840,17 +841,20 @@ static void run_shell( - su->simulate_login ? " login" : "", - su->fast_startup ? " fast-start" : "")); - -+ char* tmp = xstrdup(shell); - if (su->simulate_login) { - char *arg0; - char *shell_basename; - -- shell_basename = basename(shell); -+ shell_basename = basename(tmp); - arg0 = xmalloc(strlen(shell_basename) + 2); - arg0[0] = '-'; - strcpy(arg0 + 1, shell_basename); - args[0] = arg0; -- } else -- args[0] = basename(shell); -+ } else { -+ args[0] = basename(tmp); -+ } -+ free(tmp); - - if (su->fast_startup) - args[argno++] = "-f"; diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 64f262c25a4..cc15af24a20 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,33 +1,38 @@ # Template file for 'util-linux' # Keep this package sync with util-linux-common pkgname=util-linux -version=2.39.3 -revision=2 +version=2.40.1 +revision=1 build_style=gnu-configure configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin --enable-vipw --enable-newgrp --enable-chfn-chsh --with-systemdsystemunitdir=no - --with-udev --without-python --enable-write --disable-libmount-mountfd-support" + --with-udev --without-python --enable-write" hostmakedepends="gettext pkg-config" makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel - eudev-libudev-devel" + eudev-libudev-devel sqlite-devel" depends="libfdisk>=${version}_1<=${version}_9999 libblkid>=${version}_1<=${version}_9999 libmount>=${version}_1<=${version}_9999 libsmartcols>=${version}_1<=${version}_9999 - libuuid>=${version}_1<=${version}_9999" + libuuid>=${version}_1<=${version}_9999 + liblastlog2>=${version}_1<=${version}_9999" checkdepends="xz tar iproute2 socat procps-ng bc" short_desc="Miscellaneous linux utilities" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.kernel.org/pub/linux/utils/util-linux/" distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz" -checksum=7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f +checksum=59e676aa53ccb44b6c39f0ffe01a8fa274891c91bef1474752fad92461def24f if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" fi +if [ "$XBPS_TARGET_LIBC" = "musl" ] && [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then + configure_args+=" --disable-year2038" +fi + # Create uuidd system account for uuidd. system_accounts="_uuidd" _uuidd_homedir="/var/empty" @@ -37,6 +42,8 @@ replaces="rfkill>=0" # XXX musl needs this for switch_root(8). CFLAGS="-D_DIRENT_HAVE_D_TYPE" +# XXX currently packaged musl doesn't provide __NR_landlock_* macros +CFLAGS+=" -D__NR_landlock_create_ruleset=444 -D__NR_landlock_add_rule=445 -D__NR_landlock_restrict_self=446" alternatives=" logger:logger:/usr/bin/${pkgname}-logger