MFp4: libarchive 2.5.4b. (Still 'b' until I get a bit more

feedback, but the 2.5 branch is shaping up nicely.)

In addition to many small bug fixes and code improvements:
 * Another iteration of versioning; I think I've got it right now.
 * Portability:  A lot of progress on Windows support (though I'm
   not committing all of the Windows support files to FreeBSD CVS)
 * Explicit tracking of MBS, WCS, and UTF-8 versions of strings
   in archive_entry; the archive_entry routines now correctly return
   NULL only when something is unset, setting NULL properly clears
   string values.  Most charset conversions have been pushed down to
   archive_string.
 * Better handling of charset conversion failure when writing or
   reading UTF-8 headers in pax archives
 * archive_entry_linkify() provides multiple strategies for
   hardlink matching to suit different format expectations
 * More accurate bzip2 format detection
 * Joerg Sonnenberger's extensive improvements to mtree support
 * Rough support for self-extracting ZIP archives.  Not an ideal
   approach, but it works for the archives I've tried.
 * New "sparsify" option in archive_write_disk converts blocks of nulls
   into seeks.
 * Better default behavior for the test harness; it now reports
   all failures by default instead of coredumping at the first one.

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/libarchive/test/test_read_format_mtree.c b/lib/libarchive/test/test_read_format_mtree.c
index fa20c35..861fbc7 100644
--- a/lib/libarchive/test/test_read_format_mtree.c
+++ b/lib/libarchive/test/test_read_format_mtree.c
@@ -32,18 +32,18 @@ static unsigned char archive[] = {
 	"dir type=dir\n"
 	" file\\040with\\040space type=file uid=18\n"
 	" ..\n"
-	"file\\04with\\040space\n"
+	"file\\04with\\040space type=file\n"
 	"dir2 type=dir\n"
 	" dir3a type=dir\n"
-	"  indir3a\n"
+	"  indir3a type=file\n"
 	"dir2/fullindir2 type=file mode=0777\n"
 	"  ..\n"
-	" indir2\n"
+	" indir2 type=file\n"
 	" dir3b type=dir\n"
-	"  indir3b\n"
+	"  indir3b type=file\n"
 	"  ..\n"
 	" ..\n"
-	"notindir\n"
+	"notindir type=file\n"
 	"dir2/fullindir2 mode=0644\n"
 };