]> git.ipfire.org Git - thirdparty/util-linux.git/log
thirdparty/util-linux.git
24 hours agoMerge branch 'PR/lsns-fix-netns' of github.com:karelzak/util-linux-work master
Karel Zak [Tue, 23 Apr 2024 09:06:05 +0000 (11:06 +0200)] 
Merge branch 'PR/lsns-fix-netns' of github.com:karelzak/util-linux-work

* 'PR/lsns-fix-netns' of github.com:karelzak/util-linux-work:
  lsns: fix netns use

24 hours agoMerge branch 'PR/libmount-utab-access' of github.com:karelzak/util-linux-work
Karel Zak [Tue, 23 Apr 2024 09:05:42 +0000 (11:05 +0200)] 
Merge branch 'PR/libmount-utab-access' of github.com:karelzak/util-linux-work

* 'PR/libmount-utab-access' of github.com:karelzak/util-linux-work:
  libmount: Fix access check for utab in context

45 hours agolsns: fix netns use
Karel Zak [Mon, 22 Apr 2024 12:28:52 +0000 (14:28 +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 <kzak@redhat.com>
46 hours agolibfdisk: add missing va_end() [coverity scan]
Karel Zak [Mon, 22 Apr 2024 11:55:23 +0000 (13:55 +0200)] 
libfdisk: add missing va_end() [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
46 hours agolibmount: Fix access check for utab in context
Karel Zak [Mon, 22 Apr 2024 11:09:04 +0000 (13:09 +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 <kzak@redhat.com>
47 hours agoMerge branch 'typofix' of https://github.com/uudiin/util-linux
Karel Zak [Mon, 22 Apr 2024 10:05:58 +0000 (12:05 +0200)] 
Merge branch 'typofix' of https://github.com/uudiin/util-linux

* 'typofix' of https://github.com/uudiin/util-linux:
  libmount: fix comment typo for mnt_fs_get_comment()

47 hours agoMerge branch 'fix' of https://github.com/DaanDeMeyer/util-linux
Karel Zak [Mon, 22 Apr 2024 10:05:20 +0000 (12:05 +0200)] 
Merge branch 'fix' of https://github.com/DaanDeMeyer/util-linux

* 'fix' of https://github.com/DaanDeMeyer/util-linux:
  agetty: Don't override TERM passed by the user

47 hours agoMerge branch 'lsns--filter-option-in-usage' of https://github.com/masatake/util-linux
Karel Zak [Mon, 22 Apr 2024 10:05:05 +0000 (12:05 +0200)] 
Merge branch 'lsns--filter-option-in-usage' of https://github.com/masatake/util-linux

* 'lsns--filter-option-in-usage' of https://github.com/masatake/util-linux:
  lsns: add --filter option to the --help optout and the completion rule

47 hours agoMerge branch 'meson-build-dmesg' of https://github.com/jwillikers/util-linux
Karel Zak [Mon, 22 Apr 2024 10:04:25 +0000 (12:04 +0200)] 
Merge branch 'meson-build-dmesg' of https://github.com/jwillikers/util-linux

* 'meson-build-dmesg' of https://github.com/jwillikers/util-linux:
  meson: Add build-dmesg option

47 hours agoMerge branch 'meson-fix-absolute-check' of https://github.com/jwillikers/util-linux
Karel Zak [Mon, 22 Apr 2024 10:03:51 +0000 (12:03 +0200)] 
Merge branch 'meson-fix-absolute-check' of https://github.com/jwillikers/util-linux

* 'meson-fix-absolute-check' of https://github.com/jwillikers/util-linux:
  meson: Use is_absolute to determine if the prefix directory is absolute

47 hours agolsblk: simplify SOURCES code
Karel Zak [Mon, 22 Apr 2024 09:51:56 +0000 (11:51 +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 <kzak@redhat.com>
2 days agolibmount: fix comment typo for mnt_fs_get_comment()
Tianjia Zhang [Mon, 22 Apr 2024 06:01:25 +0000 (14:01 +0800)] 
libmount: fix comment typo for mnt_fs_get_comment()

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
2 days agofindmnt: always zero-terminate SOURCES data
Thomas Weißschuh [Sun, 21 Apr 2024 18:00:31 +0000 (20:00 +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 <thomas@t-8ch.de>
4 days agoagetty: Don't override TERM passed by the user
Daan De Meyer [Fri, 19 Apr 2024 18:07:47 +0000 (20:07 +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
4 days agolsns: add --filter option to the --help optout and the completion rule
Masatake YAMATO [Fri, 19 Apr 2024 17:17:05 +0000 (02:17 +0900)] 
lsns: add --filter option to the --help optout and the completion rule

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
5 days agomeson: Add build-dmesg option
Jordan Williams [Wed, 17 Apr 2024 16:13:59 +0000 (11:13 -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 <jordan@jwillikers.com>
5 days agomeson: Use is_absolute to determine if the prefix directory is absolute
Jordan Williams [Wed, 17 Apr 2024 15:08:40 +0000 (10:08 -0500)] 
meson: Use is_absolute to determine if the prefix directory is absolute

Meson's check for an absolute path does not work on Windows.
Meson 0.54.0 introduced the fs.is_absolute function.
Use this instead.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
5 days agodocs: update README
Karel Zak [Thu, 18 Apr 2024 11:15:17 +0000 (13:15 +0200)] 
docs: update README

Signed-off-by: Karel Zak <kzak@redhat.com>
6 days agoMerge branch 'meson-fix-build-ipcrm-option' of https://github.com/jwillikers/util...
Karel Zak [Thu, 18 Apr 2024 07:42:25 +0000 (09:42 +0200)] 
Merge branch 'meson-fix-build-ipcrm-option' of https://github.com/jwillikers/util-linux

* '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

6 days agoMerge branch 'PR/from-coverity' of github.com:karelzak/util-linux-work
Karel Zak [Thu, 18 Apr 2024 07:08:37 +0000 (09:08 +0200)] 
Merge branch 'PR/from-coverity' of github.com:karelzak/util-linux-work

* 'PR/from-coverity' of github.com:karelzak/util-linux-work:
  lslocks: remove deadcode [coverity scan]
  hardlink: use xcalloc rather than xmalloc

6 days agoMerge branch 'uuid/variant' of https://github.com/t-8ch/util-linux
Karel Zak [Thu, 18 Apr 2024 07:08:21 +0000 (09:08 +0200)] 
Merge branch 'uuid/variant' of https://github.com/t-8ch/util-linux

* 'uuid/variant' of https://github.com/t-8ch/util-linux:
  uuidparse: only report type/version for DCE variant

6 days agoMerge branch 'PR/fdisk-trim' of github.com:karelzak/util-linux-work
Karel Zak [Thu, 18 Apr 2024 07:08:05 +0000 (09:08 +0200)] 
Merge branch 'PR/fdisk-trim' of github.com:karelzak/util-linux-work

* 'PR/fdisk-trim' of github.com:karelzak/util-linux-work:
  blkdiscard: (man) add note about fdisk
  fdisk: add 'T' command to discard sectors
  libfdisk: add fdisk_ask_menu()
  fdisk: improve list_freespace()

6 days agomeson: Require the seminfo type for ipcmk, ipcrm, and ipcs
Jordan Williams [Wed, 17 Apr 2024 16:56:09 +0000 (11:56 -0500)] 
meson: Require the seminfo type for ipcmk, ipcrm, and ipcs

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
6 days agomeson: Add build-ipcmk option
Jordan Williams [Wed, 17 Apr 2024 16:37:04 +0000 (11:37 -0500)] 
meson: Add build-ipcmk option

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
6 days agomeson: Add missing check for build-ipcrm option
Jordan Williams [Wed, 17 Apr 2024 16:11:21 +0000 (11:11 -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 <jordan@jwillikers.com>
6 days agoMerge branch 'sed' of https://github.com/t-8ch/util-linux
Karel Zak [Wed, 17 Apr 2024 11:08:34 +0000 (13:08 +0200)] 
Merge branch 'sed' of https://github.com/t-8ch/util-linux

* 'sed' of https://github.com/t-8ch/util-linux:
  all_errnos/all_syscalls: use sed to extract defines from headers

6 days agolslocks: remove deadcode [coverity scan]
Karel Zak [Wed, 17 Apr 2024 10:46:50 +0000 (12:46 +0200)] 
lslocks: remove deadcode [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
6 days agohardlink: use xcalloc rather than xmalloc
Karel Zak [Wed, 17 Apr 2024 10:43:30 +0000 (12:43 +0200)] 
hardlink: use xcalloc rather than xmalloc

Signed-off-by: Karel Zak <kzak@redhat.com>
7 days agoMerge branch 'PR/libsmartcols-fix-wrap' of github.com:karelzak/util-linux-work
Karel Zak [Wed, 17 Apr 2024 07:50:52 +0000 (09:50 +0200)] 
Merge branch 'PR/libsmartcols-fix-wrap' of github.com:karelzak/util-linux-work

* 'PR/libsmartcols-fix-wrap' of github.com:karelzak/util-linux-work:
  libsmartcols: (sample) add wrap repeating example
  libsmartcols: reset wrap after calculation

7 days agoblkdiscard: (man) add note about fdisk
Karel Zak [Fri, 12 Apr 2024 09:30:15 +0000 (11:30 +0200)] 
blkdiscard: (man) add note about fdisk

Signed-off-by: Karel Zak <kzak@redhat.com>
7 days agofdisk: add 'T' command to discard sectors
Karel Zak [Tue, 16 Apr 2024 11:36:32 +0000 (13:36 +0200)] 
fdisk: add 'T' command to discard sectors

We currently have blkdiscard(8), but it can be difficult to use for
unpartitioned areas or for partitions when working with a whole-disk
device.

This commit adds BLKDISCARD support to fdisk, so that the user does
not have to specify any range, but instead follows the partition
table.

Addresses: https://github.com/util-linux/util-linux/issues/2804
Signed-off-by: Karel Zak <kzak@redhat.com>
7 days agolibfdisk: add fdisk_ask_menu()
Karel Zak [Tue, 16 Apr 2024 11:31:55 +0000 (13:31 +0200)] 
libfdisk: add fdisk_ask_menu()

Currently, only libfdisk has the ability to prompt the user with a
menu. However, this functionality is not accessible through the public
library API. This commit exports this functionality through the use of
a simple function, fdisk_ask_menu().

Signed-off-by: Karel Zak <kzak@redhat.com>
7 days agouuidparse: only report type/version for DCE variant
Thomas Weißschuh [Wed, 17 Apr 2024 07:27:08 +0000 (09:27 +0200)] 
uuidparse: only report type/version for DCE variant

The type/version is only defined in scope for the DCE variant.

From RFC4122 Section 4.1.1:

"the interpretation of all other bits in the UUID depends on the setting
of the bits in the variant field."

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
7 days agofdisk: improve list_freespace()
Karel Zak [Fri, 12 Apr 2024 09:13:39 +0000 (11:13 +0200)] 
fdisk: improve list_freespace()

Make the function usable in other dialogs:

* Return a table of the free spaces.
* Return the "best" table entry (to be used as the default in
  dialogs).
* Print the order number of entries.

Signed-off-by: Karel Zak <kzak@redhat.com>
7 days agolsfd: add meson.build for the command
Masatake YAMATO [Tue, 16 Apr 2024 20:32:12 +0000 (05:32 +0900)] 
lsfd: add meson.build for the command

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
7 days agoall_errnos/all_syscalls: use sed to extract defines from headers
Thomas Weißschuh [Tue, 16 Apr 2024 19:56:22 +0000 (21:56 +0200)] 
all_errnos/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 <glaubitz@physik.fu-berlin.de>
Link: https://lore.kernel.org/util-linux/051624b9256db27a731d62c031cb627d9f5a256e.camel@physik.fu-berlin.de/
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
8 days agolsfd: (po-man) update po4a.cfg
Karel Zak [Tue, 16 Apr 2024 09:53:45 +0000 (11:53 +0200)] 
lsfd: (po-man) update po4a.cfg

Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agoMerge branch 'lsfd-cmd--dir' of https://github.com/masatake/util-linux
Karel Zak [Tue, 16 Apr 2024 09:36:34 +0000 (11:36 +0200)] 
Merge branch 'lsfd-cmd--dir' of https://github.com/masatake/util-linux

* 'lsfd-cmd--dir' of https://github.com/masatake/util-linux:
  lsfd: move the source code to new ./lsfd-cmd directory

8 days agoMerge branch 'getwc' of https://github.com/t-8ch/util-linux
Karel Zak [Tue, 16 Apr 2024 09:28:53 +0000 (11:28 +0200)] 
Merge branch 'getwc' of https://github.com/t-8ch/util-linux

* 'getwc' of https://github.com/t-8ch/util-linux:
  textutils: introduce and use fgetwc_or_err
  treewide: use fgetc() instead of getc()
  textutils: use fgetwc() instead of getwc()

8 days agoMerge branch 'awk' of https://github.com/t-8ch/util-linux
Karel Zak [Tue, 16 Apr 2024 09:21:56 +0000 (11:21 +0200)] 
Merge branch 'awk' of https://github.com/t-8ch/util-linux

* 'awk' of https://github.com/t-8ch/util-linux:
  all_errnos/all_syscalls: don't hardcode AWK invocation
  all_errnos/all_syscalls: don't warn during cleanup
  all_errnos/all_syscalls: fail if any step fails

8 days agoMerge branch 'patch-1' of https://github.com/I-use-Arch-btw-00111/util-linux
Karel Zak [Tue, 16 Apr 2024 09:19:03 +0000 (11:19 +0200)] 
Merge branch 'patch-1' of https://github.com/I-use-Arch-btw-00111/util-linux

* 'patch-1' of https://github.com/I-use-Arch-btw-00111/util-linux:
  (minor) update sulogin.c

8 days agolibsmartcols: (sample) add wrap repeating example
Karel Zak [Tue, 16 Apr 2024 08:57:37 +0000 (10:57 +0200)] 
libsmartcols: (sample) add wrap repeating example

Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agolibsmartcols: reset wrap after calculation
Karel Zak [Tue, 16 Apr 2024 08:49:31 +0000 (10:49 +0200)] 
libsmartcols: reset wrap after calculation

Fixes: https://github.com/util-linux/util-linux/issues/2956
Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agoall_errnos/all_syscalls: don't hardcode AWK invocation
Thomas Weißschuh [Tue, 16 Apr 2024 07:26:22 +0000 (09:26 +0200)] 
all_errnos/all_syscalls: don't hardcode AWK invocation

Use the buildsystem to find a usable awk implementation and use that.

Reported-by: Firas Khalil Khana <firasuke@gmail.com>
Link: https://github.com/util-linux/util-linux/pull/2949
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
https://lore.kernel.org/util-linux/31ccace2e5912ffc428e065cd66764088c625c4d.camel@physik.fu-berlin.de/
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
8 days agoall_errnos/all_syscalls: don't warn during cleanup
Thomas Weißschuh [Tue, 16 Apr 2024 07:14:28 +0000 (09:14 +0200)] 
all_errnos/all_syscalls: don't warn during cleanup

On failure the output files may not have been created.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
8 days agoall_errnos/all_syscalls: fail if any step fails
Thomas Weißschuh [Tue, 16 Apr 2024 07:00:41 +0000 (09:00 +0200)] 
all_errnos/all_syscalls: fail if any step fails

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
8 days ago(minor) update sulogin.c
Leaflet [Mon, 15 Apr 2024 16:52:19 +0000 (16:52 +0000)] 
(minor) update sulogin.c

Make the root password prompt more technical

8 days agolibsmartcols: (filter) emulate YYerror for old Bison
Karel Zak [Mon, 15 Apr 2024 12:14:53 +0000 (14:14 +0200)] 
libsmartcols: (filter) emulate YYerror for old Bison

The special YYerror token is supported in Bison 3.6 and above.
Fortunately, it is possible to emulate this functionality in older
versions as well.

Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agolibsmartcols: (filter) check vasprintf() return value
Karel Zak [Mon, 15 Apr 2024 10:53:46 +0000 (12:53 +0200)] 
libsmartcols: (filter) check vasprintf() return value

Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agolibsmartcols: (filter) accept prefixes like k, M, G as a parts of a number
Karel Zak [Mon, 15 Apr 2024 10:34:31 +0000 (12:34 +0200)] 
libsmartcols: (filter) accept prefixes like k, M, G as a parts of a number

Co-Author: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agolibsmartcols: (filter) use variable argument lists for yyerror()
Karel Zak [Mon, 15 Apr 2024 09:59:01 +0000 (11:59 +0200)] 
libsmartcols: (filter) use variable argument lists for yyerror()

Signed-off-by: Karel Zak <kzak@redhat.com>
8 days agolibsmartcols; (filter) make libscols_filter accessible in lex
Karel Zak [Mon, 15 Apr 2024 09:54:34 +0000 (11:54 +0200)] 
libsmartcols; (filter) make libscols_filter accessible in lex

In the reentrant parser, we cannot easily extend the argument list for
yylex() using %lex-param. Instead, we must use a lex-extra pointer.

Signed-off-by: Karel Zak <kzak@redhat.com>
9 days agolsfd: move the source code to new ./lsfd-cmd directory
Masatake YAMATO [Tue, 9 Apr 2024 06:07:18 +0000 (15:07 +0900)] 
lsfd: move the source code to new ./lsfd-cmd directory

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
9 days agotests: (lsfd) don't refer "$?" on the line follwoing the use of "local"
Masatake YAMATO [Thu, 11 Apr 2024 02:49:21 +0000 (11:49 +0900)] 
tests: (lsfd) don't refer "$?" on the line follwoing the use of "local"

Suggested by ShellCheck.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
9 days agotests: (functions.sh) add a helper funcion making a device number from given major...
Masatake YAMATO [Wed, 10 Apr 2024 09:36:47 +0000 (18:36 +0900)] 
tests: (functions.sh) add a helper funcion making a device number from given major and minor nums

Fixes #2919.
Suggested by Karel Zak <kzak@redhat.com>.

The original code used an obsolete formula to make a device number from
given major and minor numbers.

ts_device_make is a new helper function based on the formula of
__SYSMACROS_DEFINE_MAKEDEV macro defined in
/usr/include/bits/sysmacros.h of GNU libc.

Suggested by Karel Zak <kzak@redhat.com> in #2919.
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
9 days agoMerge branch 'pager/less-quirk' of https://github.com/t-8ch/util-linux
Karel Zak [Mon, 15 Apr 2024 07:07:41 +0000 (09:07 +0200)] 
Merge branch 'pager/less-quirk' of https://github.com/t-8ch/util-linux

* 'pager/less-quirk' of https://github.com/t-8ch/util-linux:
  Revert "lib/pager: Apply pager-specific fixes only when needed"

9 days agoMerge branch 'lslocks--no-sleep-in-test-case' of https://github.com/masatake/util...
Karel Zak [Mon, 15 Apr 2024 07:07:12 +0000 (09:07 +0200)] 
Merge branch 'lslocks--no-sleep-in-test-case' of https://github.com/masatake/util-linux

* 'lslocks--no-sleep-in-test-case' 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

9 days agoMerge branch 'PR/autotools' of github.com:karelzak/util-linux-work
Karel Zak [Mon, 15 Apr 2024 07:04:38 +0000 (09:04 +0200)] 
Merge branch 'PR/autotools' of github.com:karelzak/util-linux-work

* 'PR/autotools' of github.com:karelzak/util-linux-work:
  autotools: add --disable-enosys, check for linux/audit.h
  autotools: check for sys/vfs.h and linux/bpf.h

9 days agoMerge branch 'fix-mnt-update' of https://github.com/gavinhungry/util-linux
Karel Zak [Mon, 15 Apr 2024 06:59:45 +0000 (08:59 +0200)] 
Merge branch 'fix-mnt-update' of https://github.com/gavinhungry/util-linux

* 'fix-mnt-update' of https://github.com/gavinhungry/util-linux:
  Fix misplaced else in mnt_update_already_done

9 days agoMerge branch 'meson-version-script-libblkid' of https://github.com/jwillikers/util...
Karel Zak [Mon, 15 Apr 2024 06:59:07 +0000 (08:59 +0200)] 
Merge branch 'meson-version-script-libblkid' of https://github.com/jwillikers/util-linux

* 'meson-version-script-libblkid' of https://github.com/jwillikers/util-linux:
  meson: Only use the --version-script linker flag where it is supported

9 days agoMerge branch 'meson-fix-libmount-libblkid-feature-dep' of https://github.com/jwillike...
Karel Zak [Mon, 15 Apr 2024 06:57:44 +0000 (08:57 +0200)] 
Merge branch 'meson-fix-libmount-libblkid-feature-dep' of https://github.com/jwillikers/util-linux

* 'meson-fix-libmount-libblkid-feature-dep' of https://github.com/jwillikers/util-linux:
  meson: Remove libblkid dependency on libmount

9 days agoMerge branch 'meson-have-sys-vfs-header' of https://github.com/jwillikers/util-linux
Karel Zak [Mon, 15 Apr 2024 06:57:13 +0000 (08:57 +0200)] 
Merge branch 'meson-have-sys-vfs-header' of https://github.com/jwillikers/util-linux

* 'meson-have-sys-vfs-header' of https://github.com/jwillikers/util-linux:
  meson: Require the sys/vfs.h header for libmount and fstrim

9 days agoMerge branch 'zlib-disabler' of https://github.com/jwillikers/util-linux
Karel Zak [Mon, 15 Apr 2024 06:56:25 +0000 (08:56 +0200)] 
Merge branch 'zlib-disabler' of https://github.com/jwillikers/util-linux

* 'zlib-disabler' of https://github.com/jwillikers/util-linux:
  meson: Make the zlib dependency a disabler when not found

9 days agoMerge branch 'tinfo-disabler' of https://github.com/jwillikers/util-linux
Karel Zak [Mon, 15 Apr 2024 06:55:47 +0000 (08:55 +0200)] 
Merge branch 'tinfo-disabler' of https://github.com/jwillikers/util-linux

* 'tinfo-disabler' of https://github.com/jwillikers/util-linux:
  meson: Make ncurses dependency a disabler when not found
  meson: Make tinfo dependency a disabler when not found

9 days agotests: (lsns::filedesc) skip if NS_GET_NSTYPE ioctl cmd not available
Masatake YAMATO [Sun, 14 Apr 2024 17:18:19 +0000 (02:18 +0900)] 
tests: (lsns::filedesc) skip if NS_GET_NSTYPE ioctl cmd not available

Currently, Qemu userspace emulation doesn't support the ioctl cmd.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
9 days agolsns: report with warnx if a namespace related ioctl fails with ENOSYS
Masatake YAMATO [Sun, 14 Apr 2024 16:44:38 +0000 (01:44 +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 <yamato@redhat.com>
9 days agolsns: fill the netsid member of lsns_process with reliable value
Masatake YAMATO [Sat, 13 Apr 2024 17:05:10 +0000 (02:05 +0900)] 
lsns: fill the netsid member of lsns_process with reliable value

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
9 days agolsns: tolerate lsns_ioctl(fd, NS_GET_{PARENT,USERNS}) failing with ENOSYS
Masatake YAMATO [Sat, 13 Apr 2024 16:40:14 +0000 (01:40 +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 <yamato@redhat.com>
10 days agotextutils: introduce and use fgetwc_or_err
Thomas Weißschuh [Sat, 13 Apr 2024 08:34:32 +0000 (10:34 +0200)] 
textutils: introduce and use fgetwc_or_err

A return value of WEOF of fgetwc() can either mean end-of-file or an
error in errno. The error was ignored and interpreted as end-of-file.
Introduce a new helper that aborts on error and use it in text-utils.

This replaces all calls to plain fgetwc().

Closes #2909
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
10 days agotreewide: use fgetc() instead of getc()
Thomas Weißschuh [Sat, 13 Apr 2024 10:59:10 +0000 (12:59 +0200)] 
treewide: use fgetc() instead of getc()

fgetc() is similar to getc() but is guaranteed to be a function.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
11 days agotextutils: use fgetwc() instead of getwc()
Thomas Weißschuh [Sat, 13 Apr 2024 08:21:21 +0000 (10:21 +0200)] 
textutils: use fgetwc() instead of getwc()

getwc() has the same semantics as fgetwc() but may be a function or
macro. According to the manpage "there is no reason ever to use it".

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
11 days agoRevert "lib/pager: Apply pager-specific fixes only when needed"
Thomas Weißschuh [Sat, 13 Apr 2024 07:42:39 +0000 (09:42 +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 <thomas@t-8ch.de>
11 days agolsns: add more print-debug code
Masatake YAMATO [Sat, 13 Apr 2024 02:32:14 +0000 (11:32 +0900)] 
lsns: add more print-debug code

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
11 days agotests: (lsns::filedesc) enable debug output and show the exit status
Masatake YAMATO [Fri, 12 Apr 2024 20:04:33 +0000 (05:04 +0900)] 
tests: (lsns::filedesc) enable debug output and show the exit status

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
11 days agolslocks: remove a unused local variable
Masatake YAMATO [Fri, 12 Apr 2024 19:13:03 +0000 (04:13 +0900)] 
lslocks: remove a unused local variable

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
11 days agolslocks: don't abort gathering per-process information even if opening a /proc/[0...
Masatake YAMATO [Fri, 12 Apr 2024 18:59:39 +0000 (03:59 +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 <yamato@redhat.com>
11 days agodocs: lsns(8): ENVIRONMENT: describe LSNS_DEBUG
Masatake YAMATO [Fri, 12 Apr 2024 18:39:18 +0000 (03:39 +0900)] 
docs: lsns(8): ENVIRONMENT: describe LSNS_DEBUG

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
11 days agolsns: continue the executing even if opening a /proc/$pid fails
Masatake YAMATO [Fri, 12 Apr 2024 18:16:32 +0000 (03:16 +0900)] 
lsns: continue the executing even if opening a /proc/$pid fails

In the original code, lsns printed nothing if it failed in opening the
last dntry in /proc/[0-9]* though lsns should work partially.

The original behavior caused the combination of the following two
test cases failed:

    $ tests/ts/lsns/filter & tests/ts/lsns/ioctl_ns &
    [1] 19178
    [2] 19179
    $          lsns: ownership and hierarchy        ...         \
    lsns: -Q, --filter option            ... FAILED
     FAILED

    [1]-  Done                    tests/ts/lsns/filter
    [2]+  Done                    tests/ts/lsns/ioctl_ns

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
11 days agotests: (lsns::filter) don't use double-quotes chars for PID
Masatake YAMATO [Mon, 8 Apr 2024 19:22:54 +0000 (04:22 +0900)] 
tests: (lsns::filter) don't use double-quotes chars for PID

11 days agotests: (lsns::filter) add more debug printing
Masatake YAMATO [Mon, 8 Apr 2024 19:18:43 +0000 (04:18 +0900)] 
tests: (lsns::filter) add more debug printing

11 days agotests: (lsns::filter) delete an unused variable
Masatake YAMATO [Mon, 8 Apr 2024 19:12:44 +0000 (04:12 +0900)] 
tests: (lsns::filter) delete an unused variable

13 days agomeson: Remove libblkid dependency on libmount
Jordan Williams [Mon, 8 Apr 2024 16:37:01 +0000 (11:37 -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 <jordan@jwillikers.com>
13 days agomeson: Make the zlib dependency a disabler when not found
Jordan Williams [Mon, 8 Apr 2024 15:49:01 +0000 (10:49 -0500)] 
meson: Make the zlib dependency a disabler when not found

This disables targets that require zlib when it is not found.
Currently, targets requiring zlib are built when it is not found.
Fixes #2930.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
13 days agomeson: Make ncurses dependency a disabler when not found
Jordan Williams [Mon, 8 Apr 2024 15:42:00 +0000 (10:42 -0500)] 
meson: Make ncurses dependency a disabler when not found

This disables targets that require ncurses when it is not found.
Currently, targets requiring ncurses are built when it is not found.
Fixes #2929.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
13 days agomeson: Make tinfo dependency a disabler when not found
Jordan Williams [Mon, 8 Apr 2024 15:28:02 +0000 (10:28 -0500)] 
meson: Make tinfo dependency a disabler when not found

This disables targets that require tinfo when it is not found.
Currently, targets requiring tinfo are built when it is not found.
Fixes #2927.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
2 weeks agoautotools: add --disable-enosys, check for linux/audit.h
Karel Zak [Wed, 10 Apr 2024 09:50:58 +0000 (11:50 +0200)] 
autotools: add --disable-enosys, check for linux/audit.h

Signed-off-by: Karel Zak <kzak@redhat.com>
2 weeks agoautotools: check for sys/vfs.h and linux/bpf.h
Karel Zak [Wed, 10 Apr 2024 09:44:49 +0000 (11:44 +0200)] 
autotools: check for sys/vfs.h and linux/bpf.h

Addresses: https://github.com/util-linux/util-linux/pull/2933
Addresses: https://github.com/util-linux/util-linux/issues/2945
Signed-off-by: Karel Zak <kzak@redhat.com>
2 weeks agoFix misplaced else in mnt_update_already_done
Gavin Lloyd [Wed, 10 Apr 2024 00:38:02 +0000 (17:38 -0700)] 
Fix misplaced else in mnt_update_already_done

See 477401f0de

2 weeks agomeson: Only use the --version-script linker flag where it is supported
Jordan Williams [Mon, 8 Apr 2024 17:02:52 +0000 (12:02 -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 <jordan@jwillikers.com>
2 weeks agomeson: Require the sys/vfs.h header for libmount and fstrim
Jordan Williams [Mon, 8 Apr 2024 16:17:12 +0000 (11:17 -0500)] 
meson: Require the sys/vfs.h header for libmount and fstrim

libmount and fstrim both include sys/vfs.h unconditionally.
To avoid an error at compile time, require this header for their
respective feature options to be enabled.
This avoids building them on systems without sys/vfs.h, such as macOS.

Fixes #2932.

Signed-off-by: Jordan Williams <jordan@jwillikers.com>
2 weeks agoaudit-arch.h: add defines for m68k, sh
Chris Hofstaedtler [Tue, 9 Apr 2024 08:34:59 +0000 (10:34 +0200)] 
audit-arch.h: add defines for m68k, sh

John Paul Adrian Glaubitz points out that libseccomp needs to release 2.6.0,
too.

Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Thomas Weißschuh <thomas@t-8ch.de>
Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
2 weeks agolsns: fix ul_path_stat() error handling [coverity scan]
Karel Zak [Tue, 9 Apr 2024 11:45:50 +0000 (13:45 +0200)] 
lsns: fix ul_path_stat() error handling [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
2 weeks agoMerge branch 'logger/fixes' of https://github.com/t-8ch/util-linux
Karel Zak [Tue, 9 Apr 2024 10:16:21 +0000 (12:16 +0200)] 
Merge branch 'logger/fixes' of https://github.com/t-8ch/util-linux

* 'logger/fixes' of https://github.com/t-8ch/util-linux:
  logger: correctly format tv_usec
  logger: rework error handling in logger_gettimeofday()
  logger: handle failures of gettimeofday()

2 weeks agoMerge branch 'lsfd--verify-proc-syscall-for-master' of https://github.com/masatake...
Karel Zak [Tue, 9 Apr 2024 10:07:12 +0000 (12:07 +0200)] 
Merge branch 'lsfd--verify-proc-syscall-for-master' of https://github.com/masatake/util-linux

* 'lsfd--verify-proc-syscall-for-master' of https://github.com/masatake/util-linux:
  tests: (lsfd::mkfds-multiplexing) skip if /proc/$pid/syscall is broken

2 weeks agoMerge branch 'missing-pam' of https://github.com/jwillikers/util-linux
Karel Zak [Tue, 9 Apr 2024 10:04:33 +0000 (12:04 +0200)] 
Merge branch 'missing-pam' of https://github.com/jwillikers/util-linux

* 'missing-pam' of https://github.com/jwillikers/util-linux:
  meson: Disable targets requiring pam when it is missing

2 weeks agoMerge branch 'meson-python-embed-dep' of https://github.com/jwillikers/util-linux
Karel Zak [Tue, 9 Apr 2024 10:02:35 +0000 (12:02 +0200)] 
Merge branch 'meson-python-embed-dep' of https://github.com/jwillikers/util-linux

* 'meson-python-embed-dep' of https://github.com/jwillikers/util-linux:
  meson: Require Python dependency which can be embedded for pylibmount

2 weeks agoMerge branch 'sqlite-dep-liblastlog2' of https://github.com/jwillikers/util-linux
Karel Zak [Tue, 9 Apr 2024 10:00:53 +0000 (12:00 +0200)] 
Merge branch 'sqlite-dep-liblastlog2' of https://github.com/jwillikers/util-linux

* 'sqlite-dep-liblastlog2' of https://github.com/jwillikers/util-linux:
  meson: Enforce sqlite dependency for liblastlog2

2 weeks agologger: correctly format tv_usec
Thomas Weißschuh [Tue, 9 Apr 2024 09:00:26 +0000 (11:00 +0200)] 
logger: correctly format tv_usec

tv_usec is an unspecified signed integer type.
The format string %u assumes an unsigned int, which is incorrect.
Especially on 32bit big-endian, where it can lead to invalid values.

Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Link: https://lore.kernel.org/util-linux/afef1b770ad80d50660bb2c53a0a8330b88d1049.camel@physik.fu-berlin.de/
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
2 weeks agologger: rework error handling in logger_gettimeofday()
Thomas Weißschuh [Tue, 9 Apr 2024 09:00:08 +0000 (11:00 +0200)] 
logger: rework error handling in logger_gettimeofday()

* Fail when LOGGER_TEST_TIMEOFDAY is set to an invalid value
* Fail with return -1 and errno, the same as normal gettimeofday()

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
2 weeks agologger: handle failures of gettimeofday()
Thomas Weißschuh [Tue, 9 Apr 2024 08:58:19 +0000 (10:58 +0200)] 
logger: handle failures of gettimeofday()

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>