Merging upstream version 2.40.

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

1 files changed, 13 insertions, 7 deletions

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: