Changes between v2.40.1 and v2.40.2 -------------------------------------------- commit 1cebcc34373ed34266f726fff71030a83b4df7da Author: Karel Zak Date: Thu Jul 4 09:59:17 2024 +0200 build-sys: release++ (v2.40.2) Signed-off-by: Karel Zak NEWS | 4 ++++ configure.ac | 2 +- meson.build | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) commit 1ac6ec7a46a00927fbee967bd8f13483abd66f13 Author: Karel Zak Date: Wed Jul 3 14:43:30 2024 +0200 docs: update v2.40.2-ReleaseNotes Signed-off-by: Karel Zak Documentation/releases/v2.40.2-ReleaseNotes | 69 +++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) commit 8ede1f5e9ed5137dd534191fa8e0fdc4d7860ed4 Author: Karel Zak Date: Wed Jul 3 14:36:32 2024 +0200 docs: update AUTHORS file Signed-off-by: Karel Zak AUTHORS | 4 ++++ 1 file changed, 4 insertions(+) commit 7613ee27ff5a74a533ff69e531760a0b62f0ff16 Author: Karel Zak Date: Wed Jul 3 14:33:35 2024 +0200 po-man: merge changes Signed-off-by: Karel Zak po-man/cs.po | 12 +- po-man/de.po | 28478 ++++++++++++++++++++++++++++++++++++-------- po-man/es.po | 15 +- po-man/fr.po | 20 +- po-man/pt_BR.po | 20 +- po-man/sr.po | 23 +- po-man/uk.po | 23 +- po-man/util-linux-man.pot | 12 +- 8 files changed, 23296 insertions(+), 5307 deletions(-) commit 87b9b861e8539aa2246ca4a77f55a36c760de795 Author: Karel Zak Date: Wed Jul 3 14:33:28 2024 +0200 po: merge changes Signed-off-by: Karel Zak po/ca.po | 314 ++++++++++++------------- po/cs.po | 314 ++++++++++++------------- po/da.po | 314 ++++++++++++------------- po/de.po | 314 ++++++++++++------------- po/es.po | 688 +++++++++++++++++++++++++++--------------------------- po/et.po | 311 ++++++++++++------------ po/eu.po | 316 ++++++++++++------------- po/fi.po | 314 ++++++++++++------------- po/fr.po | 314 ++++++++++++------------- po/gl.po | 311 ++++++++++++------------ po/hr.po | 314 ++++++++++++------------- po/hu.po | 314 ++++++++++++------------- po/id.po | 314 ++++++++++++------------- po/it.po | 314 ++++++++++++------------- po/ja.po | 688 +++++++++++++++++++++++++++--------------------------- po/ka.po | 314 ++++++++++++------------- po/ko.po | 314 ++++++++++++------------- po/nl.po | 314 ++++++++++++------------- po/pl.po | 314 ++++++++++++------------- po/pt.po | 314 ++++++++++++------------- po/pt_BR.po | 314 ++++++++++++------------- po/ro.po | 314 ++++++++++++------------- po/ru.po | 320 ++++++++++++------------- po/sk.po | 311 ++++++++++++------------ po/sl.po | 314 ++++++++++++------------- po/sr.po | 314 ++++++++++++------------- po/sv.po | 314 ++++++++++++------------- po/tr.po | 314 ++++++++++++------------- po/uk.po | 314 ++++++++++++------------- po/util-linux.pot | 313 ++++++++++++------------- po/vi.po | 314 ++++++++++++------------- po/zh_CN.po | 314 ++++++++++++------------- po/zh_TW.po | 314 ++++++++++++------------- 33 files changed, 5548 insertions(+), 5560 deletions(-) commit 8a30c811f7af54fe6f797a2278ee9d35a1075184 Author: Hideki Yoshida Date: Wed Jul 3 14:30:03 2024 +0200 po: update ja.po (from translationproject.org) po/ja.po | 421 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 204 insertions(+), 217 deletions(-) commit 3109fb4873da9ea03afcea27c08c805db353c665 Author: Antonio Ceballos Roa Date: Wed Jul 3 14:28:22 2024 +0200 po: update es.po (from translationproject.org) po/es.po | 451 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 214 insertions(+), 237 deletions(-) commit 6008b7dd15e86567b5b67e6b9e72fa8cd13be684 Author: Xi Ruoyao Date: Thu Mar 28 04:01:02 2024 +0800 lsfd: test: Adapt test cases for pidfs On Linux >= 6.9, pidfds are from pidfs instead of anonymous inode. Thus: STTYPE is REG on Linux >= 6.9, UNKN on Linux < 6.9. KNAME is pidfd:[inode number] on Linux >= 6.9, anon_inode:[pidfd] on Linux < 6.9. And ainode_class test cannot work on Linux >= 6.9, just skip this sub test if STTYPE is REG. Signed-off-by: Xi Ruoyao (cherry picked from commit 04db2ba9008e9635286b1aafc8ecd9533a0a91bf) tests/expected/lsfd/column-name-pidfd | 2 +- tests/expected/lsfd/column-type-pidfd | 2 +- tests/expected/lsfd/mkfds-pidfd | 2 +- tests/ts/lsfd/column-ainodeclass | 8 ++++++++ tests/ts/lsfd/column-name | 7 +++++++ tests/ts/lsfd/column-type | 7 +++++++ tests/ts/lsfd/mkfds-pidfd | 4 ++++ 7 files changed, 29 insertions(+), 3 deletions(-) commit 36f15ee77b9fe3a4bf3e84d10c5a9c9881115e53 Author: Xi Ruoyao Date: Wed Apr 3 15:46:57 2024 +0800 lsfd: Support pidfs In Linux 6.9 pidfds are moved from the anonymous inode infrastructure to a tiny pseudo filesystem named pidfs. Recognize it properly. Fixes #2865. Signed-off-by: Xi Ruoyao (cherry picked from commit b1a48efd173c7f37d8df39a84eb25b4440335661) Signed-off-by: Karel Zak misc-utils/lsfd-file.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++ misc-utils/lsfd.c | 3 ++ misc-utils/lsfd.h | 7 +++- 3 files changed, 105 insertions(+), 1 deletion(-) commit 2289f4e90f49a83e24a21fa887893438834d707f Author: Xi Ruoyao Date: Wed Apr 3 15:29:34 2024 +0800 lsfd: Refactor the pidfd logic into lsfd-pidfd.c We'll reuse these logic for pidfd support on Linux >= 6.9. This should be a no-functional change. Besides moving the code, this change also renames anon_pidfd_data to pidfd_data, and removes a redundant nullity check for free (because free(NULL) will just do nothing per the C standard). Signed-off-by: Xi Ruoyao (cherry picked from commit bf6645dc1edef09ad378cc5b9eb2c93861408735) misc-utils/Makemodule.am | 4 +- misc-utils/lsfd-pidfd.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ misc-utils/lsfd-pidfd.h | 37 +++++++++++++++++++ misc-utils/lsfd-unkn.c | 71 ++++++------------------------------ misc-utils/meson.build | 1 + 5 files changed, 147 insertions(+), 61 deletions(-) commit e1606a25b8b5dd643099ac7835f744202e688a69 Author: Thomas Weißschuh Date: Mon May 13 20:21:24 2024 +0200 include/pidfd-utils: provide ENOSYS stubs if pidfd functions are missing This allows code which can gracefully fall back to compile. This should fix the CI on Ubuntu 18.04. Signed-off-by: Thomas Weißschuh (cherry picked from commit 4e8c092266e28589abd5ca149ee8b3a43a9a6ee0) include/pidfd-utils.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) commit d99a71a122a68a62a70ef47a8385e4f746f328c5 Author: Karel Zak Date: Mon May 13 11:43:57 2024 +0200 include/pidfd-utils: remove hardcoded syscall fallback Based on https://github.com/util-linux/util-linux/pull/3018 The syscall numbers should not be hardcoded in the header file. If we really need them, there is UL_CHECK_SYSCALL() to define the numbers for different architectures. I doubt it's really necessary. Just update your kernel header files to get the latest kernel updates ... Signed-off-by: Karel Zak (cherry picked from commit 057080b5c89fa63cece8a5d4a6da4959bd004aa1) include/pidfd-utils.h | 13 ------------- 1 file changed, 13 deletions(-) commit 503007991b8212203954c4febae7ad7f245d97c6 Author: Karel Zak Date: Tue Jul 2 11:23:13 2024 +0200 rename: use ul_basename() Fixes: https://github.com/util-linux/util-linux/issues/3071 Signed-off-by: Karel Zak (cherry picked from commit 0309a6f5ca018d83420e49e0f9d046fecdb29261) meson.build | 1 + misc-utils/Makemodule.am | 1 + misc-utils/rename.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) commit 0bb52bae9132daffc8c918b40fa31d08680b356e Author: Karel Zak Date: Tue Jul 2 11:14:06 2024 +0200 lib/fileutils: add ul_basename() Unfortunately, the basename() function can be affected by the creativity of different libc authors, resulting in varying behavior across implementations. Instead, use a local implementation to ensure consistency and portability. Signed-off-by: Karel Zak (cherry picked from commit ff8ee29d648111eb222612ad4251e4c3b236a389) include/fileutils.h | 1 + lib/fileutils.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) commit 459eca5a824dd65f3571bfb7436f67127a91c905 Merge: 904e4f395 578b6b71d Author: Karel Zak Date: Tue Jul 2 12:05:34 2024 +0200 Merge branch 'stable/v2.40/autotools' of https://github.com/t-8ch/util-linux into stable/v2.40 * 'stable/v2.40/autotools' of https://github.com/t-8ch/util-linux: autotools: Properly order install dependencies of pam_lastlog2 autotools: make pam install path configurable commit 578b6b71db7bb2fa4c28bf239547322d57273c9c Author: Thomas Weißschuh Date: Sun Jun 30 11:23:53 2024 +0200 autotools: Properly order install dependencies of pam_lastlog2 As pam_lastlog2 is relinked during installation, all its dependencies need to already be installed. This is the same issue that affected pylibmount which was fixed in commit 324330aca644 ("build-sys: Properly order install dependencies of pylibmount"). Extend the logic added in that commit to also apply to pam_lastlog2. Closes: #3011 Signed-off-by: Thomas Weißschuh (cherry picked from commit 20dc72d8c1f3a53c0408858f0046e1849644c710) Makefile.am | 4 +++- configure.ac | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) commit 0539b1ebd26f6a168b822374d7b167f8ef4a1997 Author: Thomas Weißschuh Date: Mon Jul 1 14:04:46 2024 +0200 autotools: make pam install path configurable While at it, also move the initial definition of usesecurelib_exec_LTLIBRARIES into Makefile.am. Also add "exec" to the target name which is recognized by automake to mark the targets as architecture-specific. Signed-off-by: Thomas Weißschuh (cherry picked from commit 8c03e75c0b837f4285bd34f08eae40b48d3378be) Makefile.am | 1 + configure.ac | 3 +++ pam_lastlog2/src/Makemodule.am | 3 +-- 3 files changed, 5 insertions(+), 2 deletions(-) commit 904e4f395175307e9b9e53038848ab6e2524273e Author: Cristian Rodríguez Date: Mon Jul 1 18:10:49 2024 -0400 misc-utils:uuidd: Use ul_sig_err instead of errx Calling errx in sa_handler is as-unsafe as it is implemented using stdio. (cherry picked from commit a7df5b6380b2679635293130b0a5eba904464c1b) misc-utils/uuidd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 10d3bb70d2f754cb5c86063c0115cfa0d9575bb7 Author: Karel Zak Date: Tue Jul 2 10:39:12 2024 +0200 build-sys: _PATH_VENDORDIR workaround It appears that certain versions of libeconf do not handle calls to econf_readDirs() with NULL path. Therefore, let's set the default to "/usr/etc" if no value is defined by using the "--with-vendordir=" option. Addresses: https://github.com/util-linux/util-linux/issues/3091 Signed-off-by: Karel Zak include/pathnames.h | 5 +++++ lib/logindefs.c | 4 ---- libblkid/src/config.c | 5 +---- meson.build | 4 +++- 4 files changed, 9 insertions(+), 9 deletions(-) commit 23db938ce9bca73025e2838a6ffc30016ba1f4e2 Author: Nicholas Vinson Date: Wed May 15 11:14:54 2024 -0400 Conditionally add uuid_time64 to sym. version map The symbol uuid_time64 is conditionally defined. It only exists on 32-bit platforms that use the glibc library and enable support for the 64-bit time_t type. For all other platforms, the symbol is undefined. As a result, when ld.lld version 17 or newer is used with default flags, ld.lld will reject the symbol map with the error: version script assignment of 'UUID_2.40' to symbol 'uuid_time64' failed: symbol not defined To fix this issue, the reference to uuid_time64 is changed to uuid_time64*. The change to a glob pattern satisifies ld.lld and allows the library to link. fixes util-linux/util-linux#3036 fixes Gentoo bug #931328 Signed-off-by: Nicholas Vinson (cherry picked from commit 86d3f3f03231d25f9cbf18d83aeeccd2225dd246) libuuid/src/libuuid.sym | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 25bd5396ab700623134b491f42a3280556cb674c Author: Thomas Weißschuh Date: Tue May 7 13:44:31 2024 +0200 libuuid: clear uuidd cache on fork() After fork() the memory of the calling thread is preserved into the new process. This also includes TLS. Make sure to reset the cache after a fork to avoid reuse of cached values. Only the TLS of the thread calling fork() is relevant as that is the only thread that gets forked. New threads will received newly initialized TLS. Fixes https://github.com/util-linux/util-linux/issues/3009 Signed-off-by: Thomas Weißschuh (cherry picked from commit a3f1255f1891ddbaf3bb6a32af28569c0e6f3b91) libuuid/src/Makemodule.am | 2 +- libuuid/src/gen_uuid.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) commit 6ec5b07e9878597aa36eb8453b84b640aa3b42a0 Author: Thomas Weißschuh Date: Tue May 7 13:33:40 2024 +0200 libuuid: split uuidd cache into dedicated struct To clear the struct we need to be able to refer to it by name. Signed-off-by: Thomas Weißschuh (cherry picked from commit 26dbc85838b06bd3e5349a81a4ce869efdd9f883) libuuid/src/gen_uuid.c | 74 +++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 34 deletions(-) commit 33a7c83cfc32906957c9f1ac627a54a91d938cf2 Author: Thomas Weißschuh Date: Tue May 7 13:28:41 2024 +0200 libuuid: drop check for HAVE_TLS In the function get_clock() TLS is used unconditionally anyways. Signed-off-by: Thomas Weißschuh (cherry picked from commit c5d40f2487a971672b2e3f41f26a4cffac9a5c19) libuuid/src/gen_uuid.c | 9 --------- 1 file changed, 9 deletions(-) commit 7440fd98609cab07c1843768dfa34f5e106ff352 Author: Karel Zak Date: Wed May 15 13:07:56 2024 +0200 libuuid: drop duplicate assignment liuuid_la_LDFLAGS Signed-off-by: Karel Zak (cherry picked from commit 597e8b246ae31366514ead6cca240a09fe5e1528) libuuid/src/Makemodule.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 66e56dfaeb358950ef1216ff62484d3171875eb7 Author: Karel Zak Date: Thu Jun 27 12:57:19 2024 +0200 libmount: fix syscall save function Signed-off-by: Karel Zak libmount/src/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4dfed4a72e1558fe1ae848b10a1422501cffc841 Author: Emanuele Torre Date: Wed Jun 26 09:22:59 2024 +0200 sys-utils/setpgid: make -f work f was missing from the getopt_long optstring so only --foreground was working, not -f. (cherry picked from commit 4b9e4d3f5950fcbcc177c315058b6e335d8c4362) sys-utils/setpgid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 39f80bd77165a029fa941c79fe61a5820bcaf342 Author: Karel Zak Date: Mon Jun 24 09:46:37 2024 +0200 cfdisk: fix possible integer overflow [coverity scan] Signed-off-by: Karel Zak (cherry picked from commit 72f801dbcd99bc1dcbfdb0bf8e1f5d2f1ad753c6) disk-utils/cfdisk.c | 2 ++ 1 file changed, 2 insertions(+) commit 1e37fb6e4b71367f9fd4b719a1ab23ad88cbc593 Author: Karel Zak Date: Wed Jun 19 11:19:49 2024 +0200 libmount: improving robustness in reading kernel messages * Ensure data termination from read() function * Allocate space for terminator using "sizeof(buf)-1" Signed-off-by: Karel Zak (cherry picked from commit 0389a9eae9281405d177d0eb9ad979d7bd47a7c6) libmount/src/hook_mount.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) commit e5b6670c00c3b53beed1f2cec71f3d1616ea345e Author: Thomas Weißschuh Date: Wed Jun 12 23:32:15 2024 +0200 lib/sysfs: zero-terminate result of sysfs_blkdev_get_devchain() sysfs_blkdev_get_devchain() does not zero-terminate its result, but the caller expects a C-string. Use ul_buffer_get_string() which includes a trailing zero-byte. Now it's also valid for sz and bufsz to be equal. See #3088. Signed-off-by: Thomas Weißschuh (cherry picked from commit 24e3ede3dab15fcbf18d16ac09ae57ba4827c4b5) lib/sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6b7f1410367052f2a0e7c65ebb7c2a80e2667e33 Author: Thomas Weißschuh Date: Thu Jun 13 11:39:34 2024 +0200 lib/buffer: introduce ul_buffer_get_string() Some users need a zero-byte-terminated string. As the buffer internally already maintains a zero-termination, add a helper function that exposes this to users. Signed-off-by: Thomas Weißschuh (cherry picked from commit 49e177d627f80640aac81522090cbdc151204c2d) include/buffer.h | 1 + lib/buffer.c | 13 +++++++++++++ 2 files changed, 14 insertions(+) commit ff1909c7b92163a9b48ae6d20be741002d4a02d2 Author: Thomas Weißschuh Date: Wed Jun 12 23:30:28 2024 +0200 lib/sysfs: abort device hierarchy walk at root of sysfs It does not make sense to leave the sysfs hierarchy during the walk of the parent directories. Signed-off-by: Thomas Weißschuh (cherry picked from commit 84e33a138dc9faf2b1b154df5eaed910aa236eeb) lib/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+) commit 67d99d2282d8645ee8f52400d4174472f9512fda Author: Ville Skyttä Date: Tue Jun 4 23:19:38 2024 +0300 bash-completion: add logger --sd-* completions Signed-off-by: Ville Skyttä bash-completion/logger | 6 ++++++ 1 file changed, 6 insertions(+) commit 533aabc5def9f20633678a13aea66f2e749cb272 Author: Thomas Weißschuh Date: Tue Jun 4 21:06:49 2024 +0200 wdctl: always query device node when sysfs is unavailable When there is no sysfs at all for the watchdog, fall back to reading from the device node. This is also useful if the legacy compat /dev/watchdog device which never has a sysfs interface. Closes: #3073 Signed-off-by: Thomas Weißschuh (cherry picked from commit 8bd4d796f4d6a0480c0744302ca40fa5ad5de070) sys-utils/wdctl.c | 3 +++ 1 file changed, 3 insertions(+) commit 023096e3727fd5fc026e07703e2f2f93e1baa419 Author: Jeremy Linton Date: Wed May 29 11:04:38 2024 -0500 lscpu: New Arm Cortex part numbers Arm has announced the Cortex-X925 and published the TRM here: https://developer.arm.com/documentation/102807/0001/?lang=en As well as the Cortex-A725 with a TRM here: https://developer.arm.com/documentation/107652/0001/?lang=en Signed-off-by: Jeremy Linton (cherry picked from commit 7a136d595f1b3b48128afdb9bd110a40aec771af) sys-utils/lscpu-arm.c | 2 ++ 1 file changed, 2 insertions(+) commit c399bc797d4bdfaed6ca9ad22c1e11fc35b96341 Author: Karel Zak Date: Mon Jun 3 12:33:01 2024 +0200 libmount: fix tree FD usage in subdir hook * Initialize the tree file descriptor in the hook_subdir.c module if it has not been initialized yet. (hook_mount.c does not open the tree if the mount. helper will be executed.) * Move the function to open the tree to context.c to make it more generic and usable in more places. Reported-by: Linus Heckemann Signed-off-by: Karel Zak (cherry picked from commit 2a684833d723e29af0ba772b3e6917492c69e023) libmount/src/context.c | 41 +++++++++++++++++++++++++++++++++++++++++ libmount/src/hook_mount.c | 43 +++---------------------------------------- libmount/src/hook_subdir.c | 31 +++++++++++++++++++------------ libmount/src/mountP.h | 3 +++ 4 files changed, 66 insertions(+), 52 deletions(-) commit 9aa18ade22b55f7db28217a6d02bfd6f95f88f64 Author: Chen Qi Date: Sat May 25 11:41:35 2024 +0800 libsmartcols/src/Makemodule.am: ensure filter-scanner/paser.c file is newer than the .h file In released tarball, for filter-scanner/parser, the .h and the .c file has the same mtime. The 'make' tool thinks .h is newer than the .c file, thus deciding to remake it. This will not only cause unnecessary rebuild, but also parallel make error. For example, after 'make', when running 'make install', the libmount.la and findmnt are both rebuilt and findmnt building will somethings error out complaining 'libmount.so: no such file or directory' or 'libmount.so: file format not recognized'. Touch the generated .c file to ensure it's newer than the .h file. In this way, in new released tarballs in the future, there will be no unnecessary remake. fixes util-linux/util-linux#3061 Signed-off-by: Chen Qi (cherry picked from commit bf751e8effcc348495aa3a7aeb7a4257cf2ffa6e) libsmartcols/src/Makemodule.am | 2 ++ 1 file changed, 2 insertions(+) commit 77778b99fd842b2b03f603147544e1d31502c074 Author: Karel Zak Date: Wed May 15 15:45:19 2024 +0200 libsmartcols: fix reduction stages use There is no proper check for the number of reduction stages, so in some cases, the code can loop indefinitely. The patch also fixes 'rc' variable shadowing. Fixes: https://github.com/util-linux/util-linux/issues/3046 Signed-off-by: Karel Zak (cherry picked from commit 8a01276a3c5bc09dce342e087019c704d8c56a32) libsmartcols/src/calculate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit f4641e961c793e79c6e5322ad9552eaaf0291998 Author: Jordan Williams Date: Tue May 7 09:40:44 2024 -0500 meson: Correctly require the Python.h header for the python dependency The current solution to require the Python.h header works around a bug in Meson that has been fixed for version 1.4.1 of Meson. Refer to https://github.com/mesonbuild/meson/issues/12862. This change uses an explicit check for the Python.h include. This verifies the required header exists. This check is only necessary prior to version 1.4.1 of Meson. Signed-off-by: Jordan Williams (cherry picked from commit 7e582204cd7cac2b55a2f7c0fb06899fcf7ff5df) libmount/python/meson.build | 5 +++++ 1 file changed, 5 insertions(+) commit 69ae361c0854831ef226c2b1bc4525b6d54fb9d5 Author: Jordan Williams Date: Thu May 9 16:46:58 2024 -0500 meson: Only require Python module when building pylibmount Only the python executable is required for tests. Version 1.4.1 of Meson will require the Python.h for find_installation. This will result in the tests requiring Python.h unnecessarily. Use find_program to find the Python program for the tests instead. Signed-off-by: Jordan Williams (cherry picked from commit cb7ac65dcaf655ea5dedf8820ab6417629241aa4) libmount/python/meson.build | 5 +++++ meson.build | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) commit c29188955fdaf8e595e7a0e5215b847cf57784c1 Author: Jordan Williams Date: Mon May 13 07:25:50 2024 -0500 meson: Fix build-python option The build-python option is for controlling whether or not pylibmount is built. Unfortunately, commit b6799cc rendered the option unused. This change uses the build-python option again. Signed-off-by: Jordan Williams (cherry picked from commit b66b70d62e50923502aeb3f6420a5f9c20f769d3) libmount/python/meson.build | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 497385c0ad0a6fa4d02a266ab8298406362203b9 Author: Rom Date: Sat May 11 11:41:39 2024 -0700 Fix fstab order in `column` manpage example. fstab is: 1. fs_spec 2. fs_file 3. fs_vfstype 4. fs_mntops 5. fs_freq 6. fs_passno In other words it's: SOURCE,TARGET,TYPE,OPTIONS,FREQ,PASS (cherry picked from commit 7f4ffbc2e6740f829b45c0801fdfadea966615d5) text-utils/column.1.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 347f2cc58d1df1a5cfd4d8d6ab404932239bc2ba Author: Mike Yuan Date: Sat May 11 01:11:28 2024 +0800 libmount/utils: add pidfs to pseudo fs list (cherry picked from commit 62cf52f81d5baaba2cfe6dfe00aa4975ebd55d92) libmount/src/utils.c | 1 + 1 file changed, 1 insertion(+) commit a42b43f6ae6bcb474ccdc701753d97cc54e48b87 Author: Mike Yuan Date: Sat May 11 01:03:51 2024 +0800 mkswap.8.adoc: update note regarding swapfile creation Follow-up for 7377b0d99560460806eab9efa9d8224d084c2082 (the addition of --file option) (cherry picked from commit 7b4e937c862ea84e1568b01cd5ec69918920f9a5) disk-utils/mkswap.8.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5665b1ff86cea4e40350359121ebbcb6d226ac62 Author: Daan De Meyer Date: Thu May 9 12:32:31 2024 +0200 Fix ul_path_read_buffer() The current implementation cuts off the last character of the buffer if there is no trailing newline. (cherry picked from commit 6273c12257973cbd3c59a710049ee8a8027bbbb1) lib/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)