Merging upstream version 3:4.8.31.

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

7 files changed, 7 insertions, 7 deletions

diff --git a/tests/src/vfs/Makefile.in b/tests/src/vfs/Makefile.in
index 3cc55a3..0aeb345 100644
--- a/tests/src/vfs/Makefile.in
+++ b/tests/src/vfs/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/tests/src/vfs/extfs/Makefile.in b/tests/src/vfs/extfs/Makefile.in
index f7d69e5..c203a25 100644
--- a/tests/src/vfs/extfs/Makefile.in
+++ b/tests/src/vfs/extfs/Makefile.in
@@ -133,7 +133,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/tests/src/vfs/extfs/helpers-list/Makefile.in b/tests/src/vfs/extfs/helpers-list/Makefile.in
index 9dfaaef..d60222a 100644
--- a/tests/src/vfs/extfs/helpers-list/Makefile.in
+++ b/tests/src/vfs/extfs/helpers-list/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/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c b/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c
index 7c6ef18..8c1889e 100644
--- a/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c
+++ b/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c
@@ -1,7 +1,7 @@
 /*
    A parser for file-listings formatted like 'ls -l'.
 
-   Copyright (C) 2016-2023
+   Copyright (C) 2016-2024
    Free Software Foundation, Inc.
 
    This file is part of the Midnight Commander.
diff --git a/tests/src/vfs/extfs/helpers-list/misc/Makefile.in b/tests/src/vfs/extfs/helpers-list/misc/Makefile.in
index d3e051d..131fc7a 100644
--- a/tests/src/vfs/extfs/helpers-list/misc/Makefile.in
+++ b/tests/src/vfs/extfs/helpers-list/misc/Makefile.in
@@ -133,7 +133,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/tests/src/vfs/ftpfs/Makefile.in b/tests/src/vfs/ftpfs/Makefile.in
index 12b61ea..d325e96 100644
--- a/tests/src/vfs/ftpfs/Makefile.in
+++ b/tests/src/vfs/ftpfs/Makefile.in
@@ -136,7 +136,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/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c b/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c
index 2943364..840c57d 100644
--- a/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c
+++ b/tests/src/vfs/ftpfs/ftpfs_parse_long_list.c
@@ -1,6 +1,6 @@
 /* src/vfs/ftpfs - tests for ftpfs_parse_long_list() function.
 
-   Copyright (C) 2021-2023
+   Copyright (C) 2021-2024
    Free Software Foundation, Inc.
 
    Written by: