git: 401026e4825a - main - libarchive: merge from vendor branch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Oct 2025 15:53:53 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=401026e4825a05abba6f945cf1b74b3328876fa2
commit 401026e4825a05abba6f945cf1b74b3328876fa2
Merge: e29f81c2adc1 8f38cbcd9c4a
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-10-21 14:10:15 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2025-10-21 15:52:44 +0000
libarchive: merge from vendor branch
Update vendor/libarchive to 3.8.2
Important bugfixes:
#2477 tar writer: fix replacing a regular file with a dir for
ARCHIVE_EXTRACT_SAFE_WRITES
#2659 lib: improve filter process handling
#2664 zip writer: fix a memory leak if write callback error early
#2665 lib: archive_read_data: handle sparse holes at end of file correctly
#2668 7zip: Fix out of boundary access
#2670 zip writer: fix writing with ZSTD compression
#2672 lib: fix error checking in writing files
#2678 zstd write filter: enable Zstandard's checksum feature
#2679 lib: handle possible errors from system calls
#2707 lib: avoid leaking file descriptors into subprocesses
#2713 RAR5 reader: fix multiple issues in extra field parsing function
#2716 RAR5 reader: early fail when file declares data for a dir entry
#2717 bsdtar: Allow filename to have CRLF endings
#2719 tar reader: fix checking the result of the strftime (CVE-2025-25724)
#2737 tar reader: fix an infinite loop when parsing V headers
#2742 lib: parse_date: handle dates in 2038 and beyond if time_t is big
enough
Obtained from: libarchive
Vendor commit: 7f53fce04e4e672230f4eb80b219af17975e4f83
Security: CVE-2025-25724
PR: 290303 (exp-run)
MFC after: 1 week
contrib/libarchive/NEWS | 2 +
contrib/libarchive/SECURITY.md | 2 +-
.../github_actions/install-macos-dependencies.sh | 3 +
contrib/libarchive/cat/bsdcat.c | 15 +-
contrib/libarchive/cat/cmdline.c | 2 +-
contrib/libarchive/cpio/cmdline.c | 2 +-
contrib/libarchive/cpio/cpio.c | 14 +-
contrib/libarchive/cpio/test/test_owner_parse.c | 2 +-
contrib/libarchive/libarchive/archive.h | 4 +-
contrib/libarchive/libarchive/archive_acl.c | 23 +++
.../libarchive/libarchive/archive_check_magic.c | 9 +-
contrib/libarchive/libarchive/archive_cryptor.c | 8 +-
.../libarchive/archive_cryptor_private.h | 11 +-
contrib/libarchive/libarchive/archive_entry.h | 2 +-
.../libarchive/libarchive/archive_entry_paths.3 | 2 +-
contrib/libarchive/libarchive/archive_entry_stat.c | 6 +-
contrib/libarchive/libarchive/archive_parse_date.c | 4 +-
contrib/libarchive/libarchive/archive_platform.h | 10 --
.../libarchive/libarchive/archive_platform_stat.h | 45 ++++++
contrib/libarchive/libarchive/archive_private.h | 1 +
contrib/libarchive/libarchive/archive_read.c | 7 +-
.../libarchive/archive_read_disk_entry_from_file.c | 12 +-
.../libarchive/archive_read_disk_posix.c | 157 ++-------------------
.../libarchive/libarchive/archive_read_open_fd.c | 23 +--
.../libarchive/libarchive/archive_read_open_file.c | 16 ++-
.../libarchive/archive_read_open_filename.c | 31 ++--
.../libarchive/archive_read_set_format.c | 32 ++---
.../archive_read_support_filter_program.c | 7 +-
.../libarchive/archive_read_support_format_7zip.c | 7 +-
.../libarchive/archive_read_support_format_mtree.c | 23 ++-
.../libarchive/archive_read_support_format_rar.c | 8 +-
.../libarchive/archive_read_support_format_rar5.c | 66 +++++++--
.../libarchive/archive_read_support_format_tar.c | 70 ++++++---
.../libarchive/archive_read_support_format_warc.c | 2 +-
.../libarchive/archive_read_support_format_xar.c | 2 +-
.../libarchive/archive_read_support_format_zip.c | 4 +-
contrib/libarchive/libarchive/archive_string.c | 5 +-
.../libarchive/libarchive/archive_string_sprintf.c | 2 +-
contrib/libarchive/libarchive/archive_util.c | 38 ++++-
contrib/libarchive/libarchive/archive_write.c | 30 ++--
.../libarchive/archive_write_add_filter_bzip2.c | 4 +
.../libarchive/archive_write_add_filter_gzip.c | 55 +++++---
.../libarchive/archive_write_add_filter_program.c | 11 +-
.../libarchive/archive_write_add_filter_zstd.c | 2 +
.../libarchive/archive_write_disk_posix.c | 16 ++-
.../libarchive/libarchive/archive_write_open_fd.c | 2 +-
.../libarchive/archive_write_open_file.c | 14 +-
.../libarchive/archive_write_open_filename.c | 3 +-
.../libarchive/archive_write_set_format_7zip.c | 2 +-
.../libarchive/archive_write_set_format_mtree.c | 19 ++-
.../libarchive/archive_write_set_format_xar.c | 6 +-
.../libarchive/archive_write_set_format_zip.c | 25 +++-
contrib/libarchive/libarchive/filter_fork_posix.c | 37 ++++-
contrib/libarchive/libarchive/test/test_acl_nfs4.c | 7 +
.../libarchive/libarchive/test/test_acl_posix1e.c | 5 +
.../libarchive/test/test_archive_parse_date.c | 2 +
.../test/test_archive_string_conversion.c | 10 ++
contrib/libarchive/libarchive/test/test_entry.c | 11 ++
.../test/test_read_filter_gzip_recursive.c | 4 +-
.../libarchive/test/test_read_format_7zip.c | 81 +++++++----
.../libarchive/test/test_read_format_rar5.c | 66 +++++++++
.../test/test_read_format_rar5_dirdata.rar.uu | 6 +
...rmat_rar5_invalid_hash_valid_htime_exfld.rar.uu | 6 +
.../test_read_format_rar5_only_crypt_exfld.rar.uu | 7 +
.../test_read_format_rar5_unsupported_exfld.rar.uu | 6 +
.../test/test_read_format_tar_V_negative_size.c | 48 +++++++
.../test_read_format_tar_V_negative_size.tar.uu | 20 +++
.../libarchive/test/test_read_set_format.c | 7 +-
.../libarchive/test/test_write_filter_bzip2.c | 29 ++++
.../libarchive/test/test_write_filter_gzip.c | 12 +-
.../test/test_write_filter_gzip_timestamp.c | 7 +-
.../libarchive/libarchive_fe/{err.c => lafe_err.c} | 2 +-
.../libarchive/libarchive_fe/{err.h => lafe_err.h} | 0
contrib/libarchive/libarchive_fe/line_reader.c | 2 +-
contrib/libarchive/libarchive_fe/passphrase.c | 2 +-
contrib/libarchive/tar/bsdtar.c | 7 +-
contrib/libarchive/tar/bsdtar.h | 8 +-
contrib/libarchive/tar/cmdline.c | 2 +-
contrib/libarchive/tar/creation_set.c | 2 +-
contrib/libarchive/tar/read.c | 2 +-
contrib/libarchive/tar/subst.c | 2 +-
contrib/libarchive/tar/test/test_crlf_mtree.c | 74 ++++++++++
.../libarchive/tar/test/test_option_safe_writes.c | 5 +-
contrib/libarchive/tar/util.c | 7 +-
contrib/libarchive/tar/write.c | 29 +++-
contrib/libarchive/test_utils/test_common.h | 10 +-
contrib/libarchive/test_utils/test_main.c | 156 +++++---------------
contrib/libarchive/unzip/bsdunzip.c | 15 +-
contrib/libarchive/unzip/cmdline.c | 2 +-
contrib/libarchive/unzip/test/test_C.c | 4 +
contrib/libarchive/unzip/test/test_L.c | 4 +
contrib/libarchive/unzip/test/test_P_encryption.c | 12 +-
contrib/libarchive/unzip/test/test_basic.c | 4 +
contrib/libarchive/unzip/test/test_d.c | 8 ++
contrib/libarchive/unzip/test/test_doubledash.c | 4 +
contrib/libarchive/unzip/test/test_glob.c | 4 +
contrib/libarchive/unzip/test/test_j.c | 4 +
contrib/libarchive/unzip/test/test_n.c | 4 +
contrib/libarchive/unzip/test/test_o.c | 4 +
contrib/libarchive/unzip/test/test_p.c | 4 +
contrib/libarchive/unzip/test/test_q.c | 4 +
contrib/libarchive/unzip/test/test_singlefile.c | 4 +
contrib/libarchive/unzip/test/test_t.c | 4 +
contrib/libarchive/unzip/test/test_x.c | 12 ++
lib/libarchive/tests/Makefile | 6 +
usr.bin/bsdcat/Makefile | 2 +-
usr.bin/cpio/Makefile | 2 +-
usr.bin/cpio/tests/Makefile | 2 +-
usr.bin/tar/Makefile | 3 +-
usr.bin/tar/tests/Makefile | 1 +
usr.bin/unzip/Makefile | 2 +-
usr.bin/unzip/tests/Makefile | 2 +-
112 files changed, 1120 insertions(+), 546 deletions(-)
diff --cc contrib/libarchive/libarchive/archive_platform_stat.h
index 000000000000,5432b2f6433a..5432b2f6433a
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/archive_platform_stat.h
+++ b/contrib/libarchive/libarchive/archive_platform_stat.h
diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu
index 000000000000,c7928f344a80..c7928f344a80
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu
diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
index 000000000000,399acd814ae4..399acd814ae4
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu
index 000000000000,4f9faf350c11..4f9faf350c11
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu
diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu
index 000000000000,16b456bf4873..16b456bf4873
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu
diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c
index 000000000000,d110553acfaf..d110553acfaf
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c
+++ b/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c
diff --cc contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
index 000000000000,230d710c8f8f..230d710c8f8f
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
diff --cc contrib/libarchive/tar/test/test_crlf_mtree.c
index 000000000000,5ef8811369c1..5ef8811369c1
mode 000000,100644..100644
--- a/contrib/libarchive/tar/test/test_crlf_mtree.c
+++ b/contrib/libarchive/tar/test/test_crlf_mtree.c
diff --cc lib/libarchive/tests/Makefile
index 07c5fe24dd30,000000000000..930250d974c5
mode 100644,000000..100644
--- a/lib/libarchive/tests/Makefile
+++ b/lib/libarchive/tests/Makefile
@@@ -1,742 -1,0 +1,748 @@@
+.include <src.opts.mk>
+
+PACKAGE= tests
+
+WARNS?= 3
+
+_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
+
+ATF_TESTS_SH+= functional_test
+
+TEST_METADATA.functional_test+= timeout="600"
+
+BINDIR= ${TESTSDIR}
+
+PROGS+= libarchive_test
+
+CFLAGS+= -I${.CURDIR} -I${.CURDIR:H} -I${.OBJDIR}
+CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive -I${_LIBARCHIVEDIR}/libarchive/test
+CFLAGS+= -I${_LIBARCHIVEDIR}/test_utils
+CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib
+
+CFLAGS.test_utils.c+= -Wno-cast-align
+
+# Uncomment to link against dmalloc
+#LDADD+= -L/usr/local/lib -ldmalloc
+#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
+
+.PATH: ${_LIBARCHIVEDIR}/libarchive/test
+TESTS_SRCS= \
+ test_7zip_filename_encoding.c \
+ test_acl_nfs4.c \
+ test_acl_pax.c \
+ test_acl_platform_nfs4.c \
+ test_acl_platform_posix1e.c \
+ test_acl_posix1e.c \
+ test_acl_text.c \
+ test_ar_mode.c \
+ test_archive_api_feature.c \
+ test_archive_clear_error.c \
+ test_archive_cmdline.c \
+ test_archive_digest.c \
+ test_archive_match_time.c \
+ test_archive_match_owner.c \
+ test_archive_match_path.c \
+ test_archive_pathmatch.c \
+ test_archive_parse_date.c \
+ test_archive_read.c \
+ test_archive_read_add_passphrase.c \
+ test_archive_read_close_twice.c \
+ test_archive_read_close_twice_open_fd.c \
+ test_archive_read_close_twice_open_filename.c \
+ test_archive_read_multiple_data_objects.c \
+ test_archive_read_next_header_empty.c \
+ test_archive_read_next_header_raw.c \
+ test_archive_read_open2.c \
+ test_archive_read_set_filter_option.c \
+ test_archive_read_set_format_option.c \
+ test_archive_read_set_option.c \
+ test_archive_read_set_options.c \
+ test_archive_read_support.c \
+ test_archive_set_error.c \
+ test_archive_string.c \
+ test_archive_string_conversion.c \
+ test_archive_write_add_filter_by_name.c \
+ test_archive_write_set_filter_option.c \
+ test_archive_write_set_format_by_name.c \
+ test_archive_write_set_format_filter_by_ext.c \
+ test_archive_write_set_format_option.c \
+ test_archive_write_set_option.c \
+ test_archive_write_set_options.c \
+ test_archive_write_set_passphrase.c \
+ test_bad_fd.c \
+ test_compat_bzip2.c \
+ test_compat_cpio.c \
+ test_compat_gtar.c \
+ test_compat_gtar_large.c \
+ test_compat_gzip.c \
+ test_compat_lz4.c \
+ test_compat_lzip.c \
+ test_compat_lzma.c \
+ test_compat_lzop.c \
+ test_compat_mac.c \
+ test_compat_perl_archive_tar.c \
+ test_compat_plexus_archiver_tar.c \
+ test_compat_solaris_tar_acl.c \
+ test_compat_solaris_pax_sparse.c \
+ test_compat_star_acl.c \
+ test_compat_tar_directory.c \
+ test_compat_tar_hardlink.c \
+ test_compat_uudecode.c \
+ test_compat_uudecode_large.c \
+ test_compat_xz.c \
+ test_compat_zip.c \
+ test_compat_zstd.c \
+ test_empty_write.c \
+ test_entry.c \
+ test_entry_strmode.c \
+ test_extattr_freebsd.c \
+ test_filter_count.c \
+ test_gnutar_filename_encoding.c \
+ test_link_resolver.c \
+ test_open_fd.c \
+ test_open_failure.c \
+ test_open_file.c \
+ test_open_filename.c \
+ test_pax_filename_encoding.c \
+ test_pax_xattr_header.c \
+ test_read_data_large.c \
+ test_read_disk.c \
+ test_read_disk_directory_traversals.c \
+ test_read_disk_entry_from_file.c \
+ test_read_extract.c \
+ test_read_file_nonexistent.c \
+ test_read_filter_compress.c \
+ test_read_filter_grzip.c \
+ test_read_filter_gzip_recursive.c \
+ test_read_filter_lrzip.c \
+ test_read_filter_lzop.c \
+ test_read_filter_lzop_multiple_parts.c \
+ test_read_filter_program.c \
+ test_read_filter_program_signature.c \
+ test_read_filter_uudecode.c \
+ test_read_filter_uudecode_raw.c \
+ test_read_format_7zip.c \
+ test_read_format_7zip_encryption_data.c \
+ test_read_format_7zip_encryption_header.c \
+ test_read_format_7zip_encryption_partially.c \
+ test_read_format_7zip_malformed.c \
+ test_read_format_7zip_packinfo_digests.c \
+ test_read_format_ar.c \
+ test_read_format_cab.c \
+ test_read_format_cab_filename.c \
+ test_read_format_cpio_afio.c \
+ test_read_format_cpio_bin.c \
+ test_read_format_cpio_bin_Z.c \
+ test_read_format_cpio_bin_be.c \
+ test_read_format_cpio_bin_bz2.c \
+ test_read_format_cpio_bin_gz.c \
+ test_read_format_cpio_bin_le.c \
+ test_read_format_cpio_bin_lzip.c \
+ test_read_format_cpio_bin_lzma.c \
+ test_read_format_cpio_bin_xz.c \
+ test_read_format_cpio_filename.c \
+ test_read_format_cpio_odc.c \
+ test_read_format_cpio_svr4_gzip.c \
+ test_read_format_cpio_svr4c_Z.c \
+ test_read_format_cpio_svr4_bzip2_rpm.c \
+ test_read_format_cpio_svr4_gzip_rpm.c \
+ test_read_format_empty.c \
+ test_read_format_gtar_filename.c \
+ test_read_format_gtar_gz.c \
+ test_read_format_gtar_lzma.c \
+ test_read_format_gtar_redundant_L.c \
+ test_read_format_gtar_sparse.c \
+ test_read_format_gtar_sparse_length.c \
+ test_read_format_gtar_sparse_skip_entry.c \
+ test_read_format_huge_rpm.c \
+ test_read_format_iso_Z.c \
+ test_read_format_iso_multi_extent.c \
+ test_read_format_iso_xorriso.c \
+ test_read_format_isorr_rr_moved.c \
+ test_read_format_isojoliet_bz2.c \
+ test_read_format_isojoliet_long.c \
+ test_read_format_isojoliet_rr.c \
+ test_read_format_isojoliet_versioned.c \
+ test_read_format_isorr_bz2.c \
+ test_read_format_isorr_ce.c \
+ test_read_format_isorr_new_bz2.c \
+ test_read_format_isozisofs_bz2.c \
+ test_read_format_lha.c \
+ test_read_format_lha_bugfix_0.c \
+ test_read_format_lha_filename.c \
+ test_read_format_lha_filename_utf16.c \
+ test_read_format_mtree.c \
+ test_read_format_mtree_crash747.c \
+ test_read_format_pax_bz2.c \
+ test_read_format_rar.c \
+ test_read_format_rar5.c \
+ test_read_format_rar_encryption.c \
+ test_read_format_rar_encryption_data.c \
+ test_read_format_rar_encryption_header.c \
+ test_read_format_rar_encryption_partially.c \
+ test_read_format_rar_filter.c \
+ test_read_format_rar_invalid1.c \
+ test_read_format_rar_overflow.c \
+ test_read_format_raw.c \
+ test_read_format_tar.c \
++ test_read_format_tar_V_negative_size.c \
+ test_read_format_tar_concatenated.c \
+ test_read_format_tar_empty_filename.c \
+ test_read_format_tar_empty_pax.c \
+ test_read_format_tar_empty_with_gnulabel.c \
+ test_read_format_tar_filename.c \
+ test_read_format_tar_invalid_pax_size.c \
+ test_read_format_tar_mac_metadata.c \
+ test_read_format_tar_pax_g_large.c \
+ test_read_format_tar_pax_large_attr.c \
+ test_read_format_tar_pax_negative_time.c \
+ test_read_format_tbz.c \
+ test_read_format_tgz.c \
+ test_read_format_tlz.c \
+ test_read_format_txz.c \
+ test_read_format_tz.c \
+ test_read_format_ustar_filename.c \
+ test_read_format_warc.c \
+ test_read_format_xar.c \
+ test_read_format_xar_doublelink.c \
+ test_read_format_zip.c \
+ test_read_format_zip_7075_utf8_paths.c \
+ test_read_format_zip_comment_stored.c \
+ test_read_format_zip_encryption_data.c \
+ test_read_format_zip_encryption_header.c \
+ test_read_format_zip_encryption_partially.c \
+ test_read_format_zip_extra_padding.c \
+ test_read_format_zip_filename.c \
+ test_read_format_zip_high_compression.c \
+ test_read_format_zip_jar.c \
+ test_read_format_zip_mac_metadata.c \
+ test_read_format_zip_malformed.c \
+ test_read_format_zip_msdos.c \
+ test_read_format_zip_nested.c \
+ test_read_format_zip_nofiletype.c \
+ test_read_format_zip_padded.c \
+ test_read_format_zip_sfx.c \
+ test_read_format_zip_traditional_encryption_data.c \
+ test_read_format_zip_winzip_aes.c \
+ test_read_format_zip_winzip_aes_large.c \
+ test_read_format_zip_with_invalid_traditional_eocd.c \
+ test_read_format_zip_zip64.c \
+ test_read_large.c \
+ test_read_pax_empty_val_no_nl.c \
+ test_read_pax_xattr_rht_security_selinux.c \
+ test_read_pax_xattr_schily.c \
+ test_read_pax_truncated.c \
+ test_read_position.c \
+ test_read_set_format.c \
+ test_read_too_many_filters.c \
+ test_read_truncated.c \
+ test_read_truncated_filter.c \
+ test_short_writes.c \
+ test_sparse_basic.c \
+ test_tar_filenames.c \
+ test_tar_large.c \
+ test_warn_missing_hardlink_target.c \
+ test_ustar_filenames.c \
+ test_ustar_filename_encoding.c \
+ test_write_disk.c \
+ test_write_disk_appledouble.c \
+ test_write_disk_failures.c \
+ test_write_disk_fixup.c \
+ test_write_disk_hardlink.c \
+ test_write_disk_hfs_compression.c \
+ test_write_disk_lookup.c \
+ test_write_disk_mac_metadata.c \
+ test_write_disk_no_hfs_compression.c \
+ test_write_disk_perms.c \
+ test_write_disk_secure.c \
+ test_write_disk_secure_noabsolutepaths.c \
+ test_write_disk_secure744.c \
+ test_write_disk_secure745.c \
+ test_write_disk_secure746.c \
+ test_write_disk_sparse.c \
+ test_write_disk_symlink.c \
+ test_write_disk_times.c \
+ test_write_filter_b64encode.c \
+ test_write_filter_bzip2.c \
+ test_write_filter_compress.c \
+ test_write_filter_gzip.c \
+ test_write_filter_gzip_timestamp.c \
+ test_write_filter_lrzip.c \
+ test_write_filter_lz4.c \
+ test_write_filter_lzip.c \
+ test_write_filter_lzma.c \
+ test_write_filter_lzop.c \
+ test_write_filter_program.c \
+ test_write_filter_uuencode.c \
+ test_write_filter_xz.c \
+ test_write_filter_zstd.c \
+ test_write_format_7zip.c \
+ test_write_format_7zip_empty.c \
+ test_write_format_7zip_large.c \
+ test_write_format_ar.c \
+ test_write_format_cpio.c \
+ test_write_format_cpio_empty.c \
+ test_write_format_cpio_newc.c \
+ test_write_format_cpio_odc.c \
+ test_write_format_gnutar.c \
+ test_write_format_gnutar_filenames.c \
+ test_write_format_iso9660.c \
+ test_write_format_iso9660_boot.c \
+ test_write_format_iso9660_empty.c \
+ test_write_format_iso9660_filename.c \
+ test_write_format_iso9660_zisofs.c \
+ test_write_format_mtree.c \
+ test_write_format_mtree_absolute_path.c \
+ test_write_format_mtree_classic.c \
+ test_write_format_mtree_classic_indent.c \
+ test_write_format_mtree_fflags.c \
+ test_write_format_mtree_no_separator.c \
+ test_write_format_mtree_preset_digests.c \
+ test_write_format_mtree_quoted_filename.c \
+ test_write_format_pax.c \
+ test_write_format_raw.c \
+ test_write_format_raw_b64.c \
+ test_write_format_shar_empty.c \
+ test_write_format_tar.c \
+ test_write_format_tar_empty.c \
+ test_write_format_tar_sparse.c \
+ test_write_format_tar_ustar.c \
+ test_write_format_tar_v7tar.c \
+ test_write_format_warc.c \
+ test_write_format_warc_empty.c \
+ test_write_format_xar.c \
+ test_write_format_xar_empty.c \
+ test_write_format_zip.c \
+ test_write_format_zip_compression_store.c \
+ test_write_format_zip_compression_zstd.c \
+ test_write_format_zip_compression_bzip2.c \
+ test_write_format_zip_compression_lzmaxz.c \
+ test_write_format_zip_empty.c \
+ test_write_format_zip_empty_zip64.c \
+ test_write_format_zip_entry_size_unset.c \
+ test_write_format_zip_file.c \
+ test_write_format_zip_file_zip64.c \
+ test_write_format_zip_large.c \
+ test_write_format_zip_zip64.c \
+ test_write_format_zip64_stream.c \
+ test_write_format_zip_stream.c \
+ test_write_format_zip_windows_path.c \
+ test_write_open_memory.c \
+ test_write_read_format_zip.c \
+ test_xattr_platform.c \
+ test_zip_filename_encoding.c
+
+# Deterministic failures:
+# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago`
+BROKEN_TESTS+= test_read_disk_directory_traversals
+
+.if 0
+# test_fuzz.c is not a real test, but rather a simple fuzz-test using random().
+# Since this is not a regression/unit test, we don't include it by default.
+# If you would still like to include it, comment out the `.if 0`.
+TEST_SCRCS+= test_fuzz.c
+${PACKAGE}FILES+= test_fuzz.cab.uu
+${PACKAGE}FILES+= test_fuzz.lzh.uu
+${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu
+# Non-deterministic failures:
+# (Times out?) [and] crashes
+BROKEN_TESTS+= test_fuzz_rar
+.endif
+
+# Build the test program.
+SRCS.libarchive_test= \
+ ${TESTS_SRCS} \
+ read_open_memory.c \
+ list.h
+
+LIBADD.libarchive_test= archive
+
+.PATH: ${_LIBARCHIVEDIR}/test_utils
+SRCS.libarchive_test+= test_main.c \
+ test_utils.c
+
+# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
+list.h: ${TESTS_SRCS} Makefile
+ @(cd ${_LIBARCHIVEDIR}/libarchive/test && \
+ grep -E -h ^DEFINE_TEST ${.ALLSRC:N*Makefile} | \
+ egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp
+ @mv ${.TARGET}.tmp ${.TARGET}
+
+CLEANTESTS+= list.h list.h.tmp
+${PACKAGE}FILES+= README
+${PACKAGE}FILES+= test_acl_pax_posix1e.tar.uu
+${PACKAGE}FILES+= test_acl_pax_nfs4.tar.uu
+${PACKAGE}FILES+= test_archive_string_conversion.txt.Z.uu
+${PACKAGE}FILES+= test_compat_bzip2_1.tbz.uu
+${PACKAGE}FILES+= test_compat_bzip2_2.tbz.uu
+${PACKAGE}FILES+= test_compat_cpio_1.cpio.uu
+${PACKAGE}FILES+= test_compat_gtar_1.tar.uu
+${PACKAGE}FILES+= test_compat_gtar_2.tar.uu
+${PACKAGE}FILES+= test_compat_gzip_1.tgz.uu
+${PACKAGE}FILES+= test_compat_gzip_2.tgz.uu
+${PACKAGE}FILES+= test_compat_lz4_1.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_2.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_3.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B4.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B4BD.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B4BDBX.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B5.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B5BD.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B6.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B6BD.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B7.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lz4_B7BD.tar.lz4.uu
+${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu
+${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu
+${PACKAGE}FILES+= test_compat_lzip_3.lz.uu
+${PACKAGE}FILES+= test_compat_lzip_4.tlz.uu
+${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu
+${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu
+${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu
+${PACKAGE}FILES+= test_compat_lzop_1.tar.lzo.uu
+${PACKAGE}FILES+= test_compat_lzop_2.tar.lzo.uu
+${PACKAGE}FILES+= test_compat_lzop_3.tar.lzo.uu
+${PACKAGE}FILES+= test_compat_mac-1.tar.Z.uu
+${PACKAGE}FILES+= test_compat_mac-2.tar.Z.uu
+${PACKAGE}FILES+= test_compat_perl_archive_tar.tar.uu
+${PACKAGE}FILES+= test_compat_plexus_archiver_tar.tar.uu
+${PACKAGE}FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu
+${PACKAGE}FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu
+${PACKAGE}FILES+= test_compat_solaris_tar_acl.tar.uu
+${PACKAGE}FILES+= test_compat_star_acl_nfs4.tar.uu
+${PACKAGE}FILES+= test_compat_star_acl_posix1e.tar.uu
+${PACKAGE}FILES+= test_compat_tar_directory_1.tar.uu
+${PACKAGE}FILES+= test_compat_tar_hardlink_1.tar.uu
+${PACKAGE}FILES+= test_compat_uudecode_large.tar.Z.uu
+${PACKAGE}FILES+= test_compat_xz_1.txz.uu
+${PACKAGE}FILES+= test_compat_zip_1.zip.uu
+${PACKAGE}FILES+= test_compat_zip_2.zip.uu
+${PACKAGE}FILES+= test_compat_zip_3.zip.uu
+${PACKAGE}FILES+= test_compat_zip_4.zip.uu
+${PACKAGE}FILES+= test_compat_zip_5.zip.uu
+${PACKAGE}FILES+= test_compat_zip_6.zip.uu
+${PACKAGE}FILES+= test_compat_zip_7.xps.uu
+${PACKAGE}FILES+= test_compat_zip_8.zip.uu
+${PACKAGE}FILES+= test_compat_zstd_1.tar.zst.uu
+${PACKAGE}FILES+= test_compat_zstd_2.tar.zst.uu
+${PACKAGE}FILES+= test_pax_filename_encoding.tar.uu
+${PACKAGE}FILES+= test_pax_xattr_header_all.tar.uu
+${PACKAGE}FILES+= test_pax_xattr_header_libarchive.tar.uu
+${PACKAGE}FILES+= test_pax_xattr_header_schily.tar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part1.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part2.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part3.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part4.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part5.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part6.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_single_file.part1.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_single_file.part2.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_single_file.part3.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu
+${PACKAGE}FILES+= test_read_filter_grzip.tar.grz.uu
+${PACKAGE}FILES+= test_read_filter_gzip_recursive.gz.uu
+${PACKAGE}FILES+= test_read_filter_lrzip.tar.lrz.uu
+${PACKAGE}FILES+= test_read_filter_lzop.tar.lzo.uu
+${PACKAGE}FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu
+${PACKAGE}FILES+= test_read_filter_uudecode_base64_raw.uu
+${PACKAGE}FILES+= test_read_filter_uudecode_raw.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_deflate.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_deflate_arm64.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_deflate_powerpc.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_bzip2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_copy.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_deflate.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bzip2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_copy.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_copy_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_deflate.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_delta_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_delta_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_delta4_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_empty_archive.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_empty_file.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_encryption.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_encryption_header.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_encryption_partially.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_extract_second.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma1_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2_arm64.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2_powerpc.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2_riscv.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2_sparc.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_malformed.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_malformed2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_packinfo_digests.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_ppmd.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_sfx_elf.elf.uu
+${PACKAGE}FILES+= test_read_format_7zip_sfx_modified_pe.exe.uu
+${PACKAGE}FILES+= test_read_format_7zip_sfx_pe.exe.uu
+${PACKAGE}FILES+= test_read_format_7zip_solid_zstd.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_symbolic_name.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_zstd.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_zstd_arm.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_zstd_bcj.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_zstd_nobcj.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_zstd_sparc.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_win_attrib.7z.uu
+${PACKAGE}FILES+= test_read_format_ar.ar.uu
+${PACKAGE}FILES+= test_read_format_cab_1.cab.uu
+${PACKAGE}FILES+= test_read_format_cab_2.cab.uu
+${PACKAGE}FILES+= test_read_format_cab_3.cab.uu
+${PACKAGE}FILES+= test_read_format_cab_filename_cp932.cab.uu
+${PACKAGE}FILES+= test_read_format_cpio_bin_be.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_bin_le.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_cp866.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_eucjp.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_koi8r.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
+${PACKAGE}FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu
+${PACKAGE}FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_redundant_L.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_13.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_length.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_huge_rpm.rpm.uu
+${PACKAGE}FILES+= test_read_format_iso.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_2.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_3.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet_long.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_multi_extent.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge_new.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_xorriso.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_zisofs.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_lha_bugfix_0.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_filename_cp932.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_filename_utf16.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header0.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header1.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header2.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header3.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_lh0.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_lh6.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_lh7.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_withjunk.lzh.uu
+${PACKAGE}FILES+= test_read_format_mtree.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_crash747.mtree.bz2.uu
+${PACKAGE}FILES+= test_read_format_mtree_nomagic.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_nomagic2.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_nomagic3.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_noprint.mtree.uu
+${PACKAGE}FILES+= test_read_format_rar.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_binary_data.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_compress_best.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_compress_normal.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_encryption_data.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_encryption_header.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_encryption_partially.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_endarc_huge.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_filter.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_invalid1.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0001.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0002.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0003.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0004.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_newsub_huge.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_noeof.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_overflow.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_ppmd_use_after_free2.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_sfx.exe.uu
+${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_symlink_huge.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu
+${PACKAGE}FILES+= test_read_format_rar4_encrypted.rar.uu
+${PACKAGE}FILES+= test_read_format_rar4_encrypted_filenames.rar.uu
+${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted.rar.uu
+${PACKAGE}FILES+= test_read_format_rar4_solid_encrypted_filenames.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_arm.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_arm_filter_on_window_boundary.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_data_ready_pointer_leak.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_blake2.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_block_size_is_too_small.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_compressed.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_decode_number_out_of_bounds_read.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_different_solid_window_size.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_different_window_size.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_different_winsize_on_merge.rar.uu
++${PACKAGE}FILES+= test_read_format_rar5_dirdata.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_distance_overflow.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_encrypted.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_encrypted_filenames.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_solid_encrypted_filenames.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_extra_field_version.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_fileattr.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_hardlink.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_invalid_dict_reference.rar.uu
++${PACKAGE}FILES+= test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_leftshift1.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_leftshift2.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part01.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part02.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part03.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part04.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part05.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part06.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part07.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive.part08.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part01.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part02.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part03.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiarchive_solid.part04.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiple_files.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_multiple_files_solid.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_nonempty_dir_stream.rar.uu
++${PACKAGE}FILES+= test_read_format_rar5_only_crypt_exfld.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_owner.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_readtables_overflow.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_sfx.exe.uu
+${PACKAGE}FILES+= test_read_format_rar5_solid.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_stored.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_stored_manyfiles.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_symlink.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_truncated_huff.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_unicode.rar.uu
++${PACKAGE}FILES+= test_read_format_rar5_unsupported_exfld.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_win32.rar.uu
+${PACKAGE}FILES+= test_read_format_rar5_window_buf_and_size_desync.rar.uu
+${PACKAGE}FILES+= test_read_format_raw.bufr.uu
+${PACKAGE}FILES+= test_read_format_raw.data.Z.uu
+${PACKAGE}FILES+= test_read_format_raw.data.gz.uu
+${PACKAGE}FILES+= test_read_format_raw.data.uu
++${PACKAGE}FILES+= test_read_format_tar_V_negative_size.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_concatenated.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_empty_filename.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_empty_with_gnulabel.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_empty_pax.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_tar_invalid_pax_size.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_mac_metadata_1.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_pax_g_large.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_pax_large_attr.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_tar_pax_negative_time.tar.uu
+${PACKAGE}FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_warc.warc.uu
+${PACKAGE}FILES+= test_read_format_warc_incomplete.warc.uu
+${PACKAGE}FILES+= test_read_format_xar_doublelink.xar.uu
+${PACKAGE}FILES+= test_read_format_xar_duplicate_filename_node.xar.uu
+${PACKAGE}FILES+= test_read_format_zip.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_7075_utf8_paths.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_7z_deflate.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_7z_lzma.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_bz2_hang.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_bzip2.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_bzip2_multi.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_comment_stored_1.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_comment_stored_2.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_encryption_data.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_encryption_header.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_encryption_partially.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_extra_padding.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_cp866.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_cp932.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_koi8r.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_utf8_jp.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_high_compression.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_jar.jar.uu
+${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_lzma_alone_leak.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_lzma.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_lzma_multi.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_lzma_stream_end.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_malformed1.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_msdos.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_nested.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_nofiletype.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_padded1.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_padded2.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_padded3.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_ppmd8.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_1.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_ppmd8_crash_2.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_ppmd8_multi.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_sfx.uu
+${PACKAGE}FILES+= test_read_format_zip_symlink.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_traditional_encryption_data.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_ux.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_with_invalid_traditional_eocd.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_winzip_aes128.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_winzip_aes256.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_large.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_winzip_aes256_stored.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_xz_multi.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_zip64a.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_zip64b.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_zstd.zipx.uu
+${PACKAGE}FILES+= test_read_format_zip_zstd_multi.zipx.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_aa.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ab.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ac.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ad.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ae.uu
+${PACKAGE}FILES+= test_read_pax_empty_val_no_nl.tar.uu
+${PACKAGE}FILES+= test_read_pax_xattr_rht_security_selinux.tar.uu
+${PACKAGE}FILES+= test_read_pax_xattr_schily.tar.uu
+${PACKAGE}FILES+= test_read_splitted_rar_aa.uu
+${PACKAGE}FILES+= test_read_splitted_rar_ab.uu
+${PACKAGE}FILES+= test_read_splitted_rar_ac.uu
+${PACKAGE}FILES+= test_read_splitted_rar_ad.uu
+${PACKAGE}FILES+= test_read_too_many_filters.gz.uu
+${PACKAGE}FILES+= test_splitted_rar_seek_support_aa.uu
+${PACKAGE}FILES+= test_splitted_rar_seek_support_ab.uu
+${PACKAGE}FILES+= test_splitted_rar_seek_support_ac.uu
+${PACKAGE}FILES+= test_write_disk_appledouble.cpio.gz.uu
+${PACKAGE}FILES+= test_write_disk_appledouble_zip.zip.uu
+${PACKAGE}FILES+= test_write_disk_hfs_compression.tgz.uu
+${PACKAGE}FILES+= test_write_disk_mac_metadata.tar.gz.uu
+${PACKAGE}FILES+= test_write_disk_no_hfs_compression.tgz.uu
+
+.include <bsd.test.mk>
diff --cc usr.bin/bsdcat/Makefile
index 032207217be6,000000000000..06081fc2b2f8
mode 100644,000000..100644
--- a/usr.bin/bsdcat/Makefile
+++ b/usr.bin/bsdcat/Makefile
@@@ -1,29 -1,0 +1,29 @@@
+.include <src.opts.mk>
+
+_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
+_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
+
+PROG= bsdcat
+BSDCAT_VERSION_STRING!= sed -n '/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \
+ ${_LIBARCHIVEDIR}/libarchive/archive.h
+
+.PATH: ${_LIBARCHIVEDIR}/cat
+SRCS= bsdcat.c cmdline.c
+
+.PATH: ${_LIBARCHIVEDIR}/libarchive_fe
- SRCS+= err.c
++SRCS+= lafe_err.c
+
+CFLAGS+= -DBSDCAT_VERSION_STRING=\"${BSDCAT_VERSION_STRING}\"
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\"
+CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe
+
+LIBADD= archive
+
+.if ${MK_ICONV} != "no"
+CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
+.endif
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
+.include <bsd.prog.mk>
diff --cc usr.bin/cpio/Makefile
*** 477 LINES SKIPPED ***