Merging upstream version 3:4.8.31.

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

3 files changed, 4 insertions, 2 deletions

diff --git a/src/vfs/sfs/Makefile.in b/src/vfs/sfs/Makefile.in
index f9893eb..54392be 100644
--- a/src/vfs/sfs/Makefile.in
+++ b/src/vfs/sfs/Makefile.in
@@ -135,7 +135,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-ftp.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-sftp.m4 \
-	$(top_srcdir)/m4.include/vfs/mc-vfs-fish.m4 \
+	$(top_srcdir)/m4.include/vfs/mc-vfs-shell.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-undelfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-tarfs.m4 \
 	$(top_srcdir)/m4.include/vfs/mc-vfs-cpiofs.m4 \
diff --git a/src/vfs/sfs/sfs.c b/src/vfs/sfs/sfs.c
index fdcc823..58ce5a2 100644
--- a/src/vfs/sfs/sfs.c
+++ b/src/vfs/sfs/sfs.c
@@ -1,7 +1,7 @@
 /*
    Single File fileSystem
 
-   Copyright (C) 1998-2023
+   Copyright (C) 1998-2024
    Free Software Foundation, Inc.
 
    Written by:
diff --git a/src/vfs/sfs/sfs.ini b/src/vfs/sfs/sfs.ini
index d817dc9..a7b059b 100644
--- a/src/vfs/sfs/sfs.ini
+++ b/src/vfs/sfs/sfs.ini
@@ -16,6 +16,8 @@ lz4/1	lz4 < %1 > %3
 ulz4/1	lz4 -d < %1 > %3
 lzma/1	lzma < %1 > %3
 ulzma/1	lzma -d < %1 > %3
+lzo/1	lzop < %1 > %3
+ulzo/1	lzop -d < %1 > %3
 xz/1	xz < %1 > %3
 uxz/1	xz -d < %1 > %3
 zst/1	zstd < %1 > %3