tests: (test_mkfds::mapped-packet-socket) add a new parameter, protocol

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit a6584a456835bbef703d7aae1f51d4e07177f8cb)

lsfd: fix the description for PACKET.PROTOCOL column

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit df3b38fab56001537364302479b33cb104ef7411)

Fix typo in blkdiscard docs

(cherry picked from commit 7d181e8f1ecdeca764b62f1daf0bb13cec349e7e)

lsns: enhance compilation without USE_NS_GET_API

- Move add_namespace_for_nsfd() declaration to the #ifdef block
(based on c62ed3d58602fd29fe12085f7caf03761ed91b81)

References: 2ced43400f35f7bd45b29364e04166a63a06e16a
Signed-off-by: Karel Zak <kzak@redhat.com>

lsns: fix undefined reference to add_namespace_for_nsfd #3483

Fixes:

sys-utils/lsns-lsns.o: In function `read_process':
lsns.c:(.text+0x9e8): undefined reference to `add_namespace_for_nsfd'
collect2: error: ld returned 1 exit status

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 2ced43400f35f7bd45b29364e04166a63a06e16a)

libmount: fix --no-canonicalize regression

Fixes: https://github.com/util-linux/util-linux/issues/3474
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7dbfe31a83f45d5aef2b508697e9511c569ffbc8)

meson: fix manadocs for libsmartcols and libblkid

Fixes: https://github.com/util-linux/util-linux/issues/3475
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 531b2afd4ef3016b14fff41eef208ead5213138e)

meson: fix po-man installation

* in po-man/meson.build use already defined mandir
* make sure $DESTDIR is used in the install script

Addresses: https://github.com/util-linux/util-linux/pull/3378
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 56b97db03a56d90f0480885a35b0383afabc2e18)

misc: never include wchar.h

We have a portable "widechar.h" that follows --disable-widechar and
provides portability. It is a bug to directly include libc's wchar.h
or wctype.h.

Fixes: https://github.com/util-linux/util-linux/issues/3470
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 5c0888dde3cc296d06b8243dcc78248ff90526e5)

autotools: don't use wide-character ncurses if --disable-widechar

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 23aa09d7baec72cf6bac9d32c844a5bd2a6ef609)

column: fix compiler warning for non-widechar compilation

text-utils/column.c: In function ‘ansi_esc_width’:
text-utils/column.c:212:17: warning: case label value exceeds maximum value for type [-Wswitch-outside-range]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 0e28ab361375036f62dbba9d589576d38f43f157)

lib/fileeq.c Fix a typo in message.

This patch fixes a spelling typo in a command message.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
(cherry picked from commit ccda6b9abde4425c03bf9c8da967fa02a64d0887)

irqtop,lsirq: use scols debug

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit b7f5e6bba0b77c50eff53d5a9079403cde4cfc18)

build-sys: update release dates

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update v2.41-ReleaseNotes

Signed-off-by: Karel Zak <kzak@redhat.com>

po: update uk.po (from translationproject.org)

po: update ro.po (from translationproject.org)

po: update pl.po (from translationproject.org)

po: update nl.po (from translationproject.org)

po: update ko.po (from translationproject.org)

po: update hr.po (from translationproject.org)

po: update fr.po (from translationproject.org)

po-man: merge changes

po-man: add pl.po (from translationproject.org)

po-man: update uk.po (from translationproject.org)

po-man: update ro.po (from translationproject.org)

po-man: update fr.po (from translationproject.org)

po-man: fix typos in configuration

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 126ef957f7c5d42a4ef51353d521eee6e22b8015)

terminal-colors.d: support NO_COLOR

We already provide the ability to easily disable output colorization,
but there is also the https://no-color.org initiative based on the
NO_COLOR environment variable. Let's support this method to disable
colors. Let's be friendly :-)

Addresses: https://github.com/util-linux/util-linux/issues/3463
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 61bd162fa1246a1d296cf943d12f7c01c8053b10)

su: (man) fix duplicate asterisk

Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 1b317ef942bf007d2c765a390d2087a79a6de766)

include: use public domain for colors.{c,h} and xalloc.h

The LGPL makes it difficult to use the code in the old BSD tools we
have in util-linux. After obtaining agreement from the major
contributors to the files, we are changing it to "Public Domain".

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 549a5178574364a2bd219ad1ed028f4f4ea71c3d)

unshare: fix typo in --map-groups=subids map name [coverity scan]

Addresses: https://github.com/util-linux/util-linux/pull/3121
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 9dd140220c6d6c53383405191001c7372488d264)

Use ipc_stat::cgid for the column COL_CGID.

(cherry picked from commit c64c64b7683695828a6fef044c7193cfa0461be9)

lsfd: (man) fix a typo

(cherry picked from commit d6cdde2d6b9482c1cb790bd17c84fc31a2fad410)

various: (man) list --help and --version last among the options

Almost all util-linux man pages mention -h/--help and -V/--version
last in the list of options.  Make the few deviant pages conform.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 77b01d90dad212e57fa801e2eccda9724d102c0b)

more: remove a duplicate call of setlocale()

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 361718387dc19334d060b5f303cd9fe1c19af01e)

lslogins: fix typo

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit ede1561d2071e0da859cbdd36bee8cf07807caf4)

hwclock: avoid dereferencing a pointer [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 16c1d8734847bdeac0e6650a7364e33fb881bfc6)

lsfd: initialize struct stat [coverity scan]

It's probably unnecessary, but for a complicated function, it's
probably better just to keep the static analyzer happy.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit e05e2b4f89a00fadc1032ad7720fefdd99dca029)

unshare: make strings more robust

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit ad591f1a8e5917cd41d91de18626494e072414f8)

liblastlog2: (test) fix memory leak in failed test [coverity scan]

This is just a cosmetic change to satisfy the static analyzer. The
free-before-exit is unnecessary, but in this case (library test), it's
better.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 2e6cc76741a580b9338ab679cf96375eb1084e92)

libmount: remove possible leak in mnt_context_guess_srcpath_fstype() [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 6e2127384ba267119311437b233e413e16ef8721)

test_sysinfo: remove memory lea [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 87c1ea68155b88ccdc07069c267a3121468d72c8)

lslogins: remove possible memory leaks [coverity scan]

The column can be specified more than once. In this case, the code
will gather the column data multiple times, resulting in a memory
leak.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 52a6e45bfe5ddee1fed20f2f4f7542cac6bf13c9)

more: fix repeat command

The function more_key_command() may modify the current command setting.
We need to remember the original unmodified version, as specified by
the user, as the previous command; otherwise, the output will be affected
by unexpected cmd.number settings.

Simple reproducer:

 $ more -c /etc/passwd

 - Press <enter> to jump to the next line.
 - Press '.' to repeat the last command.

Old version:
 - It clears the screen and prints only one line (like the "1 <enter>" command).
Fixed version:
 - It jumps to the next line (like the "<enter>" command).

Reported-by: Benno Schulenberg <bensberg@telfort.nl>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 5be4bdf81a8e89b98b12db275deb6154f87feb4b)

swapon: remove unnecessary variable usage

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7dd72369680323a1c01dd7226e1158741cc8d55d)

irqtop,lsirq: set up locale path, so messages get actually translated

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 7a912b98f99131049f91c1a3f53c4f51075ac348)

swapon: make options --help and --version override --summary

When -h or --help is among the given options, most utilities
print a help text, ignoring all other options and arguments.
Make `swapon --summary --help` conform to this general pattern.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit ad9b9058721a7322f702d5c9beea6e77cd923377)

lsfd: (man) fix a typo

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit beaa7dd93ed336c7e486f1200feeaaec50bb8e52)

tools/poman-translate: fix to work outside on source dir

* Let's check only the adoc file name if defined in po4a.cfg, not the
  complete path.

 cd ..
 meson setup build-dir util-linux
 ninja -C build-dir

* Exclude manpage-stub.adoc (it's just an example)

Addresses: https://github.com/util-linux/util-linux/pull/3378
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 95833d8e5e32dea9781873cbbd4e8b01e02d8bad)

meson: bring hexdump in line with others

Before it was different, and the executable was not installed.

(cherry picked from commit ecd8d1e56ca5aeef0b47f3a2b855b83e121359b8)

autotools: add missing meson.build files

Fixes: https://github.com/util-linux/util-linux/issues/3460
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit b8d8e3c7a03e36e3e4ef1c31416f7ef1e36a3e58)

tools: add SPDX-License-Identifier

Add an SPDX label to the newly added scripts.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit f4c71fbb24a0a47e1c9e9d834bc05f4c02bdc4c7)

sys-utils/chmem: fix typo.

(cherry picked from commit 43d88060d368c17c7ca572f13ced42c255c540ab)

lscpu: New Arm part numbers

Arm has announced the Cortex-A320 and published the TRM here:
https://developer.arm.com/documentation/109551

The Cortex-A520AE with a TRM here:
https://developer.arm.com/documentation/107726

The Cortex-A720AE with a TRM here:
https://developer.arm.com/documentation/102828

The Neoverse-V3AE with a TRM here:
https://developer.arm.com/documentation/101595

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
(cherry picked from commit be77fa82ad491f38537030c329c2a8e0612506a5)

exch: cosmetic code changes

* Remove unnecessary dirfd (use AT_FDCWD directly)
* Remove unnecessary 'rc' variable

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 6bef160562189a72c6f5c779cb7e06e72a0fe6bc)

exch: fix compile error if renameat2 is not present

https://www.man7.org/linux/man-pages/man2/rename.2.html
Available since Linux 3.15 or glibc 2.28,
add a fallback for older systems.

My initial implementation did the exchange using a swap
file if both HAVE_RENAMEAT2 and SYS_renameat2 were absent.
But that is not really what is desired since exch is supposed
to be atomic. So simply return -1 renameat2 is available.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 72a99516f7bdf72411501d0a04cc8f8a7e562d10)

{configure.ac,meson.build}: conditionally build {enosys,setpriv} if seccomp is present #3280

misc-utils/enosys.c:25:27: fatal error: linux/seccomp.h: No such file or directory
 #include <linux/seccomp.h>

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 8de1ec203b0fbf86ae67b1ac18ba094d36b6a34a)

build-sys: update release dates

Signed-off-by: Karel Zak <kzak@redhat.com>

tests: update lsmem outputs

Addresses: 68c9f5578230b8a715204d7f05b52b65f97f808a
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 0e08b4300efac2230d65bdbc737985e399b168d7)

tools/git-version-bump: add from master branch

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update v2.41-rc2-ReleaseNotes

Signed-off-by: Karel Zak <kzak@redhat.com>

tools/git-grouped-log: sort output

Signed-off-by: Karel Zak <kzak@redhat.com>

tools/git-grouped-log: add from master branch

Signed-off-by: Karel Zak <kzak@redhat.com>

tools/git-tp-sync: update also po-man

Signed-off-by: Karel Zak <kzak@redhat.com>

po-man: merge changes

tools/git-tp-sync: fix checkout -f use

Signed-off-by: Karel Zak <kzak@redhat.com>

po: merge changes

po: update nl.po (from translationproject.org)

po: update es.po (from translationproject.org)

hardlink: replace a strange word in an error message

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit bd83387e25fca9e3fbeb6787b421b24673d7ac8c)

lsmem: increase the available width for the summary text labels

This allows the subsequent numbers to get vertically aligned for
most translations too.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 68c9f5578230b8a715204d7f05b52b65f97f808a)

tests: (lsns/nsfs) consider the cases that lsns returns multiple paths

Fixes #3442

If a target directory is bind-mount'ed, lsns returns multiple paths
as the value for NSFS column. This change considers this case.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit dc5c86e91aa9a8fa386896865e069383c5bc4cac)

tests: (lsns/nsfs) check test_sysinfo helper

This check was missed though the command was used in
the test case.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit f39d142bfea2471ea94cb17de884642e8fcbc880)

tests: improve test_sysinfo to check for NS_GET_NSTYPE usability

Now the test checks if the kernel supports the NS_GET_NSTYPE ioctl,
but it seems that on some platforms it's implemented but does not work
as expected and returns ENOTTY.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 4391638806a40b71383646a33ed022476f4c9dea)

tests: check for ns-get*-ok

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 4f6135531ceb808e721f36937c0a11c865bb4bd8)

ci: bump uraimo/run-on-arch-action to v3

The latest v3 version should address the sporadic segfaults we've been
seeing (mainly on s390x).

(cherry picked from commit 14707be7318936a6bed2f1bba5dc7b8741e83992)

Revert "ci: temporarily switch the alt-arch job worker to Ubuntu 22.04"

This reverts commit c389f166e5c35e3a7d91205997b75bec5d4353fb.

(cherry picked from commit fca77fea84d080547714f5c866c0775d04b61125)

fallocate: rework incompatible options

Follow up to d95f9a6, addressing ordering requirements, natural
incompatibilities between various options, and limitations of
posix_fallocate.

(cherry picked from commit 7130d901f1867061514296395589fe004a3e4bec)

test_mkfds: disable ppoll multiplexer if sigset_t is not defined

Fixes #3432

The ppoll multiplexer requires RAW sigset_t type generally defined in
asm/linux.h. However, the parisc arch of the kernel older than
487fa28fa8b60417642ac58e8beda6e2509d18f9 didn't export the type to
the user space.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit 82390c030674ec496ab70b143c54f7e961f45a48)

test_mkfds: remove local pidfd_open() fallback

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 3664cacaafa4834b0b7702da9e4df0aef9700263)

include/pidfd-utils: improve robustness

* remove global UL_HAVE_PIDFD, in many cases we need only subset of pidfd
  kernel API, rrather than all the functios

* improve #ifdefs for pidfd_*() direct syscalls

* improve dummy fallback to not redefine system header files

Fixes: https://github.com/util-linux/util-linux/issues/3437
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 4a1053812f396619070b6849f4d8830c1ee272ee)

column: replace a mistaken word in an error message

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 455e609f06810d01336b61a273673e4fddeb33c2)

misc-utils/lastlog2: Add option -a for listing active users only

(cherry picked from commit 00bd8b9fc1369706d973b5e3cd1f2f7320ed9426)

sys-utils/lscpu: Change object type to SCOLS_JSON_STRING if data == "-"

(cherry picked from commit 049901c63ea7ad8a1e0ba4feeaf7360dbf4bdc2f)

include/mount-api-utils: improve coding style

Improve the alignment of comments and other elements.

Signed-off-by: Karel Zak <kzak@redhat.com>

mount: (man) add info about info messages

Signed-off-by: Karel Zak <kzak@redhat.com>

fdisk: (man) add note about partition size calculation

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 57df7ea01b2c3dddbe88651cbd1db9ab0b6c94f2)

libmount: add support for STATMOUNT_SB_SOURCE

* read mount source by statmount() 9requires kernel >=6.14
* add new STATMOUNT_* masks

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 781a960cef0599db0aca074403db87f24394c1af)

scriptlive: improve some descriptions, markup, and grammar in the manpage

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 2263c16364b2248e73b9efd1c33c01bb190ba4a6)

scriptlive: reduce two usage synopses to one simple one

No synopsis can show all possible permutattions of arguments and
options, so do not even try and just give the most basic form,
without unneeded -t, -I, or -B.

Also, use angle brackets to show that <timingfile> and <typescript>
are placeholders.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 921b4fe498edde7d1d5c280d6d50050d18d97b44)

scriptreplay: mark literal values in the man page in bold, not italic

Also, mention which keys can be used to speed up, slow down, and pause
the replay.  Shorten the description of '-s' as it is deprecated.  And
improve the description of '-t': it does not override the _timingfile_
positional argument, but takes the place of it, makes it unneeded.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit df2353c92ed5ea632826a4b81f22cb38f944407c)

scriptreplay: reduce two usage synopses to one, and drop the -t from it

Those two synopses still did not express several possible forms:

    scriptreplay -m.1 timings
    scriptreplay typescript -t timings -m.1
    ...

So, instead of trying to cover all possibilities, just give the
basic form of the command, which is clearest and most helpful.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 6a408bdc6596a70cffa40d8fa129508de1410b21)

scriptreplay: make Up/Down keys use a percentage instead of fixed amount

Using a fixed 0.1 amount made each subsequent Down-arrow key slow things
down _more_, and each subsequent Up-arrow key speed things up _less_.
It's nicer when each subsequent keystroke has the same relative effect.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 2b528997f22c2784bf09d492842833f3a1e38ab0)

scriptreplay: indicate that <divisor> is conditional on <typescript>

Also, use angle brackets to show that those words are placeholders,
not literals, and improve the descriptions of the key bindings.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit d2c323bc41dd276bc0678a06b77cceca52a2ec1d)

autotools: Fix use of mq_open and mq_close

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7ef6bd05f88b6149a0160877856c6155ef6c7130)

Libmount: Fix removal of "owner" option when executed as root

When executed as root, libmount replaces the "owner" and "group" mount
options with "nosuid, nodev, ..." However, this can result in an
"invalid argument" error because libmount removes the unwanted options
first and then tries to address the location for the new options using
the already removed options. To fix this, we need to reverse the order
of operations.

Reported-by: hxinzhe <hxinzhe1024@163.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 4aa39b894dbb80eab45af53a011224a43b687b94)

agetty: fix stdin conversion to tty name

Addresses: https://github.com/util-linux/util-linux/issues/3304
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit bd6c104f931329ce6fbc5a1250c8c80a1d8223ee)

po: merge changes

po: update LINGUAS list