Merging upstream version 2.40.

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

23 files changed, 211 insertions, 67 deletions

diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all
index 0574f23..88b6e06 100644
--- a/tests/expected/build-sys/config-all
+++ b/tests/expected/build-sys/config-all
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdformat:  
@@ -109,6 +115,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -123,6 +130,6 @@ unshare:
 utmpdump:  
 vipw:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
-write:  
+write:  libsystemd 
diff --git a/tests/expected/build-sys/config-all-devel b/tests/expected/build-sys/config-all-devel
index 3e9a720..da9afc1 100644
--- a/tests/expected/build-sys/config-all-devel
+++ b/tests/expected/build-sys/config-all-devel
@@ -89,6 +89,7 @@ readprofile:
 renice:  
 rtcwake:  
 setarch:  
+setpgid:  
 setsid:  
 switch_root:  
 tunelp:  
diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls
index 0574f23..88b6e06 100644
--- a/tests/expected/build-sys/config-all-non-nls
+++ b/tests/expected/build-sys/config-all-non-nls
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdformat:  
@@ -109,6 +115,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -123,6 +130,6 @@ unshare:
 utmpdump:  
 vipw:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
-write:  
+write:  libsystemd 
diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit
index bdcd087..749a35b 100644
--- a/tests/expected/build-sys/config-audit
+++ b/tests/expected/build-sys/config-audit
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser
index 97e1ae6..238c150 100644
--- a/tests/expected/build-sys/config-chfnsh-libuser
+++ b/tests/expected/build-sys/config-chfnsh-libuser
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password
index 734113e..41bd6c5 100644
--- a/tests/expected/build-sys/config-chfnsh-no-password
+++ b/tests/expected/build-sys/config-chfnsh-no-password
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam
index 532013c..17cd06c 100644
--- a/tests/expected/build-sys/config-chfnsh-pam
+++ b/tests/expected/build-sys/config-chfnsh-pam
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core
index a20517c..bb4ac01 100644
--- a/tests/expected/build-sys/config-core
+++ b/tests/expected/build-sys/config-core
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-cryptsetup b/tests/expected/build-sys/config-cryptsetup
index c4aae45..b21174e 100644
--- a/tests/expected/build-sys/config-cryptsetup
+++ b/tests/expected/build-sys/config-cryptsetup
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libcryptsetup 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libcryptsetup libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdformat:  
@@ -109,6 +115,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -123,6 +130,6 @@ unshare:
 utmpdump:  
 vipw:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
-write:  
+write:  libsystemd 
diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel
index 5682413..4b44616 100644
--- a/tests/expected/build-sys/config-devel
+++ b/tests/expected/build-sys/config-devel
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdformat:  
@@ -109,6 +115,7 @@ script:  libutempter
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -123,6 +130,6 @@ unshare:
 utmpdump:  
 vipw:  libselinux 
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
-write:  
+write:  libsystemd 
diff --git a/tests/expected/build-sys/config-devel-new-mount b/tests/expected/build-sys/config-devel-new-mount
index 9ac8272..8befe4c 100644
--- a/tests/expected/build-sys/config-devel-new-mount
+++ b/tests/expected/build-sys/config-devel-new-mount
@@ -94,6 +94,7 @@ readprofile:
 renice:  
 rtcwake:  
 setarch:  
+setpgid:  
 setsid:  
 switch_root:  
 tunelp:  
diff --git a/tests/expected/build-sys/config-devel-non-asan b/tests/expected/build-sys/config-devel-non-asan
index 5682413..4b44616 100644
--- a/tests/expected/build-sys/config-devel-non-asan
+++ b/tests/expected/build-sys/config-devel-non-asan
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdformat:  
@@ -109,6 +115,7 @@ script:  libutempter
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -123,6 +130,6 @@ unshare:
 utmpdump:  
 vipw:  libselinux 
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
-write:  
+write:  libsystemd 
diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs
index 5682413..4b44616 100644
--- a/tests/expected/build-sys/config-devel-non-docs
+++ b/tests/expected/build-sys/config-devel-non-docs
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdformat:  
@@ -109,6 +115,7 @@ script:  libutempter
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -123,6 +130,6 @@ unshare:
 utmpdump:  
 vipw:  libselinux 
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
-write:  
+write:  libsystemd 
diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid
index ed38eb5..0cce945 100644
--- a/tests/expected/build-sys/config-non-libblkid
+++ b/tests/expected/build-sys/config-non-libblkid
@@ -3,10 +3,13 @@ column:  libsmartcols
 fdisk:  libfdisk libreadline libsmartcols libtinfo 
 fincore:  libsmartcols 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libfdisk.so.1.1.0:  libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -14,6 +17,7 @@ lsirq:  libsmartcols
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
 mkswap:  libuuid 
+pam_lastlog2.so:  
 prlimit:  libsmartcols 
 rfkill:  libsmartcols 
 sfdisk:  libfdisk libreadline libsmartcols libtinfo 
@@ -22,7 +26,7 @@ uuidgen:  libuuid
 uuidparse:  libsmartcols libuuid 
 wdctl:  libsmartcols 
 zramctl:  libsmartcols 
-agetty:  
+agetty:  libsystemd 
 blkdiscard:  
 blkpr:  
 blkzone:  
@@ -39,6 +43,8 @@ colcrt:
 colrm:  
 ctrlaltdel:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -82,6 +88,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -94,5 +101,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount
index 45ff711..ed8895b 100644
--- a/tests/expected/build-sys/config-non-libmount
+++ b/tests/expected/build-sys/config-non-libmount
@@ -6,11 +6,14 @@ fdisk:  libfdisk libreadline libsmartcols libtinfo
 fincore:  libsmartcols 
 findfs:  libblkid 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -18,6 +21,7 @@ lsirq:  libsmartcols
 lslogins:  libsmartcols libsystemd 
 lsmem:  libsmartcols 
 mkswap:  libblkid libuuid 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 rfkill:  libsmartcols 
@@ -30,7 +34,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -47,6 +51,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -91,6 +97,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -103,5 +110,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs
index b88a6a1..f517ba5 100644
--- a/tests/expected/build-sys/config-non-libs
+++ b/tests/expected/build-sys/config-non-libs
@@ -1,4 +1,7 @@
-agetty:  
+lastlog2:  liblastlog2 
+liblastlog2.so.2.0.0:  libsqlite3 
+pam_lastlog2.so:  
+agetty:  libsystemd 
 blkdiscard:  
 blkpr:  
 blkzone:  
@@ -15,6 +18,8 @@ colcrt:
 colrm:  
 ctrlaltdel:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -59,6 +64,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -71,5 +77,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols
index 28ff817..6889c74 100644
--- a/tests/expected/build-sys/config-non-libsmartcols
+++ b/tests/expected/build-sys/config-non-libsmartcols
@@ -1,22 +1,25 @@
 blkdiscard:  libblkid 
 blkid:  libblkid 
-eject:  libmount 
+eject:  libblkid libmount 
 findfs:  libblkid 
 fsck:  libblkid libmount 
-fstrim:  libmount 
+fstrim:  libblkid libmount 
+lastlog2:  liblastlog2 libsqlite3 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libuuid.so.1.3.0:  
 mkswap:  libblkid libuuid 
-mount:  libmount 
-mountpoint:  libmount 
+mount:  libblkid libmount 
+mountpoint:  libblkid libmount 
+pam_lastlog2.so:  
 pylibmount.so:  libblkid libmount 
 swaplabel:  libblkid libuuid 
-umount:  libmount 
+umount:  libblkid libmount 
 uuidd:  libsystemd libuuid 
 uuidgen:  libuuid 
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -32,6 +35,8 @@ colcrt:
 colrm:  
 ctrlaltdel:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -75,6 +80,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -87,5 +93,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid
index 3e5a295..8d19e47 100644
--- a/tests/expected/build-sys/config-non-libuuid
+++ b/tests/expected/build-sys/config-non-libuuid
@@ -8,11 +8,14 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -24,6 +27,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -36,7 +40,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -53,6 +57,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -97,6 +103,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -109,5 +116,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls
index a20517c..bb4ac01 100644
--- a/tests/expected/build-sys/config-non-nls
+++ b/tests/expected/build-sys/config-non-nls
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-non-widechar b/tests/expected/build-sys/config-non-widechar
index e69de29..56e9f2f 100644
--- a/tests/expected/build-sys/config-non-widechar
+++ b/tests/expected/build-sys/config-non-widechar
@@ -0,0 +1,4 @@
+pam_lastlog2.so:  
+fsfreeze:  
+pivot_root:  
+switch_root:  
diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux
index 4d2e5f8..c8aa80c 100644
--- a/tests/expected/build-sys/config-selinux
+++ b/tests/expected/build-sys/config-selinux
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid libselinux 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libselinux libuuid 
 mount:  libmount libselinux 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount libselinux 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang
index 5a3ac99..6b676cc 100644
--- a/tests/expected/build-sys/config-slang
+++ b/tests/expected/build-sys/config-slang
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libslang libsmartcols 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkpr:  
 blkzone:  
 blockdev:  
@@ -61,6 +65,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 flock:  
@@ -105,6 +111,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -117,5 +124,5 @@ ul:  libtinfo
 unshare:  
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis:  
diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static
index 92de9d7..10d1052 100644
--- a/tests/expected/build-sys/config-static
+++ b/tests/expected/build-sys/config-static
@@ -10,13 +10,16 @@ findmnt:  libblkid libmount libsmartcols libudev
 fsck:  libblkid libmount 
 fstrim:  libmount 
 irqtop:  libncursesw libsmartcols libtinfo 
+lastlog2:  liblastlog2 
 libblkid.so.1.1.0:  
 libfdisk.so.1.1.0:  libblkid libuuid 
+liblastlog2.so.2.0.0:  libsqlite3 
 libmount.so.1.1.0:  libblkid 
 libsmartcols.so.1.1.0:  
 libuuid.so.1.3.0:  
 losetup:  libsmartcols 
-lsblk:  libblkid libmount libsmartcols libudev 
+lsblk:  libblkid libmount libsmartcols libtinfo libudev 
+lsclocks:  libsmartcols 
 lscpu:  libsmartcols 
 lsfd:  libsmartcols 
 lsipc:  libsmartcols 
@@ -28,6 +31,7 @@ lsns:  libmount libsmartcols
 mkswap:  libblkid libuuid 
 mount:  libmount 
 mountpoint:  libmount 
+pam_lastlog2.so:  
 partx:  libblkid libsmartcols 
 prlimit:  libsmartcols 
 pylibmount.so:  libblkid libmount 
@@ -44,7 +48,7 @@ wdctl:  libsmartcols
 wipefs:  libblkid libsmartcols 
 zramctl:  libsmartcols 
 addpart:  
-agetty:  
+agetty:  libsystemd 
 blkid.static: STATIC
 blkpr:  
 blkzone:  
@@ -62,6 +66,8 @@ colrm:
 ctrlaltdel:  
 delpart:  
 dmesg:  libtinfo 
+enosys:  
+exch:  
 fadvise:  
 fallocate:  
 fdisk.static: STATIC
@@ -110,6 +116,7 @@ script:
 scriptlive:  
 scriptreplay:  
 setarch:  
+setpgid:  
 setpriv:  libcap-ng 
 setsid:  
 setterm:  libtinfo 
@@ -125,5 +132,5 @@ unshare:
 unshare.static: STATIC
 utmpdump:  
 waitpid:  
-wall:  
+wall:  libsystemd 
 whereis: