Changes between v2.40 and v2.40.1-rc1 -------------------------------------------- commit 4c55f993bdaaae31d2b0475d40821cf56af5cb2e Author: Karel Zak Date: Wed May 1 21:46:06 2024 +0200 build-sys: release++ (v2.40.1-rc1) Signed-off-by: Karel Zak NEWS | 4 ++++ configure.ac | 2 +- meson.build | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) commit ffa9168c1d4cf0a3c570edb2573ffede5c2c1cc4 Author: Karel Zak Date: Wed May 1 21:42:51 2024 +0200 docs: update v2.40.1-ReleaseNotes Signed-off-by: Karel Zak Documentation/releases/v2.40.1-ReleaseNotes | 109 ++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) commit 6a56f2a2962b88f283b18045eae17d7444efff26 Author: Karel Zak Date: Wed May 1 21:39:24 2024 +0200 docs: update AUTHORS file Signed-off-by: Karel Zak AUTHORS | 5 +++++ 1 file changed, 5 insertions(+) commit bf778aecbcc2181250d1c894210e3e894ac2db6e Author: Karel Zak Date: Wed May 1 21:35:43 2024 +0200 po-man: merge changes Signed-off-by: Karel Zak po-man/cs.po | 26 ++++++++++++------------- po-man/de.po | 38 +++++++++++++++++++++---------------- po-man/es.po | 26 ++++++++++++------------- po-man/fr.po | 48 ++++++++++++++++++++++++++--------------------- po-man/pt_BR.po | 26 ++++++++++++------------- po-man/sr.po | 38 +++++++++++++++++++++---------------- po-man/uk.po | 39 ++++++++++++++++++++++---------------- po-man/util-linux-man.pot | 27 +++++++++++++------------- 8 files changed, 147 insertions(+), 121 deletions(-) commit 09f6353caf43663c66eb2bb755840ae1b20c8ba5 Author: Karel Zak Date: Wed May 1 21:35:36 2024 +0200 po: merge changes Signed-off-by: Karel Zak po/ca.po | 885 ++++++++++++++++++++++++++-------------------------- po/cs.po | 910 ++++++++++++++++++++++++++++-------------------------- po/da.po | 895 +++++++++++++++++++++++++++-------------------------- po/de.po | 902 +++++++++++++++++++++++++++-------------------------- po/es.po | 902 +++++++++++++++++++++++++++-------------------------- po/et.po | 882 ++++++++++++++++++++++++++-------------------------- po/eu.po | 882 ++++++++++++++++++++++++++-------------------------- po/fi.po | 883 ++++++++++++++++++++++++++-------------------------- po/fr.po | 908 +++++++++++++++++++++++++++-------------------------- po/gl.po | 881 ++++++++++++++++++++++++++-------------------------- po/hr.po | 902 +++++++++++++++++++++++++++-------------------------- po/hu.po | 879 ++++++++++++++++++++++++++-------------------------- po/id.po | 879 ++++++++++++++++++++++++++-------------------------- po/it.po | 879 ++++++++++++++++++++++++++-------------------------- po/ja.po | 893 +++++++++++++++++++++++++++-------------------------- po/ko.po | 908 +++++++++++++++++++++++++++-------------------------- po/nl.po | 892 ++++++++++++++++++++++++++-------------------------- po/pl.po | 908 +++++++++++++++++++++++++++-------------------------- po/pt.po | 899 +++++++++++++++++++++++++++-------------------------- po/pt_BR.po | 899 +++++++++++++++++++++++++++-------------------------- po/ru.po | 885 ++++++++++++++++++++++++++-------------------------- po/sk.po | 894 +++++++++++++++++++++++++++-------------------------- po/sl.po | 879 ++++++++++++++++++++++++++-------------------------- po/sr.po | 902 +++++++++++++++++++++++++++-------------------------- po/sv.po | 899 +++++++++++++++++++++++++++-------------------------- po/tr.po | 893 +++++++++++++++++++++++++++-------------------------- po/uk.po | 908 +++++++++++++++++++++++++++-------------------------- po/util-linux.pot | 868 +++++++++++++++++++++++++-------------------------- po/vi.po | 891 ++++++++++++++++++++++++++-------------------------- po/zh_CN.po | 897 +++++++++++++++++++++++++++-------------------------- po/zh_TW.po | 881 ++++++++++++++++++++++++++-------------------------- 31 files changed, 14111 insertions(+), 13554 deletions(-) commit 893901a834e9bdabdb5ece8268ba085c85024670 Author: Karel Zak Date: Tue Apr 30 10:26:09 2024 +0200 libsmartcols: fix column reduction 4013986: libsmartcols: TAB: [0x5626b97f8e10]: #5 reduce stage (width=38, term=1) 4013986: libsmartcols: COL: [0x5626b97f9130]: [01] (null) reduced 2-->18446744073709551615 Fixes: https://github.com/util-linux/util-linux/issues/3003 Signed-off-by: Karel Zak (cherry picked from commit 28c7c29b2d57705fdc4ff486b38937c73b2d9b5d) libsmartcols/src/calculate.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit aef623dba691e87870c8bb520f13d23dafceea69 Author: Tony Asleson Date: Mon Apr 29 13:04:12 2024 -0500 bcachefs: Remove BCACHEFS_SB_MAX_SIZE & check This constant had an incorrect value. However, the code already does a max. size check which is correct. Note: bcachefs can theoretically have a superblock of 32MiB, but this is very unlikely to happen. Signed-off-by: Tony Asleson (cherry picked from commit 63ffa1c6e616fd391fddabc15314d3a735c62d50) libblkid/src/superblocks/bcache.c | 5 ----- 1 file changed, 5 deletions(-) commit c0593ebac808a8a803241c5e7b7ef845a53111b4 Author: Colin Walters Date: Mon Apr 29 15:45:56 2024 -0400 losetup.8: Clarify --direct-io See e.g. https://github.com/containers/bootc/pull/375#issuecomment-1981109022 The phrasing here was in my opinion technically correct but quite confusing and easy to misunderstand. Let's be very clear: - The default is *off* - You can turn it on in two ways - You can also explicitly turn it off Signed-off-by: Colin Walters sys-utils/losetup.8.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 92a0595ea78d0aca58af8c26c686e46d0fc44f0a Author: Karel Zak Date: Tue Apr 23 10:29:37 2024 +0200 libmount: fix umount --read-only Reported-by: Krzysztof Olędzki Signed-off-by: Karel Zak (cherry picked from commit a20e7e23a8565e01b1c84de6924d1fbbdb1cfccc) libmount/src/context_umount.c | 4 ++++ 1 file changed, 4 insertions(+) commit 51fdec42ed22258cc01491e3944251d2d64337c7 Merge: 991cb1568 6ef355808 Author: Karel Zak Date: Wed May 1 21:11:10 2024 +0200 Merge branch 'stable/v2.40-meson-more-build-options' of https://github.com/jwillikers/util-linux into stable/v2.40 * 'stable/v2.40-meson-more-build-options' of https://github.com/jwillikers/util-linux: (21 commits) meson: Add build-lsclocks option meson: Add build-enosys option meson: Define _DARWIN_C_SOURCE on macOS as is done in Autotools strutils.h: Include strings.h header for strncasecmp function xalloc.h: Include stdio.h header for vasprintf function meson: Fix build by default and install behavior for build-pipesz option meson: Add build-fadvise option meson: Add build-scriptlive option meson: Add build-script option meson: Require pty for the su and runuser executables meson: Add have_pty variable to check if pty is available meson: Add build-blockdev option meson: Add build-chcpu option meson: Use has_type instead of sizeof to detect cpu_set_t type meson: Add build-setarch option meson: Add build-rtcwake option meson: Add build-ldattach option meson: Add build-blkdiscard option meson: Add build-fsfreeze option meson: Add build-blkzone option ... commit 991cb1568a7b3770e33d68c4df49a97068ac8588 Author: Benno Schulenberg Date: Tue Mar 26 16:48:22 2024 +0100 lastlog2: begin descriptions of options with a lowercase letter These descriptions are not full sentences and do not end with a period, so they should not start with a capital either. misc-utils/lastlog2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit eeeb3dc9e662c8cf0383fb109bc5e7d2e2fa7a98 Author: Benno Schulenberg Date: Tue Mar 26 16:48:21 2024 +0100 textual: fix some typos and inconsistencies in usage and error messages Reported-by: Petr Pisar Signed-off-by: Benno Schulenberg login-utils/lslogins.c | 2 +- misc-utils/lastlog2.c | 2 +- misc-utils/lsfd.c | 2 +- misc-utils/lslocks.c | 2 +- misc-utils/waitpid.c | 2 +- sys-utils/irqtop.c | 4 ++-- sys-utils/setpriv.c | 2 +- term-utils/agetty.c | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) commit 6ef35580839715685f702a58e43ca3c87a98ae70 Author: Jordan Williams Date: Tue Apr 23 07:45:24 2024 -0500 meson: Add build-lsclocks option Signed-off-by: Jordan Williams (cherry picked from commit 5873f36e0ebf40121cbe33e7c632193433b8d085) meson.build | 10 +++++++--- meson_options.txt | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) commit ff9553320bdb9e946333b5f361496fd45b8ffe38 Author: Jordan Williams Date: Tue Apr 23 07:43:00 2024 -0500 meson: Add build-enosys option Add a check to ensure that the linux/audit.h header exists for enosys. Signed-off-by: Jordan Williams (cherry picked from commit 0f2dd62ed106af8291e91364e992bc9eb65cab55) meson.build | 29 ++++++++++++++++------------- meson_options.txt | 2 ++ 2 files changed, 18 insertions(+), 13 deletions(-) commit a5981b20e242efe916e5f3a3e7303725d2157a38 Author: Jordan Williams Date: Mon Apr 22 15:03:50 2024 -0500 meson: Define _DARWIN_C_SOURCE on macOS as is done in Autotools Signed-off-by: Jordan Williams (cherry picked from commit df277231cf9f4dcb98dd16dc77ff5c9d4d0b1452) meson.build | 4 ++++ 1 file changed, 4 insertions(+) commit dbd95f119a62fdf7d1016e0d9d3b87e7d0948c8a Author: Jordan Williams Date: Mon Apr 22 14:51:40 2024 -0500 strutils.h: Include strings.h header for strncasecmp function Signed-off-by: Jordan Williams (cherry picked from commit 42a7b48fd1f3643e962c75a6003a305851064763) include/strutils.h | 1 + 1 file changed, 1 insertion(+) commit 20326764a37a563eacbaca144f13c49ab37965e1 Author: Jordan Williams Date: Mon Apr 22 14:51:09 2024 -0500 xalloc.h: Include stdio.h header for vasprintf function Signed-off-by: Jordan Williams (cherry picked from commit d4d9744c62bfb4d179473e6adcd304318b4d952f) include/xalloc.h | 1 + 1 file changed, 1 insertion(+) commit ab610e6ea1a7814f002cae9acd326916d29db04e Author: Jordan Williams Date: Mon Apr 22 14:35:50 2024 -0500 meson: Fix build by default and install behavior for build-pipesz option Signed-off-by: Jordan Williams (cherry picked from commit 5cf8a7ac3a8038212c369bf5d05c74516b328a3a) meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit bb003cdd19238429fe4ef5257c9a4121a63563fc Author: Jordan Williams Date: Mon Apr 22 14:33:49 2024 -0500 meson: Add build-fadvise option Signed-off-by: Jordan Williams (cherry picked from commit 3ba934c9c411795cca50e55cb3fc1309c3469827) meson.build | 8 ++++++-- meson_options.txt | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) commit 4a2a933478d0d5b8ab4bae67aded099298fa3d7b Author: Jordan Williams Date: Mon Apr 22 11:08:26 2024 -0500 meson: Add build-scriptlive option Signed-off-by: Jordan Williams (cherry picked from commit 8f6efe8cb65498e9586a7217aac77f25068f770b) meson.build | 12 ++++++++---- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) commit cb32e645e8a456008610509956e40839d7e5c8ca Author: Jordan Williams Date: Mon Apr 22 11:06:48 2024 -0500 meson: Add build-script option Signed-off-by: Jordan Williams (cherry picked from commit 236918fcc6d886270e8585cbc594ac71c24b1951) meson.build | 18 ++++++++++++------ meson_options.txt | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) commit 9b066dda9fc4d4537ece85e7cbdb3f01b61ed2f3 Author: Jordan Williams Date: Mon Apr 22 11:04:36 2024 -0500 meson: Require pty for the su and runuser executables Signed-off-by: Jordan Williams (cherry picked from commit 8c917cf8a054058b261c7b02699b017443dbb501) meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fd94707a207255a5841db5250a986f787ace51ac Author: Jordan Williams Date: Mon Apr 22 11:02:39 2024 -0500 meson: Add have_pty variable to check if pty is available Signed-off-by: Jordan Williams (cherry picked from commit f71723ef67d4d1ab5762492c4a162498c53e51eb) meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 8fe43153b66c0d692dd2d829df7b12c9bb712dea Author: Jordan Williams Date: Mon Apr 22 09:42:25 2024 -0500 meson: Add build-blockdev option Only build blockdev on Linux. The BLKROSET macro is used in blockdev.c from blkdev.h. The blkdev.h header only defines this macro when it is missing on Linux. Add blockdev to the list of executables, which appears to have been omitted previously. Signed-off-by: Jordan Williams (cherry picked from commit 3e6d539e6e283927639c02792c968848f6c7dc71) meson.build | 11 ++++++++--- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) commit 70c0742e7e0b8499fce0668816abad35a7cc0f16 Author: Jordan Williams Date: Mon Apr 22 09:14:26 2024 -0500 meson: Add build-chcpu option The cpu_set_t type does not exist on macOS. Signed-off-by: Jordan Williams (cherry picked from commit a2c940f44b2a54deedfc21cc7fd91625dcbacf1a) meson.build | 12 ++++++++---- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) commit 48ea38fdc06a06caaba157cba8dc853d7753bcce Author: Jordan Williams Date: Mon Apr 22 09:28:04 2024 -0500 meson: Use has_type instead of sizeof to detect cpu_set_t type Signed-off-by: Jordan Williams (cherry picked from commit fa3bce7e0025fb921a8d05ac26288e687cd1bec5) meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 1d1f6dc3157269225fe8786971fd48a9b2db0e12 Author: Jordan Williams Date: Tue Apr 23 08:39:12 2024 -0500 meson: Add build-setarch option The sys/personality.h header does not exist on macOS. Signed-off-by: Jordan Williams (cherry picked from commit 17146fbf1bb4c93db53bd741f1484327c729631d) meson.build | 52 +++++++++++++++++++++++++++++----------------------- meson_options.txt | 2 ++ 2 files changed, 31 insertions(+), 23 deletions(-) commit 131c53f58d580a0c4e69ed3afaa7d534628000d4 Author: Jordan Williams Date: Mon Apr 22 09:03:52 2024 -0500 meson: Add build-rtcwake option Signed-off-by: Jordan Williams (cherry picked from commit fa907a8810d9a0e7049a01828e2dd0d53567cf0a) meson.build | 12 ++++++++---- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) commit ad73809424586380526038e68c26b99bf4c22552 Author: Jordan Williams Date: Mon Apr 22 08:57:40 2024 -0500 meson: Add build-ldattach option Signed-off-by: Jordan Williams (cherry picked from commit 75637b8813f593225fa69b4f963c9bfd16daefc9) meson.build | 12 ++++++++---- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) commit 1d9e1bf9aad506ac545c3d90b81e468bdd8173ec Author: Jordan Williams Date: Wed Apr 24 15:30:26 2024 -0500 meson: Add build-blkdiscard option Signed-off-by: Jordan Williams (cherry picked from commit 9c4ef6f71169c48cee60523d851ff0b453a1d52f) meson.build | 18 ++++++++++++------ meson_options.txt | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) commit 629a64217eed474efeaeaafe53c309a920a1fa36 Author: Jordan Williams Date: Wed Apr 24 15:29:08 2024 -0500 meson: Add build-fsfreeze option Signed-off-by: Jordan Williams (cherry picked from commit 6549a90cb9d3f6c0a4a3fc7e87536b5e4690517a) meson.build | 12 ++++++++---- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) commit a949f475638e147f6582dd269a7eee520e03d515 Author: Jordan Williams Date: Mon Apr 22 08:48:27 2024 -0500 meson: Add build-blkzone option Signed-off-by: Jordan Williams (cherry picked from commit ca42082d60de44534836571e109e14f3a47fcb61) meson.build | 18 ++++++++++-------- meson_options.txt | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) commit 6299fd50a6862996930cacfb5aa79f43939fc24e Author: Jordan Williams Date: Mon Apr 22 08:46:55 2024 -0500 meson: Add build-blkpr option Signed-off-by: Jordan Williams (cherry picked from commit cd8fd8a1e23b39f6cb069a4829cf2ecc497c8e1c) meson.build | 18 ++++++++++-------- meson_options.txt | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) commit 4f1947a4bf9719be3bc112684b80bc679b20b821 Author: Karel Zak Date: Wed Apr 24 12:05:25 2024 +0200 docs: fix GPL name typo References: https://github.com/util-linux/util-linux/pull/2988 Signed-off-by: Karel Zak (cherry picked from commit f4cb44bd1140ff3e778491671f4bd17e73cb78ee) disk-utils/fsck.8.adoc | 2 +- disk-utils/swaplabel.8.adoc | 2 +- disk-utils/swaplabel.c | 2 +- include/pager.h | 2 +- libsmartcols/scols-filter.5.adoc | 2 +- misc-utils/blkid.8.adoc | 2 +- misc-utils/fincore.1.adoc | 2 +- misc-utils/findfs.8.adoc | 2 +- misc-utils/lastlog2.8.adoc | 2 +- misc-utils/uuidd.8.adoc | 2 +- misc-utils/uuidgen.1.adoc | 2 +- misc-utils/wipefs.8.adoc | 2 +- po-man/cs.po | 20 ++++++++++---------- po-man/de.po | 20 ++++++++++---------- po-man/es.po | 20 ++++++++++---------- po-man/fr.po | 20 ++++++++++---------- po-man/ko.po | 20 ++++++++++---------- po-man/pt_BR.po | 20 ++++++++++---------- po-man/ro.po | 20 ++++++++++---------- po-man/sr.po | 20 ++++++++++---------- po-man/uk.po | 20 ++++++++++---------- po-man/util-linux-man.pot | 20 ++++++++++---------- sys-utils/eject.1.adoc | 2 +- 23 files changed, 113 insertions(+), 113 deletions(-) commit 6ad2ea691dfba6881cbd86379de7e16a86fab35b Author: Jakub Wilk Date: Mon Apr 22 15:52:04 2024 +0200 lsfd: (man) fix license name Signed-off-by: Jakub Wilk (cherry picked from commit d2dc150fe502a5bd8fa6f1a4a7c4c08bacfe4ca8) misc-utils/lsfd.1.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a8aa0b5f154a44557f5bae5a4027bdbfe42b0323 Author: Karel Zak Date: Mon Apr 22 14:28:52 2024 +0200 lsns: fix netns use # ip netns add vpn # lsns -T -t net Segmentation fault (core dumped) The function interpolate_missing_namespaces() reads data from /proc. However, in the case of a persistent namespace, there is no procfs entry for the namespace. Therefore, this function should ignore it. Fixes: https://github.com/util-linux/util-linux/issues/2982 Signed-off-by: Karel Zak (cherry picked from commit 42880f54894c1d7fd113552ff8474566a2595a0d) sys-utils/lsns.c | 3 +++ 1 file changed, 3 insertions(+) commit a8ac243892b0d4b222fe268e740cc500046d0efc Author: Tianjia Zhang Date: Mon Apr 22 14:01:25 2024 +0800 libmount: fix comment typo for mnt_fs_get_comment() Signed-off-by: Tianjia Zhang (cherry picked from commit c630dbc38f7cd1f838e65e2c43d8375bce1ec20f) libmount/src/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3ad4a9aae9116355f00e16b02fa5596102ddbd50 Author: Karel Zak Date: Mon Apr 22 13:09:04 2024 +0200 libmount: Fix access check for utab in context The function mnt_has_regular_utab() properly detects that the utab is not writable, but this is ignored by the high-level context API. As a result, the library later attempts to update the file and ends up with a warning in mount(8): $ mkdir sys $ unshare --map-root-user --mount $ mount --rbind /sys sys $ umount --lazy sys; echo $? umount: /home/user/sys: filesystem was unmounted, but failed to update userspace mount table. 16 In this case, the utab should be ignored. Fixes: https://github.com/util-linux/util-linux/issues/2981 Signed-off-by: Karel Zak (cherry picked from commit 97f7bfc0fdf74b6a6e220ba9d2f620386e660b29) libmount/src/context.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit a0df678b5ce6a671fea13b47a3121f4cc97b2fb5 Author: Jordan Williams Date: Wed Apr 17 11:13:59 2024 -0500 meson: Add build-dmesg option Require the sys/klog.h header to exist in order to enable the feature. Signed-off-by: Jordan Williams (cherry picked from commit 73f3e2ad6e00c93e9a0c7ed8bdb4eb63ac5ebdad) meson.build | 8 +++++--- meson_options.txt | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) commit 7f555340d61a2ada41ea2a3a6587fea252bc0e2d Author: Karel Zak Date: Mon Apr 22 11:51:56 2024 +0200 lsblk: simplify SOURCES code This complicated implementation originated from an early version of zero-separated items for libsmartcols. It is no longer necessary. References: https://github.com/util-linux/util-linux/pull/2983 Signed-off-by: Karel Zak (cherry picked from commit af4c7dac191abadc33aae75916583c890cd2ebc3) libsmartcols/src/column.c | 2 +- misc-utils/lsblk.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) commit 9e187d83861cd0b01aefc6f20326259b3dbe1303 Author: Thomas Weißschuh Date: Sun Apr 21 20:00:31 2024 +0200 findmnt: always zero-terminate SOURCES data libsmartcols expects it's data fields to be zero terminated. See the call to strlen() in scols_column_greatest_wrap(). ul_buffer however does not guarantee that termination, ul_buffer_append_strings() discard the zero-termination. Always zero-terminate in get_data_col_sources() and drop the now unnecessary variable "i". Closes: https://github.com/util-linux/util-linux/issues/2980 Signed-off-by: Thomas Weißschuh (cherry picked from commit 6594679e9af805075c282da35b1b2a8d767e403b) misc-utils/findmnt.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 32cc417009a26a095924fda415e53e82a917af0e Author: Daan De Meyer Date: Fri Apr 19 20:07:47 2024 +0200 agetty: Don't override TERM passed by the user Before 4869b259d68f65ea88df625ce8df9c0177d55a01, any TERM passed on the agetty command line would be used instead of the default TERM. After 4869b259d68f65ea88df625ce8df9c0177d55a01, the default TERM is used unconditionally. Fix the regression by checking if the user passed a custom TERM. Fixes: 4869b259d68f65ea88df625ce8df9c0177d55a01 (cherry picked from commit af354e92111769d57e43eb4f1825c0d99c894ddb) term-utils/agetty.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9fcfea99a940f970442b60e6d78ffac8090e78af Merge: 380120a07 e1b0a094c Author: Karel Zak Date: Mon Apr 22 12:06:37 2024 +0200 Merge branch 'stable/2.40-meson-fix-build-ipcrm-option' of https://github.com/jwillikers/util-linux into stable/v2.40 * 'stable/2.40-meson-fix-build-ipcrm-option' of https://github.com/jwillikers/util-linux: meson: Require the seminfo type for ipcmk, ipcrm, and ipcs meson: Add build-ipcmk option meson: Add missing check for build-ipcrm option commit 380120a07154d9447edc703d628416c717493b7d Author: Masatake YAMATO Date: Wed Apr 17 07:49:40 2024 +0900 tests: (lsns::ioctl_ns) add more debug print Signed-off-by: Masatake YAMATO tests/ts/lsns/ioctl_ns | 4 ++++ 1 file changed, 4 insertions(+) commit 82ecf6cf5495f43716fbe9d72411d8bd5994f75d Author: Masatake YAMATO Date: Wed Apr 17 05:57:45 2024 +0900 tests: (lsns::ioctl_ns) record stdout/stderr for debugging the case When the test case runs successfully, we expect the case test prints nothing to stderr. If something is printed to stderr, it helps us debug lsns command and the test case. Signed-off-by: Masatake YAMATO tests/expected/lsns/ioctl_ns.err | 0 tests/ts/lsns/ioctl_ns | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) commit e1b0a094c6fdd2bdd98f5cd06cc48a236b8ef5b6 Author: Jordan Williams Date: Wed Apr 17 11:56:09 2024 -0500 meson: Require the seminfo type for ipcmk, ipcrm, and ipcs Signed-off-by: Jordan Williams (cherry picked from commit 023950b1b623e6c3598d244a5569eeb0d5141237) meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit 78d4a9cf32e03862d5df27dd9dd8efa22f6eff4f Author: Jordan Williams Date: Wed Apr 17 11:37:04 2024 -0500 meson: Add build-ipcmk option Signed-off-by: Jordan Williams (cherry picked from commit 0b91fd9f45bbdb0ed792f2535b8b95b965e8a176) meson.build | 12 ++++++++---- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) commit c3ee9b23c9ee3515ada919faf6ac2446d168f714 Author: Jordan Williams Date: Wed Apr 17 11:11:21 2024 -0500 meson: Add missing check for build-ipcrm option The build-ipcrm option exists in meson_options.txt but has no effect. Use the option to gate building the ipcrm executable. Signed-off-by: Jordan Williams (cherry picked from commit 25c9b3b4d849f6211ccb668932f0f8823286cd7d) meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 6ef0c2a6d82cb56bbdedad696734ac4fda3398cd Author: Thomas Weißschuh Date: Tue Apr 16 21:56:22 2024 +0200 all_syscalls: use sed to extract defines from headers Posix-compliant awk does not seem capable of matching lines and extracting capture groups of them. Use sed instead. Reported-by: John Paul Adrian Glaubitz Link: https://lore.kernel.org/util-linux/051624b9256db27a731d62c031cb627d9f5a256e.camel@physik.fu-berlin.de/ Signed-off-by: Thomas Weißschuh (cherry picked from commit 7e8bf34a2a54b639d95c51a4a0368b0c9578d612) configure.ac | 2 +- meson.build | 4 ++-- misc-utils/Makemodule.am | 2 +- tools/all_syscalls | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) commit 3f37ffe68790d997e7327656a169cea8e8c5b2e7 Author: Thomas Weißschuh Date: Tue Apr 16 09:26:22 2024 +0200 all_syscalls: don't hardcode AWK invocation Use the buildsystem to find a usable awk implementation and use that. Reported-by: Firas Khalil Khana Link: https://github.com/util-linux/util-linux/pull/2949 Reported-by: John Paul Adrian Glaubitz https://lore.kernel.org/util-linux/31ccace2e5912ffc428e065cd66764088c625c4d.camel@physik.fu-berlin.de/ Signed-off-by: Thomas Weißschuh (cherry picked from commit 543f991f62659b9a3ff67f9cda3456b2a5bb3f98) configure.ac | 1 + meson.build | 4 +++- misc-utils/Makemodule.am | 2 +- tools/all_syscalls | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) commit da5c3015dc0fcf5fab298fdf3e9b396b806dc00b Author: Thomas Weißschuh Date: Tue Apr 16 09:14:28 2024 +0200 all_syscalls: don't warn during cleanup On failure the output files may not have been created. Signed-off-by: Thomas Weißschuh (cherry picked from commit 4d5441ec53337edae2b9f7deef0e21d700c06b4d) tools/all_syscalls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 122a97fbf261230b8bd7476ad0cbd91e85302d2c Author: Thomas Weißschuh Date: Tue Apr 16 09:00:41 2024 +0200 all_syscalls: fail if any step fails Signed-off-by: Thomas Weißschuh (cherry picked from commit 7522d8df797c9ed813b9f75050e25becdcb4a25b) tools/all_syscalls | 1 + 1 file changed, 1 insertion(+) commit 58bc2bb7c9d6d00767186eb44ea597a80d02f92d Author: Karel Zak Date: Tue Apr 16 10:49:31 2024 +0200 libsmartcols: reset wrap after calculation Fixes: https://github.com/util-linux/util-linux/issues/2956 Signed-off-by: Karel Zak (cherry picked from commit 62f64717ec134b10c5a670403c2d8c43b608e671) libsmartcols/src/calculate.c | 7 +++++-- libsmartcols/src/print.c | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) commit a7ca6687322f36b853dad5b0ecb3f5a4d74ad039 Merge: 550a95797 44ac01bf9 Author: Karel Zak Date: Wed Apr 17 09:49:40 2024 +0200 Merge branch 'lslocks--no-sleep-in-test-case-for-stable' of https://github.com/masatake/util-linux into stable/v2.40 * 'lslocks--no-sleep-in-test-case-for-stable' of https://github.com/masatake/util-linux: lslocks: remove a unused local variable lslocks: don't abort gathering per-process information even if opening a /proc/[0-9]* fails commit 44ac01bf91c4180db088643d59608ccfc17c8e3f Author: Masatake YAMATO Date: Sat Apr 13 04:13:03 2024 +0900 lslocks: remove a unused local variable Signed-off-by: Masatake YAMATO (cherry picked from commit c8c85e8e54aa201766f2420e2a7c86ccfa8d5df0) misc-utils/lslocks.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 18d9780f0e846912379c37b7840ba303299ff3c9 Author: Masatake YAMATO Date: Sat Apr 13 03:59:39 2024 +0900 lslocks: don't abort gathering per-process information even if opening a /proc/[0-9]* fails If a process ($pid) taking a lock is gone while running lslocks, gathering per-process information for the process may fail in opening /proc/$pid. Though lslocks should work with incomplete information, the original code stopped gathering per-process information for the other processes. As a result of the original behavior, tests/ts/lslocks/lslocks really failed in an environment where multiple test cases ran simultaneously. Close #2624 again. See also #2633. Signed-off-by: Masatake YAMATO (cherry picked from commit 20df923cc3d2da12a5296223c3ff0de7484cc587) misc-utils/lslocks.c | 6 ++---- tests/ts/lslocks/lslocks | 11 ----------- 2 files changed, 2 insertions(+), 15 deletions(-) commit 550a95797622c6a459aeac7ff89f50df573ae726 Author: Jordan Williams Date: Tue Apr 16 10:30:42 2024 -0500 meson: Remove lingering mq_libs variable The cherry-pick of #2879 in PR #2941 to the stable/v2.40 branch didn't include the removal of mq_libs like it should have. I must have resolved a conflict incorrectly in the cherry-pick. This just removes the lingering definitions which are no longer used. The extra find_library call for rt is a problem. Signed-off-by: Jordan Williams meson.build | 3 --- 1 file changed, 3 deletions(-) commit eaa8798a4871c7e6564e5da1c2dd6d66bbc6a7cb Merge: 6eb447d1c 5e35ee0a7 Author: Karel Zak Date: Tue Apr 16 11:08:50 2024 +0200 Merge branch 'stable/meson-version-script-libblkid' of https://github.com/jwillikers/util-linux into stable/v2.40 * 'stable/meson-version-script-libblkid' of https://github.com/jwillikers/util-linux: meson: Only use the --version-script linker flag where it is supported commit 6eb447d1c1a71317ace9861a63eb2cd1c43c9dd1 Merge: 476e88eac b159ba202 Author: Karel Zak Date: Tue Apr 16 11:07:35 2024 +0200 Merge branch 'stable/optional-libmount' of https://github.com/jwillikers/util-linux into stable/v2.40 * 'stable/optional-libmount' of https://github.com/jwillikers/util-linux: meson: Remove libblkid dependency on libmount meson: Only build libmount when required meson: Use libblkid as a dependency meson: Use libmount as a dependency commit 476e88eacd9a6f9d45ca4ef61ab134645e5044c5 Author: Masatake YAMATO Date: Sun Apr 14 01:40:14 2024 +0900 lsns: tolerate lsns_ioctl(fd, NS_GET_{PARENT,USERNS}) failing with ENOSYS With the original code, "lsns/filedesc" test case failed on "build (qemu-user, s390x)" and "build (qemu-user, riscv64)". On the platforms, lsns_ioctl(fd, NS_GET_{PARENT,USERNS}) failed with ENOSYS. The error stoped the iteration for gathering information from /proc/[0-9]+. As a result, lsns printed nothing. We don't expect this behavior. Signed-off-by: Masatake YAMATO (cherry picked from commit f2a8b20d9c63f771d1fddd639ea1ec3fe034dc6d) sys-utils/lsns.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 532bd55ff160cdb16f2a871ce81be00bfa63d62a Author: Masatake YAMATO Date: Mon Apr 15 01:44:38 2024 +0900 lsns: report with warnx if a namespace related ioctl fails with ENOSYS Qemu userspace emulation reports ENOSYS if it doesn't support a given ioctl command. Signed-off-by: Masatake YAMATO (cherry picked from commit 0a7a8fbc7a82dfbd9e925d1b4d4936bf4e011bc1) sys-utils/lsns.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7356b6f7091373c5390895bffe777a98dc17104b Author: Gavin Lloyd Date: Tue Apr 9 17:38:02 2024 -0700 Fix misplaced else in mnt_update_already_done See 477401f0de (cherry picked from commit 6b316e0c9f1feb61bef3bb14b1356be8fbefcc17) libmount/src/tab_update.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 558ea65e3da74588dd2540406920c3fea310f4fa Author: Thomas Weißschuh Date: Sat Apr 13 09:42:39 2024 +0200 Revert "lib/pager: Apply pager-specific fixes only when needed" Less is not always detectable, as it can be hidden behind symlinks or wrapper as for example in a default Debian installation. Also testing for the literal string "less" does not match full path specifications like "/usr/bin/less". Instead always apply the fixes. This reverts commit c10ad975895372122f72c8d9da089b6ea69f778b. Closes #2951 Signed-off-by: Thomas Weißschuh (cherry picked from commit 966cb1382b59a9c1d5735b47aba27050c6d5c7e5) lib/pager.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) commit b159ba20264aa424453ff312bc8093337c883d34 Author: Jordan Williams Date: Mon Apr 8 11:37:01 2024 -0500 meson: Remove libblkid dependency on libmount I added this incorrect dependency between libblkid and libmount. The option to build libblkid should be allowed whether or not the build-libmount feature is allowed. Signed-off-by: Jordan Williams (cherry picked from commit efce415c094e7daf2b0781c70129b4f0f05120d4) meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 79546fc1b084839e635eba6736cd809bdbda5d6e Author: Jordan Williams Date: Fri Apr 5 07:49:17 2024 -0700 meson: Only build libmount when required It is not currently possible to build any part of util-linux without building libmount when using Meson. The libuuid library is commonly used on macOS, where it is not possible to build libmount. To address this, this PR makes it possible to build without libmount and libblkid. Options have been added to allow toggling whether to build targets that require libmount. This makes it possible to fully disable building libmount. The python object had to be defined outside of the meson.build file in libmount/python since this may no longer be included. The python object is used for tests. Signed-off-by: Jordan Williams (cherry picked from commit b6799ccbc08aea69a26cdaa97ab436bfae2ae27f) libblkid/meson.build | 19 +++++++++------- libmount/meson.build | 20 ++++++++++------- libmount/python/meson.build | 6 ----- meson.build | 55 +++++++++++++++++++++++++++++++-------------- meson_options.txt | 14 ++++++++++++ 5 files changed, 75 insertions(+), 39 deletions(-) commit 1443a1852472181c2c1f6e6dd7085b88805b9e0d Author: Jordan Williams Date: Mon Apr 15 08:02:05 2024 -0500 meson: Use libblkid as a dependency Several utilities depend on libblkid internally. Currently, link_with and global include directories are used to associate targets with libblkid. This PR uses Meson's dependencies argument for targets to define this relationship instead. This carries include directories along with the library to link. An additional dependency is declared for the static libblkid library. A couple of executables use this dependency explicitly. Signed-off-by: Jordan Williams (cherry picked from commit a764efb5fb14b9a66bff8807c04ddcebc51939ea) libblkid/meson.build | 1 + libfdisk/meson.build | 4 ++-- libmount/meson.build | 23 +++++++++---------- meson.build | 62 ++++++++++++++++++++++++++-------------------------- 4 files changed, 44 insertions(+), 46 deletions(-) commit 4895394ba6dec446dd222933c9b7933581ae23eb Author: Jordan Williams Date: Fri Apr 5 08:33:22 2024 -0700 meson: Use libmount as a dependency Several utilities depend on libmount internally. Currently, link_with and global include directories are used to associate targets with libmount. This PR uses Meson's dependencies argument for targets to define this relationship instead. This carries include directories along with the library to link. An additional dependency is declared for the static libmount library. A couple of executables use this dependency explicitly. Signed-off-by: Jordan Williams (cherry picked from commit c43b185a3feb8cd7261c94f42a566486ce2c0438) libmount/meson.build | 1 + libmount/python/meson.build | 5 ++-- meson.build | 58 +++++++++++++++++++++------------------------ 3 files changed, 30 insertions(+), 34 deletions(-) commit 5e35ee0a7bd6cf7d11d609edc2489666a21c32d0 Author: Jordan Williams Date: Mon Apr 8 12:02:52 2024 -0500 meson: Only use the --version-script linker flag where it is supported macOS does not support the --version-script linker flag. Only use it if it is available. Signed-off-by: Jordan Williams (cherry picked from commit 21da737099626a5cf00e1e0719ed2262aae6e2ea) libblkid/meson.build | 12 ++++++++++-- libuuid/meson.build | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) commit 013c3665556a3820952a4d80e62670ad32a48949 Merge: 38493c768 712e9271d Author: Karel Zak Date: Mon Apr 15 09:16:40 2024 +0200 Merge branch 'stable-meson-optional-rt' of https://github.com/jwillikers/util-linux into stable/v2.40 * 'stable-meson-optional-rt' of https://github.com/jwillikers/util-linux: meson: Only pick up the rt library once meson: Add build-lsfd option and make rt dependency optional commit 712e9271d199aacc0694c73b5c908203713bb16a Author: Jordan Williams Date: Mon Apr 1 12:18:52 2024 -0500 meson: Only pick up the rt library once Require the rt library for the build-lsfd feature. Signed-off-by: Jordan Williams (cherry picked from commit 243950279f413e3844d13a2d87b3853c1242f437) meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) commit 381faf9bc11a87819f8904ebe3d3cdc7daba002a Author: Jordan Williams Date: Tue Apr 9 16:58:27 2024 -0500 meson: Add build-lsfd option and make rt dependency optional A dependency on the rt library is unnecessarily required when checking for the clock_gettime and timer_create functions. This causes the build to fail if the rt library is not found. This should not fail the build as rt is only required for the checks. Additionally, the lsfd executable and some tests require rt. There is currently no option to toggle building lsfd. This PR makes it possible to build without the rt library. Function checks no longer require rt for the build. The function checks for the rt library only run when rt is available. This PR adds an option to allow building without lsfd. This makes it possible to build without the executable that requires rt. To not require rt for the test, a additional check has been added. The effected tests won't be built unless rt has been found. Signed-off-by: Jordan Williams (cherry picked from commit 06b27058a04c1ac9eba44f19e320ecd862f6d75f) meson.build | 32 +++++++++++++++++++++----------- meson_options.txt | 2 ++ 2 files changed, 23 insertions(+), 11 deletions(-) commit 38493c7681a82cd4cd1e88f9a9e483eb0ff00a16 Author: Masatake YAMATO Date: Fri Apr 5 22:40:36 2024 +0900 findmnt: revise the code for -I and -D option Fixes #2913. 3dd79293b5b655da9d913dedd8facb08959a7826 added -I option. However, the code used bit flags (FL_DF and FL_DF_INODES) wrongly; the code broke the output of -D option. Signed-off-by: Masatake YAMATO (cherry picked from commit aa0c45e8686df509c169121473d2cfb4fe18c3ea) misc-utils/findmnt.c | 28 ++++++++---------- misc-utils/findmnt.h | 2 +- tests/expected/findmnt/df-options | 4 +++ tests/ts/findmnt/df-options | 62 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 16 deletions(-) commit 5de7172a3e59b6861bff0b7baa6f0cad321ab3ff Merge: 1b92ff39b e199a9330 Author: Karel Zak Date: Mon Apr 8 09:36:51 2024 +0200 Merge branch 'lsfd--verify-proc-syscall' of https://github.com/masatake/util-linux into stable/v2.40 * 'lsfd--verify-proc-syscall' of https://github.com/masatake/util-linux: tests: (lsfd::mkfds-multiplexing) skip if /proc/$pid/syscall is broken commit 1b92ff39b64baf6b23254589b0299aefdb4b3f37 Merge: abae34dba f98a4c12b Author: Karel Zak Date: Fri Apr 5 10:55:21 2024 +0200 Merge branch 'lsfd--debug-endpoint' of https://github.com/masatake/util-linux into stable/v2.40 * 'lsfd--debug-endpoint' of https://github.com/masatake/util-linux: tests: (test_mkfds::sockdiag) verify the recieved message to detect whether the socket is usable or not lsfd: add LSFD_DEBUG env var for debugging commit abae34dba21a74bc4338b8bbffef2d308c965b5d Author: Thomas Weißschuh Date: Thu Apr 4 07:24:58 2024 +0200 libblkid: topology/ioctl: simplify ioctl handling Coverity complains about the data copy within the union. Instead unroll the loop which is less code and easier to follow. Signed-off-by: Thomas Weißschuh (cherry picked from commit 2ab95860db0b7423906911b8b9e9f231332c2c11) libblkid/src/topology/ioctl.c | 85 ++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 58 deletions(-) commit e199a933058ae052b1dfa2fcb457791f47b60b11 Author: Masatake YAMATO Date: Fri Apr 5 04:00:45 2024 +0900 tests: (lsfd::mkfds-multiplexing) skip if /proc/$pid/syscall is broken Close #2867 Close #2887 We should skip the test case on the platforms where /proc/$pid/syscall doesn't report correct system call number. On such platforms, Signed-off-by: Masatake YAMATO tests/ts/lsfd/mkfds-multiplexing | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) commit c15085d00d88bf0cfb9043214d44ee542297d9ef Author: Thomas Weißschuh Date: Tue Apr 2 18:55:29 2024 +0200 libblkid: topology/ioctl: correctly handle kernel types Commit 5d71d711d07a ("libblkid: topolicy/ioctl: use union for multiple data types") incorrectly assumed that set_ulong and set_int refer to the type returned by the kernel. Instead the different function pointer names refer to the types of the function pointers. However all ioctls, except for the later added BLKGETDISKSEQ, return 32bit integers. This made libblkid also interpret the upper 32bits too, leading to garbage values. Introduce a new member 'kernel_size' to also handle the 64bit BLKGETDISKSEQ. Drop data.ul as it is no actually used. Closes #2904 Signed-off-by: Thomas Weißschuh (cherry picked from commit a10081a52c48a5232db30d8e0a7a7570cc8163ae) libblkid/src/topology/ioctl.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) commit f98a4c12b366ae2b5e01fa30d72eef34f3bab681 Author: Masatake YAMATO Date: Tue Apr 2 06:34:40 2024 +0900 tests: (test_mkfds::sockdiag) verify the recieved message to detect whether the socket is usable or not Close #2822. Signed-off-by: Masatake YAMATO tests/helpers/test_mkfds.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) commit fbdbf44752b1b8fe5caeae168809fe2e4629752f Author: Masatake YAMATO Date: Sat Mar 30 18:47:03 2024 +0900 lsfd: add LSFD_DEBUG env var for debugging Signed-off-by: Masatake YAMATO misc-utils/lsfd-sock-xinfo.c | 51 ++++++++++++++++++++++++++++++++++++++------ misc-utils/lsfd.c | 10 +++++++++ misc-utils/lsfd.h | 15 +++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) commit 777cd421f2bc56c5d850d3231862225565a0f12e Author: Jordan Williams Date: Fri Mar 29 10:31:27 2024 -0500 meson: Only require the crypt library when necessary The `crypt` library is only necessary for two executables. These are build-newgrp and build-sulogin. Don't otherwise require this dependency. Signed-off-by: Jordan Williams (cherry picked from commit d0a07e7fb8109e9fdeb5e2c90c019c0cf5f92009) meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 6e93a2ce5f7c41731d0f07ac6a3638d9f981d707 Author: Jordan Williams Date: Fri Mar 29 14:00:01 2024 -0500 meson: Fix false positive detection of mempcpy on macOS The has_function check incorrectly detects mempcpy on macOS. This function is not available on macOS and should not be detected. Likely, this has to do with Meson's detection of compiler built-ins. Using a specific prefix and defining _GNU_SOURCE fixes the detection. Signed-off-by: Jordan Williams (cherry picked from commit 2c5a42b3cbf278461a12872ce7a944ad396d47b5) meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 08debe8f35d5111f58420fd015e7987bc1ce38e6 Author: Thomas Weißschuh Date: Mon Apr 1 22:53:32 2024 +0200 pam_lastlog2: link against liblastlog While at it also drop the duplicated include path. Fixes #2897 Signed-off-by: Thomas Weißschuh (cherry picked from commit 2722b40012740372daf3585b7c071fcbede13359) pam_lastlog2/src/Makemodule.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 4a04b22ba57f9e176bf50fe05bae213326a98419 Author: Karel Zak Date: Mon Apr 1 12:14:50 2024 +0200 libblkid: Fix segfault when blkid.conf doesn't exist * Move 'line' and 'uevent' to the beginning of the LIBECONF code. * Remove unwanted space between function name and arguments. * Check for 'line' pointer before dereferencing. References: https://github.com/util-linux/util-linux/pull/2883 Signed-off-by: Karel Zak (cherry picked from commit 7e357241b413a01c37b0b4d064bc0a47e3259361) libblkid/src/config.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit bf2a125606839a75e99dd64defdf6fef816fc3c5 Author: Karel Zak Date: Tue Apr 2 08:39:40 2024 +0200 meson: respect c_args/CFLAGS when generating syscalls References: http://github.com/util-linux/util-linux/commit/8e7f14391bab98b3ce83a2df27ebbf76c1b5a9fc Signed-off-by: Karel Zak meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 871c24b8640a182acc17c82882062378b2293536 Author: Thomas Weißschuh Date: Sat Mar 30 17:46:19 2024 +0100 autotools: distribute pam_lastlog2/meson.build Otherwise building the dist tarball via meson doesn't work. Fixes #2875 Signed-off-by: Thomas Weißschuh (cherry picked from commit f016443026af3dfafbb7b5a8c65c37768a9df182) pam_lastlog2/Makemodule.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 597b78f0cac7a2379208834675d1e199b1e9e32a Author: Jordan Williams Date: Fri Mar 29 16:56:43 2024 -0500 meson: Don't define HAVE_ENVIRON_DECL when environ is unavailable HAVE_ENVIRON_DECL is being defined to 0 by cfg_data.set10(). The code only checks whether or not is defined. This leads to it not being declared appropriately. Use cfg_data.set() instead of cfg_data.set10() to define it when true. Signed-off-by: Jordan Williams (cherry picked from commit 640754e29475a22fb19082dbd5cd587edc05e4b7) meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b126dea5a356bdb7f94675eb1b68c69f83cd8bcf Author: CismonX Date: Fri Mar 29 07:26:35 2024 +0800 libuuid: (man) fix function declarations libuuid/man/uuid_compare.3.adoc | 2 +- libuuid/man/uuid_copy.3.adoc | 2 +- libuuid/man/uuid_is_null.3.adoc | 2 +- libuuid/man/uuid_parse.3.adoc | 4 ++-- libuuid/man/uuid_time.3.adoc | 2 +- libuuid/man/uuid_unparse.3.adoc | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) commit 5e981e3e635f6635e622430999d019bbcbf9aed9 Author: Karel Zak Date: Mon Apr 1 12:04:47 2024 +0200 docs: add COPYING.MIT Signed-off-by: Karel Zak (cherry picked from commit 18b0d243e0d05855f56f00bee885f82c39a6a4d9) Documentation/licenses/COPYING.MIT | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 674c4456ba6c86fbbf154a73043833130163d04c Author: Richard Purdie Date: Thu Mar 28 12:16:57 2024 +0000 README.licensing/flock: Add MIT license mention Looking at the license text, flock.c is under the MIT license (see https://spdx.org/licenses/MIT). Add an SPDX license identifier header and add to the list of licenses the source so everything is correctly listed/identified. Signed-off-by: Richard Purdie (cherry picked from commit 5b8fab1584017d9d9be008c23b90128bba41a7b5) README.licensing | 2 ++ sys-utils/flock.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)