git: b9128a37faaf - main - libarchive: merge from vendor branch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 16 Apr 2024 21:41:29 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=b9128a37faafede823eb456aa65a11ac69997284
commit b9128a37faafede823eb456aa65a11ac69997284
Merge: e0919a4bac2b a509d68f27b9
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2024-04-16 21:39:31 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2024-04-16 21:39:31 +0000
libarchive: merge from vendor branch
Libarchive 3.7.3
New features:
#1941 uudecode filter: support file name and file mode in raw mode
#1943 7-zip reader: translate Windows permissions into UNIX
permissions
#1962 zstd filter now supports the "long" write option
#2012 add trailing letter b to bsdtar(1) substitute pattern
#2031 PCRE2 support
#2054 add support for long options "--group" and "--owner" to tar(1)
Security fixes:
#2101 Fix possible vulnerability in tar error reporting introduced
in f27c173
Important bugfixes:
#1974 ISO9660: preserve the natural order of links
#2105 rar5: fix infinite loop if during rar5 decompression the last
block produced no data
#2027 xz filter: fix incorrect eof at the end of an lzip member
#2043 zip: fix end-of-data marker processing when decompressing zip
archives
PR: 278315 (exp-run)
MFC after: 1 week
contrib/libarchive/.editorconfig | 18 -
contrib/libarchive/.github/workflows/cifuzz.yml | 24 -
contrib/libarchive/NEWS | 4 +
.../build/autoconf/m4_ax_compile_check_sizeof.m4 | 115 --
contrib/libarchive/cat/bsdcat.1 | 2 -
contrib/libarchive/cat/bsdcat.c | 36 +-
contrib/libarchive/cat/bsdcat.h | 7 -
contrib/libarchive/cat/bsdcat_platform.h | 24 +-
contrib/libarchive/cat/cmdline.c | 1 -
contrib/libarchive/cat/test/test.h | 2 -
contrib/libarchive/cpio/bsdcpio.1 | 2 -
contrib/libarchive/cpio/cmdline.c | 1 -
contrib/libarchive/cpio/cpio.c | 17 +-
contrib/libarchive/cpio/cpio.h | 2 -
contrib/libarchive/cpio/cpio_platform.h | 18 +-
contrib/libarchive/cpio/test/test.h | 2 -
contrib/libarchive/cpio/test/test_0.c | 1 -
contrib/libarchive/cpio/test/test_basic.c | 1 -
contrib/libarchive/cpio/test/test_cmdline.c | 1 -
contrib/libarchive/cpio/test/test_extract_cpio_Z.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_bz2.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_grz.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_gz.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_lrz.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_lz.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_lz4.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_lzma.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_lzo.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_xz.c | 1 -
.../libarchive/cpio/test/test_extract_cpio_zstd.c | 1 -
contrib/libarchive/cpio/test/test_format_newc.c | 1 -
contrib/libarchive/cpio/test/test_gcpio_compat.c | 1 -
.../cpio/test/test_gcpio_compat_ref.bin.uu | 1 -
.../cpio/test/test_gcpio_compat_ref.crc.uu | 1 -
.../cpio/test/test_gcpio_compat_ref.newc.uu | 1 -
.../cpio/test/test_gcpio_compat_ref.ustar.uu | 1 -
contrib/libarchive/cpio/test/test_missing_file.c | 1 -
contrib/libarchive/cpio/test/test_option_0.c | 1 -
contrib/libarchive/cpio/test/test_option_B_upper.c | 2 -
contrib/libarchive/cpio/test/test_option_C_upper.c | 2 -
contrib/libarchive/cpio/test/test_option_J_upper.c | 1 -
contrib/libarchive/cpio/test/test_option_L_upper.c | 1 -
contrib/libarchive/cpio/test/test_option_Z_upper.c | 1 -
contrib/libarchive/cpio/test/test_option_a.c | 1 -
.../libarchive/cpio/test/test_option_b64encode.c | 1 -
contrib/libarchive/cpio/test/test_option_c.c | 1 -
contrib/libarchive/cpio/test/test_option_d.c | 2 -
contrib/libarchive/cpio/test/test_option_f.c | 1 -
contrib/libarchive/cpio/test/test_option_f.cpio.uu | 1 -
contrib/libarchive/cpio/test/test_option_grzip.c | 1 -
contrib/libarchive/cpio/test/test_option_help.c | 1 -
contrib/libarchive/cpio/test/test_option_l.c | 1 -
contrib/libarchive/cpio/test/test_option_lrzip.c | 1 -
contrib/libarchive/cpio/test/test_option_lz4.c | 1 -
contrib/libarchive/cpio/test/test_option_lzma.c | 1 -
contrib/libarchive/cpio/test/test_option_lzop.c | 1 -
contrib/libarchive/cpio/test/test_option_m.c | 2 -
contrib/libarchive/cpio/test/test_option_m.cpio.uu | 1 -
.../libarchive/cpio/test/test_option_passphrase.c | 1 -
contrib/libarchive/cpio/test/test_option_t.c | 1 -
contrib/libarchive/cpio/test/test_option_t.cpio.uu | 1 -
.../libarchive/cpio/test/test_option_t.stdout.uu | 1 -
.../libarchive/cpio/test/test_option_tv.stdout.uu | 1 -
contrib/libarchive/cpio/test/test_option_u.c | 1 -
.../libarchive/cpio/test/test_option_uuencode.c | 1 -
contrib/libarchive/cpio/test/test_option_xz.c | 1 -
contrib/libarchive/cpio/test/test_option_y.c | 1 -
contrib/libarchive/cpio/test/test_option_z.c | 1 -
contrib/libarchive/cpio/test/test_option_zstd.c | 1 -
contrib/libarchive/cpio/test/test_owner_parse.c | 1 -
.../libarchive/cpio/test/test_passthrough_dotdot.c | 1 -
.../cpio/test/test_passthrough_reverse.c | 1 -
contrib/libarchive/libarchive/archive.h | 10 +-
contrib/libarchive/libarchive/archive_acl.c | 1 -
.../libarchive/libarchive/archive_acl_private.h | 2 -
.../libarchive/libarchive/archive_check_magic.c | 20 +-
contrib/libarchive/libarchive/archive_cmdline.c | 2 -
.../libarchive/archive_cmdline_private.h | 2 -
contrib/libarchive/libarchive/archive_crc32.h | 2 -
contrib/libarchive/libarchive/archive_cryptor.c | 4 +-
contrib/libarchive/libarchive/archive_digest.c | 2 +-
contrib/libarchive/libarchive/archive_endian.h | 2 -
contrib/libarchive/libarchive/archive_entry.3 | 2 -
contrib/libarchive/libarchive/archive_entry.c | 30 +-
contrib/libarchive/libarchive/archive_entry.h | 8 +-
.../libarchive/archive_entry_copy_stat.c | 1 -
.../libarchive/archive_entry_link_resolver.c | 1 -
.../libarchive/libarchive/archive_entry_locale.h | 2 -
.../libarchive/libarchive/archive_entry_private.h | 6 +-
.../libarchive/libarchive/archive_entry_sparse.c | 1 -
contrib/libarchive/libarchive/archive_entry_stat.c | 1 -
.../libarchive/libarchive/archive_entry_strmode.c | 1 -
contrib/libarchive/libarchive/archive_entry_time.3 | 2 -
.../libarchive/libarchive/archive_entry_xattr.c | 1 -
contrib/libarchive/libarchive/archive_getdate.c | 4 -
contrib/libarchive/libarchive/archive_getdate.h | 2 -
contrib/libarchive/libarchive/archive_match.c | 1 -
contrib/libarchive/libarchive/archive_options.c | 1 -
.../libarchive/archive_options_private.h | 2 -
contrib/libarchive/libarchive/archive_pack_dev.c | 7 -
contrib/libarchive/libarchive/archive_pathmatch.c | 1 -
contrib/libarchive/libarchive/archive_pathmatch.h | 2 -
contrib/libarchive/libarchive/archive_platform.h | 15 -
.../libarchive/libarchive/archive_platform_acl.h | 2 -
.../libarchive/libarchive/archive_platform_xattr.h | 2 -
contrib/libarchive/libarchive/archive_private.h | 12 +-
contrib/libarchive/libarchive/archive_random.c | 3 +-
contrib/libarchive/libarchive/archive_read.3 | 2 -
contrib/libarchive/libarchive/archive_read.c | 1 -
.../libarchive/archive_read_add_passphrase.3 | 2 -
.../libarchive/archive_read_add_passphrase.c | 1 -
.../libarchive/archive_read_append_filter.c | 1 -
contrib/libarchive/libarchive/archive_read_data.3 | 2 -
.../libarchive/archive_read_data_into_fd.c | 1 -
contrib/libarchive/libarchive/archive_read_disk.3 | 2 -
.../libarchive/archive_read_disk_entry_from_file.c | 1 -
.../libarchive/archive_read_disk_posix.c | 1 -
.../libarchive/archive_read_disk_private.h | 2 -
.../archive_read_disk_set_standard_lookup.c | 1 -
.../libarchive/libarchive/archive_read_extract.3 | 2 -
.../libarchive/libarchive/archive_read_extract.c | 1 -
.../libarchive/libarchive/archive_read_extract2.c | 1 -
.../libarchive/libarchive/archive_read_filter.3 | 2 -
.../libarchive/libarchive/archive_read_format.3 | 2 -
contrib/libarchive/libarchive/archive_read_free.3 | 2 -
.../libarchive/libarchive/archive_read_header.3 | 2 -
contrib/libarchive/libarchive/archive_read_new.3 | 2 -
contrib/libarchive/libarchive/archive_read_open.3 | 2 -
.../libarchive/libarchive/archive_read_open_fd.c | 1 -
.../libarchive/libarchive/archive_read_open_file.c | 1 -
.../libarchive/archive_read_open_filename.c | 112 +-
.../libarchive/archive_read_open_memory.c | 1 -
.../libarchive/libarchive/archive_read_private.h | 2 -
.../libarchive/archive_read_set_format.c | 1 -
.../libarchive/archive_read_set_options.3 | 2 -
.../libarchive/archive_read_set_options.c | 1 -
.../libarchive/archive_read_support_filter_all.c | 1 -
.../archive_read_support_filter_by_code.c | 1 -
.../libarchive/archive_read_support_filter_bzip2.c | 4 +-
.../archive_read_support_filter_compress.c | 3 +-
.../libarchive/archive_read_support_filter_grzip.c | 3 -
.../libarchive/archive_read_support_filter_gzip.c | 5 +-
.../libarchive/archive_read_support_filter_lrzip.c | 3 -
.../libarchive/archive_read_support_filter_lz4.c | 8 +-
.../libarchive/archive_read_support_filter_lzop.c | 6 +-
.../libarchive/archive_read_support_filter_none.c | 1 -
.../archive_read_support_filter_program.c | 1 -
.../libarchive/archive_read_support_filter_rpm.c | 2 +-
.../libarchive/archive_read_support_filter_uu.c | 53 +-
.../libarchive/archive_read_support_filter_xz.c | 20 +-
.../libarchive/archive_read_support_filter_zstd.c | 4 +-
.../libarchive/archive_read_support_format_7zip.c | 83 +-
.../libarchive/archive_read_support_format_all.c | 1 -
.../libarchive/archive_read_support_format_ar.c | 1 -
.../archive_read_support_format_by_code.c | 1 -
.../libarchive/archive_read_support_format_cpio.c | 1 -
.../libarchive/archive_read_support_format_empty.c | 1 -
.../archive_read_support_format_iso9660.c | 6 +-
.../libarchive/archive_read_support_format_mtree.c | 1 -
.../libarchive/archive_read_support_format_rar.c | 2 +-
.../libarchive/archive_read_support_format_rar5.c | 12 +-
.../libarchive/archive_read_support_format_raw.c | 1 -
.../libarchive/archive_read_support_format_tar.c | 1 -
.../libarchive/archive_read_support_format_warc.c | 1 -
.../libarchive/archive_read_support_format_xar.c | 3 +-
.../libarchive/archive_read_support_format_zip.c | 499 ++++---
contrib/libarchive/libarchive/archive_string.c | 16 +-
contrib/libarchive/libarchive/archive_string.h | 3 -
.../libarchive/archive_string_composition.h | 2 -
.../libarchive/libarchive/archive_string_sprintf.c | 1 -
contrib/libarchive/libarchive/archive_util.3 | 2 -
contrib/libarchive/libarchive/archive_util.c | 1 -
.../libarchive/archive_version_details.c | 1 -
contrib/libarchive/libarchive/archive_virtual.c | 1 -
contrib/libarchive/libarchive/archive_write.3 | 2 -
contrib/libarchive/libarchive/archive_write.c | 3 +-
.../libarchive/archive_write_add_filter.c | 1 -
.../archive_write_add_filter_b64encode.c | 2 -
.../libarchive/archive_write_add_filter_by_name.c | 1 -
.../libarchive/archive_write_add_filter_bzip2.c | 2 -
.../libarchive/archive_write_add_filter_compress.c | 2 -
.../libarchive/archive_write_add_filter_grzip.c | 2 -
.../libarchive/archive_write_add_filter_gzip.c | 2 -
.../libarchive/archive_write_add_filter_lrzip.c | 2 -
.../libarchive/archive_write_add_filter_lz4.c | 2 -
.../libarchive/archive_write_add_filter_lzop.c | 1 -
.../libarchive/archive_write_add_filter_none.c | 1 -
.../libarchive/archive_write_add_filter_program.c | 1 -
.../libarchive/archive_write_add_filter_uuencode.c | 2 -
.../libarchive/archive_write_add_filter_xz.c | 2 -
.../libarchive/archive_write_add_filter_zstd.c | 149 +-
.../libarchive/archive_write_blocksize.3 | 2 -
contrib/libarchive/libarchive/archive_write_data.3 | 2 -
contrib/libarchive/libarchive/archive_write_disk.3 | 2 -
.../libarchive/archive_write_disk_posix.c | 1 -
.../libarchive/archive_write_disk_private.h | 2 -
.../archive_write_disk_set_standard_lookup.c | 1 -
.../libarchive/libarchive/archive_write_filter.3 | 2 -
.../libarchive/archive_write_finish_entry.3 | 2 -
.../libarchive/libarchive/archive_write_format.3 | 2 -
contrib/libarchive/libarchive/archive_write_free.3 | 2 -
.../libarchive/libarchive/archive_write_header.3 | 2 -
contrib/libarchive/libarchive/archive_write_new.3 | 2 -
contrib/libarchive/libarchive/archive_write_open.3 | 2 -
.../libarchive/libarchive/archive_write_open_fd.c | 1 -
.../libarchive/archive_write_open_file.c | 1 -
.../libarchive/archive_write_open_filename.c | 1 -
.../libarchive/archive_write_open_memory.c | 1 -
.../libarchive/libarchive/archive_write_private.h | 2 -
.../libarchive/archive_write_set_format.c | 1 -
.../libarchive/archive_write_set_format_7zip.c | 34 +-
.../libarchive/archive_write_set_format_ar.c | 1 -
.../libarchive/archive_write_set_format_by_name.c | 1 -
.../archive_write_set_format_cpio_binary.c | 1 -
.../archive_write_set_format_cpio_newc.c | 1 -
.../libarchive/archive_write_set_format_cpio_odc.c | 1 -
.../archive_write_set_format_filter_by_ext.c | 1 -
.../libarchive/archive_write_set_format_gnutar.c | 2 -
.../libarchive/archive_write_set_format_mtree.c | 1 -
.../libarchive/archive_write_set_format_pax.c | 1 -
.../libarchive/archive_write_set_format_private.h | 2 -
.../libarchive/archive_write_set_format_shar.c | 1 -
.../libarchive/archive_write_set_format_ustar.c | 2 -
.../libarchive/archive_write_set_format_v7tar.c | 2 -
.../libarchive/archive_write_set_format_warc.c | 1 -
.../libarchive/archive_write_set_format_xar.c | 1 -
.../libarchive/archive_write_set_format_zip.c | 189 ++-
.../libarchive/archive_write_set_options.3 | 20 +-
.../libarchive/archive_write_set_options.c | 1 -
.../libarchive/archive_write_set_passphrase.3 | 2 -
.../libarchive/archive_write_set_passphrase.c | 1 -
contrib/libarchive/libarchive/cpio.5 | 2 -
contrib/libarchive/libarchive/filter_fork.h | 2 -
contrib/libarchive/libarchive/filter_fork_posix.c | 2 -
contrib/libarchive/libarchive/libarchive-formats.5 | 2 -
contrib/libarchive/libarchive/libarchive.3 | 2 -
contrib/libarchive/libarchive/libarchive_changes.3 | 2 -
.../libarchive/libarchive/libarchive_internals.3 | 2 -
contrib/libarchive/libarchive/tar.5 | 2 -
contrib/libarchive/libarchive/test/README | 2 -
.../libarchive/libarchive/test/read_open_memory.c | 1 -
contrib/libarchive/libarchive/test/test_acl_nfs4.c | 1 -
contrib/libarchive/libarchive/test/test_acl_pax.c | 1 -
.../libarchive/test/test_acl_platform_nfs4.c | 1 -
.../libarchive/test/test_acl_platform_posix1e.c | 1 -
.../libarchive/libarchive/test/test_acl_posix1e.c | 1 -
contrib/libarchive/libarchive/test/test_acl_text.c | 1 -
.../libarchive/test/test_archive_api_feature.c | 1 -
.../libarchive/test/test_archive_clear_error.c | 1 -
.../libarchive/test/test_archive_cmdline.c | 1 -
.../libarchive/test/test_archive_getdate.c | 1 -
.../libarchive/test/test_archive_match_owner.c | 1 -
.../libarchive/test/test_archive_match_path.c | 1 -
.../libarchive/test/test_archive_match_time.c | 1 -
.../libarchive/test/test_archive_pathmatch.c | 1 -
.../test/test_archive_read_add_passphrase.c | 1 -
.../test/test_archive_read_close_twice.c | 2 -
.../test/test_archive_read_close_twice_open_fd.c | 1 -
.../test_archive_read_close_twice_open_filename.c | 1 -
.../test/test_archive_read_multiple_data_objects.c | 5 +-
.../test/test_archive_read_next_header_empty.c | 1 -
.../test/test_archive_read_next_header_raw.c | 1 -
.../libarchive/test/test_archive_read_open2.c | 1 -
.../test/test_archive_read_set_filter_option.c | 1 -
.../test/test_archive_read_set_format_option.c | 1 -
.../libarchive/test/test_archive_read_set_option.c | 1 -
.../test/test_archive_read_set_options.c | 1 -
.../libarchive/test/test_archive_read_support.c | 1 -
.../libarchive/test/test_archive_set_error.c | 1 -
.../libarchive/test/test_archive_string.c | 3 +-
.../test/test_archive_string_conversion.c | 4 +-
.../test/test_archive_string_conversion.txt.Z.uu | 1 -
.../test/test_archive_write_add_filter_by_name.c | 4 +-
.../test/test_archive_write_set_filter_option.c | 1 -
.../test/test_archive_write_set_format_by_name.c | 2 -
.../test_archive_write_set_format_filter_by_ext.c | 2 -
.../test/test_archive_write_set_format_option.c | 1 -
.../test/test_archive_write_set_option.c | 1 -
.../test/test_archive_write_set_options.c | 1 -
.../test/test_archive_write_set_passphrase.c | 1 -
contrib/libarchive/libarchive/test/test_bad_fd.c | 1 -
.../libarchive/libarchive/test/test_compat_bzip2.c | 1 -
.../libarchive/test/test_compat_bzip2_1.tbz.uu | 2 -
.../libarchive/test/test_compat_bzip2_2.tbz.uu | 2 -
.../libarchive/libarchive/test/test_compat_cpio.c | 1 -
.../libarchive/test/test_compat_cpio_1.cpio.uu | 2 -
.../libarchive/libarchive/test/test_compat_gtar.c | 1 -
.../libarchive/test/test_compat_gtar_1.tar.uu | 1 -
.../libarchive/test/test_compat_gtar_2.tar.uu | 2 +-
.../libarchive/libarchive/test/test_compat_gzip.c | 1 -
.../libarchive/test/test_compat_gzip_1.tgz.uu | 2 -
.../libarchive/test/test_compat_gzip_2.tgz.uu | 2 -
.../libarchive/libarchive/test/test_compat_lz4.c | 1 -
.../libarchive/libarchive/test/test_compat_lzip.c | 85 +-
.../libarchive/test/test_compat_lzip_3.lz.uu | 1461 +++++++++++++++++++
.../libarchive/test/test_compat_lzip_4.tlz.uu | 1474 ++++++++++++++++++++
.../libarchive/libarchive/test/test_compat_lzma.c | 1 -
.../libarchive/test/test_compat_lzma_1.tlz.uu | 2 -
.../libarchive/test/test_compat_lzma_2.tlz.uu | 2 -
.../libarchive/test/test_compat_lzma_3.tlz.uu | 2 -
.../libarchive/libarchive/test/test_compat_lzop.c | 1 -
.../libarchive/libarchive/test/test_compat_mac.c | 1 -
.../libarchive/test/test_compat_perl_archive_tar.c | 1 -
.../test/test_compat_plexus_archiver_tar.c | 1 -
.../test/test_compat_solaris_pax_sparse.c | 2 -
.../libarchive/test/test_compat_solaris_tar_acl.c | 1 -
.../libarchive/test/test_compat_star_acl.c | 1 -
.../libarchive/test/test_compat_tar_directory.c | 1 -
.../test/test_compat_tar_directory_1.tar.uu | 1 -
.../libarchive/test/test_compat_tar_hardlink.c | 1 -
.../test/test_compat_tar_hardlink_1.tar.uu | 1 -
.../libarchive/test/test_compat_uudecode.c | 1 -
.../libarchive/test/test_compat_uudecode_large.c | 1 -
.../libarchive/libarchive/test/test_compat_xz.c | 1 -
.../libarchive/test/test_compat_xz_1.txz.uu | 3 +-
.../libarchive/libarchive/test/test_compat_zip.c | 1 -
.../libarchive/test/test_compat_zip_1.zip.uu | 1 -
.../libarchive/test/test_compat_zip_8.zip.uu | 12 +-
.../libarchive/libarchive/test/test_compat_zstd.c | 2 -
.../libarchive/libarchive/test/test_empty_write.c | 1 -
contrib/libarchive/libarchive/test/test_entry.c | 1 -
.../libarchive/test/test_entry_strmode.c | 1 -
.../libarchive/test/test_extattr_freebsd.c | 1 -
.../libarchive/libarchive/test/test_filter_count.c | 1 -
contrib/libarchive/libarchive/test/test_fuzz.c | 1 -
.../libarchive/test/test_fuzz_1.iso.Z.uu | 2 -
.../test/test_gnutar_filename_encoding.c | 2 -
.../libarchive/test/test_link_resolver.c | 1 -
.../libarchive/libarchive/test/test_open_failure.c | 1 -
contrib/libarchive/libarchive/test/test_open_fd.c | 1 -
.../libarchive/libarchive/test/test_open_file.c | 1 -
.../libarchive/test/test_open_filename.c | 1 -
.../libarchive/test/test_pax_filename_encoding.c | 1 -
.../test/test_pax_filename_encoding.tar.uu | 1 -
.../libarchive/test/test_pax_xattr_header.c | 1 -
.../test_rar_multivolume_single_file.part1.rar.uu | 2 +-
.../test_rar_multivolume_single_file.part2.rar.uu | 2 +-
.../test_rar_multivolume_single_file.part3.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part01.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part02.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part03.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part04.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part05.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part06.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part07.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part08.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part09.rar.uu | 2 +-
...ar_multivolume_uncompressed_files.part10.rar.uu | 2 +-
.../libarchive/test/test_read_data_large.c | 1 -
.../libarchive/libarchive/test/test_read_disk.c | 1 -
.../test/test_read_disk_directory_traversals.c | 1 -
.../test/test_read_disk_entry_from_file.c | 1 -
.../libarchive/libarchive/test/test_read_extract.c | 1 -
.../libarchive/test/test_read_file_nonexistent.c | 1 -
.../test/test_read_filter_lrzip.tar.lrz.uu | 2 +-
.../libarchive/test/test_read_filter_program.c | 1 -
.../test/test_read_filter_program_signature.c | 1 -
.../libarchive/test/test_read_filter_uudecode.c | 1 -
.../test/test_read_filter_uudecode_base64_raw.uu | 11 +
.../test/test_read_filter_uudecode_raw.c | 67 +
.../test/test_read_filter_uudecode_raw.uu | 14 +
.../libarchive/test/test_read_format_7zip.c | 81 +-
.../test/test_read_format_7zip_copy.7z.uu | 2 +-
.../test/test_read_format_7zip_deflate_arm64.7z.uu | 2 +-
.../test/test_read_format_7zip_encryption_data.c | 1 -
.../test/test_read_format_7zip_encryption_header.c | 2 -
.../test_read_format_7zip_encryption_partially.c | 1 -
.../test/test_read_format_7zip_lzma2_arm64.7z.uu | 2 +-
.../test/test_read_format_7zip_malformed.c | 1 -
.../test/test_read_format_7zip_packinfo_digests.c | 5 +-
.../test/test_read_format_7zip_win_attrib.7z.uu | 10 +
.../libarchive/test/test_read_format_ar.ar.uu | 2 -
.../libarchive/test/test_read_format_ar.c | 2 -
.../libarchive/test/test_read_format_cab.c | 1 -
.../test/test_read_format_cab_filename.c | 1 -
.../test_read_format_cab_filename_cp932.cab.uu | 2 +-
.../libarchive/test/test_read_format_cpio_afio.c | 1 -
.../libarchive/test/test_read_format_cpio_bin.c | 1 -
.../libarchive/test/test_read_format_cpio_bin_Z.c | 1 -
.../libarchive/test/test_read_format_cpio_bin_be.c | 1 -
.../test/test_read_format_cpio_bin_be.cpio.uu | 1 -
.../test/test_read_format_cpio_bin_bz2.c | 1 -
.../libarchive/test/test_read_format_cpio_bin_gz.c | 1 -
.../libarchive/test/test_read_format_cpio_bin_le.c | 1 -
.../test/test_read_format_cpio_bin_lzip.c | 1 -
.../test/test_read_format_cpio_bin_lzma.c | 1 -
.../libarchive/test/test_read_format_cpio_bin_xz.c | 1 -
.../test/test_read_format_cpio_filename.c | 13 +-
.../test_read_format_cpio_filename_cp866.cpio.uu | 2 +-
.../test_read_format_cpio_filename_eucjp.cpio.uu | 2 +-
.../test_read_format_cpio_filename_koi8r.cpio.uu | 2 +-
.../test_read_format_cpio_filename_utf8_jp.cpio.uu | 2 +-
.../test_read_format_cpio_filename_utf8_ru.cpio.uu | 2 +-
.../libarchive/test/test_read_format_cpio_odc.c | 1 -
.../test/test_read_format_cpio_svr4_gzip.c | 1 -
.../test/test_read_format_cpio_svr4c_Z.c | 1 -
.../libarchive/test/test_read_format_empty.c | 1 -
.../test/test_read_format_gtar_filename.c | 1 -
.../test_read_format_gtar_filename_cp866.tar.Z.uu | 2 +-
.../test_read_format_gtar_filename_eucjp.tar.Z.uu | 2 +-
.../test_read_format_gtar_filename_koi8r.tar.Z.uu | 2 +-
.../libarchive/test/test_read_format_gtar_gz.c | 1 -
.../libarchive/test/test_read_format_gtar_lzma.c | 1 -
.../libarchive/test/test_read_format_gtar_sparse.c | 2 -
.../test/test_read_format_gtar_sparse_1_13.tar.uu | 1 -
.../test/test_read_format_gtar_sparse_1_17.tar.uu | 1 -
...est_read_format_gtar_sparse_1_17_posix00.tar.uu | 1 -
...est_read_format_gtar_sparse_1_17_posix01.tar.uu | 1 -
...est_read_format_gtar_sparse_1_17_posix10.tar.uu | 1 -
...format_gtar_sparse_1_17_posix10_modified.tar.uu | 1 -
.../test/test_read_format_gtar_sparse_skip_entry.c | 1 -
...est_read_format_gtar_sparse_skip_entry.tar.Z.uu | 2 +-
.../libarchive/test/test_read_format_iso.iso.Z.uu | 2 -
.../libarchive/test/test_read_format_iso_Z.c | 1 -
.../test/test_read_format_iso_joliet.iso.Z.uu | 2 -
.../test/test_read_format_iso_joliet_long.iso.Z.uu | 2 -
.../test_read_format_iso_joliet_rockridge.iso.Z.uu | 2 -
.../test/test_read_format_iso_multi_extent.c | 1 -
.../test_read_format_iso_multi_extent.iso.Z.uu | 2 -
.../test/test_read_format_iso_rockridge.iso.Z.uu | 2 -
.../test_read_format_iso_rockridge_ce.iso.Z.uu | 2 -
.../test_read_format_iso_rockridge_new.iso.Z.uu | 2 -
...est_read_format_iso_rockridge_rr_moved.iso.Z.uu | 2 -
.../libarchive/test/test_read_format_iso_xorriso.c | 2 -
.../test/test_read_format_iso_zisofs.iso.Z.uu | 2 -
.../test/test_read_format_isojoliet_bz2.c | 1 -
.../test/test_read_format_isojoliet_long.c | 7 +-
.../test/test_read_format_isojoliet_rr.c | 1 -
.../test/test_read_format_isojoliet_versioned.c | 1 -
.../libarchive/test/test_read_format_isorr_bz2.c | 1 -
.../libarchive/test/test_read_format_isorr_ce.c | 1 -
.../test/test_read_format_isorr_new_bz2.c | 2 -
.../test/test_read_format_isorr_rr_moved.c | 1 -
.../test/test_read_format_isozisofs_bz2.c | 1 -
.../libarchive/test/test_read_format_lha.c | 1 -
.../test/test_read_format_lha_bugfix_0.c | 1 -
.../test/test_read_format_lha_filename.c | 1 -
.../test_read_format_lha_filename_cp932.lzh.uu | 2 +-
.../test/test_read_format_lha_filename_utf16.c | 1 -
.../test_read_format_lha_filename_utf16.lzh.uu | 38 +-
.../libarchive/test/test_read_format_mtree.c | 1 -
.../libarchive/test/test_read_format_pax_bz2.c | 1 -
.../libarchive/test/test_read_format_rar.c | 85 +-
.../libarchive/test/test_read_format_rar.rar.uu | 2 +-
.../libarchive/test/test_read_format_rar5.c | 30 +
...format_rar5_bad_window_sz_in_mltarc_file.rar.uu | 2 +-
.../test/test_read_format_rar5_compressed.rar.uu | 2 +-
...d_format_rar5_different_winsize_on_merge.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part01.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part02.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part03.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part04.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part05.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part06.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part07.rar.uu | 2 +-
...est_read_format_rar5_multiarchive.part08.rar.uu | 2 +-
.../test_read_format_rar5_multiple_files.rar.uu | 2 +-
...st_read_format_rar5_multiple_files_solid.rar.uu | 2 +-
.../test/test_read_format_rar5_sfx.exe.uu | 2 +-
.../test/test_read_format_rar5_stored.rar.uu | 2 +-
.../test/test_read_format_rar5_unicode.rar.uu | 9 +
.../test/test_read_format_rar_binary_data.rar.uu | 2 +-
.../test/test_read_format_rar_compress_best.rar.uu | 2 +-
.../test_read_format_rar_compress_normal.rar.uu | 2 +-
.../test/test_read_format_rar_encryption_data.c | 1 -
.../test/test_read_format_rar_encryption_header.c | 1 -
.../test_read_format_rar_encryption_partially.c | 1 -
.../libarchive/test/test_read_format_rar_filter.c | 1 -
.../test/test_read_format_rar_invalid1.c | 1 -
.../test_read_format_rar_multi_lzss_blocks.rar.uu | 2 +-
...est_read_format_rar_multivolume.part0001.rar.uu | 2 +-
...est_read_format_rar_multivolume.part0002.rar.uu | 2 +-
...est_read_format_rar_multivolume.part0003.rar.uu | 2 +-
...est_read_format_rar_multivolume.part0004.rar.uu | 2 +-
.../test/test_read_format_rar_noeof.rar.uu | 2 +-
...est_read_format_rar_ppmd_lzss_conversion.rar.uu | 2 +-
.../test/test_read_format_rar_sfx.exe.uu | 2 +-
.../test/test_read_format_rar_subblock.rar.uu | 2 +-
.../test/test_read_format_rar_windows.rar.uu | 2 +-
.../libarchive/test/test_read_format_raw.bufr.uu | 2 +-
.../libarchive/test/test_read_format_raw.c | 1 -
.../libarchive/test/test_read_format_raw.data.Z.uu | 1 -
.../libarchive/test/test_read_format_raw.data.uu | 1 -
.../libarchive/test/test_read_format_tar.c | 1 -
.../test/test_read_format_tar_concatenated.c | 1 -
.../test/test_read_format_tar_empty_filename.c | 1 -
.../test_read_format_tar_empty_filename.tar.uu | 3 +-
.../test/test_read_format_tar_empty_pax.c | 1 -
.../test/test_read_format_tar_empty_pax.tar.Z.uu | 2 +-
.../test_read_format_tar_empty_with_gnulabel.c | 1 -
.../test/test_read_format_tar_filename.c | 1 -
.../test/test_read_format_tar_invalid_pax_size.c | 1 -
.../test_read_format_tar_invalid_pax_size.tar.uu | 2 +-
.../libarchive/test/test_read_format_tbz.c | 1 -
.../libarchive/test/test_read_format_tgz.c | 1 -
.../libarchive/test/test_read_format_tlz.c | 1 -
.../libarchive/test/test_read_format_txz.c | 1 -
.../libarchive/test/test_read_format_tz.c | 1 -
.../test/test_read_format_ustar_filename.c | 1 -
.../libarchive/test/test_read_format_warc.c | 2 -
.../libarchive/test/test_read_format_xar.c | 1 -
.../libarchive/test/test_read_format_zip.c | 3 +-
.../test/test_read_format_zip_7075_utf8_paths.c | 1 -
.../test/test_read_format_zip_bzip2.zipx.uu | 2 +-
.../test/test_read_format_zip_comment_stored.c | 1 -
.../test/test_read_format_zip_encryption_data.c | 1 -
.../test/test_read_format_zip_encryption_header.c | 1 -
.../test_read_format_zip_encryption_partially.c | 1 -
.../test/test_read_format_zip_filename.c | 7 +-
.../test_read_format_zip_filename_cp866.zip.uu | 2 +-
.../test_read_format_zip_filename_cp932.zip.uu | 2 +-
.../test_read_format_zip_filename_koi8r.zip.uu | 2 +-
.../test_read_format_zip_filename_utf8_jp.zip.uu | 2 +-
.../test_read_format_zip_filename_utf8_ru.zip.uu | 2 +-
.../test_read_format_zip_filename_utf8_ru2.zip.uu | 2 +-
.../test/test_read_format_zip_high_compression.c | 2 -
.../libarchive/test/test_read_format_zip_jar.c | 1 -
.../test/test_read_format_zip_lzma.zipx.uu | 2 +-
.../test/test_read_format_zip_mac_metadata.c | 1 -
.../test/test_read_format_zip_malformed.c | 1 -
.../libarchive/test/test_read_format_zip_nested.c | 3 +-
.../test/test_read_format_zip_nofiletype.c | 1 -
.../libarchive/test/test_read_format_zip_padded.c | 1 -
.../test/test_read_format_zip_ppmd8.zipx.uu | 2 +-
.../libarchive/test/test_read_format_zip_sfx.c | 1 -
...t_read_format_zip_traditional_encryption_data.c | 1 -
.../test/test_read_format_zip_winzip_aes.c | 1 -
.../test/test_read_format_zip_winzip_aes128.zip.uu | 2 +-
.../test/test_read_format_zip_winzip_aes256.zip.uu | 2 +-
...est_read_format_zip_winzip_aes256_stored.zip.uu | 2 +-
.../test/test_read_format_zip_winzip_aes_large.c | 1 -
...read_format_zip_with_invalid_traditional_eocd.c | 2 -
...format_zip_with_invalid_traditional_eocd.zip.uu | 2 +-
.../libarchive/test/test_read_format_zip_zip64.c | 1 -
.../libarchive/libarchive/test/test_read_large.c | 1 -
.../test/test_read_large_splitted_rar_aa.uu | 2 +-
.../test/test_read_large_splitted_rar_ab.uu | 2 +-
.../test/test_read_large_splitted_rar_ac.uu | 2 +-
.../test/test_read_large_splitted_rar_ad.uu | 2 +-
.../test/test_read_large_splitted_rar_ae.uu | 2 +-
.../libarchive/test/test_read_pax_truncated.c | 1 -
.../test/test_read_pax_xattr_schily.tar.uu | 2 +-
.../libarchive/test/test_read_position.c | 1 -
.../libarchive/test/test_read_splitted_rar_aa.uu | 2 +-
.../libarchive/test/test_read_splitted_rar_ab.uu | 2 +-
.../libarchive/test/test_read_splitted_rar_ac.uu | 2 +-
.../libarchive/test/test_read_splitted_rar_ad.uu | 2 +-
.../libarchive/test/test_read_truncated.c | 1 -
.../libarchive/test/test_read_truncated_filter.c | 1 -
.../libarchive/libarchive/test/test_sparse_basic.c | 3 +-
.../test/test_splitted_rar_seek_support_aa.uu | 2 +-
.../test/test_splitted_rar_seek_support_ab.uu | 2 +-
.../test/test_splitted_rar_seek_support_ac.uu | 2 +-
.../libarchive/test/test_tar_filenames.c | 1 -
.../libarchive/libarchive/test/test_tar_large.c | 1 -
.../libarchive/test/test_ustar_filename_encoding.c | 1 -
.../libarchive/test/test_ustar_filenames.c | 1 -
.../libarchive/libarchive/test/test_write_disk.c | 1 -
.../libarchive/test/test_write_disk_appledouble.c | 1 -
.../libarchive/test/test_write_disk_failures.c | 1 -
.../libarchive/test/test_write_disk_hardlink.c | 1 -
.../test/test_write_disk_hfs_compression.c | 1 -
.../libarchive/test/test_write_disk_lookup.c | 1 -
.../libarchive/test/test_write_disk_mac_metadata.c | 1 -
.../test/test_write_disk_no_hfs_compression.c | 1 -
.../libarchive/test/test_write_disk_perms.c | 1 -
.../libarchive/test/test_write_disk_secure.c | 1 -
.../libarchive/test/test_write_disk_secure744.c | 1 -
.../libarchive/test/test_write_disk_secure745.c | 1 -
.../libarchive/test/test_write_disk_secure746.c | 1 -
.../libarchive/test/test_write_disk_sparse.c | 1 -
.../libarchive/test/test_write_disk_symlink.c | 1 -
.../libarchive/test/test_write_disk_times.c | 1 -
.../libarchive/test/test_write_filter_b64encode.c | 1 -
.../libarchive/test/test_write_filter_bzip2.c | 1 -
.../libarchive/test/test_write_filter_compress.c | 1 -
.../libarchive/test/test_write_filter_gzip.c | 1 -
.../test/test_write_filter_gzip_timestamp.c | 1 -
.../libarchive/test/test_write_filter_lz4.c | 5 +-
.../libarchive/test/test_write_filter_lzip.c | 1 -
.../libarchive/test/test_write_filter_lzma.c | 1 -
.../libarchive/test/test_write_filter_lzop.c | 4 +-
.../libarchive/test/test_write_filter_program.c | 1 -
.../libarchive/test/test_write_filter_uuencode.c | 1 -
.../libarchive/test/test_write_filter_xz.c | 1 -
.../libarchive/test/test_write_filter_zstd.c | 107 +-
.../libarchive/test/test_write_format_7zip.c | 1 -
.../libarchive/test/test_write_format_7zip_empty.c | 1 -
.../libarchive/test/test_write_format_7zip_large.c | 1 -
.../libarchive/test/test_write_format_ar.c | 1 -
.../libarchive/test/test_write_format_cpio.c | 1 -
.../libarchive/test/test_write_format_cpio_empty.c | 1 -
.../libarchive/test/test_write_format_cpio_newc.c | 2 -
.../libarchive/test/test_write_format_cpio_odc.c | 2 -
.../libarchive/test/test_write_format_gnutar.c | 1 -
.../test/test_write_format_gnutar_filenames.c | 1 -
.../libarchive/test/test_write_format_iso9660.c | 21 +-
.../libarchive/test/test_write_format_mtree.c | 1 -
.../test/test_write_format_mtree_absolute_path.c | 1 -
.../test/test_write_format_mtree_classic.c | 1 -
.../test/test_write_format_mtree_classic_indent.c | 1 -
.../test/test_write_format_mtree_fflags.c | 2 +-
.../test/test_write_format_mtree_no_separator.c | 2 +-
.../test/test_write_format_mtree_quoted_filename.c | 1 -
.../libarchive/test/test_write_format_pax.c | 1 -
.../libarchive/test/test_write_format_shar_empty.c | 1 -
.../libarchive/test/test_write_format_tar.c | 1 -
.../libarchive/test/test_write_format_tar_empty.c | 1 -
.../libarchive/test/test_write_format_tar_sparse.c | 1 -
.../libarchive/test/test_write_format_tar_ustar.c | 1 -
.../libarchive/test/test_write_format_tar_v7tar.c | 1 -
.../libarchive/test/test_write_format_warc.c | 1 -
.../libarchive/test/test_write_format_warc_empty.c | 1 -
.../libarchive/test/test_write_format_xar.c | 1 -
.../libarchive/test/test_write_format_xar_empty.c | 1 -
.../libarchive/test/test_write_format_zip.c | 50 +-
.../test/test_write_format_zip64_stream.c | 276 ++++
.../test/test_write_format_zip_compression_store.c | 66 +-
.../libarchive/test/test_write_format_zip_empty.c | 1 -
.../test/test_write_format_zip_empty_zip64.c | 1 -
.../test/test_write_format_zip_entry_size_unset.c | 13 +-
.../libarchive/test/test_write_format_zip_file.c | 43 +-
.../test/test_write_format_zip_file_zip64.c | 47 +-
.../libarchive/test/test_write_format_zip_large.c | 31 +-
.../libarchive/test/test_write_format_zip_stream.c | 247 ++++
.../libarchive/test/test_write_format_zip_zip64.c | 1 -
.../libarchive/test/test_write_open_memory.c | 1 -
.../libarchive/test/test_write_read_format_zip.c | 56 +-
.../libarchive/test/test_xattr_platform.c | 1 -
.../libarchive/test/test_zip_filename_encoding.c | 4 +-
contrib/libarchive/libarchive_fe/err.c | 2 -
contrib/libarchive/libarchive_fe/err.h | 11 +-
contrib/libarchive/libarchive_fe/lafe_platform.h | 12 -
contrib/libarchive/libarchive_fe/line_reader.c | 2 -
contrib/libarchive/libarchive_fe/passphrase.c | 4 +-
contrib/libarchive/tar/bsdtar.1 | 77 +-
contrib/libarchive/tar/bsdtar.c | 82 +-
contrib/libarchive/tar/bsdtar.h | 8 +-
contrib/libarchive/tar/bsdtar_platform.h | 24 +-
contrib/libarchive/tar/cmdline.c | 3 +-
contrib/libarchive/tar/creation_set.c | 1 -
contrib/libarchive/tar/read.c | 1 -
contrib/libarchive/tar/subst.c | 28 +-
contrib/libarchive/tar/test/test.h | 2 -
contrib/libarchive/tar/test/test_0.c | 1 -
contrib/libarchive/tar/test/test_basic.c | 1 -
contrib/libarchive/tar/test/test_copy.c | 1 -
contrib/libarchive/tar/test/test_empty_mtree.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_Z.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_bz2.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_grz.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_gz.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_lrz.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_lz.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_lz4.c | 1 -
.../libarchive/tar/test/test_extract_tar_lzma.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_lzo.c | 1 -
contrib/libarchive/tar/test/test_extract_tar_xz.c | 1 -
.../libarchive/tar/test/test_extract_tar_zstd.c | 1 -
contrib/libarchive/tar/test/test_format_newc.c | 1 -
contrib/libarchive/tar/test/test_help.c | 1 -
contrib/libarchive/tar/test/test_leading_slash.c | 1 -
contrib/libarchive/tar/test/test_missing_file.c | 1 -
contrib/libarchive/tar/test/test_option_C_mtree.c | 1 -
contrib/libarchive/tar/test/test_option_C_upper.c | 1 -
contrib/libarchive/tar/test/test_option_H_upper.c | 1 -
contrib/libarchive/tar/test/test_option_L_upper.c | 1 -
contrib/libarchive/tar/test/test_option_O_upper.c | 1 -
contrib/libarchive/tar/test/test_option_T_upper.c | 1 -
contrib/libarchive/tar/test/test_option_U_upper.c | 1 -
contrib/libarchive/tar/test/test_option_X_upper.c | 1 -
contrib/libarchive/tar/test/test_option_a.c | 1 -
contrib/libarchive/tar/test/test_option_acls.c | 1 -
contrib/libarchive/tar/test/test_option_b.c | 1 -
.../libarchive/tar/test/test_option_b64encode.c | 1 -
contrib/libarchive/tar/test/test_option_exclude.c | 1 -
.../libarchive/tar/test/test_option_exclude_vcs.c | 2 +-
contrib/libarchive/tar/test/test_option_fflags.c | 1 -
.../libarchive/tar/test/test_option_gid_gname.c | 1 -
contrib/libarchive/tar/test/test_option_group.c | 84 ++
contrib/libarchive/tar/test/test_option_grzip.c | 1 -
.../libarchive/tar/test/test_option_ignore_zeros.c | 1 -
contrib/libarchive/tar/test/test_option_j.c | 1 -
contrib/libarchive/tar/test/test_option_k.c | 1 -
.../tar/test/test_option_keep_newer_files.c | 1 -
contrib/libarchive/tar/test/test_option_lrzip.c | 1 -
contrib/libarchive/tar/test/test_option_lz4.c | 1 -
contrib/libarchive/tar/test/test_option_lzma.c | 1 -
contrib/libarchive/tar/test/test_option_lzop.c | 1 -
contrib/libarchive/tar/test/test_option_n.c | 1 -
.../libarchive/tar/test/test_option_newer_than.c | 1 -
contrib/libarchive/tar/test/test_option_nodump.c | 1 -
.../libarchive/tar/test/test_option_older_than.c | 1 -
contrib/libarchive/tar/test/test_option_owner.c | 84 ++
.../libarchive/tar/test/test_option_passphrase.c | 1 -
contrib/libarchive/tar/test/test_option_q.c | 1 -
contrib/libarchive/tar/test/test_option_r.c | 1 -
contrib/libarchive/tar/test/test_option_s.c | 12 +-
.../libarchive/tar/test/test_option_safe_writes.c | 1 -
.../libarchive/tar/test/test_option_uid_uname.c | 1 -
contrib/libarchive/tar/test/test_option_uuencode.c | 1 -
contrib/libarchive/tar/test/test_option_xattrs.c | 1 -
contrib/libarchive/tar/test/test_option_xz.c | 1 -
contrib/libarchive/tar/test/test_option_z.c | 1 -
contrib/libarchive/tar/test/test_option_zstd.c | 1 -
contrib/libarchive/tar/test/test_patterns.c | 1 -
contrib/libarchive/tar/test/test_print_longpath.c | 1 -
contrib/libarchive/tar/test/test_stdio.c | 1 -
.../libarchive/tar/test/test_strip_components.c | 1 -
contrib/libarchive/tar/test/test_symlink_dir.c | 1 -
contrib/libarchive/tar/util.c | 3 +-
contrib/libarchive/tar/write.c | 1 -
contrib/libarchive/test_utils/test_common.h | 15 +-
contrib/libarchive/test_utils/test_main.c | 18 +-
contrib/libarchive/unzip/bsdunzip.1 | 2 -
contrib/libarchive/unzip/bsdunzip.c | 17 +-
contrib/libarchive/unzip/bsdunzip_platform.h | 24 +-
contrib/libarchive/unzip/cmdline.c | 3 +-
contrib/libarchive/unzip/test/test.h | 2 -
contrib/libarchive/unzip/test/test_I.c | 41 +
contrib/libarchive/unzip/test/test_I.zip.uu | 8 +
contrib/libarchive/unzip/test/test_doubledash.c | 44 +
lib/libarchive/Makefile.inc | 2 +-
lib/libarchive/tests/Makefile | 7 +
usr.bin/unzip/tests/Makefile | 3 +
725 files changed, 5735 insertions(+), 1735 deletions(-)
diff --cc contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu
index 000000000000,d72f533f8e5a..d72f533f8e5a
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu
+++ b/contrib/libarchive/libarchive/test/test_compat_lzip_3.lz.uu
diff --cc contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu
index 000000000000,6a230c5e1322..6a230c5e1322
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu
+++ b/contrib/libarchive/libarchive/test/test_compat_lzip_4.tlz.uu
diff --cc contrib/libarchive/libarchive/test/test_read_filter_uudecode_base64_raw.uu
index 000000000000,b4ddfb0a22e8..b4ddfb0a22e8
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_filter_uudecode_base64_raw.uu
+++ b/contrib/libarchive/libarchive/test/test_read_filter_uudecode_base64_raw.uu
diff --cc contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.c
index 000000000000,6f02dc5de147..6f02dc5de147
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.c
+++ b/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.c
diff --cc contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.uu
index 000000000000,8a5f8b5a607d..8a5f8b5a607d
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.uu
+++ b/contrib/libarchive/libarchive/test/test_read_filter_uudecode_raw.uu
diff --cc contrib/libarchive/libarchive/test/test_read_format_7zip_win_attrib.7z.uu
index 000000000000,dc7495bcbf37..dc7495bcbf37
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_7zip_win_attrib.7z.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_7zip_win_attrib.7z.uu
diff --cc contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu
index 000000000000,e011ab64e689..e011ab64e689
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu
+++ b/contrib/libarchive/libarchive/test/test_read_format_rar5_unicode.rar.uu
diff --cc contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c
index 000000000000,bed97894e8da..bed97894e8da
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c
+++ b/contrib/libarchive/libarchive/test/test_write_format_zip64_stream.c
diff --cc contrib/libarchive/libarchive/test/test_write_format_zip_stream.c
index 000000000000,aff6a31ae171..aff6a31ae171
mode 000000,100644..100644
--- a/contrib/libarchive/libarchive/test/test_write_format_zip_stream.c
+++ b/contrib/libarchive/libarchive/test/test_write_format_zip_stream.c
diff --cc contrib/libarchive/libarchive_fe/err.h
index 2f84c2fe6fe0,000000000000..f4a66350a669
mode 100644,000000..100644
--- a/contrib/libarchive/libarchive_fe/err.h
+++ b/contrib/libarchive/libarchive_fe/err.h
@@@ -1,57 -1,0 +1,58 @@@
+/*-
+ * Copyright (c) 2009 Joerg Sonnenberger
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef LAFE_ERR_H
+#define LAFE_ERR_H
+
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
- (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
- #define __LA_DEAD __attribute__((__noreturn__))
++ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
++#define __LA_NORETURN __attribute__((__noreturn__))
++#elif defined(_MSC_VER)
++#define __LA_NORETURN __declspec(noreturn)
+#else
- #define __LA_DEAD
++#define __LA_NORETURN
+#endif
+
+#if defined(__GNUC__) && (__GNUC__ > 2 || \
+ (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
+# ifdef __MINGW_PRINTF_FORMAT
+# define __LA_PRINTF_FORMAT __MINGW_PRINTF_FORMAT
+# else
+# define __LA_PRINTF_FORMAT __printf__
+# endif
+# define __LA_PRINTFLIKE(f,a) __attribute__((__format__(__LA_PRINTF_FORMAT, f, a)))
+#else
+# define __LA_PRINTFLIKE(f,a)
+#endif
+
+void lafe_warnc(int code, const char *fmt, ...) __LA_PRINTFLIKE(2, 3);
- void lafe_errc(int eval, int code, const char *fmt, ...) __LA_DEAD
- __LA_PRINTFLIKE(3, 4);
++__LA_NORETURN void lafe_errc(int eval, int code, const char *fmt, ...) __LA_PRINTFLIKE(3, 4);
+
+const char * lafe_getprogname(void);
+void lafe_setprogname(const char *name, const char *defaultname);
+
+#endif
diff --cc contrib/libarchive/tar/test/test_option_group.c
index 000000000000,d429ddab9f9f..d429ddab9f9f
mode 000000,100644..100644
--- a/contrib/libarchive/tar/test/test_option_group.c
+++ b/contrib/libarchive/tar/test/test_option_group.c
diff --cc contrib/libarchive/tar/test/test_option_owner.c
index 000000000000,04c86cc0e8d4..04c86cc0e8d4
mode 000000,100644..100644
--- a/contrib/libarchive/tar/test/test_option_owner.c
+++ b/contrib/libarchive/tar/test/test_option_owner.c
diff --cc contrib/libarchive/unzip/test/test_I.c
index 000000000000,a6bad85a011f..a6bad85a011f
mode 000000,100644..100644
--- a/contrib/libarchive/unzip/test/test_I.c
+++ b/contrib/libarchive/unzip/test/test_I.c
diff --cc contrib/libarchive/unzip/test/test_I.zip.uu
index 000000000000,8a1e7afa5b92..8a1e7afa5b92
mode 000000,100644..100644
--- a/contrib/libarchive/unzip/test/test_I.zip.uu
+++ b/contrib/libarchive/unzip/test/test_I.zip.uu
diff --cc contrib/libarchive/unzip/test/test_doubledash.c
index 000000000000,eb7d34e4f6cc..eb7d34e4f6cc
mode 000000,100644..100644
--- a/contrib/libarchive/unzip/test/test_doubledash.c
+++ b/contrib/libarchive/unzip/test/test_doubledash.c
diff --cc lib/libarchive/Makefile.inc
index 95d96df24eef,000000000000..153f96b12165
mode 100644,000000..100644
--- a/lib/libarchive/Makefile.inc
+++ b/lib/libarchive/Makefile.inc
@@@ -1,23 -1,0 +1,23 @@@
+# These defines are needed for both libarchive and the tests. If we don't keep
+# them in sync we can get run-time crashes while running tests due to mismatches
+# between structures such as archive_md5_ctx, etc.
+
+LIBADD= z bz2 lzma bsdxml zstd
+CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 \
- -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_LIBZSTD_COMPRESSOR=1
++ -DHAVE_ZSTD_H=1 -DHAVE_LIBZSTD=1 -DHAVE_ZSTD_compressStream=1
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
+
+.if ${MK_OPENSSL} != "no"
+CFLAGS+= -DWITH_OPENSSL
+CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
+LIBADD+= crypto
+CFLAGS.archive_hmac.c+=-Wno-error=cast-qual
+.else
+LIBADD+= md
+.endif
+
+.if ${MK_ICONV} != "no"
+# TODO: This can be changed back to CFLAGS once iconv works correctly
+# with statically linked binaries.
+SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=
+.endif
diff --cc lib/libarchive/tests/Makefile
index 2fe9bbcc7c2d,000000000000..0d47e1a5ed3c
mode 100644,000000..100644
--- a/lib/libarchive/tests/Makefile
+++ b/lib/libarchive/tests/Makefile
@@@ -1,677 -1,0 +1,684 @@@
+.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.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_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_archive_api_feature.c \
+ test_archive_clear_error.c \
+ test_archive_cmdline.c \
+ test_archive_digest.c \
+ test_archive_getdate.c \
+ test_archive_match_time.c \
+ test_archive_match_owner.c \
+ test_archive_match_path.c \
+ test_archive_pathmatch.c \
+ test_archive_read_add_passphrase.c \
+ test_archive_read_close_twice.c \
*** 721 LINES SKIPPED ***