Merge branch '4154_rar6'

* 4154_rar6:
  Ticket #4154: support unrar v6.

src/vfs/extfs/helpers/urar.in

@@ -113,7 +113,7 @@ mcrar5fs_list ()
 
 mcrarfs_list ()
 {
-    [ x$UNRAR_VERSION = x5 ] && mcrar5fs_list "$@" || mcrar4fs_list "$@"
+    [ x$UNRAR_VERSION = x6 -o x$UNRAR_VERSION = x5 ] && mcrar5fs_list "$@" || mcrar4fs_list "$@"
 }
 
 mcrarfs_copyin ()

tests/src/vfs/extfs/helpers-list/Makefile.am

@@ -72,9 +72,9 @@ data_files_to_distribute = \
 	data/urar.v4,v3.env_vars \
 	data/urar.v4,v3.input \
 	data/urar.v4,v3.output \
-	data/urar.v5.env_vars \
-	data/urar.v5.input \
-	data/urar.v5.output \
+	data/urar.v6,v5.env_vars \
+	data/urar.v6,v5.input \
+	data/urar.v6,v5.output \
 	data/uzip.README \
 	data/uzip.with-zipinfo.env_vars \
 	data/uzip.with-zipinfo.input \

tests/src/vfs/extfs/helpers-list/data/urar.README

@@ -4,10 +4,10 @@ The archive was created thus:
     echo hello > 'filename with spaces.txt'
     rar a archive.rar 'filename with spaces.txt' ...
 
-Our 'urar' supports two listing formats: that of version 5, and that of
-version 4.
+Our 'urar' supports two listing formats: that of versions 6 and 5, and that of
+versions 4 and 3.
 
-'urar.v5.input' was created with "unrar vt -c- -cfg- archive.rar" using
+'urar.v6,v5.input' was created with "unrar vt -c- -cfg- archive.rar" using
 unrar 5.30.
 
 'urar.v4,v3.input' was created with "unrar v -c- -cfg- archive.rar" using