From 2bf5a7da9ed4788a517066acccbb697c893ce5bb Mon Sep 17 00:00:00 2001 From: TomIO Date: Mon, 14 Apr 2025 07:19:37 +0200 Subject: [PATCH] bump(main/util-linux): 2.41 --- packages/util-linux/build.sh | 22 +-- packages/util-linux/configure.patch | 58 ------ packages/util-linux/fix-paths.patch | 172 ++++++++++-------- ...sfd-file.c.patch => lsfd-cmd-file.c.patch} | 20 +- ...fo.c.patch => lsfd-cmd-sock-xinfo.c.patch} | 8 +- packages/util-linux/sys-utils-ipcmk.c.patch | 52 ------ .../util-linux/sys-utils-ipcutils.c.patch | 50 +++-- 7 files changed, 154 insertions(+), 228 deletions(-) delete mode 100644 packages/util-linux/configure.patch rename packages/util-linux/{misc-utuls-lsfd-file.c.patch => lsfd-cmd-file.c.patch} (64%) rename packages/util-linux/{misc-utils-lsfd-sock-xinfo.c.patch => lsfd-cmd-sock-xinfo.c.patch} (52%) diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh index 016b19895d7e365..ee157ff6ffa02d6 100644 --- a/packages/util-linux/build.sh +++ b/packages/util-linux/build.sh @@ -1,18 +1,18 @@ TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Util-linux TERMUX_PKG_DESCRIPTION="Miscellaneous system utilities" TERMUX_PKG_LICENSE="GPL-3.0-or-later, GPL-2.0-or-later, LGPL-2.1-or-later, BSD 3-Clause, BSD, ISC" -TERMUX_PKG_LICENSE_FILE="\ -Documentation/licenses/COPYING.GPL-3.0-or-later -Documentation/licenses/COPYING.GPL-2.0-or-later -Documentation/licenses/COPYING.LGPL-2.1-or-later -Documentation/licenses/COPYING.BSD-3-Clause -Documentation/licenses/COPYING.BSD-4-Clause-UC -Documentation/licenses/COPYING.ISC" -TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.40.2" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_LICENSE_FILE=" + Documentation/licenses/COPYING.GPL-3.0-or-later + Documentation/licenses/COPYING.GPL-2.0-or-later + Documentation/licenses/COPYING.LGPL-2.1-or-later + Documentation/licenses/COPYING.BSD-3-Clause + Documentation/licenses/COPYING.BSD-4-Clause-UC + Documentation/licenses/COPYING.ISC +" +TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000" +TERMUX_PKG_VERSION="2.41" TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 +TERMUX_PKG_SHA256=81ee93b3cfdfeb7d7c4090cedeba1d7bbce9141fd0b501b686b3fe475ddca4c6 # libcrypt is required for only newgrp and sulogin, which are not built anyways TERMUX_PKG_DEPENDS="libcap-ng, libsmartcols, ncurses, zlib, libandroid-glob" TERMUX_PKG_ESSENTIAL=true diff --git a/packages/util-linux/configure.patch b/packages/util-linux/configure.patch deleted file mode 100644 index 3ca4fb155249d9c..000000000000000 --- a/packages/util-linux/configure.patch +++ /dev/null @@ -1,58 +0,0 @@ -col is by default only built when using glibc, but we keep -it in Termux by patching away the configure check. - -See https://github.com/termux/termux-packages/issues/21537 - -diff -u -r ../util-linux-2.40.2/configure ./configure ---- ../util-linux-2.40.2/configure 2024-07-04 08:01:06.791975965 +0000 -+++ ./configure 2024-09-22 10:43:46.010626256 +0000 -@@ -39078,49 +39078,6 @@ - - - -- if test "x$build_col" != xno; then -- -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking building for glibc" >&5 --printf %s "checking building for glibc... " >&6; } -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include --int --main (void) --{ --__GLIBC__ -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO" --then : -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --printf "%s\n" "yes" >&6; } -- ul_haveprogram_col=yes --else $as_nop -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 --printf "%s\n" "no" >&6; } -- ul_haveprogram_col=no --fi --rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -- -- case $enable_col:$ul_haveprogram_col in #( -- no:*) -- build_col=no ;; -- yes:yes) -- build_col=yes ;; -- yes:*) -- as_fn_error $? "col selected, but required building for glibc not available" "$LINENO" 5;; -- check:yes) -- build_col=yes ;; -- check:*) -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: building for glibc not found; not building col" >&5 --printf "%s\n" "$as_me: WARNING: building for glibc not found; not building col" >&2;} -- build_col=no ;; -- esac -- fi -- - if test "x$build_col" = xyes; then - BUILD_COL_TRUE= - BUILD_COL_FALSE='#' diff --git a/packages/util-linux/fix-paths.patch b/packages/util-linux/fix-paths.patch index e85d4f24ee23e28..28e7f862f464fe3 100644 --- a/packages/util-linux/fix-paths.patch +++ b/packages/util-linux/fix-paths.patch @@ -1,10 +1,13 @@ -diff -uNr util-linux-2.36.1/include/pathnames.h util-linux-2.36.1.mod/include/pathnames.h ---- util-linux-2.36.1/include/pathnames.h 2020-11-16 10:41:16.338846226 +0000 -+++ util-linux-2.36.1.mod/include/pathnames.h 2020-11-22 21:23:16.999470089 +0000 -@@ -206,4 +206,107 @@ - #define _PATH_DEV_RFKILL "/dev/rfkill" - #define _PATH_SYS_RFKILL "/sys/class/rfkill" +diff --git a/include/pathnames.h b/include/pathnames.h +index 34ba11ca3..77d863c45 100644 +--- a/include/pathnames.h ++++ b/include/pathnames.h +@@ -250,4 +250,107 @@ + # define UL_VENDORDIR_PATH NULL + #endif +-#endif /* PATHNAMES_H */ +\ No newline at end of file +// On Android (Termux) paths are different. +#if defined(__ANDROID__) +# undef _PATH_DEFPATH @@ -108,10 +111,11 @@ diff -uNr util-linux-2.36.1/include/pathnames.h util-linux-2.36.1.mod/include/pa +# define _PATH_ADJTIME "@TERMUX_PREFIX@/etc/adjtime" +#endif + - #endif /* PATHNAMES_H */ -diff -uNr util-linux-2.36.1/lib/exec_shell.c util-linux-2.36.1.mod/lib/exec_shell.c ---- util-linux-2.36.1/lib/exec_shell.c 2020-11-13 11:33:31.084801627 +0000 -+++ util-linux-2.36.1.mod/lib/exec_shell.c 2020-11-22 21:23:17.000470088 +0000 ++#endif /* PATHNAMES_H */ +diff --git a/lib/exec_shell.c b/lib/exec_shell.c +index 96d3e95a8..46840a53e 100644 +--- a/lib/exec_shell.c ++++ b/lib/exec_shell.c @@ -28,7 +28,7 @@ #include "exec_shell.h" @@ -121,10 +125,11 @@ diff -uNr util-linux-2.36.1/lib/exec_shell.c util-linux-2.36.1.mod/lib/exec_shel void __attribute__((__noreturn__)) exec_shell(void) { -diff -uNr util-linux-2.36.1/lib/loopdev.c util-linux-2.36.1.mod/lib/loopdev.c ---- util-linux-2.36.1/lib/loopdev.c 2020-11-16 10:41:16.338846226 +0000 -+++ util-linux-2.36.1.mod/lib/loopdev.c 2020-11-22 21:23:17.000470088 +0000 -@@ -105,13 +105,13 @@ +diff --git a/lib/loopdev.c b/lib/loopdev.c +index 699322c4a..342443d08 100644 +--- a/lib/loopdev.c ++++ b/lib/loopdev.c +@@ -128,13 +128,13 @@ int loopcxt_set_device(struct loopdev_cxt *lc, const char *device) /* set new */ if (device) { if (*device != '/') { @@ -138,13 +143,14 @@ diff -uNr util-linux-2.36.1/lib/loopdev.c util-linux-2.36.1.mod/lib/loopdev.c return -1; - device += 4; + device += 10; - dir = _PATH_DEV_LOOP "/"; /* _PATH_DEV uses tailing slash */ + dir = _PATH_DEV_LOOP "/"; /* _PATH_DEV uses trailing slash */ } snprintf(lc->device, sizeof(lc->device), "%s%s", -diff -uNr util-linux-2.36.1/libblkid/src/blkidP.h util-linux-2.36.1.mod/libblkid/src/blkidP.h ---- util-linux-2.36.1/libblkid/src/blkidP.h 2020-11-16 10:41:16.339846221 +0000 -+++ util-linux-2.36.1.mod/libblkid/src/blkidP.h 2020-11-22 21:23:17.000470088 +0000 -@@ -287,7 +287,7 @@ +diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h +index fa2379c4d..f11996748 100644 +--- a/libblkid/src/blkidP.h ++++ b/libblkid/src/blkidP.h +@@ -308,7 +308,7 @@ struct blkid_struct_cache #define BLKID_BIC_FL_CHANGED 0x0004 /* Cache has changed from disk */ /* config file */ @@ -153,19 +159,20 @@ diff -uNr util-linux-2.36.1/libblkid/src/blkidP.h util-linux-2.36.1.mod/libblkid /* cache file on systemds with /run */ #define BLKID_RUNTIME_TOPDIR "/run" -@@ -295,7 +295,7 @@ +@@ -316,7 +316,7 @@ struct blkid_struct_cache #define BLKID_CACHE_FILE BLKID_RUNTIME_DIR "/blkid.tab" /* old systems */ -#define BLKID_CACHE_FILE_OLD "/etc/blkid.tab" +#define BLKID_CACHE_FILE_OLD "@TERMUX_PREFIX@/etc/blkid.tab" - #define BLKID_PROBE_OK 0 - #define BLKID_PROBE_NONE 1 -diff -uNr util-linux-2.36.1/libblkid/src/topology/dm.c util-linux-2.36.1.mod/libblkid/src/topology/dm.c ---- util-linux-2.36.1/libblkid/src/topology/dm.c 2020-02-27 09:26:34.573141186 +0000 -+++ util-linux-2.36.1.mod/libblkid/src/topology/dm.c 2020-11-22 21:23:17.001470087 +0000 -@@ -30,9 +30,8 @@ + #define BLKID_ERR_IO 5 + #define BLKID_ERR_SYSFS 9 +diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c +index 612b5df33..af4adcd87 100644 +--- a/libblkid/src/topology/dm.c ++++ b/libblkid/src/topology/dm.c +@@ -30,9 +30,8 @@ static int probe_dm_tp(blkid_probe pr, const struct blkid_idmag *mag __attribute__((__unused__))) { const char * const paths[] = { @@ -177,10 +184,11 @@ diff -uNr util-linux-2.36.1/libblkid/src/topology/dm.c util-linux-2.36.1.mod/lib }; int dmpipe[] = { -1, -1 }, stripes = 0, stripesize = 0; const char *cmd = NULL; -diff -uNr util-linux-2.36.1/libblkid/src/topology/lvm.c util-linux-2.36.1.mod/libblkid/src/topology/lvm.c ---- util-linux-2.36.1/libblkid/src/topology/lvm.c 2017-09-18 09:48:03.563891490 +0000 -+++ util-linux-2.36.1.mod/libblkid/src/topology/lvm.c 2020-11-22 21:23:17.001470087 +0000 -@@ -36,9 +36,8 @@ +diff --git a/libblkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c +index af1a61299..f8267d8bd 100644 +--- a/libblkid/src/topology/lvm.c ++++ b/libblkid/src/topology/lvm.c +@@ -36,9 +36,8 @@ static int probe_lvm_tp(blkid_probe pr, const struct blkid_idmag *mag __attribute__((__unused__))) { const char * const paths[] = { @@ -192,10 +200,11 @@ diff -uNr util-linux-2.36.1/libblkid/src/topology/lvm.c util-linux-2.36.1.mod/li }; int lvpipe[] = { -1, -1 }, stripes = 0, stripesize = 0; FILE *stream = NULL; -diff -uNr util-linux-2.36.1/libmount/src/cache.c util-linux-2.36.1.mod/libmount/src/cache.c ---- util-linux-2.36.1/libmount/src/cache.c 2020-11-10 09:25:56.566810017 +0000 -+++ util-linux-2.36.1.mod/libmount/src/cache.c 2020-11-22 21:23:17.001470087 +0000 -@@ -633,7 +633,7 @@ +diff --git a/libmount/src/cache.c b/libmount/src/cache.c +index b7956346f..ffe3dc103 100644 +--- a/libmount/src/cache.c ++++ b/libmount/src/cache.c +@@ -654,7 +654,7 @@ char *mnt_pretty_path(const char *path, struct libmnt_cache *cache) /* users assume backing file name rather than /dev/loopN in * output if the device has been initialized by mount(8). */ @@ -204,9 +213,11 @@ diff -uNr util-linux-2.36.1/libmount/src/cache.c util-linux-2.36.1.mod/libmount/ struct loopdev_cxt lc; if (loopcxt_init(&lc, 0) || loopcxt_set_device(&lc, pretty)) +diff --git a/libmount/src/hook_loopdev.c b/libmount/src/hook_loopdev.c +index 444d69d6f..54ca0ebf3 100644 --- a/libmount/src/hook_loopdev.c +++ b/libmount/src/hook_loopdev.c -@@ -129,7 +129,7 @@ +@@ -105,7 +105,7 @@ is_mounted_same_loopfile(struct libmnt_context *cxt, rc = 0; @@ -215,10 +226,11 @@ diff -uNr util-linux-2.36.1/libmount/src/cache.c util-linux-2.36.1.mod/libmount/ rc = loopdev_is_used((char *) src, bf, offset, 0, LOOPDEV_FL_OFFSET); } else if (opts && (flags & MNT_MS_LOOP) && -diff -uNr util-linux-2.36.1/libmount/src/tab.c util-linux-2.36.1.mod/libmount/src/tab.c ---- util-linux-2.36.1/libmount/src/tab.c 2020-11-10 09:25:56.568810004 +0000 -+++ util-linux-2.36.1.mod/libmount/src/tab.c 2020-11-22 21:23:17.002470086 +0000 -@@ -1740,7 +1740,7 @@ +diff --git a/libmount/src/tab.c b/libmount/src/tab.c +index 8508715ea..0b1298a34 100644 +--- a/libmount/src/tab.c ++++ b/libmount/src/tab.c +@@ -1948,7 +1948,7 @@ int __mnt_table_is_fs_mounted(struct libmnt_table *tb, struct libmnt_fs *fstab_f int flags = 0; if (!mnt_fs_get_srcpath(fs) || @@ -227,9 +239,10 @@ diff -uNr util-linux-2.36.1/libmount/src/tab.c util-linux-2.36.1.mod/libmount/sr continue; /* does not look like loopdev */ if (mnt_fs_get_option(fstab_fs, "offset", &val, &len) == 0) { -diff -uNr util-linux-2.36.1/libuuid/src/uuidd.h util-linux-2.36.1.mod/libuuid/src/uuidd.h ---- util-linux-2.36.1/libuuid/src/uuidd.h 2020-11-16 10:41:16.342846207 +0000 -+++ util-linux-2.36.1.mod/libuuid/src/uuidd.h 2020-11-22 21:23:17.003470085 +0000 +diff --git a/libuuid/src/uuidd.h b/libuuid/src/uuidd.h +index f76acc8b2..14b1c2c12 100644 +--- a/libuuid/src/uuidd.h ++++ b/libuuid/src/uuidd.h @@ -38,7 +38,7 @@ #define UUIDD_DIR _PATH_RUNSTATEDIR "/uuidd" #define UUIDD_SOCKET_PATH UUIDD_DIR "/request" @@ -239,10 +252,11 @@ diff -uNr util-linux-2.36.1/libuuid/src/uuidd.h util-linux-2.36.1.mod/libuuid/sr #define UUIDD_OP_GETPID 0 #define UUIDD_OP_GET_MAXOP 1 -diff -uNr util-linux-2.36.1/login-utils/su-common.c util-linux-2.36.1.mod/login-utils/su-common.c ---- util-linux-2.36.1/login-utils/su-common.c 2020-11-16 10:41:16.342846207 +0000 -+++ util-linux-2.36.1.mod/login-utils/su-common.c 2020-11-22 21:23:17.004470084 +0000 -@@ -101,7 +101,7 @@ +diff --git a/login-utils/su-common.c b/login-utils/su-common.c +index 8a77cf2a8..d76fda302 100644 +--- a/login-utils/su-common.c ++++ b/login-utils/su-common.c +@@ -107,7 +107,7 @@ UL_DEBUG_DEFINE_MASKNAMES(su) = UL_DEBUG_EMPTY_MASKNAMES; #define is_pam_failure(_rc) ((_rc) != PAM_SUCCESS) /* The shell to run if none is given in the user's passwd entry. */ @@ -251,10 +265,11 @@ diff -uNr util-linux-2.36.1/login-utils/su-common.c util-linux-2.36.1.mod/login- /* The user to become if none is specified. */ #define DEFAULT_USER "root" -diff -uNr util-linux-2.36.1/login-utils/sulogin.c util-linux-2.36.1.mod/login-utils/sulogin.c ---- util-linux-2.36.1/login-utils/sulogin.c 2020-11-13 11:33:31.084801627 +0000 -+++ util-linux-2.36.1.mod/login-utils/sulogin.c 2020-11-22 21:24:51.388374725 +0000 -@@ -743,7 +743,7 @@ +diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c +index aeaa3f11f..ba0e13d4b 100644 +--- a/login-utils/sulogin.c ++++ b/login-utils/sulogin.c +@@ -893,7 +893,7 @@ static void sushell(struct passwd *pwd, struct console *con) if (pwd->pw_shell[0]) su_shell = pwd->pw_shell; else @@ -263,7 +278,7 @@ diff -uNr util-linux-2.36.1/login-utils/sulogin.c util-linux-2.36.1.mod/login-ut } if ((p = strrchr(su_shell, '/')) == NULL) p = su_shell; -@@ -792,9 +792,9 @@ +@@ -942,9 +942,9 @@ static void sushell(struct passwd *pwd, struct console *con) execl(su_shell, shell, (char *)NULL); warn(_("failed to execute %s"), su_shell); @@ -275,14 +290,15 @@ diff -uNr util-linux-2.36.1/login-utils/sulogin.c util-linux-2.36.1.mod/login-ut + warn(_("failed to execute %s"), "@TERMUX_PREFIX@/bin/sh"); } - static void usage(void) -diff -uNr util-linux-2.36.1/misc-utils/whereis.c util-linux-2.36.1.mod/misc-utils/whereis.c ---- util-linux-2.36.1/misc-utils/whereis.c 2020-11-16 10:41:16.343846201 +0000 -+++ util-linux-2.36.1.mod/misc-utils/whereis.c 2020-11-22 21:23:17.005470083 +0000 -@@ -97,84 +97,18 @@ + #ifdef HAVE_LIBSELINUX +diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c +index b575e57ae..40b2d34cc 100644 +--- a/misc-utils/whereis.c ++++ b/misc-utils/whereis.c +@@ -101,84 +101,18 @@ struct wh_dirlist { }; - static const char *bindirs[] = { + static const char *const bindirs[] = { - "/usr/bin", - "/usr/sbin", - "/bin", @@ -344,7 +360,7 @@ diff -uNr util-linux-2.36.1/misc-utils/whereis.c util-linux-2.36.1.mod/misc-util NULL }; - static const char *mandirs[] = { + static const char *const mandirs[] = { - "/usr/man/*", - "/usr/share/man/*", - "/usr/X386/man/*", @@ -357,7 +373,7 @@ diff -uNr util-linux-2.36.1/misc-utils/whereis.c util-linux-2.36.1.mod/misc-util NULL }; - static const char *srcdirs[] = { + static const char *const srcdirs[] = { - "/usr/src/*", - "/usr/src/lib/libc/*", - "/usr/src/lib/libc/net/*", @@ -368,10 +384,11 @@ diff -uNr util-linux-2.36.1/misc-utils/whereis.c util-linux-2.36.1.mod/misc-util NULL }; -diff -uNr util-linux-2.36.1/sys-utils/setarch.c util-linux-2.36.1.mod/sys-utils/setarch.c ---- util-linux-2.36.1/sys-utils/setarch.c 2020-11-13 11:33:31.084801627 +0000 -+++ util-linux-2.36.1.mod/sys-utils/setarch.c 2020-11-22 21:23:17.005470083 +0000 -@@ -349,7 +349,7 @@ +diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c +index 4bcb5e69e..a61db097d 100644 +--- a/sys-utils/setarch.c ++++ b/sys-utils/setarch.c +@@ -482,7 +482,7 @@ int main(int argc, char *argv[]) /* Don't use ifdef sparc here, we get "Unrecognized architecture" * error message later if necessary */ if (strcmp(arch, "sparc32bash") == 0) { @@ -380,7 +397,7 @@ diff -uNr util-linux-2.36.1/sys-utils/setarch.c util-linux-2.36.1.mod/sys-utils/ shell_arg = ""; goto set_arch; } -@@ -458,7 +458,7 @@ +@@ -605,7 +605,7 @@ set_arch: verify_arch_domain(doms, target, arch); if (!argc) { @@ -389,10 +406,11 @@ diff -uNr util-linux-2.36.1/sys-utils/setarch.c util-linux-2.36.1.mod/sys-utils/ shell_arg = "-sh"; } if (verbose) { -diff -uNr util-linux-2.36.1/sys-utils/setpriv.c util-linux-2.36.1.mod/sys-utils/setpriv.c ---- util-linux-2.36.1/sys-utils/setpriv.c 2020-07-01 10:36:00.074753746 +0000 -+++ util-linux-2.36.1.mod/sys-utils/setpriv.c 2020-11-22 21:23:17.006470082 +0000 -@@ -52,7 +52,7 @@ +diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c +index daa3ab366..95d3c6a6c 100644 +--- a/sys-utils/setpriv.c ++++ b/sys-utils/setpriv.c +@@ -56,7 +56,7 @@ #define SETPRIV_EXIT_PRIVERR 127 /* how we exit when we fail to set privs */ /* The shell to set SHELL env.variable if none is given in the user's passwd entry. */ @@ -401,10 +419,11 @@ diff -uNr util-linux-2.36.1/sys-utils/setpriv.c util-linux-2.36.1.mod/sys-utils/ static gid_t get_group(const char *s, const char *err); -diff -uNr util-linux-2.36.1/text-utils/more.c util-linux-2.36.1.mod/text-utils/more.c ---- util-linux-2.36.1/text-utils/more.c 2020-11-10 09:25:56.658809468 +0000 -+++ util-linux-2.36.1.mod/text-utils/more.c 2020-11-22 21:23:17.007470081 +0000 -@@ -78,6 +78,7 @@ +diff --git a/text-utils/more.c b/text-utils/more.c +index a035591af..0f67fde70 100644 +--- a/text-utils/more.c ++++ b/text-utils/more.c +@@ -81,6 +81,7 @@ # include #endif @@ -412,10 +431,11 @@ diff -uNr util-linux-2.36.1/text-utils/more.c util-linux-2.36.1.mod/text-utils/m #include "strutils.h" #include "nls.h" #include "xalloc.h" -diff -uNr util-linux-2.36.1/text-utils/pg.c util-linux-2.36.1.mod/text-utils/pg.c ---- util-linux-2.36.1/text-utils/pg.c 2020-11-13 11:33:31.084801627 +0000 -+++ util-linux-2.36.1.mod/text-utils/pg.c 2020-11-22 21:23:17.007470081 +0000 -@@ -1368,7 +1368,7 @@ +diff --git a/text-utils/pg.c b/text-utils/pg.c +index 3623f3f78..6c68dc16e 100644 +--- a/text-utils/pg.c ++++ b/text-utils/pg.c +@@ -1371,7 +1371,7 @@ static void pgfile(FILE *f, const char *name) { const char *sh = getenv("SHELL"); if (!sh) diff --git a/packages/util-linux/misc-utuls-lsfd-file.c.patch b/packages/util-linux/lsfd-cmd-file.c.patch similarity index 64% rename from packages/util-linux/misc-utuls-lsfd-file.c.patch rename to packages/util-linux/lsfd-cmd-file.c.patch index 84a773fdeed4909..73e50264d307d02 100644 --- a/packages/util-linux/misc-utuls-lsfd-file.c.patch +++ b/packages/util-linux/lsfd-cmd-file.c.patch @@ -1,6 +1,7 @@ -diff -u -r ../util-linux-2.40.2/misc-utils/lsfd-file.c ./misc-utils/lsfd-file.c ---- ../util-linux-2.40.2/misc-utils/lsfd-file.c 2024-07-04 07:54:41.235242049 +0000 -+++ ./misc-utils/lsfd-file.c 2024-09-15 13:42:15.256736746 +0000 +diff --git a/lsfd-cmd/file.c b/lsfd-cmd/file.c +index 32b08693d..c52f1a83d 100644 +--- a/lsfd-cmd/file.c ++++ b/lsfd-cmd/file.c @@ -32,11 +32,15 @@ # endif #endif @@ -17,17 +18,18 @@ diff -u -r ../util-linux-2.40.2/misc-utils/lsfd-file.c ./misc-utils/lsfd-file.c #include "buffer.h" #include "idcache.h" -@@ -425,6 +429,9 @@ +@@ -604,6 +608,10 @@ static void file_free_content(struct file *file) static unsigned long get_minor_for_sysvipc(void) { +#ifdef __ANDROID__ + return 0; +#else ++ int id; void *start; -@@ -464,10 +471,14 @@ +@@ -641,10 +649,14 @@ static unsigned long get_minor_for_sysvipc(void) shmdt(start); shmctl(id, IPC_RMID, NULL); return m; @@ -36,13 +38,13 @@ diff -u -r ../util-linux-2.40.2/misc-utils/lsfd-file.c ./misc-utils/lsfd-file.c static unsigned long get_minor_for_mqueue(void) { -+#ifdef __ANDROID__ -+ return 0; -+#else +++#ifdef __ANDROID__ +++ return 0; +++#else mqd_t mq; char mq_name[BUFSIZ]; struct mq_attr attr = { -@@ -492,6 +503,7 @@ +@@ -669,6 +681,7 @@ static unsigned long get_minor_for_mqueue(void) mq_close(mq); mq_unlink(mq_name); return minor(sb.st_dev); diff --git a/packages/util-linux/misc-utils-lsfd-sock-xinfo.c.patch b/packages/util-linux/lsfd-cmd-sock-xinfo.c.patch similarity index 52% rename from packages/util-linux/misc-utils-lsfd-sock-xinfo.c.patch rename to packages/util-linux/lsfd-cmd-sock-xinfo.c.patch index 8ffae599a73bd4a..87d5381d799e110 100644 --- a/packages/util-linux/misc-utils-lsfd-sock-xinfo.c.patch +++ b/packages/util-linux/lsfd-cmd-sock-xinfo.c.patch @@ -1,6 +1,8 @@ ---- a/misc-utils/lsfd-sock-xinfo.c -+++ b/misc-utils/lsfd-sock-xinfo.c -@@ -1213,7 +1213,7 @@ +diff --git a/lsfd-cmd/sock-xinfo.c b/lsfd-cmd/sock-xinfo.c +index f6811213a..7f19ca976 100644 +--- a/lsfd-cmd/sock-xinfo.c ++++ b/lsfd-cmd/sock-xinfo.c +@@ -1580,7 +1580,7 @@ static void *tcp6_xinfo_get_addr(struct l4_xinfo * l4, enum l4_side side) static bool tcp6_xinfo_is_any_addr(void *addr) { diff --git a/packages/util-linux/sys-utils-ipcmk.c.patch b/packages/util-linux/sys-utils-ipcmk.c.patch index 9616fab47e79733..e69de29bb2d1d64 100644 --- a/packages/util-linux/sys-utils-ipcmk.c.patch +++ b/packages/util-linux/sys-utils-ipcmk.c.patch @@ -1,52 +0,0 @@ ---- ./sys-utils/ipcmk.c.orig 2021-06-05 14:50:46.811230515 +0000 -+++ ./sys-utils/ipcmk.c 2021-06-05 14:52:14.776138430 +0000 -@@ -26,8 +26,10 @@ - #include - #include - #include -+#ifndef __ANDROID__ - #include - #include -+#endif - #include - - #include "c.h" -@@ -38,26 +40,38 @@ - - static int create_shm(size_t size, int permission) - { -+#ifdef __ANDROID__ -+ return -1; -+#else - key_t key; - - ul_random_get_bytes(&key, sizeof(key)); - return shmget(key, size, permission | IPC_CREAT); -+#endif - } - - static int create_msg(int permission) - { -+#ifdef __ANDROID__ -+ return -1; -+#else - key_t key; - - ul_random_get_bytes(&key, sizeof(key)); - return msgget(key, permission | IPC_CREAT); -+#endif - } - - static int create_sem(int nsems, int permission) - { -+#ifdef __ANDROID__ -+ return -1; -+#else - key_t key; - - ul_random_get_bytes(&key, sizeof(key)); - return semget(key, nsems, permission | IPC_CREAT); -+#endif - } - - static void __attribute__((__noreturn__)) usage(void) diff --git a/packages/util-linux/sys-utils-ipcutils.c.patch b/packages/util-linux/sys-utils-ipcutils.c.patch index 9f7db89d729b990..7ab037193c6e18f 100644 --- a/packages/util-linux/sys-utils-ipcutils.c.patch +++ b/packages/util-linux/sys-utils-ipcutils.c.patch @@ -1,19 +1,20 @@ -diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipcutils.c ---- util-linux-2.33/sys-utils/ipcutils.c 2018-09-20 15:38:55.955404280 +0300 -+++ util-linux-2.33.mod/sys-utils/ipcutils.c 2018-11-09 14:26:56.564588140 +0200 -@@ -18,6 +18,9 @@ +diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c +index a755849fb..4a55d58b5 100644 +--- a/sys-utils/ipcutils.c ++++ b/sys-utils/ipcutils.c +@@ -29,6 +29,9 @@ int ipc_msg_get_limits(struct ipc_limits *lim) { +#ifdef __ANDROID__ -+ return -1; ++ return -1; +#else memset(lim, 0, sizeof(*lim)); if (access(_PATH_PROC_IPC_MSGMNI, F_OK) == 0 && -@@ -36,10 +39,14 @@ +@@ -77,10 +80,14 @@ int ipc_msg_get_limits(struct ipc_limits *lim) } - + #endif return 0; +#endif } @@ -26,7 +27,7 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc FILE *f; int rc = 0; -@@ -65,10 +72,14 @@ +@@ -106,10 +113,14 @@ int ipc_sem_get_limits(struct ipc_limits *lim) } return 0; @@ -41,7 +42,7 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc lim->shmmin = SHMMIN; if (access(_PATH_PROC_IPC_SHMALL, F_OK) == 0 && -@@ -92,10 +103,14 @@ +@@ -133,10 +144,14 @@ int ipc_shm_get_limits(struct ipc_limits *lim) } return 0; @@ -54,9 +55,9 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc + return -1; +#else FILE *f; - int i = 0, maxid; + int i = 0, maxid, j; char buf[BUFSIZ]; -@@ -200,17 +215,23 @@ +@@ -241,15 +256,20 @@ shm_fallback: if (i == 0) free(*shmds); return i; @@ -76,11 +77,16 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc +#endif } -+#ifndef __ANDROID__ + #ifndef HAVE_SYS_MMAN_H +@@ -326,6 +346,7 @@ void posix_ipc_shm_free_info(struct posix_shm_data *shmds) + } + } + ++#ifdef __ANDROID__ static void get_sem_elements(struct sem_data *p) { size_t i; -@@ -241,9 +262,13 @@ +@@ -356,9 +377,13 @@ static void get_sem_elements(struct sem_data *p) err(EXIT_FAILURE, _("%s failed"), "semctl(GETPID)"); } } @@ -92,9 +98,9 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc + return -1; +#else FILE *f; - int i = 0, maxid; + int i = 0, maxid, j; struct sem_data *p; -@@ -338,20 +363,28 @@ +@@ -453,16 +478,21 @@ sem_fallback: if (i == 0) free(*semds); return i; @@ -115,15 +121,18 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc +#endif } + #ifndef HAVE_SEMAPHORE_H +@@ -546,6 +576,9 @@ void posix_ipc_sem_free_info(struct posix_sem_data *semds) + int ipc_msg_get_info(int id, struct msg_data **msgds) { +#ifdef __ANDROID__ + return -1; +#else FILE *f; - int i = 0, maxid; + int i = 0, maxid, j; struct msg_data *p; -@@ -450,19 +483,27 @@ +@@ -644,15 +677,20 @@ msg_fallback: if (i == 0) free(*msgds); return i; @@ -143,6 +152,9 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc +#endif } + #ifndef HAVE_MQUEUE_H +@@ -761,6 +799,9 @@ void posix_ipc_msg_free_info(struct posix_msg_data *msgds) + void ipc_print_perms(FILE *f, struct ipc_stat *is) { +#ifdef __ANDROID__ @@ -151,7 +163,7 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc struct passwd *pw; struct group *gr; -@@ -487,11 +528,15 @@ +@@ -785,11 +826,15 @@ void ipc_print_perms(FILE *f, struct ipc_stat *is) fprintf(f, " %-10s\n", gr->gr_name); else fprintf(f, " %-10u\n", is->gid); @@ -167,7 +179,7 @@ diff -uNr util-linux-2.33/sys-utils/ipcutils.c util-linux-2.33.mod/sys-utils/ipc char format[32]; if (!msg) -@@ -530,4 +575,5 @@ +@@ -828,4 +873,5 @@ void ipc_print_size(int unit, char *msg, uint64_t size, const char *end, if (end) printf("%s", end);