Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

20 files changed, 285 insertions, 4 deletions

diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
index eb10f6f..034f943 100644
--- a/bash-completion/Makemodule.am
+++ b/bash-completion/Makemodule.am
@@ -18,6 +18,9 @@ endif
 if BUILD_COLUMN
 dist_bashcompletion_DATA += bash-completion/column
 endif
+if BUILD_EXCH
+dist_bashcompletion_DATA += bash-completion/exch
+endif
 if BUILD_FINCORE
 dist_bashcompletion_DATA += bash-completion/fincore
 endif
@@ -99,6 +102,9 @@ endif
 if BUILD_SCRIPTLIVE
 dist_bashcompletion_DATA += bash-completion/scriptlive
 endif
+if BUILD_SETPGID
+dist_bashcompletion_DATA += bash-completion/setpgid
+endif
 if BUILD_SETSID
 dist_bashcompletion_DATA += bash-completion/setsid
 endif
@@ -195,6 +201,9 @@ endif
 if BUILD_UUIDGEN
 dist_bashcompletion_DATA += bash-completion/uuidgen
 endif
+if BUILD_LIBLASTLOG2
+dist_bashcompletion_DATA += bash-completion/lastlog2
+endif
 if BUILD_UUIDPARSE
 dist_bashcompletion_DATA += bash-completion/uuidparse
 endif
@@ -344,5 +353,11 @@ endif
 if BUILD_WAITPID
 dist_bashcompletion_DATA += bash-completion/waitpid
 endif
+if BUILD_ENOSYS
+dist_bashcompletion_DATA += bash-completion/enosys
+endif
+if BUILD_LSCLOCKS
+dist_bashcompletion_DATA += bash-completion/lsclocks
+endif
 
 endif # BUILD_BASH_COMPLETION
diff --git a/bash-completion/blockdev b/bash-completion/blockdev
index 48ba8c7..30eeff5 100644
--- a/bash-completion/blockdev
+++ b/bash-completion/blockdev
@@ -13,6 +13,7 @@ _blockdev_module()
 		--getro
 		--getdiscardzeroes
 		--getdiskseq
+		--getzonesz
 		--getss
 		--getpbsz
 		--getiomin
diff --git a/bash-completion/enosys b/bash-completion/enosys
new file mode 100644
index 0000000..7ce7609
--- /dev/null
+++ b/bash-completion/enosys
@@ -0,0 +1,45 @@
+_waitpid_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-s'|'--syscall')
+			return 0
+			;;
+		'-i'|'--ioctl')
+			return 0
+			;;
+		'-l'|'--list')
+			return 0
+			;;
+		'-m'|'--list-ioctl')
+			return 0
+			;;
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="--syscall
+			        --ioctl
+			        --list
+			        --list-ioctl
+				--help
+				--version"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+		*)
+			_pids
+			return 0
+			;;
+	esac
+	local IFS=$'\n'
+	compopt -o filenames
+	COMPREPLY=( $(compgen -u -- $cur) )
+	return 0
+}
+complete -F _enosys_module enosys
diff --git a/bash-completion/exch b/bash-completion/exch
new file mode 100644
index 0000000..a3fc994
--- /dev/null
+++ b/bash-completion/exch
@@ -0,0 +1,26 @@
+_exch_module()
+{
+    local cur prev OPTS
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    case $prev in
+	'-h'|'--help'|'-V'|'--version')
+	    return 0
+	    ;;
+    esac
+    case $cur in
+	-*)
+	    OPTS='
+		  --help
+		  --version'
+	    COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+	    return 0
+	;;
+    esac
+    local IFS=$'\n'
+    compopt -o filenames
+    COMPREPLY=( $(compgen -f -- $cur) )
+    return 0
+}
+complete -F _exch_module exch
diff --git a/bash-completion/fadvise b/bash-completion/fadvise
index 3ec55f5..985c947 100644
--- a/bash-completion/fadvise
+++ b/bash-completion/fadvise
@@ -29,7 +29,7 @@ _fadvise_module()
 		  --length
 		  --offset
 		  --help
-		  --versione'
+		  --version'
 	    COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 	    return 0
 	;;
diff --git a/bash-completion/fincore b/bash-completion/fincore
index 3639763..f0f9c45 100644
--- a/bash-completion/fincore
+++ b/bash-completion/fincore
@@ -30,6 +30,7 @@ _fincore_module()
 				--bytes
 				--noheadings
 				--output
+				--output-all
 				--raw
 				--help
 				--version
diff --git a/bash-completion/findmnt b/bash-completion/findmnt
index 7270d36..8594394 100644
--- a/bash-completion/findmnt
+++ b/bash-completion/findmnt
@@ -106,6 +106,7 @@ _findmnt_module()
 				--ascii
 				--canonicalize
 				--df
+				--dfi
 				--direction
 				--evaluate
 				--tab-file
@@ -131,6 +132,7 @@ _findmnt_module()
 				--tree
 				--real
 				--pseudo
+				--list-columns
 				--version"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 			return 0
diff --git a/bash-completion/hexdump b/bash-completion/hexdump
index 80b1ab6..981d535 100644
--- a/bash-completion/hexdump
+++ b/bash-completion/hexdump
@@ -28,6 +28,7 @@ _hexdump_module()
 	case $cur in
 		-*)
 			OPTS="	--one-byte-octal
+				--one-byte-hex
 				--one-byte-char
 				--canonical
 				--two-bytes-decimal
diff --git a/bash-completion/hwclock b/bash-completion/hwclock
index 6b4c017..6240d7d 100644
--- a/bash-completion/hwclock
+++ b/bash-completion/hwclock
@@ -54,6 +54,8 @@ _hwclock_module()
 				--epoch
 				--param-get
 				--param-set
+				--vl-read
+				--vl-clear
 				--update-drift
 				--noadjfile
 				--adjfile
diff --git a/bash-completion/last b/bash-completion/last
index fcd8021..ff264c1 100644
--- a/bash-completion/last
+++ b/bash-completion/last
@@ -36,6 +36,7 @@ _last_module()
 				--nohostname
 				--since
 				--until
+				--tab-separated
 				--present
 				--fullnames
 				--system
@@ -50,4 +51,4 @@ _last_module()
 	COMPREPLY=( $(compgen -u -- $cur) )
 	return 0
 }
-complete -F _last_module last
+complete -F _last_module last lastb
diff --git a/bash-completion/lastlog2 b/bash-completion/lastlog2
new file mode 100644
index 0000000..09aa4ed
--- /dev/null
+++ b/bash-completion/lastlog2
@@ -0,0 +1,57 @@
+_lastlog2_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-b'|'--before')
+			COMPREPLY=( $(compgen -W "days" -- $cur) )
+			return 0
+			;;
+		'-t'|'--time')
+			COMPREPLY=( $(compgen -W "days" -- $cur) )
+			return 0
+			;;
+		'-i'|'--import')
+			COMPREPLY=( $(compgen -W "file" -- "$cur") )
+			return 0
+			;;
+		'-r'|'--rename')
+			COMPREPLY=( $(compgen -W "user_name" -- "$cur") )
+			return 0
+			;;
+		'-u'|'--user')
+			COMPREPLY=( $(compgen -W "login" -- "$cur") )
+			return 0
+			;;			
+		'-d'|'--database')
+			COMPREPLY=( $(compgen -W "file" -- "$cur") )
+			return 0
+			;;			
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="
+				--before
+				--clear
+				--database
+				--help
+				--import
+				--rename
+				--service
+				--set
+				--time
+				--user
+				--version
+			"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+	esac
+	return 0
+}
+complete -F _lastlog2_module lastlog2
diff --git a/bash-completion/lsblk b/bash-completion/lsblk
index 6756764..4f1c39d 100644
--- a/bash-completion/lsblk
+++ b/bash-completion/lsblk
@@ -62,6 +62,10 @@ _lsblk_module()
 				--discard
 				--exclude
 				--fs
+				--filter
+				--highlight
+				--ct
+				--ct-filter
 				--help
 				--include
 				--json
@@ -83,6 +87,7 @@ _lsblk_module()
 				--virtio
 				--sort
 				--width
+				--list-columns
 				--help
 				--version"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
diff --git a/bash-completion/lsclocks b/bash-completion/lsclocks
new file mode 100644
index 0000000..7158701
--- /dev/null
+++ b/bash-completion/lsclocks
@@ -0,0 +1,69 @@
+_lsclocks_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+	case $prev in
+		'-J'|'--json')
+			return 0
+			;;
+		'-n'|'--noheadings')
+			return 0
+			;;
+		'-o'|'--output')
+			return 0
+			;;
+		'--output-all')
+			return 0
+			;;
+		'-r'|'--raw')
+			return 0
+			;;
+		'-t'|'--time')
+			clocks="$(command "$1" --noheadings --raw --output NAME)"
+			COMPREPLY=( $(compgen -W "$clocks" -- "$cur") )
+			return 0
+			;;
+		'-d'|'--dynamic-clock')
+			clocks="$(echo /dev/ptp*)"
+			COMPREPLY=( $(compgen -o filenames -W "$clocks" -- "$cur") )
+			return 0
+			;;
+		'-x'|'--rtc')
+			clocks="$(echo /dev/rtc*)"
+			COMPREPLY=( $(compgen -o filenames -W "$clocks" -- "$cur") )
+			return 0
+			;;
+		'-c'|'--cpu-clock')
+			_pids
+			return 0
+			;;
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="--json
+				--noheadings
+				--output
+				--output-all
+				--raw
+				--time
+				--dynamic-clock
+				--rtc
+				--cpu-clock
+				--help
+				--version"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+		*)
+			return 0
+			;;
+	esac
+	return 0
+}
+complete -F _lsclocks_module lsclocks
diff --git a/bash-completion/lslocks b/bash-completion/lslocks
index fbe75ff..97f7d6d 100644
--- a/bash-completion/lslocks
+++ b/bash-completion/lslocks
@@ -31,7 +31,7 @@ _lslocks_module()
 			return 0
 			;;
 	esac
-	OPTS="
+	OPTS="--bytes
 		--json
 		--noinaccessible
 		--noheadings
@@ -40,6 +40,7 @@ _lslocks_module()
 		--pid
 		--raw
 		--notruncate
+		--list-columns
 		--help
 		--version
 	"
diff --git a/bash-completion/mkswap b/bash-completion/mkswap
index 61157ef..71ae77e 100644
--- a/bash-completion/mkswap
+++ b/bash-completion/mkswap
@@ -21,13 +21,21 @@ _mkswap_module()
 			COMPREPLY=( $(compgen -W "$(uuidgen -r)" -- $cur) )
 			return 0
 			;;
+		'-o'|'--offset')
+			COMPREPLY=( $(compgen -W "bytes" -- $cur) )
+			return 0
+			;;
+		'-s'|'--size')
+			COMPREPLY=( $(compgen -W "bytes" -- $cur) )
+			return 0
+			;;
 		'-h'|'--help'|'-V'|'--version')
 			return 0
 			;;
 	esac
 	case $cur in
 		-*)
-			OPTS="--check --force --pagesize --lock --label --swapversion --uuid --verbose --version --help"
+			OPTS="--check --force --pagesize --lock --label --swapversion --uuid --offset --verbose --version --help --size --file"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
 			return 0
 			;;
diff --git a/bash-completion/nsenter b/bash-completion/nsenter
index 86c76db..19f18e7 100644
--- a/bash-completion/nsenter
+++ b/bash-completion/nsenter
@@ -42,15 +42,18 @@ _nsenter_module()
 				--pid=
 				--cgroup=
 				--user=
+				--user-parent
 				--time=
 				--setuid
 				--setgid
+				--keep-caps
 				--preserve-credentials
 				--root=
 				--wd=
 				--wdns=
 				--env
 				--no-fork
+				--join-cgroup
 				--help
 				--version
 			"
diff --git a/bash-completion/setpgid b/bash-completion/setpgid
new file mode 100644
index 0000000..5ad9be5
--- /dev/null
+++ b/bash-completion/setpgid
@@ -0,0 +1,23 @@
+_setpgid_module()
+{
+	local cur prev OPTS
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	case $prev in
+		'-h'|'--help'|'-V'|'--version')
+			return 0
+			;;
+	esac
+	case $cur in
+		-*)
+			OPTS="--foreground --help --version"
+			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
+			return 0
+			;;
+	esac
+	compopt -o bashdefault
+	COMPREPLY=( $(compgen -c -- $cur) )
+	return 0
+}
+complete -F _setpgid_module setpgid
diff --git a/bash-completion/setpriv b/bash-completion/setpriv
index 69df34b..766bbcb 100644
--- a/bash-completion/setpriv
+++ b/bash-completion/setpriv
@@ -87,6 +87,16 @@ _setpriv_module()
 			COMPREPLY=( $(compgen -W "profile" -- $cur) )
 			return 0
 			;;
+		'--landlock-access')
+			# FIXME: how to list landlock accesses?
+			COMPREPLY=( $(compgen -W "access" -- $cur) )
+			return 0
+			;;
+		'--landlock-rule')
+			# FIXME: how to list landlock rules?
+			COMPREPLY=( $(compgen -W "rule" -- $cur) )
+			return 0
+			;;
 		'-h'|'--help'|'-V'|'--version')
 			return 0
 			;;
@@ -112,6 +122,8 @@ _setpriv_module()
 				--reset-env
 				--selinux-label
 				--apparmor-profile
+				--landlock-access
+				--landlock-rule
 				--help
 				--version"
 			COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
diff --git a/bash-completion/uuidgen b/bash-completion/uuidgen
index 8e64015..45f690d 100644
--- a/bash-completion/uuidgen
+++ b/bash-completion/uuidgen
@@ -13,6 +13,10 @@ _uuidgen_module()
 			COMPREPLY=( $(compgen -W "name" -- "$cur") )
 			return 0
 			;;
+		'-C'|'--count')
+			COMPREPLY=( $(compgen -W "number" -- $cur) )
+			return 0
+			;;
 		'-h'|'--help'|'-V'|'--version')
 			return 0
 			;;
@@ -25,6 +29,7 @@ _uuidgen_module()
 				--namespace
 				--name
 				--md5
+				--count
 				--sha1
 				--hex
 				--help
diff --git a/bash-completion/wipefs b/bash-completion/wipefs
index 8e49a8b..de17272 100644
--- a/bash-completion/wipefs
+++ b/bash-completion/wipefs
@@ -5,6 +5,10 @@ _wipefs_module()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
+		'-b'|'--backup')
+			COMPREPLY=( $(compgen -o dirnames -- ${cur:-"/"}) )
+			return 0
+			;;
 		'-O'|'--output')
 			local prefix realcur OUTPUT_ALL OUTPUT
 			realcur="${cur##*,}"