pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/archivers/libarchive



Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec 23 14:01:24 UTC 2025

Modified Files:
        pkgsrc/archivers/libarchive: Makefile.common
        pkgsrc/archivers/libarchive/files: Makefile.am Makefile.in NEWS
            configure configure.ac
        pkgsrc/archivers/libarchive/files/build: version
        pkgsrc/archivers/libarchive/files/doc/html: archive_entry.3.html
            archive_entry_acl.3.html archive_entry_linkify.3.html
            archive_entry_misc.3.html archive_entry_paths.3.html
            archive_entry_perms.3.html archive_entry_stat.3.html
            archive_entry_time.3.html archive_read.3.html
            archive_read_add_passphrase.3.html archive_read_data.3.html
            archive_read_disk.3.html archive_read_extract.3.html
            archive_read_filter.3.html archive_read_format.3.html
            archive_read_free.3.html archive_read_header.3.html
            archive_read_new.3.html archive_read_open.3.html
            archive_read_set_options.3.html archive_util.3.html
            archive_write.3.html archive_write_blocksize.3.html
            archive_write_data.3.html archive_write_disk.3.html
            archive_write_filter.3.html archive_write_finish_entry.3.html
            archive_write_format.3.html archive_write_free.3.html
            archive_write_header.3.html archive_write_new.3.html
            archive_write_open.3.html archive_write_set_options.3.html
            archive_write_set_passphrase.3.html bsdcpio.1.html bsdtar.1.html
            cpio.5.html libarchive-formats.5.html libarchive.3.html
            libarchive_changes.3.html libarchive_internals.3.html mtree.5.html
            tar.5.html
        pkgsrc/archivers/libarchive/files/doc/pdf: archive_entry.3.pdf
            archive_entry_acl.3.pdf archive_entry_linkify.3.pdf
            archive_entry_misc.3.pdf archive_entry_paths.3.pdf
            archive_entry_perms.3.pdf archive_entry_stat.3.pdf
            archive_entry_time.3.pdf archive_read.3.pdf
            archive_read_add_passphrase.3.pdf archive_read_data.3.pdf
            archive_read_disk.3.pdf archive_read_extract.3.pdf
            archive_read_filter.3.pdf archive_read_format.3.pdf
            archive_read_free.3.pdf archive_read_header.3.pdf
            archive_read_new.3.pdf archive_read_open.3.pdf
            archive_read_set_options.3.pdf archive_util.3.pdf
            archive_write.3.pdf archive_write_blocksize.3.pdf
            archive_write_data.3.pdf archive_write_disk.3.pdf
            archive_write_filter.3.pdf archive_write_finish_entry.3.pdf
            archive_write_format.3.pdf archive_write_free.3.pdf
            archive_write_header.3.pdf archive_write_new.3.pdf
            archive_write_open.3.pdf archive_write_set_options.3.pdf
            archive_write_set_passphrase.3.pdf bsdcpio.1.pdf bsdtar.1.pdf
            cpio.5.pdf libarchive-formats.5.pdf libarchive.3.pdf
            libarchive_changes.3.pdf libarchive_internals.3.pdf mtree.5.pdf
            tar.5.pdf
        pkgsrc/archivers/libarchive/files/libarchive: archive.h
            archive_cryptor.c archive_cryptor_private.h archive_entry.h
            archive_read_disk_entry_from_file.c archive_read_disk_posix.c
            archive_read_support_format_mtree.c archive_version_details.c
            archive_write.c archive_write_disk_posix.c
            archive_write_set_format_xar.c
        pkgsrc/archivers/libarchive/files/libarchive/test: list.h
            test_archive_read_multiple_data_objects.c test_write_disk_perms.c
            test_write_filter_bzip2.c
        pkgsrc/archivers/libarchive/files/tar: subst.c
        pkgsrc/archivers/libarchive/files/tar/test: list.h test_option_s.c

Log Message:
libarchive: updated to 3.8.4

3.8.4

Notable bugxies:

bsdtar: Fix zero-length pattern issue
lib: Fix regression introduced in libarchive 3.8.2 when walking enterable but unreadable directories


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/archivers/libarchive/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/archivers/libarchive/files/Makefile.am
cvs rdiff -u -r1.24 -r1.25 pkgsrc/archivers/libarchive/files/Makefile.in
cvs rdiff -u -r1.23 -r1.24 pkgsrc/archivers/libarchive/files/NEWS
cvs rdiff -u -r1.32 -r1.33 pkgsrc/archivers/libarchive/files/configure
cvs rdiff -u -r1.31 -r1.32 pkgsrc/archivers/libarchive/files/configure.ac
cvs rdiff -u -r1.18 -r1.19 pkgsrc/archivers/libarchive/files/build/version
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html \
    pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html \
    pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html \
    pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html \
    pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html \
    pkgsrc/archivers/libarchive/files/doc/html/tar.5.html
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html \
    pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_util.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/bsdtar.1.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/cpio.5.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/libarchive.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/mtree.5.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/tar.5.pdf
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_acl.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_linkify.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_paths.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_perms.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_stat.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_time.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_data.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_extract.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_filter.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_format.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_free.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_header.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_new.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_open.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_set_options.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_blocksize.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_data.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_filter.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_finish_entry.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_format.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_free.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_header.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_new.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_open.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_options.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_changes.3.pdf
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_misc.3.pdf
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf \
    pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf
cvs rdiff -u -r1.24 -r1.25 \
    pkgsrc/archivers/libarchive/files/libarchive/archive.h
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c \
    pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor_private.h
cvs rdiff -u -r1.20 -r1.21 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h \
    pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
cvs rdiff -u -r1.14 -r1.15 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write.c
cvs rdiff -u -r1.17 -r1.18 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c
cvs rdiff -u -r1.20 -r1.21 \
    pkgsrc/archivers/libarchive/files/libarchive/test/list.h
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/libarchive/files/tar/subst.c
cvs rdiff -u -r1.14 -r1.15 pkgsrc/archivers/libarchive/files/tar/test/list.h
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/Makefile.common
diff -u pkgsrc/archivers/libarchive/Makefile.common:1.24 pkgsrc/archivers/libarchive/Makefile.common:1.25
--- pkgsrc/archivers/libarchive/Makefile.common:1.24    Thu Nov 20 06:08:23 2025
+++ pkgsrc/archivers/libarchive/Makefile.common Tue Dec 23 14:01:21 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2025/11/20 06:08:23 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2025/12/23 14:01:21 adam Exp $
 # used by archivers/bsdtar/Makefile
 # used by archivers/libarchive/Makefile
 
-DISTNAME=      libarchive-3.8.3
+DISTNAME=      libarchive-3.8.4
 CATEGORIES=    archivers
 MASTER_SITES=  https://www.libarchive.org/downloads/
 DISTFILES=     # empty

Index: pkgsrc/archivers/libarchive/files/Makefile.am
diff -u pkgsrc/archivers/libarchive/files/Makefile.am:1.22 pkgsrc/archivers/libarchive/files/Makefile.am:1.23
--- pkgsrc/archivers/libarchive/files/Makefile.am:1.22  Thu Nov 20 06:08:23 2025
+++ pkgsrc/archivers/libarchive/files/Makefile.am       Tue Dec 23 14:01:21 2025
@@ -96,61 +96,73 @@ distclean-local:
 
 include_HEADERS= libarchive/archive.h libarchive/archive_entry.h
 
-libarchive_la_SOURCES= \
-       libarchive/archive_acl.c \
+noinst_HEADERS= \
        libarchive/archive_acl_private.h \
-       libarchive/archive_check_magic.c \
-       libarchive/archive_cmdline.c \
        libarchive/archive_cmdline_private.h \
        libarchive/archive_crc32.h \
-       libarchive/archive_cryptor.c \
        libarchive/archive_cryptor_private.h \
-       libarchive/archive_digest.c \
        libarchive/archive_digest_private.h \
        libarchive/archive_endian.h \
-       libarchive/archive_entry.c \
        libarchive/archive_entry.h \
-       libarchive/archive_entry_copy_stat.c \
-       libarchive/archive_entry_link_resolver.c \
        libarchive/archive_entry_locale.h \
        libarchive/archive_entry_private.h \
-       libarchive/archive_entry_sparse.c \
-       libarchive/archive_entry_stat.c \
-       libarchive/archive_entry_strmode.c \
-       libarchive/archive_entry_xattr.c \
-       libarchive/archive_hmac.c \
        libarchive/archive_hmac_private.h \
-       libarchive/archive_match.c \
        libarchive/archive_openssl_evp_private.h \
        libarchive/archive_openssl_hmac_private.h \
-       libarchive/archive_options.c \
        libarchive/archive_options_private.h \
        libarchive/archive_pack_dev.h \
-       libarchive/archive_pack_dev.c \
-       libarchive/archive_parse_date.c \
-       libarchive/archive_pathmatch.c \
        libarchive/archive_pathmatch.h \
        libarchive/archive_platform.h \
        libarchive/archive_platform_acl.h \
        libarchive/archive_platform_stat.h \
        libarchive/archive_platform_xattr.h \
-       libarchive/archive_ppmd_private.h \
-       libarchive/archive_ppmd7.c \
        libarchive/archive_ppmd7_private.h \
-       libarchive/archive_ppmd8.c \
        libarchive/archive_ppmd8_private.h \
+       libarchive/archive_ppmd_private.h \
        libarchive/archive_private.h \
-       libarchive/archive_random.c \
        libarchive/archive_random_private.h \
-       libarchive/archive_rb.c \
        libarchive/archive_rb.h \
+       libarchive/archive_read_disk_private.h \
+       libarchive/archive_read_private.h \
+       libarchive/archive_string.h \
+       libarchive/archive_string_composition.h \
+       libarchive/archive_time_private.h \
+       libarchive/archive_write_disk_private.h \
+       libarchive/archive_write_private.h \
+       libarchive/archive_write_set_format_private.h \
+       libarchive/archive_xxhash.h \
+       libarchive/config_freebsd.h \
+       libarchive/filter_fork.h
+
+libarchive_la_SOURCES= \
+       libarchive/archive_acl.c \
+       libarchive/archive_check_magic.c \
+       libarchive/archive_cmdline.c \
+       libarchive/archive_cryptor.c \
+       libarchive/archive_digest.c \
+       libarchive/archive_entry.c \
+       libarchive/archive_entry_copy_stat.c \
+       libarchive/archive_entry_link_resolver.c \
+       libarchive/archive_entry_sparse.c \
+       libarchive/archive_entry_stat.c \
+       libarchive/archive_entry_strmode.c \
+       libarchive/archive_entry_xattr.c \
+       libarchive/archive_hmac.c \
+       libarchive/archive_match.c \
+       libarchive/archive_options.c \
+       libarchive/archive_pack_dev.c \
+       libarchive/archive_parse_date.c \
+       libarchive/archive_pathmatch.c \
+       libarchive/archive_ppmd7.c \
+       libarchive/archive_ppmd8.c \
+       libarchive/archive_random.c \
+       libarchive/archive_rb.c \
        libarchive/archive_read.c \
        libarchive/archive_read_add_passphrase.c \
        libarchive/archive_read_append_filter.c \
        libarchive/archive_read_data_into_fd.c \
        libarchive/archive_read_disk_entry_from_file.c \
        libarchive/archive_read_disk_posix.c \
-       libarchive/archive_read_disk_private.h \
        libarchive/archive_read_disk_set_standard_lookup.c \
        libarchive/archive_read_extract.c \
        libarchive/archive_read_extract2.c \
@@ -158,12 +170,11 @@ libarchive_la_SOURCES= \
        libarchive/archive_read_open_file.c \
        libarchive/archive_read_open_filename.c \
        libarchive/archive_read_open_memory.c \
-       libarchive/archive_read_private.h \
        libarchive/archive_read_set_format.c \
        libarchive/archive_read_set_options.c \
        libarchive/archive_read_support_filter_all.c \
-       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_by_code.c \
+       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_compress.c \
        libarchive/archive_read_support_filter_grzip.c \
        libarchive/archive_read_support_filter_gzip.c \
@@ -194,23 +205,12 @@ libarchive_la_SOURCES= \
        libarchive/archive_read_support_format_xar.c \
        libarchive/archive_read_support_format_zip.c \
        libarchive/archive_string.c \
-       libarchive/archive_string.h \
-       libarchive/archive_string_composition.h \
        libarchive/archive_string_sprintf.c \
        libarchive/archive_time.c \
-       libarchive/archive_time_private.h \
        libarchive/archive_util.c \
        libarchive/archive_version_details.c \
        libarchive/archive_virtual.c \
        libarchive/archive_write.c \
-       libarchive/archive_write_disk_posix.c \
-       libarchive/archive_write_disk_private.h \
-       libarchive/archive_write_disk_set_standard_lookup.c \
-       libarchive/archive_write_open_fd.c \
-       libarchive/archive_write_open_file.c \
-       libarchive/archive_write_open_filename.c \
-       libarchive/archive_write_open_memory.c \
-       libarchive/archive_write_private.h \
        libarchive/archive_write_add_filter.c \
        libarchive/archive_write_add_filter_b64encode.c \
        libarchive/archive_write_add_filter_by_name.c \
@@ -226,6 +226,12 @@ libarchive_la_SOURCES= \
        libarchive/archive_write_add_filter_uuencode.c \
        libarchive/archive_write_add_filter_xz.c \
        libarchive/archive_write_add_filter_zstd.c \
+       libarchive/archive_write_disk_posix.c \
+       libarchive/archive_write_disk_set_standard_lookup.c \
+       libarchive/archive_write_open_fd.c \
+       libarchive/archive_write_open_file.c \
+       libarchive/archive_write_open_filename.c \
+       libarchive/archive_write_open_memory.c \
        libarchive/archive_write_set_format.c \
        libarchive/archive_write_set_format_7zip.c \
        libarchive/archive_write_set_format_ar.c \
@@ -235,59 +241,54 @@ libarchive_la_SOURCES= \
        libarchive/archive_write_set_format_cpio_newc.c \
        libarchive/archive_write_set_format_cpio_odc.c \
        libarchive/archive_write_set_format_filter_by_ext.c \
+       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_iso9660.c \
        libarchive/archive_write_set_format_mtree.c \
        libarchive/archive_write_set_format_pax.c \
-       libarchive/archive_write_set_format_private.h \
        libarchive/archive_write_set_format_raw.c \
        libarchive/archive_write_set_format_shar.c \
        libarchive/archive_write_set_format_ustar.c \
        libarchive/archive_write_set_format_v7tar.c \
-       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_warc.c \
        libarchive/archive_write_set_format_xar.c \
        libarchive/archive_write_set_format_zip.c \
        libarchive/archive_write_set_options.c \
        libarchive/archive_write_set_passphrase.c \
-       libarchive/archive_xxhash.h \
-       libarchive/config_freebsd.h \
        libarchive/filter_fork_posix.c \
-       libarchive/filter_fork.h \
        libarchive/xxhash.c
 
 if INC_WINDOWS_FILES
+noinst_HEADERS+= \
+       libarchive/archive_windows.h
 libarchive_la_SOURCES+= \
        libarchive/archive_entry_copy_bhfi.c \
        libarchive/archive_read_disk_windows.c \
-       libarchive/archive_windows.h \
        libarchive/archive_windows.c \
        libarchive/archive_write_disk_windows.c \
        libarchive/filter_fork_windows.c
 endif
 
 if INC_BLAKE2
-libarchive_la_SOURCES+= \
+noinst_HEADERS+= \
        libarchive/archive_blake2.h \
-       libarchive/archive_blake2_impl.h \
+       libarchive/archive_blake2_impl.h
+libarchive_la_SOURCES+= \
        libarchive/archive_blake2s_ref.c \
        libarchive/archive_blake2sp_ref.c
 endif
 
 if INC_LINUX_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_linux.c
-else
+endif
 if INC_SUNOS_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_sunos.c
-else
+endif
 if INC_DARWIN_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_darwin.c
-else
+endif
 if INC_FREEBSD_ACL
 libarchive_la_SOURCES+= libarchive/archive_disk_acl_freebsd.c
 endif
-endif
-endif
-endif
 
 # -no-undefined marks that libarchive doesn't rely on symbols
 # defined in the application.  This is mandatory for cygwin.
@@ -351,22 +352,24 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = build/pkgconfig/libarchive.pc
 
 # Sources needed by all test programs
+noinst_HEADERS+= \
+       test_utils/test_common.h \
+       test_utils/test_utils.h
 test_utils_SOURCES= \
-       test_utils/test_utils.c \
-       test_utils/test_utils.h \
        test_utils/test_main.c \
-       test_utils/test_common.h
+       test_utils/test_utils.c
 
 #
 #
 # libarchive_test program
 #
 #
+noinst_HEADERS+= \
+       libarchive/test/test.h
 libarchive_test_SOURCES= \
        $(libarchive_la_SOURCES) \
        $(test_utils_SOURCES) \
        libarchive/test/read_open_memory.c \
-       libarchive/test/test.h \
        libarchive/test/test_7zip_filename_encoding.c \
        libarchive/test/test_acl_nfs4.c \
        libarchive/test/test_acl_pax.c \
@@ -673,7 +676,6 @@ libarchive_test_SOURCES= \
        libarchive/test/test_write_read_format_zip.c \
        libarchive/test/test_xattr_platform.c \
        libarchive/test/test_zip_filename_encoding.c
-
 libarchive_test_CPPFLAGS= \
        -I$(top_srcdir)/libarchive \
        -I$(top_srcdir)/libarchive/test \
@@ -686,9 +688,9 @@ libarchive_test_LDADD= $(LTLIBICONV)
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
 # above.
-libarchive/test/list.h: Makefile
+libarchive/test/list.h: $(libarchive_test_SOURCES)
        $(MKDIR_P) libarchive/test
-       cat $(top_srcdir)/libarchive/test/test_*.c | grep '^DEFINE_TEST' > libarchive/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
 libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
 
@@ -969,6 +971,7 @@ libarchive_test_EXTRA_DIST=\
        libarchive/test/test_read_format_rar5_stored_manyfiles.rar.uu \
        libarchive/test/test_read_format_rar5_symlink.rar.uu \
        libarchive/test/test_read_format_rar5_truncated_huff.rar.uu \
+       libarchive/test/test_read_format_rar5_unicode.rar.uu \
        libarchive/test/test_read_format_rar5_win32.rar.uu \
        libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \
        libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu \
@@ -1078,14 +1081,15 @@ libarchive_test_EXTRA_DIST=\
 #
 # Common code for libarchive frontends (cpio, tar)
 #
-libarchive_fe_la_SOURCES= \
-       libarchive_fe/lafe_err.c \
+noinst_HEADERS+= \
        libarchive_fe/lafe_err.h \
        libarchive_fe/lafe_platform.h \
-       libarchive_fe/line_reader.c \
        libarchive_fe/line_reader.h \
-       libarchive_fe/passphrase.c \
        libarchive_fe/passphrase.h
+libarchive_fe_la_SOURCES= \
+       libarchive_fe/lafe_err.c \
+       libarchive_fe/line_reader.c \
+       libarchive_fe/passphrase.c
 
 libarchive_fe_la_CPPFLAGS= -I$(top_srcdir)/libarchive
 #
@@ -1094,21 +1098,23 @@ libarchive_fe_la_CPPFLAGS= -I$(top_srcdi
 #
 #
 
+noinst_HEADERS+= \
+       tar/bsdtar.h \
+       tar/bsdtar_platform.h
 bsdtar_SOURCES= \
-               tar/bsdtar.c \
-               tar/bsdtar.h \
-               tar/bsdtar_platform.h \
-               tar/cmdline.c \
-               tar/creation_set.c \
-               tar/read.c \
-               tar/subst.c \
-               tar/util.c \
-               tar/write.c
+       tar/bsdtar.c \
+       tar/cmdline.c \
+       tar/creation_set.c \
+       tar/read.c \
+       tar/subst.c \
+       tar/util.c \
+       tar/write.c
 
 if INC_WINDOWS_FILES
+noinst_HEADERS+= \
+       tar/bsdtar_windows.h
 bsdtar_SOURCES+= \
-               tar/bsdtar_windows.h \
-               tar/bsdtar_windows.c
+       tar/bsdtar_windows.c
 endif
 
 bsdtar_DEPENDENCIES= libarchive.la libarchive_fe.la
@@ -1145,9 +1151,11 @@ endif
 # bsdtar_test
 #
 
+noinst_HEADERS+= \
+       tar/test/test.h
+
 bsdtar_test_SOURCES= \
        $(test_utils_SOURCES) \
-       tar/test/test.h \
        tar/test/test_0.c \
        tar/test/test_basic.c \
        tar/test/test_copy.c \
@@ -1228,9 +1236,9 @@ bsdtar_test_CPPFLAGS=\
        -I$(top_builddir)/tar/test \
        $(PLATFORMCPPFLAGS)
 
-tar/test/list.h: Makefile
+tar/test/list.h: $(bsdtar_test_SOURCES)
        $(MKDIR_P) tar/test
-       cat $(top_srcdir)/tar/test/test_*.c | grep '^DEFINE_TEST' > tar/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
 if BUILD_BSDTAR
 bsdtar_test_programs= bsdtar_test
@@ -1271,16 +1279,18 @@ bsdtar_test_EXTRA_DIST= \
 #
 #
 
+noinst_HEADERS+= \
+       cpio/cpio.h \
+       cpio/cpio_platform.h
 bsdcpio_SOURCES= \
-               cpio/cmdline.c \
-               cpio/cpio.c \
-               cpio/cpio.h \
-               cpio/cpio_platform.h
+       cpio/cmdline.c \
+       cpio/cpio.c
 
 if INC_WINDOWS_FILES
+noinst_HEADERS+= \
+       cpio/cpio_windows.h
 bsdcpio_SOURCES+= \
-               cpio/cpio_windows.h \
-               cpio/cpio_windows.c
+       cpio/cpio_windows.c
 endif
 
 bsdcpio_DEPENDENCIES = libarchive.la libarchive_fe.la
@@ -1319,10 +1329,11 @@ endif
 # bsdcpio_test
 #
 
+noinst_HEADERS+= \
+       cpio/test/test.h
 bsdcpio_test_SOURCES= \
        $(test_utils_SOURCES) \
        cpio/cmdline.c \
-       cpio/test/test.h \
        cpio/test/test_0.c \
        cpio/test/test_basic.c \
        cpio/test/test_cmdline.c \
@@ -1381,9 +1392,9 @@ bsdcpio_test_CPPFLAGS= \
        $(PLATFORMCPPFLAGS)
 bsdcpio_test_LDADD=libarchive_fe.la
 
-cpio/test/list.h: Makefile
+cpio/test/list.h: $(bsdcpio_test_SOURCES)
        $(MKDIR_P) cpio/test
-       cat $(top_srcdir)/cpio/test/test_*.c | grep '^DEFINE_TEST' > cpio/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
 if BUILD_BSDCPIO
 bsdcpio_test_programs= bsdcpio_test
@@ -1428,13 +1439,15 @@ bsdcpio_test_EXTRA_DIST= \
 #
 #
 
+noinst_HEADERS+= \
+       cat/bsdcat.h \
+       cat/bsdcat_platform.h
 bsdcat_SOURCES= \
-               cat/bsdcat.c \
-               cat/bsdcat.h \
-               cat/bsdcat_platform.h \
-               cat/cmdline.c
+       cat/bsdcat.c \
+       cat/cmdline.c
 
 if INC_WINDOWS_FILES
+noinst_HEADERS+=
 bsdcat_SOURCES+=
 endif
 
@@ -1471,9 +1484,10 @@ endif
 # bsdcat_test
 #
 
+noinst_HEADERS+= \
+       cat/test/test.h
 bsdcat_test_SOURCES= \
        $(test_utils_SOURCES) \
-       cat/test/test.h \
        cat/test/test_0.c \
        cat/test/test_empty_gz.c \
        cat/test/test_empty_lz4.c \
@@ -1501,9 +1515,9 @@ bsdcat_test_CPPFLAGS= \
        $(PLATFORMCPPFLAGS)
 bsdcat_test_LDADD=libarchive_fe.la
 
-cat/test/list.h: Makefile
+cat/test/list.h: $(bsdcat_test_SOURCES)
        $(MKDIR_P) cat/test
-       cat $(top_srcdir)/cat/test/test_*.c | grep '^DEFINE_TEST' > cat/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
 if BUILD_BSDCAT
 bsdcat_test_programs= bsdcat_test
@@ -1534,16 +1548,18 @@ bsdcat_test_EXTRA_DIST= \
 #
 #
 
+noinst_HEADERS+= \
+       unzip/bsdunzip.h \
+       unzip/bsdunzip_platform.h \
+       unzip/la_getline.h \
+       unzip/la_queue.h
 bsdunzip_SOURCES= \
-               unzip/bsdunzip.c \
-               unzip/bsdunzip.h \
-               unzip/bsdunzip_platform.h \
-               unzip/cmdline.c \
-               unzip/la_getline.c \
-               unzip/la_getline.h \
-               unzip/la_queue.h
+       unzip/bsdunzip.c \
+       unzip/cmdline.c \
+       unzip/la_getline.c
 
 if INC_WINDOWS_FILES
+noinst_HEADERS+=
 bsdunzip_SOURCES+=
 endif
 
@@ -1580,9 +1596,10 @@ endif
 # bsdunzip_test
 #
 
+noinst_HEADERS+= \
+       unzip/test/test.h
 bsdunzip_test_SOURCES= \
        $(test_utils_SOURCES) \
-       unzip/test/test.h \
        unzip/test/test_0.c \
        unzip/test/test_basic.c \
        unzip/test/test_doubledash.c \
@@ -1613,9 +1630,9 @@ bsdunzip_test_CPPFLAGS= \
        $(PLATFORMCPPFLAGS)
 bsdunzip_test_LDADD=libarchive_fe.la
 
-unzip/test/list.h: Makefile
+unzip/test/list.h: $(bsdunzip_test_SOURCES)
        $(MKDIR_P) unzip/test
-       cat $(top_srcdir)/unzip/test/test_*.c | grep '^DEFINE_TEST' > unzip/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
 if BUILD_BSDUNZIP
 bsdunzip_test_programs= bsdunzip_test

Index: pkgsrc/archivers/libarchive/files/Makefile.in
diff -u pkgsrc/archivers/libarchive/files/Makefile.in:1.24 pkgsrc/archivers/libarchive/files/Makefile.in:1.25
--- pkgsrc/archivers/libarchive/files/Makefile.in:1.24  Thu Nov 20 06:08:23 2025
+++ pkgsrc/archivers/libarchive/files/Makefile.in       Tue Dec 23 14:01:21 2025
@@ -100,33 +100,43 @@ check_PROGRAMS = libarchive_test$(EXEEXT
 TESTS = libarchive_test$(EXEEXT) $(am__EXEEXT_5) $(am__EXEEXT_6) \
        $(am__EXEEXT_7) $(am__EXEEXT_8)
 @INC_WINDOWS_FILES_TRUE@am__append_1 = \
+@INC_WINDOWS_FILES_TRUE@       libarchive/archive_windows.h
+
+@INC_WINDOWS_FILES_TRUE@am__append_2 = \
 @INC_WINDOWS_FILES_TRUE@       libarchive/archive_entry_copy_bhfi.c \
 @INC_WINDOWS_FILES_TRUE@       libarchive/archive_read_disk_windows.c \
-@INC_WINDOWS_FILES_TRUE@       libarchive/archive_windows.h \
 @INC_WINDOWS_FILES_TRUE@       libarchive/archive_windows.c \
 @INC_WINDOWS_FILES_TRUE@       libarchive/archive_write_disk_windows.c \
 @INC_WINDOWS_FILES_TRUE@       libarchive/filter_fork_windows.c
 
-@INC_BLAKE2_TRUE@am__append_2 = \
+@INC_BLAKE2_TRUE@am__append_3 = \
 @INC_BLAKE2_TRUE@      libarchive/archive_blake2.h \
-@INC_BLAKE2_TRUE@      libarchive/archive_blake2_impl.h \
+@INC_BLAKE2_TRUE@      libarchive/archive_blake2_impl.h
+
+@INC_BLAKE2_TRUE@am__append_4 = \
 @INC_BLAKE2_TRUE@      libarchive/archive_blake2s_ref.c \
 @INC_BLAKE2_TRUE@      libarchive/archive_blake2sp_ref.c
 
-@INC_LINUX_ACL_TRUE@am__append_3 = libarchive/archive_disk_acl_linux.c
-@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_TRUE@am__append_4 = libarchive/archive_disk_acl_sunos.c
-@INC_DARWIN_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__append_5 = libarchive/archive_disk_acl_darwin.c
-@INC_DARWIN_ACL_FALSE@@INC_FREEBSD_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__append_6 = libarchive/archive_disk_acl_freebsd.c
-@INC_WINDOWS_FILES_TRUE@am__append_7 = \
-@INC_WINDOWS_FILES_TRUE@               tar/bsdtar_windows.h \
-@INC_WINDOWS_FILES_TRUE@               tar/bsdtar_windows.c
-
-@INC_WINDOWS_FILES_TRUE@am__append_8 = \
-@INC_WINDOWS_FILES_TRUE@               cpio/cpio_windows.h \
-@INC_WINDOWS_FILES_TRUE@               cpio/cpio_windows.c
-
-@INC_WINDOWS_FILES_TRUE@am__append_9 = 
-@INC_WINDOWS_FILES_TRUE@am__append_10 = 
+@INC_LINUX_ACL_TRUE@am__append_5 = libarchive/archive_disk_acl_linux.c
+@INC_SUNOS_ACL_TRUE@am__append_6 = libarchive/archive_disk_acl_sunos.c
+@INC_DARWIN_ACL_TRUE@am__append_7 = libarchive/archive_disk_acl_darwin.c
+@INC_FREEBSD_ACL_TRUE@am__append_8 = libarchive/archive_disk_acl_freebsd.c
+@INC_WINDOWS_FILES_TRUE@am__append_9 = \
+@INC_WINDOWS_FILES_TRUE@       tar/bsdtar_windows.h
+
+@INC_WINDOWS_FILES_TRUE@am__append_10 = \
+@INC_WINDOWS_FILES_TRUE@       tar/bsdtar_windows.c
+
+@INC_WINDOWS_FILES_TRUE@am__append_11 = \
+@INC_WINDOWS_FILES_TRUE@       cpio/cpio_windows.h
+
+@INC_WINDOWS_FILES_TRUE@am__append_12 = \
+@INC_WINDOWS_FILES_TRUE@       cpio/cpio_windows.c
+
+@INC_WINDOWS_FILES_TRUE@am__append_13 = 
+@INC_WINDOWS_FILES_TRUE@am__append_14 = 
+@INC_WINDOWS_FILES_TRUE@am__append_15 = 
+@INC_WINDOWS_FILES_TRUE@am__append_16 = 
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
@@ -145,7 +155,8 @@ am__aclocal_m4_deps =  \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-       $(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON)
+       $(am__configure_deps) $(include_HEADERS) \
+       $(am__noinst_HEADERS_DIST) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -195,46 +206,25 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noins
 am__DEPENDENCIES_1 =
 libarchive_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__libarchive_la_SOURCES_DIST = libarchive/archive_acl.c \
-       libarchive/archive_acl_private.h \
        libarchive/archive_check_magic.c libarchive/archive_cmdline.c \
-       libarchive/archive_cmdline_private.h \
-       libarchive/archive_crc32.h libarchive/archive_cryptor.c \
-       libarchive/archive_cryptor_private.h \
-       libarchive/archive_digest.c \
-       libarchive/archive_digest_private.h \
-       libarchive/archive_endian.h libarchive/archive_entry.c \
-       libarchive/archive_entry.h \
+       libarchive/archive_cryptor.c libarchive/archive_digest.c \
+       libarchive/archive_entry.c \
        libarchive/archive_entry_copy_stat.c \
        libarchive/archive_entry_link_resolver.c \
-       libarchive/archive_entry_locale.h \
-       libarchive/archive_entry_private.h \
        libarchive/archive_entry_sparse.c \
        libarchive/archive_entry_stat.c \
        libarchive/archive_entry_strmode.c \
        libarchive/archive_entry_xattr.c libarchive/archive_hmac.c \
-       libarchive/archive_hmac_private.h libarchive/archive_match.c \
-       libarchive/archive_openssl_evp_private.h \
-       libarchive/archive_openssl_hmac_private.h \
-       libarchive/archive_options.c \
-       libarchive/archive_options_private.h \
-       libarchive/archive_pack_dev.h libarchive/archive_pack_dev.c \
-       libarchive/archive_parse_date.c libarchive/archive_pathmatch.c \
-       libarchive/archive_pathmatch.h libarchive/archive_platform.h \
-       libarchive/archive_platform_acl.h \
-       libarchive/archive_platform_stat.h \
-       libarchive/archive_platform_xattr.h \
-       libarchive/archive_ppmd_private.h libarchive/archive_ppmd7.c \
-       libarchive/archive_ppmd7_private.h libarchive/archive_ppmd8.c \
-       libarchive/archive_ppmd8_private.h \
-       libarchive/archive_private.h libarchive/archive_random.c \
-       libarchive/archive_random_private.h libarchive/archive_rb.c \
-       libarchive/archive_rb.h libarchive/archive_read.c \
+       libarchive/archive_match.c libarchive/archive_options.c \
+       libarchive/archive_pack_dev.c libarchive/archive_parse_date.c \
+       libarchive/archive_pathmatch.c libarchive/archive_ppmd7.c \
+       libarchive/archive_ppmd8.c libarchive/archive_random.c \
+       libarchive/archive_rb.c libarchive/archive_read.c \
        libarchive/archive_read_add_passphrase.c \
        libarchive/archive_read_append_filter.c \
        libarchive/archive_read_data_into_fd.c \
        libarchive/archive_read_disk_entry_from_file.c \
        libarchive/archive_read_disk_posix.c \
-       libarchive/archive_read_disk_private.h \
        libarchive/archive_read_disk_set_standard_lookup.c \
        libarchive/archive_read_extract.c \
        libarchive/archive_read_extract2.c \
@@ -242,12 +232,11 @@ am__libarchive_la_SOURCES_DIST = libarch
        libarchive/archive_read_open_file.c \
        libarchive/archive_read_open_filename.c \
        libarchive/archive_read_open_memory.c \
-       libarchive/archive_read_private.h \
        libarchive/archive_read_set_format.c \
        libarchive/archive_read_set_options.c \
        libarchive/archive_read_support_filter_all.c \
-       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_by_code.c \
+       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_compress.c \
        libarchive/archive_read_support_filter_grzip.c \
        libarchive/archive_read_support_filter_gzip.c \
@@ -277,20 +266,10 @@ am__libarchive_la_SOURCES_DIST = libarch
        libarchive/archive_read_support_format_warc.c \
        libarchive/archive_read_support_format_xar.c \
        libarchive/archive_read_support_format_zip.c \
-       libarchive/archive_string.c libarchive/archive_string.h \
-       libarchive/archive_string_composition.h \
+       libarchive/archive_string.c \
        libarchive/archive_string_sprintf.c libarchive/archive_time.c \
-       libarchive/archive_time_private.h libarchive/archive_util.c \
-       libarchive/archive_version_details.c \
+       libarchive/archive_util.c libarchive/archive_version_details.c \
        libarchive/archive_virtual.c libarchive/archive_write.c \
-       libarchive/archive_write_disk_posix.c \
-       libarchive/archive_write_disk_private.h \
-       libarchive/archive_write_disk_set_standard_lookup.c \
-       libarchive/archive_write_open_fd.c \
-       libarchive/archive_write_open_file.c \
-       libarchive/archive_write_open_filename.c \
-       libarchive/archive_write_open_memory.c \
-       libarchive/archive_write_private.h \
        libarchive/archive_write_add_filter.c \
        libarchive/archive_write_add_filter_b64encode.c \
        libarchive/archive_write_add_filter_by_name.c \
@@ -306,6 +285,12 @@ am__libarchive_la_SOURCES_DIST = libarch
        libarchive/archive_write_add_filter_uuencode.c \
        libarchive/archive_write_add_filter_xz.c \
        libarchive/archive_write_add_filter_zstd.c \
+       libarchive/archive_write_disk_posix.c \
+       libarchive/archive_write_disk_set_standard_lookup.c \
+       libarchive/archive_write_open_fd.c \
+       libarchive/archive_write_open_file.c \
+       libarchive/archive_write_open_filename.c \
+       libarchive/archive_write_open_memory.c \
        libarchive/archive_write_set_format.c \
        libarchive/archive_write_set_format_7zip.c \
        libarchive/archive_write_set_format_ar.c \
@@ -315,28 +300,25 @@ am__libarchive_la_SOURCES_DIST = libarch
        libarchive/archive_write_set_format_cpio_newc.c \
        libarchive/archive_write_set_format_cpio_odc.c \
        libarchive/archive_write_set_format_filter_by_ext.c \
+       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_iso9660.c \
        libarchive/archive_write_set_format_mtree.c \
        libarchive/archive_write_set_format_pax.c \
-       libarchive/archive_write_set_format_private.h \
        libarchive/archive_write_set_format_raw.c \
        libarchive/archive_write_set_format_shar.c \
        libarchive/archive_write_set_format_ustar.c \
        libarchive/archive_write_set_format_v7tar.c \
-       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_warc.c \
        libarchive/archive_write_set_format_xar.c \
        libarchive/archive_write_set_format_zip.c \
        libarchive/archive_write_set_options.c \
        libarchive/archive_write_set_passphrase.c \
-       libarchive/archive_xxhash.h libarchive/config_freebsd.h \
-       libarchive/filter_fork_posix.c libarchive/filter_fork.h \
-       libarchive/xxhash.c libarchive/archive_entry_copy_bhfi.c \
+       libarchive/filter_fork_posix.c libarchive/xxhash.c \
+       libarchive/archive_entry_copy_bhfi.c \
        libarchive/archive_read_disk_windows.c \
-       libarchive/archive_windows.h libarchive/archive_windows.c \
+       libarchive/archive_windows.c \
        libarchive/archive_write_disk_windows.c \
-       libarchive/filter_fork_windows.c libarchive/archive_blake2.h \
-       libarchive/archive_blake2_impl.h \
+       libarchive/filter_fork_windows.c \
        libarchive/archive_blake2s_ref.c \
        libarchive/archive_blake2sp_ref.c \
        libarchive/archive_disk_acl_linux.c \
@@ -354,9 +336,12 @@ am__dirstamp = $(am__leading_dot)dirstam
 @INC_BLAKE2_TRUE@      libarchive/archive_blake2sp_ref.lo
 @INC_LINUX_ACL_TRUE@am__objects_3 =  \
 @INC_LINUX_ACL_TRUE@   libarchive/archive_disk_acl_linux.lo
-@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_TRUE@am__objects_4 = libarchive/archive_disk_acl_sunos.lo
-@INC_DARWIN_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_5 = libarchive/archive_disk_acl_darwin.lo
-@INC_DARWIN_ACL_FALSE@@INC_FREEBSD_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_6 = libarchive/archive_disk_acl_freebsd.lo
+@INC_SUNOS_ACL_TRUE@am__objects_4 =  \
+@INC_SUNOS_ACL_TRUE@   libarchive/archive_disk_acl_sunos.lo
+@INC_DARWIN_ACL_TRUE@am__objects_5 =  \
+@INC_DARWIN_ACL_TRUE@  libarchive/archive_disk_acl_darwin.lo
+@INC_FREEBSD_ACL_TRUE@am__objects_6 =  \
+@INC_FREEBSD_ACL_TRUE@ libarchive/archive_disk_acl_freebsd.lo
 am_libarchive_la_OBJECTS = libarchive/archive_acl.lo \
        libarchive/archive_check_magic.lo \
        libarchive/archive_cmdline.lo libarchive/archive_cryptor.lo \
@@ -388,8 +373,8 @@ am_libarchive_la_OBJECTS = libarchive/ar
        libarchive/archive_read_set_format.lo \
        libarchive/archive_read_set_options.lo \
        libarchive/archive_read_support_filter_all.lo \
-       libarchive/archive_read_support_filter_bzip2.lo \
        libarchive/archive_read_support_filter_by_code.lo \
+       libarchive/archive_read_support_filter_bzip2.lo \
        libarchive/archive_read_support_filter_compress.lo \
        libarchive/archive_read_support_filter_grzip.lo \
        libarchive/archive_read_support_filter_gzip.lo \
@@ -424,12 +409,6 @@ am_libarchive_la_OBJECTS = libarchive/ar
        libarchive/archive_time.lo libarchive/archive_util.lo \
        libarchive/archive_version_details.lo \
        libarchive/archive_virtual.lo libarchive/archive_write.lo \
-       libarchive/archive_write_disk_posix.lo \
-       libarchive/archive_write_disk_set_standard_lookup.lo \
-       libarchive/archive_write_open_fd.lo \
-       libarchive/archive_write_open_file.lo \
-       libarchive/archive_write_open_filename.lo \
-       libarchive/archive_write_open_memory.lo \
        libarchive/archive_write_add_filter.lo \
        libarchive/archive_write_add_filter_b64encode.lo \
        libarchive/archive_write_add_filter_by_name.lo \
@@ -445,6 +424,12 @@ am_libarchive_la_OBJECTS = libarchive/ar
        libarchive/archive_write_add_filter_uuencode.lo \
        libarchive/archive_write_add_filter_xz.lo \
        libarchive/archive_write_add_filter_zstd.lo \
+       libarchive/archive_write_disk_posix.lo \
+       libarchive/archive_write_disk_set_standard_lookup.lo \
+       libarchive/archive_write_open_fd.lo \
+       libarchive/archive_write_open_file.lo \
+       libarchive/archive_write_open_filename.lo \
+       libarchive/archive_write_open_memory.lo \
        libarchive/archive_write_set_format.lo \
        libarchive/archive_write_set_format_7zip.lo \
        libarchive/archive_write_set_format_ar.lo \
@@ -454,6 +439,7 @@ am_libarchive_la_OBJECTS = libarchive/ar
        libarchive/archive_write_set_format_cpio_newc.lo \
        libarchive/archive_write_set_format_cpio_odc.lo \
        libarchive/archive_write_set_format_filter_by_ext.lo \
+       libarchive/archive_write_set_format_gnutar.lo \
        libarchive/archive_write_set_format_iso9660.lo \
        libarchive/archive_write_set_format_mtree.lo \
        libarchive/archive_write_set_format_pax.lo \
@@ -461,7 +447,6 @@ am_libarchive_la_OBJECTS = libarchive/ar
        libarchive/archive_write_set_format_shar.lo \
        libarchive/archive_write_set_format_ustar.lo \
        libarchive/archive_write_set_format_v7tar.lo \
-       libarchive/archive_write_set_format_gnutar.lo \
        libarchive/archive_write_set_format_warc.lo \
        libarchive/archive_write_set_format_xar.lo \
        libarchive/archive_write_set_format_zip.lo \
@@ -489,8 +474,8 @@ bsdcat_OBJECTS = $(am_bsdcat_OBJECTS)
 bsdcat_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(bsdcat_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_8 = test_utils/bsdcat_test-test_utils.$(OBJEXT) \
-       test_utils/bsdcat_test-test_main.$(OBJEXT)
+am__objects_8 = test_utils/bsdcat_test-test_main.$(OBJEXT) \
+       test_utils/bsdcat_test-test_utils.$(OBJEXT)
 am_bsdcat_test_OBJECTS = $(am__objects_8) \
        cat/test/bsdcat_test-test_0.$(OBJEXT) \
        cat/test/bsdcat_test-test_empty_gz.$(OBJEXT) \
@@ -512,8 +497,8 @@ am_bsdcat_test_OBJECTS = $(am__objects_8
        cat/test/bsdcat_test-test_version.$(OBJEXT)
 bsdcat_test_OBJECTS = $(am_bsdcat_test_OBJECTS)
 bsdcat_test_DEPENDENCIES = libarchive_fe.la
-am__bsdcpio_SOURCES_DIST = cpio/cmdline.c cpio/cpio.c cpio/cpio.h \
-       cpio/cpio_platform.h cpio/cpio_windows.h cpio/cpio_windows.c
+am__bsdcpio_SOURCES_DIST = cpio/cmdline.c cpio/cpio.c \
+       cpio/cpio_windows.c
 @INC_WINDOWS_FILES_TRUE@am__objects_9 =  \
 @INC_WINDOWS_FILES_TRUE@       cpio/bsdcpio-cpio_windows.$(OBJEXT)
 am_bsdcpio_OBJECTS = cpio/bsdcpio-cmdline.$(OBJEXT) \
@@ -522,8 +507,8 @@ bsdcpio_OBJECTS = $(am_bsdcpio_OBJECTS)
 bsdcpio_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(bsdcpio_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_10 = test_utils/bsdcpio_test-test_utils.$(OBJEXT) \
-       test_utils/bsdcpio_test-test_main.$(OBJEXT)
+am__objects_10 = test_utils/bsdcpio_test-test_main.$(OBJEXT) \
+       test_utils/bsdcpio_test-test_utils.$(OBJEXT)
 am_bsdcpio_test_OBJECTS = $(am__objects_10) \
        cpio/bsdcpio_test-cmdline.$(OBJEXT) \
        cpio/test/bsdcpio_test-test_0.$(OBJEXT) \
@@ -577,10 +562,9 @@ am_bsdcpio_test_OBJECTS = $(am__objects_
        cpio/test/bsdcpio_test-test_passthrough_reverse.$(OBJEXT)
 bsdcpio_test_OBJECTS = $(am_bsdcpio_test_OBJECTS)
 bsdcpio_test_DEPENDENCIES = libarchive_fe.la
-am__bsdtar_SOURCES_DIST = tar/bsdtar.c tar/bsdtar.h \
-       tar/bsdtar_platform.h tar/cmdline.c tar/creation_set.c \
-       tar/read.c tar/subst.c tar/util.c tar/write.c \
-       tar/bsdtar_windows.h tar/bsdtar_windows.c
+am__bsdtar_SOURCES_DIST = tar/bsdtar.c tar/cmdline.c \
+       tar/creation_set.c tar/read.c tar/subst.c tar/util.c \
+       tar/write.c tar/bsdtar_windows.c
 @INC_WINDOWS_FILES_TRUE@am__objects_11 =  \
 @INC_WINDOWS_FILES_TRUE@       tar/bsdtar-bsdtar_windows.$(OBJEXT)
 am_bsdtar_OBJECTS = tar/bsdtar-bsdtar.$(OBJEXT) \
@@ -592,8 +576,8 @@ bsdtar_OBJECTS = $(am_bsdtar_OBJECTS)
 bsdtar_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(bsdtar_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_12 = test_utils/bsdtar_test-test_utils.$(OBJEXT) \
-       test_utils/bsdtar_test-test_main.$(OBJEXT)
+am__objects_12 = test_utils/bsdtar_test-test_main.$(OBJEXT) \
+       test_utils/bsdtar_test-test_utils.$(OBJEXT)
 am_bsdtar_test_OBJECTS = $(am__objects_12) \
        tar/test/bsdtar_test-test_0.$(OBJEXT) \
        tar/test/bsdtar_test-test_basic.$(OBJEXT) \
@@ -676,8 +660,8 @@ bsdunzip_OBJECTS = $(am_bsdunzip_OBJECTS
 bsdunzip_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(bsdunzip_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_13 = test_utils/bsdunzip_test-test_utils.$(OBJEXT) \
-       test_utils/bsdunzip_test-test_main.$(OBJEXT)
+am__objects_13 = test_utils/bsdunzip_test-test_main.$(OBJEXT) \
+       test_utils/bsdunzip_test-test_utils.$(OBJEXT)
 am_bsdunzip_test_OBJECTS = $(am__objects_13) \
        unzip/test/bsdunzip_test-test_0.$(OBJEXT) \
        unzip/test/bsdunzip_test-test_basic.$(OBJEXT) \
@@ -703,46 +687,25 @@ am_bsdunzip_test_OBJECTS = $(am__objects
 bsdunzip_test_OBJECTS = $(am_bsdunzip_test_OBJECTS)
 bsdunzip_test_DEPENDENCIES = libarchive_fe.la
 am__libarchive_test_SOURCES_DIST = libarchive/archive_acl.c \
-       libarchive/archive_acl_private.h \
        libarchive/archive_check_magic.c libarchive/archive_cmdline.c \
-       libarchive/archive_cmdline_private.h \
-       libarchive/archive_crc32.h libarchive/archive_cryptor.c \
-       libarchive/archive_cryptor_private.h \
-       libarchive/archive_digest.c \
-       libarchive/archive_digest_private.h \
-       libarchive/archive_endian.h libarchive/archive_entry.c \
-       libarchive/archive_entry.h \
+       libarchive/archive_cryptor.c libarchive/archive_digest.c \
+       libarchive/archive_entry.c \
        libarchive/archive_entry_copy_stat.c \
        libarchive/archive_entry_link_resolver.c \
-       libarchive/archive_entry_locale.h \
-       libarchive/archive_entry_private.h \
        libarchive/archive_entry_sparse.c \
        libarchive/archive_entry_stat.c \
        libarchive/archive_entry_strmode.c \
        libarchive/archive_entry_xattr.c libarchive/archive_hmac.c \
-       libarchive/archive_hmac_private.h libarchive/archive_match.c \
-       libarchive/archive_openssl_evp_private.h \
-       libarchive/archive_openssl_hmac_private.h \
-       libarchive/archive_options.c \
-       libarchive/archive_options_private.h \
-       libarchive/archive_pack_dev.h libarchive/archive_pack_dev.c \
-       libarchive/archive_parse_date.c libarchive/archive_pathmatch.c \
-       libarchive/archive_pathmatch.h libarchive/archive_platform.h \
-       libarchive/archive_platform_acl.h \
-       libarchive/archive_platform_stat.h \
-       libarchive/archive_platform_xattr.h \
-       libarchive/archive_ppmd_private.h libarchive/archive_ppmd7.c \
-       libarchive/archive_ppmd7_private.h libarchive/archive_ppmd8.c \
-       libarchive/archive_ppmd8_private.h \
-       libarchive/archive_private.h libarchive/archive_random.c \
-       libarchive/archive_random_private.h libarchive/archive_rb.c \
-       libarchive/archive_rb.h libarchive/archive_read.c \
+       libarchive/archive_match.c libarchive/archive_options.c \
+       libarchive/archive_pack_dev.c libarchive/archive_parse_date.c \
+       libarchive/archive_pathmatch.c libarchive/archive_ppmd7.c \
+       libarchive/archive_ppmd8.c libarchive/archive_random.c \
+       libarchive/archive_rb.c libarchive/archive_read.c \
        libarchive/archive_read_add_passphrase.c \
        libarchive/archive_read_append_filter.c \
        libarchive/archive_read_data_into_fd.c \
        libarchive/archive_read_disk_entry_from_file.c \
        libarchive/archive_read_disk_posix.c \
-       libarchive/archive_read_disk_private.h \
        libarchive/archive_read_disk_set_standard_lookup.c \
        libarchive/archive_read_extract.c \
        libarchive/archive_read_extract2.c \
@@ -750,12 +713,11 @@ am__libarchive_test_SOURCES_DIST = libar
        libarchive/archive_read_open_file.c \
        libarchive/archive_read_open_filename.c \
        libarchive/archive_read_open_memory.c \
-       libarchive/archive_read_private.h \
        libarchive/archive_read_set_format.c \
        libarchive/archive_read_set_options.c \
        libarchive/archive_read_support_filter_all.c \
-       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_by_code.c \
+       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_compress.c \
        libarchive/archive_read_support_filter_grzip.c \
        libarchive/archive_read_support_filter_gzip.c \
@@ -785,20 +747,10 @@ am__libarchive_test_SOURCES_DIST = libar
        libarchive/archive_read_support_format_warc.c \
        libarchive/archive_read_support_format_xar.c \
        libarchive/archive_read_support_format_zip.c \
-       libarchive/archive_string.c libarchive/archive_string.h \
-       libarchive/archive_string_composition.h \
+       libarchive/archive_string.c \
        libarchive/archive_string_sprintf.c libarchive/archive_time.c \
-       libarchive/archive_time_private.h libarchive/archive_util.c \
-       libarchive/archive_version_details.c \
+       libarchive/archive_util.c libarchive/archive_version_details.c \
        libarchive/archive_virtual.c libarchive/archive_write.c \
-       libarchive/archive_write_disk_posix.c \
-       libarchive/archive_write_disk_private.h \
-       libarchive/archive_write_disk_set_standard_lookup.c \
-       libarchive/archive_write_open_fd.c \
-       libarchive/archive_write_open_file.c \
-       libarchive/archive_write_open_filename.c \
-       libarchive/archive_write_open_memory.c \
-       libarchive/archive_write_private.h \
        libarchive/archive_write_add_filter.c \
        libarchive/archive_write_add_filter_b64encode.c \
        libarchive/archive_write_add_filter_by_name.c \
@@ -814,6 +766,12 @@ am__libarchive_test_SOURCES_DIST = libar
        libarchive/archive_write_add_filter_uuencode.c \
        libarchive/archive_write_add_filter_xz.c \
        libarchive/archive_write_add_filter_zstd.c \
+       libarchive/archive_write_disk_posix.c \
+       libarchive/archive_write_disk_set_standard_lookup.c \
+       libarchive/archive_write_open_fd.c \
+       libarchive/archive_write_open_file.c \
+       libarchive/archive_write_open_filename.c \
+       libarchive/archive_write_open_memory.c \
        libarchive/archive_write_set_format.c \
        libarchive/archive_write_set_format_7zip.c \
        libarchive/archive_write_set_format_ar.c \
@@ -823,37 +781,32 @@ am__libarchive_test_SOURCES_DIST = libar
        libarchive/archive_write_set_format_cpio_newc.c \
        libarchive/archive_write_set_format_cpio_odc.c \
        libarchive/archive_write_set_format_filter_by_ext.c \
+       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_iso9660.c \
        libarchive/archive_write_set_format_mtree.c \
        libarchive/archive_write_set_format_pax.c \
-       libarchive/archive_write_set_format_private.h \
        libarchive/archive_write_set_format_raw.c \
        libarchive/archive_write_set_format_shar.c \
        libarchive/archive_write_set_format_ustar.c \
        libarchive/archive_write_set_format_v7tar.c \
-       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_warc.c \
        libarchive/archive_write_set_format_xar.c \
        libarchive/archive_write_set_format_zip.c \
        libarchive/archive_write_set_options.c \
        libarchive/archive_write_set_passphrase.c \
-       libarchive/archive_xxhash.h libarchive/config_freebsd.h \
-       libarchive/filter_fork_posix.c libarchive/filter_fork.h \
-       libarchive/xxhash.c libarchive/archive_entry_copy_bhfi.c \
+       libarchive/filter_fork_posix.c libarchive/xxhash.c \
+       libarchive/archive_entry_copy_bhfi.c \
        libarchive/archive_read_disk_windows.c \
-       libarchive/archive_windows.h libarchive/archive_windows.c \
+       libarchive/archive_windows.c \
        libarchive/archive_write_disk_windows.c \
-       libarchive/filter_fork_windows.c libarchive/archive_blake2.h \
-       libarchive/archive_blake2_impl.h \
+       libarchive/filter_fork_windows.c \
        libarchive/archive_blake2s_ref.c \
        libarchive/archive_blake2sp_ref.c \
        libarchive/archive_disk_acl_linux.c \
        libarchive/archive_disk_acl_sunos.c \
        libarchive/archive_disk_acl_darwin.c \
-       libarchive/archive_disk_acl_freebsd.c test_utils/test_utils.c \
-       test_utils/test_utils.h test_utils/test_main.c \
-       test_utils/test_common.h libarchive/test/read_open_memory.c \
-       libarchive/test/test.h \
+       libarchive/archive_disk_acl_freebsd.c test_utils/test_main.c \
+       test_utils/test_utils.c libarchive/test/read_open_memory.c \
        libarchive/test/test_7zip_filename_encoding.c \
        libarchive/test/test_acl_nfs4.c libarchive/test/test_acl_pax.c \
        libarchive/test/test_acl_platform_nfs4.c \
@@ -1166,9 +1119,9 @@ am__libarchive_test_SOURCES_DIST = libar
 @INC_BLAKE2_TRUE@am__objects_15 = libarchive/test-archive_blake2s_ref.$(OBJEXT) \
 @INC_BLAKE2_TRUE@      libarchive/test-archive_blake2sp_ref.$(OBJEXT)
 @INC_LINUX_ACL_TRUE@am__objects_16 = libarchive/test-archive_disk_acl_linux.$(OBJEXT)
-@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_TRUE@am__objects_17 = libarchive/test-archive_disk_acl_sunos.$(OBJEXT)
-@INC_DARWIN_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_18 = libarchive/test-archive_disk_acl_darwin.$(OBJEXT)
-@INC_DARWIN_ACL_FALSE@@INC_FREEBSD_ACL_TRUE@@INC_LINUX_ACL_FALSE@@INC_SUNOS_ACL_FALSE@am__objects_19 = libarchive/test-archive_disk_acl_freebsd.$(OBJEXT)
+@INC_SUNOS_ACL_TRUE@am__objects_17 = libarchive/test-archive_disk_acl_sunos.$(OBJEXT)
+@INC_DARWIN_ACL_TRUE@am__objects_18 = libarchive/test-archive_disk_acl_darwin.$(OBJEXT)
+@INC_FREEBSD_ACL_TRUE@am__objects_19 = libarchive/test-archive_disk_acl_freebsd.$(OBJEXT)
 am__objects_20 = libarchive/test-archive_acl.$(OBJEXT) \
        libarchive/test-archive_check_magic.$(OBJEXT) \
        libarchive/test-archive_cmdline.$(OBJEXT) \
@@ -1207,8 +1160,8 @@ am__objects_20 = libarchive/test-archive
        libarchive/test-archive_read_set_format.$(OBJEXT) \
        libarchive/test-archive_read_set_options.$(OBJEXT) \
        libarchive/test-archive_read_support_filter_all.$(OBJEXT) \
-       libarchive/test-archive_read_support_filter_bzip2.$(OBJEXT) \
        libarchive/test-archive_read_support_filter_by_code.$(OBJEXT) \
+       libarchive/test-archive_read_support_filter_bzip2.$(OBJEXT) \
        libarchive/test-archive_read_support_filter_compress.$(OBJEXT) \
        libarchive/test-archive_read_support_filter_grzip.$(OBJEXT) \
        libarchive/test-archive_read_support_filter_gzip.$(OBJEXT) \
@@ -1245,12 +1198,6 @@ am__objects_20 = libarchive/test-archive
        libarchive/test-archive_version_details.$(OBJEXT) \
        libarchive/test-archive_virtual.$(OBJEXT) \
        libarchive/test-archive_write.$(OBJEXT) \
-       libarchive/test-archive_write_disk_posix.$(OBJEXT) \
-       libarchive/test-archive_write_disk_set_standard_lookup.$(OBJEXT) \
-       libarchive/test-archive_write_open_fd.$(OBJEXT) \
-       libarchive/test-archive_write_open_file.$(OBJEXT) \
-       libarchive/test-archive_write_open_filename.$(OBJEXT) \
-       libarchive/test-archive_write_open_memory.$(OBJEXT) \
        libarchive/test-archive_write_add_filter.$(OBJEXT) \
        libarchive/test-archive_write_add_filter_b64encode.$(OBJEXT) \
        libarchive/test-archive_write_add_filter_by_name.$(OBJEXT) \
@@ -1266,6 +1213,12 @@ am__objects_20 = libarchive/test-archive
        libarchive/test-archive_write_add_filter_uuencode.$(OBJEXT) \
        libarchive/test-archive_write_add_filter_xz.$(OBJEXT) \
        libarchive/test-archive_write_add_filter_zstd.$(OBJEXT) \
+       libarchive/test-archive_write_disk_posix.$(OBJEXT) \
+       libarchive/test-archive_write_disk_set_standard_lookup.$(OBJEXT) \
+       libarchive/test-archive_write_open_fd.$(OBJEXT) \
+       libarchive/test-archive_write_open_file.$(OBJEXT) \
+       libarchive/test-archive_write_open_filename.$(OBJEXT) \
+       libarchive/test-archive_write_open_memory.$(OBJEXT) \
        libarchive/test-archive_write_set_format.$(OBJEXT) \
        libarchive/test-archive_write_set_format_7zip.$(OBJEXT) \
        libarchive/test-archive_write_set_format_ar.$(OBJEXT) \
@@ -1275,6 +1228,7 @@ am__objects_20 = libarchive/test-archive
        libarchive/test-archive_write_set_format_cpio_newc.$(OBJEXT) \
        libarchive/test-archive_write_set_format_cpio_odc.$(OBJEXT) \
        libarchive/test-archive_write_set_format_filter_by_ext.$(OBJEXT) \
+       libarchive/test-archive_write_set_format_gnutar.$(OBJEXT) \
        libarchive/test-archive_write_set_format_iso9660.$(OBJEXT) \
        libarchive/test-archive_write_set_format_mtree.$(OBJEXT) \
        libarchive/test-archive_write_set_format_pax.$(OBJEXT) \
@@ -1282,7 +1236,6 @@ am__objects_20 = libarchive/test-archive
        libarchive/test-archive_write_set_format_shar.$(OBJEXT) \
        libarchive/test-archive_write_set_format_ustar.$(OBJEXT) \
        libarchive/test-archive_write_set_format_v7tar.$(OBJEXT) \
-       libarchive/test-archive_write_set_format_gnutar.$(OBJEXT) \
        libarchive/test-archive_write_set_format_warc.$(OBJEXT) \
        libarchive/test-archive_write_set_format_xar.$(OBJEXT) \
        libarchive/test-archive_write_set_format_zip.$(OBJEXT) \
@@ -1292,8 +1245,8 @@ am__objects_20 = libarchive/test-archive
        libarchive/test-xxhash.$(OBJEXT) $(am__objects_14) \
        $(am__objects_15) $(am__objects_16) $(am__objects_17) \
        $(am__objects_18) $(am__objects_19)
-am__objects_21 = test_utils/libarchive_test-test_utils.$(OBJEXT) \
-       test_utils/libarchive_test-test_main.$(OBJEXT)
+am__objects_21 = test_utils/libarchive_test-test_main.$(OBJEXT) \
+       test_utils/libarchive_test-test_utils.$(OBJEXT)
 am_libarchive_test_OBJECTS = $(am__objects_20) $(am__objects_21) \
        libarchive/test/test-read_open_memory.$(OBJEXT) \
        libarchive/test/test-test_7zip_filename_encoding.$(OBJEXT) \
@@ -2419,7 +2372,47 @@ man5dir = $(mandir)/man5
 NROFF = nroff
 MANS = $(man_MANS)
 DATA = $(pkgconfig_DATA)
-HEADERS = $(include_HEADERS)
+am__noinst_HEADERS_DIST = libarchive/archive_acl_private.h \
+       libarchive/archive_cmdline_private.h \
+       libarchive/archive_crc32.h \
+       libarchive/archive_cryptor_private.h \
+       libarchive/archive_digest_private.h \
+       libarchive/archive_endian.h libarchive/archive_entry.h \
+       libarchive/archive_entry_locale.h \
+       libarchive/archive_entry_private.h \
+       libarchive/archive_hmac_private.h \
+       libarchive/archive_openssl_evp_private.h \
+       libarchive/archive_openssl_hmac_private.h \
+       libarchive/archive_options_private.h \
+       libarchive/archive_pack_dev.h libarchive/archive_pathmatch.h \
+       libarchive/archive_platform.h \
+       libarchive/archive_platform_acl.h \
+       libarchive/archive_platform_stat.h \
+       libarchive/archive_platform_xattr.h \
+       libarchive/archive_ppmd7_private.h \
+       libarchive/archive_ppmd8_private.h \
+       libarchive/archive_ppmd_private.h libarchive/archive_private.h \
+       libarchive/archive_random_private.h libarchive/archive_rb.h \
+       libarchive/archive_read_disk_private.h \
+       libarchive/archive_read_private.h libarchive/archive_string.h \
+       libarchive/archive_string_composition.h \
+       libarchive/archive_time_private.h \
+       libarchive/archive_write_disk_private.h \
+       libarchive/archive_write_private.h \
+       libarchive/archive_write_set_format_private.h \
+       libarchive/archive_xxhash.h libarchive/config_freebsd.h \
+       libarchive/filter_fork.h libarchive/archive_windows.h \
+       libarchive/archive_blake2.h libarchive/archive_blake2_impl.h \
+       test_utils/test_common.h test_utils/test_utils.h \
+       libarchive/test/test.h libarchive_fe/lafe_err.h \
+       libarchive_fe/lafe_platform.h libarchive_fe/line_reader.h \
+       libarchive_fe/passphrase.h tar/bsdtar.h tar/bsdtar_platform.h \
+       tar/bsdtar_windows.h tar/test/test.h cpio/cpio.h \
+       cpio/cpio_platform.h cpio/cpio_windows.h cpio/test/test.h \
+       cat/bsdcat.h cat/bsdcat_platform.h cat/test/test.h \
+       unzip/bsdunzip.h unzip/bsdunzip_platform.h unzip/la_getline.h \
+       unzip/la_queue.h unzip/test/test.h
+HEADERS = $(include_HEADERS) $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
        config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -2865,47 +2858,117 @@ DISTCLEANFILES = \
 #
 #
 include_HEADERS = libarchive/archive.h libarchive/archive_entry.h
-libarchive_la_SOURCES = libarchive/archive_acl.c \
-       libarchive/archive_acl_private.h \
-       libarchive/archive_check_magic.c libarchive/archive_cmdline.c \
+
+# Sources needed by all test programs
+
+#
+#
+# libarchive_test program
+#
+#
+
+#
+# Common code for libarchive frontends (cpio, tar)
+#
+#
+#
+# bsdtar source, docs, etc.
+#
+#
+
+#
+# bsdtar_test
+#
+
+#
+#
+# bsdcpio source, docs, etc.
+#
+#
+
+#
+# bsdcpio_test
+#
+
+#
+#
+# bsdcat source, docs, etc.
+#
+#
+
+#
+# bsdcat_test
+#
+
+#
+#
+# bsdunzip source, docs, etc.
+#
+#
+
+#
+# bsdunzip_test
+#
+noinst_HEADERS = libarchive/archive_acl_private.h \
        libarchive/archive_cmdline_private.h \
-       libarchive/archive_crc32.h libarchive/archive_cryptor.c \
+       libarchive/archive_crc32.h \
        libarchive/archive_cryptor_private.h \
-       libarchive/archive_digest.c \
        libarchive/archive_digest_private.h \
-       libarchive/archive_endian.h libarchive/archive_entry.c \
-       libarchive/archive_entry.h \
-       libarchive/archive_entry_copy_stat.c \
-       libarchive/archive_entry_link_resolver.c \
+       libarchive/archive_endian.h libarchive/archive_entry.h \
        libarchive/archive_entry_locale.h \
        libarchive/archive_entry_private.h \
-       libarchive/archive_entry_sparse.c \
-       libarchive/archive_entry_stat.c \
-       libarchive/archive_entry_strmode.c \
-       libarchive/archive_entry_xattr.c libarchive/archive_hmac.c \
-       libarchive/archive_hmac_private.h libarchive/archive_match.c \
+       libarchive/archive_hmac_private.h \
        libarchive/archive_openssl_evp_private.h \
        libarchive/archive_openssl_hmac_private.h \
-       libarchive/archive_options.c \
        libarchive/archive_options_private.h \
-       libarchive/archive_pack_dev.h libarchive/archive_pack_dev.c \
-       libarchive/archive_parse_date.c libarchive/archive_pathmatch.c \
-       libarchive/archive_pathmatch.h libarchive/archive_platform.h \
+       libarchive/archive_pack_dev.h libarchive/archive_pathmatch.h \
+       libarchive/archive_platform.h \
        libarchive/archive_platform_acl.h \
        libarchive/archive_platform_stat.h \
        libarchive/archive_platform_xattr.h \
-       libarchive/archive_ppmd_private.h libarchive/archive_ppmd7.c \
-       libarchive/archive_ppmd7_private.h libarchive/archive_ppmd8.c \
+       libarchive/archive_ppmd7_private.h \
        libarchive/archive_ppmd8_private.h \
-       libarchive/archive_private.h libarchive/archive_random.c \
-       libarchive/archive_random_private.h libarchive/archive_rb.c \
-       libarchive/archive_rb.h libarchive/archive_read.c \
+       libarchive/archive_ppmd_private.h libarchive/archive_private.h \
+       libarchive/archive_random_private.h libarchive/archive_rb.h \
+       libarchive/archive_read_disk_private.h \
+       libarchive/archive_read_private.h libarchive/archive_string.h \
+       libarchive/archive_string_composition.h \
+       libarchive/archive_time_private.h \
+       libarchive/archive_write_disk_private.h \
+       libarchive/archive_write_private.h \
+       libarchive/archive_write_set_format_private.h \
+       libarchive/archive_xxhash.h libarchive/config_freebsd.h \
+       libarchive/filter_fork.h $(am__append_1) $(am__append_3) \
+       test_utils/test_common.h test_utils/test_utils.h \
+       libarchive/test/test.h libarchive_fe/lafe_err.h \
+       libarchive_fe/lafe_platform.h libarchive_fe/line_reader.h \
+       libarchive_fe/passphrase.h tar/bsdtar.h tar/bsdtar_platform.h \
+       $(am__append_9) tar/test/test.h cpio/cpio.h \
+       cpio/cpio_platform.h $(am__append_11) cpio/test/test.h \
+       cat/bsdcat.h cat/bsdcat_platform.h $(am__append_13) \
+       cat/test/test.h unzip/bsdunzip.h unzip/bsdunzip_platform.h \
+       unzip/la_getline.h unzip/la_queue.h $(am__append_15) \
+       unzip/test/test.h
+libarchive_la_SOURCES = libarchive/archive_acl.c \
+       libarchive/archive_check_magic.c libarchive/archive_cmdline.c \
+       libarchive/archive_cryptor.c libarchive/archive_digest.c \
+       libarchive/archive_entry.c \
+       libarchive/archive_entry_copy_stat.c \
+       libarchive/archive_entry_link_resolver.c \
+       libarchive/archive_entry_sparse.c \
+       libarchive/archive_entry_stat.c \
+       libarchive/archive_entry_strmode.c \
+       libarchive/archive_entry_xattr.c libarchive/archive_hmac.c \
+       libarchive/archive_match.c libarchive/archive_options.c \
+       libarchive/archive_pack_dev.c libarchive/archive_parse_date.c \
+       libarchive/archive_pathmatch.c libarchive/archive_ppmd7.c \
+       libarchive/archive_ppmd8.c libarchive/archive_random.c \
+       libarchive/archive_rb.c libarchive/archive_read.c \
        libarchive/archive_read_add_passphrase.c \
        libarchive/archive_read_append_filter.c \
        libarchive/archive_read_data_into_fd.c \
        libarchive/archive_read_disk_entry_from_file.c \
        libarchive/archive_read_disk_posix.c \
-       libarchive/archive_read_disk_private.h \
        libarchive/archive_read_disk_set_standard_lookup.c \
        libarchive/archive_read_extract.c \
        libarchive/archive_read_extract2.c \
@@ -2913,12 +2976,11 @@ libarchive_la_SOURCES = libarchive/archi
        libarchive/archive_read_open_file.c \
        libarchive/archive_read_open_filename.c \
        libarchive/archive_read_open_memory.c \
-       libarchive/archive_read_private.h \
        libarchive/archive_read_set_format.c \
        libarchive/archive_read_set_options.c \
        libarchive/archive_read_support_filter_all.c \
-       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_by_code.c \
+       libarchive/archive_read_support_filter_bzip2.c \
        libarchive/archive_read_support_filter_compress.c \
        libarchive/archive_read_support_filter_grzip.c \
        libarchive/archive_read_support_filter_gzip.c \
@@ -2948,20 +3010,10 @@ libarchive_la_SOURCES = libarchive/archi
        libarchive/archive_read_support_format_warc.c \
        libarchive/archive_read_support_format_xar.c \
        libarchive/archive_read_support_format_zip.c \
-       libarchive/archive_string.c libarchive/archive_string.h \
-       libarchive/archive_string_composition.h \
+       libarchive/archive_string.c \
        libarchive/archive_string_sprintf.c libarchive/archive_time.c \
-       libarchive/archive_time_private.h libarchive/archive_util.c \
-       libarchive/archive_version_details.c \
+       libarchive/archive_util.c libarchive/archive_version_details.c \
        libarchive/archive_virtual.c libarchive/archive_write.c \
-       libarchive/archive_write_disk_posix.c \
-       libarchive/archive_write_disk_private.h \
-       libarchive/archive_write_disk_set_standard_lookup.c \
-       libarchive/archive_write_open_fd.c \
-       libarchive/archive_write_open_file.c \
-       libarchive/archive_write_open_filename.c \
-       libarchive/archive_write_open_memory.c \
-       libarchive/archive_write_private.h \
        libarchive/archive_write_add_filter.c \
        libarchive/archive_write_add_filter_b64encode.c \
        libarchive/archive_write_add_filter_by_name.c \
@@ -2977,6 +3029,12 @@ libarchive_la_SOURCES = libarchive/archi
        libarchive/archive_write_add_filter_uuencode.c \
        libarchive/archive_write_add_filter_xz.c \
        libarchive/archive_write_add_filter_zstd.c \
+       libarchive/archive_write_disk_posix.c \
+       libarchive/archive_write_disk_set_standard_lookup.c \
+       libarchive/archive_write_open_fd.c \
+       libarchive/archive_write_open_file.c \
+       libarchive/archive_write_open_filename.c \
+       libarchive/archive_write_open_memory.c \
        libarchive/archive_write_set_format.c \
        libarchive/archive_write_set_format_7zip.c \
        libarchive/archive_write_set_format_ar.c \
@@ -2986,25 +3044,22 @@ libarchive_la_SOURCES = libarchive/archi
        libarchive/archive_write_set_format_cpio_newc.c \
        libarchive/archive_write_set_format_cpio_odc.c \
        libarchive/archive_write_set_format_filter_by_ext.c \
+       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_iso9660.c \
        libarchive/archive_write_set_format_mtree.c \
        libarchive/archive_write_set_format_pax.c \
-       libarchive/archive_write_set_format_private.h \
        libarchive/archive_write_set_format_raw.c \
        libarchive/archive_write_set_format_shar.c \
        libarchive/archive_write_set_format_ustar.c \
        libarchive/archive_write_set_format_v7tar.c \
-       libarchive/archive_write_set_format_gnutar.c \
        libarchive/archive_write_set_format_warc.c \
        libarchive/archive_write_set_format_xar.c \
        libarchive/archive_write_set_format_zip.c \
        libarchive/archive_write_set_options.c \
        libarchive/archive_write_set_passphrase.c \
-       libarchive/archive_xxhash.h libarchive/config_freebsd.h \
-       libarchive/filter_fork_posix.c libarchive/filter_fork.h \
-       libarchive/xxhash.c $(am__append_1) $(am__append_2) \
-       $(am__append_3) $(am__append_4) $(am__append_5) \
-       $(am__append_6)
+       libarchive/filter_fork_posix.c libarchive/xxhash.c \
+       $(am__append_2) $(am__append_4) $(am__append_5) \
+       $(am__append_6) $(am__append_7) $(am__append_8)
 
 # -no-undefined marks that libarchive doesn't rely on symbols
 # defined in the application.  This is mandatory for cygwin.
@@ -3068,25 +3123,14 @@ libarchive_EXTRA_DIST = \
 # pkgconfig
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = build/pkgconfig/libarchive.pc
-
-# Sources needed by all test programs
 test_utils_SOURCES = \
-       test_utils/test_utils.c \
-       test_utils/test_utils.h \
        test_utils/test_main.c \
-       test_utils/test_common.h
+       test_utils/test_utils.c
 
-
-#
-#
-# libarchive_test program
-#
-#
 libarchive_test_SOURCES = \
        $(libarchive_la_SOURCES) \
        $(test_utils_SOURCES) \
        libarchive/test/read_open_memory.c \
-       libarchive/test/test.h \
        libarchive/test/test_7zip_filename_encoding.c \
        libarchive/test/test_acl_nfs4.c \
        libarchive/test/test_acl_pax.c \
@@ -3680,6 +3724,7 @@ libarchive_test_EXTRA_DIST = \
        libarchive/test/test_read_format_rar5_stored_manyfiles.rar.uu \
        libarchive/test/test_read_format_rar5_symlink.rar.uu \
        libarchive/test/test_read_format_rar5_truncated_huff.rar.uu \
+       libarchive/test/test_read_format_rar5_unicode.rar.uu \
        libarchive/test/test_read_format_rar5_win32.rar.uu \
        libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu \
        libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu \
@@ -3786,28 +3831,14 @@ libarchive_test_EXTRA_DIST = \
        libarchive/test/CMakeLists.txt \
        libarchive/test/README
 
-
-#
-# Common code for libarchive frontends (cpio, tar)
-#
 libarchive_fe_la_SOURCES = \
        libarchive_fe/lafe_err.c \
-       libarchive_fe/lafe_err.h \
-       libarchive_fe/lafe_platform.h \
        libarchive_fe/line_reader.c \
-       libarchive_fe/line_reader.h \
-       libarchive_fe/passphrase.c \
-       libarchive_fe/passphrase.h
+       libarchive_fe/passphrase.c
 
 libarchive_fe_la_CPPFLAGS = -I$(top_srcdir)/libarchive
-#
-#
-# bsdtar source, docs, etc.
-#
-#
-bsdtar_SOURCES = tar/bsdtar.c tar/bsdtar.h tar/bsdtar_platform.h \
-       tar/cmdline.c tar/creation_set.c tar/read.c tar/subst.c \
-       tar/util.c tar/write.c $(am__append_7)
+bsdtar_SOURCES = tar/bsdtar.c tar/cmdline.c tar/creation_set.c \
+       tar/read.c tar/subst.c tar/util.c tar/write.c $(am__append_10)
 bsdtar_DEPENDENCIES = libarchive.la libarchive_fe.la
 @STATIC_BSDTAR_FALSE@bsdtar_ldstatic = 
 @STATIC_BSDTAR_TRUE@bsdtar_ldstatic = -static
@@ -3827,13 +3858,8 @@ bsdtar_EXTRA_DIST = \
 @BUILD_BSDTAR_TRUE@bsdtar_man_MANS = tar/bsdtar.1
 @BUILD_BSDTAR_FALSE@bsdtar_programs = 
 @BUILD_BSDTAR_TRUE@bsdtar_programs = bsdtar
-
-#
-# bsdtar_test
-#
 bsdtar_test_SOURCES = \
        $(test_utils_SOURCES) \
-       tar/test/test.h \
        tar/test/test_0.c \
        tar/test/test_basic.c \
        tar/test/test_copy.c \
@@ -3942,14 +3968,7 @@ bsdtar_test_EXTRA_DIST = \
        tar/test/test_print_longpath.tar.Z.uu \
        tar/test/CMakeLists.txt
 
-
-#
-#
-# bsdcpio source, docs, etc.
-#
-#
-bsdcpio_SOURCES = cpio/cmdline.c cpio/cpio.c cpio/cpio.h \
-       cpio/cpio_platform.h $(am__append_8)
+bsdcpio_SOURCES = cpio/cmdline.c cpio/cpio.c $(am__append_12)
 bsdcpio_DEPENDENCIES = libarchive.la libarchive_fe.la
 @STATIC_BSDCPIO_FALSE@bsdcpio_ldstatic = 
 @STATIC_BSDCPIO_TRUE@bsdcpio_ldstatic = -static
@@ -3971,14 +3990,9 @@ bsdcpio_EXTRA_DIST = \
 @BUILD_BSDCPIO_TRUE@bsdcpio_man_MANS = cpio/bsdcpio.1
 @BUILD_BSDCPIO_FALSE@bsdcpio_programs = 
 @BUILD_BSDCPIO_TRUE@bsdcpio_programs = bsdcpio
-
-#
-# bsdcpio_test
-#
 bsdcpio_test_SOURCES = \
        $(test_utils_SOURCES) \
        cpio/cmdline.c \
-       cpio/test/test.h \
        cpio/test/test_0.c \
        cpio/test/test_basic.c \
        cpio/test/test_cmdline.c \
@@ -4070,14 +4084,7 @@ bsdcpio_test_EXTRA_DIST = \
        cpio/test/test_option_tv.stdout.uu \
        cpio/test/CMakeLists.txt
 
-
-#
-#
-# bsdcat source, docs, etc.
-#
-#
-bsdcat_SOURCES = cat/bsdcat.c cat/bsdcat.h cat/bsdcat_platform.h \
-       cat/cmdline.c $(am__append_9)
+bsdcat_SOURCES = cat/bsdcat.c cat/cmdline.c $(am__append_14)
 bsdcat_DEPENDENCIES = libarchive.la libarchive_fe.la
 @STATIC_BSDCAT_FALSE@bsdcat_ldstatic = 
 @STATIC_BSDCAT_TRUE@bsdcat_ldstatic = -static
@@ -4096,13 +4103,8 @@ bsdcat_EXTRA_DIST = \
 @BUILD_BSDCAT_TRUE@bsdcat_man_MANS = cat/bsdcat.1
 @BUILD_BSDCAT_FALSE@bsdcat_programs = 
 @BUILD_BSDCAT_TRUE@bsdcat_programs = bsdcat
-
-#
-# bsdcat_test
-#
 bsdcat_test_SOURCES = \
        $(test_utils_SOURCES) \
-       cat/test/test.h \
        cat/test/test_0.c \
        cat/test/test_empty_gz.c \
        cat/test/test_empty_lz4.c \
@@ -4149,15 +4151,8 @@ bsdcat_test_EXTRA_DIST = \
        cat/test/test_expand.xz.uu \
        cat/test/CMakeLists.txt
 
-
-#
-#
-# bsdunzip source, docs, etc.
-#
-#
-bsdunzip_SOURCES = unzip/bsdunzip.c unzip/bsdunzip.h \
-       unzip/bsdunzip_platform.h unzip/cmdline.c unzip/la_getline.c \
-       unzip/la_getline.h unzip/la_queue.h $(am__append_10)
+bsdunzip_SOURCES = unzip/bsdunzip.c unzip/cmdline.c unzip/la_getline.c \
+       $(am__append_16)
 bsdunzip_DEPENDENCIES = libarchive.la libarchive_fe.la
 @STATIC_BSDUNZIP_FALSE@bsdunzip_ldstatic = 
 @STATIC_BSDUNZIP_TRUE@bsdunzip_ldstatic = -static
@@ -4176,13 +4171,8 @@ bsdunzip_EXTRA_DIST = \
 @BUILD_BSDUNZIP_TRUE@bsdunzip_man_MANS = unzip/bsdunzip.1
 @BUILD_BSDUNZIP_FALSE@bsdunzip_programs = 
 @BUILD_BSDUNZIP_TRUE@bsdunzip_programs = bsdunzip
-
-#
-# bsdunzip_test
-#
 bsdunzip_test_SOURCES = \
        $(test_utils_SOURCES) \
-       unzip/test/test.h \
        unzip/test/test_0.c \
        unzip/test/test_basic.c \
        unzip/test/test_doubledash.c \
@@ -4456,10 +4446,10 @@ libarchive/archive_read_set_options.lo: 
 libarchive/archive_read_support_filter_all.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_read_support_filter_bzip2.lo:  \
+libarchive/archive_read_support_filter_by_code.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_read_support_filter_by_code.lo:  \
+libarchive/archive_read_support_filter_bzip2.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_read_support_filter_compress.lo:  \
@@ -4563,19 +4553,6 @@ libarchive/archive_virtual.lo: libarchiv
        libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write.lo: libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_disk_posix.lo: libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_disk_set_standard_lookup.lo:  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_open_fd.lo: libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_open_file.lo: libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_open_filename.lo: libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_open_memory.lo: libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write_add_filter.lo: libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write_add_filter_b64encode.lo:  \
@@ -4619,6 +4596,19 @@ libarchive/archive_write_add_filter_xz.l
 libarchive/archive_write_add_filter_zstd.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_disk_posix.lo: libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_disk_set_standard_lookup.lo:  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_open_fd.lo: libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_open_file.lo: libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_open_filename.lo: libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_open_memory.lo: libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write_set_format.lo: libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write_set_format_7zip.lo:  \
@@ -4644,6 +4634,9 @@ libarchive/archive_write_set_format_cpio
 libarchive/archive_write_set_format_filter_by_ext.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/archive_write_set_format_gnutar.lo:  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write_set_format_iso9660.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -4665,9 +4658,6 @@ libarchive/archive_write_set_format_usta
 libarchive/archive_write_set_format_v7tar.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/archive_write_set_format_gnutar.lo:  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/archive_write_set_format_warc.lo:  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -4746,10 +4736,10 @@ test_utils/$(am__dirstamp):
 test_utils/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) test_utils/$(DEPDIR)
        @: >>test_utils/$(DEPDIR)/$(am__dirstamp)
-test_utils/bsdcat_test-test_utils.$(OBJEXT):  \
+test_utils/bsdcat_test-test_main.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
-test_utils/bsdcat_test-test_main.$(OBJEXT):  \
+test_utils/bsdcat_test-test_utils.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
 cat/test/$(am__dirstamp):
@@ -4814,10 +4804,10 @@ cpio/bsdcpio-cpio_windows.$(OBJEXT): cpi
 bsdcpio$(EXEEXT): $(bsdcpio_OBJECTS) $(bsdcpio_DEPENDENCIES) $(EXTRA_bsdcpio_DEPENDENCIES) 
        @rm -f bsdcpio$(EXEEXT)
        $(AM_V_CCLD)$(bsdcpio_LINK) $(bsdcpio_OBJECTS) $(bsdcpio_LDADD) $(LIBS)
-test_utils/bsdcpio_test-test_utils.$(OBJEXT):  \
+test_utils/bsdcpio_test-test_main.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
-test_utils/bsdcpio_test-test_main.$(OBJEXT):  \
+test_utils/bsdcpio_test-test_utils.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
 cpio/bsdcpio_test-cmdline.$(OBJEXT): cpio/$(am__dirstamp) \
@@ -4956,10 +4946,10 @@ tar/bsdtar-bsdtar_windows.$(OBJEXT): tar
 bsdtar$(EXEEXT): $(bsdtar_OBJECTS) $(bsdtar_DEPENDENCIES) $(EXTRA_bsdtar_DEPENDENCIES) 
        @rm -f bsdtar$(EXEEXT)
        $(AM_V_CCLD)$(bsdtar_LINK) $(bsdtar_OBJECTS) $(bsdtar_LDADD) $(LIBS)
-test_utils/bsdtar_test-test_utils.$(OBJEXT):  \
+test_utils/bsdtar_test-test_main.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
-test_utils/bsdtar_test-test_main.$(OBJEXT):  \
+test_utils/bsdtar_test-test_utils.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
 tar/test/$(am__dirstamp):
@@ -5132,10 +5122,10 @@ unzip/bsdunzip-la_getline.$(OBJEXT): unz
 bsdunzip$(EXEEXT): $(bsdunzip_OBJECTS) $(bsdunzip_DEPENDENCIES) $(EXTRA_bsdunzip_DEPENDENCIES) 
        @rm -f bsdunzip$(EXEEXT)
        $(AM_V_CCLD)$(bsdunzip_LINK) $(bsdunzip_OBJECTS) $(bsdunzip_LDADD) $(LIBS)
-test_utils/bsdunzip_test-test_utils.$(OBJEXT):  \
+test_utils/bsdunzip_test-test_main.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
-test_utils/bsdunzip_test-test_main.$(OBJEXT):  \
+test_utils/bsdunzip_test-test_utils.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
 unzip/test/$(am__dirstamp):
@@ -5300,10 +5290,10 @@ libarchive/test-archive_read_set_options
 libarchive/test-archive_read_support_filter_all.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_read_support_filter_bzip2.$(OBJEXT):  \
+libarchive/test-archive_read_support_filter_by_code.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_read_support_filter_by_code.$(OBJEXT):  \
+libarchive/test-archive_read_support_filter_bzip2.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/test-archive_read_support_filter_compress.$(OBJEXT):  \
@@ -5409,24 +5399,6 @@ libarchive/test-archive_virtual.$(OBJEXT
        libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/test-archive_write.$(OBJEXT): libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_disk_posix.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_disk_set_standard_lookup.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_open_fd.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_open_file.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_open_filename.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_open_memory.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/test-archive_write_add_filter.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -5472,6 +5444,24 @@ libarchive/test-archive_write_add_filter
 libarchive/test-archive_write_add_filter_zstd.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_disk_posix.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_disk_set_standard_lookup.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_open_fd.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_open_file.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_open_filename.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_open_memory.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/test-archive_write_set_format.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -5499,6 +5489,9 @@ libarchive/test-archive_write_set_format
 libarchive/test-archive_write_set_format_filter_by_ext.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
+libarchive/test-archive_write_set_format_gnutar.$(OBJEXT):  \
+       libarchive/$(am__dirstamp) \
+       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/test-archive_write_set_format_iso9660.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -5520,9 +5513,6 @@ libarchive/test-archive_write_set_format
 libarchive/test-archive_write_set_format_v7tar.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-libarchive/test-archive_write_set_format_gnutar.$(OBJEXT):  \
-       libarchive/$(am__dirstamp) \
-       libarchive/$(DEPDIR)/$(am__dirstamp)
 libarchive/test-archive_write_set_format_warc.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
@@ -5575,10 +5565,10 @@ libarchive/test-archive_disk_acl_darwin.
 libarchive/test-archive_disk_acl_freebsd.$(OBJEXT):  \
        libarchive/$(am__dirstamp) \
        libarchive/$(DEPDIR)/$(am__dirstamp)
-test_utils/libarchive_test-test_utils.$(OBJEXT):  \
+test_utils/libarchive_test-test_main.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
-test_utils/libarchive_test-test_main.$(OBJEXT):  \
+test_utils/libarchive_test-test_utils.$(OBJEXT):  \
        test_utils/$(am__dirstamp) \
        test_utils/$(DEPDIR)/$(am__dirstamp)
 libarchive/test/$(am__dirstamp):
@@ -7374,20 +7364,6 @@ cat/bsdcat-cmdline.obj: cat/cmdline.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cat/bsdcat-cmdline.obj `if test -f 
'cat/cmdline.c'; then $(CYGPATH_W) 'cat/cmdline.c'; else $(CYGPATH_W) '$(srcdir)/cat/cmdline.c'; fi`
 
-test_utils/bsdcat_test-test_utils.o: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcat_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo -c -o test_utils/bsdcat_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcat_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcat_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcat_test-test_utils.o `test 
-f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-
-test_utils/bsdcat_test-test_utils.obj: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcat_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo -c -o test_utils/bsdcat_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcat_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcat_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcat_test-test_utils.obj `if 
test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
-
 test_utils/bsdcat_test-test_main.o: test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcat_test-test_main.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcat_test-test_main.Tpo -c -o test_utils/bsdcat_test-test_main.o `test -f 'test_utils/test_main.c' || echo '$(srcdir)/'`test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcat_test-test_main.Tpo test_utils/$(DEPDIR)/bsdcat_test-test_main.Po
@@ -7402,6 +7378,20 @@ test_utils/bsdcat_test-test_main.obj: te
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcat_test-test_main.obj `if 
test -f 'test_utils/test_main.c'; then $(CYGPATH_W) 'test_utils/test_main.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_main.c'; fi`
 
+test_utils/bsdcat_test-test_utils.o: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcat_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo -c -o test_utils/bsdcat_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcat_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcat_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcat_test-test_utils.o `test 
-f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+
+test_utils/bsdcat_test-test_utils.obj: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcat_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo -c -o test_utils/bsdcat_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcat_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcat_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcat_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcat_test-test_utils.obj `if 
test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
+
 cat/test/bsdcat_test-test_0.o: cat/test/test_0.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcat_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cat/test/bsdcat_test-test_0.o -MD -MP -MF 
cat/test/$(DEPDIR)/bsdcat_test-test_0.Tpo -c -o cat/test/bsdcat_test-test_0.o `test -f 'cat/test/test_0.c' || echo '$(srcdir)/'`cat/test/test_0.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) cat/test/$(DEPDIR)/bsdcat_test-test_0.Tpo cat/test/$(DEPDIR)/bsdcat_test-test_0.Po
@@ -7696,20 +7686,6 @@ cpio/bsdcpio-cpio_windows.obj: cpio/cpio
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cpio/bsdcpio-cpio_windows.obj `if test -f 
'cpio/cpio_windows.c'; then $(CYGPATH_W) 'cpio/cpio_windows.c'; else $(CYGPATH_W) '$(srcdir)/cpio/cpio_windows.c'; fi`
 
-test_utils/bsdcpio_test-test_utils.o: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcpio_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo -c -o test_utils/bsdcpio_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcpio_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcpio_test-test_utils.o `test 
-f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-
-test_utils/bsdcpio_test-test_utils.obj: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcpio_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo -c -o test_utils/bsdcpio_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcpio_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcpio_test-test_utils.obj `if 
test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
-
 test_utils/bsdcpio_test-test_main.o: test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcpio_test-test_main.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcpio_test-test_main.Tpo -c -o test_utils/bsdcpio_test-test_main.o `test -f 'test_utils/test_main.c' || echo '$(srcdir)/'`test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcpio_test-test_main.Tpo test_utils/$(DEPDIR)/bsdcpio_test-test_main.Po
@@ -7724,6 +7700,20 @@ test_utils/bsdcpio_test-test_main.obj: t
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcpio_test-test_main.obj `if 
test -f 'test_utils/test_main.c'; then $(CYGPATH_W) 'test_utils/test_main.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_main.c'; fi`
 
+test_utils/bsdcpio_test-test_utils.o: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcpio_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo -c -o test_utils/bsdcpio_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcpio_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcpio_test-test_utils.o `test 
-f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+
+test_utils/bsdcpio_test-test_utils.obj: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdcpio_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo -c -o test_utils/bsdcpio_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdcpio_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdcpio_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdcpio_test-test_utils.obj `if 
test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
+
 cpio/bsdcpio_test-cmdline.o: cpio/cmdline.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdcpio_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cpio/bsdcpio_test-cmdline.o -MD -MP -MF 
cpio/$(DEPDIR)/bsdcpio_test-cmdline.Tpo -c -o cpio/bsdcpio_test-cmdline.o `test -f 'cpio/cmdline.c' || echo '$(srcdir)/'`cpio/cmdline.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) cpio/$(DEPDIR)/bsdcpio_test-cmdline.Tpo cpio/$(DEPDIR)/bsdcpio_test-cmdline.Po
@@ -8536,20 +8526,6 @@ tar/bsdtar-bsdtar_windows.obj: tar/bsdta
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tar/bsdtar-bsdtar_windows.obj `if test -f 
'tar/bsdtar_windows.c'; then $(CYGPATH_W) 'tar/bsdtar_windows.c'; else $(CYGPATH_W) '$(srcdir)/tar/bsdtar_windows.c'; fi`
 
-test_utils/bsdtar_test-test_utils.o: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdtar_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo -c -o test_utils/bsdtar_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdtar_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdtar_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdtar_test-test_utils.o `test 
-f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-
-test_utils/bsdtar_test-test_utils.obj: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdtar_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo -c -o test_utils/bsdtar_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdtar_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdtar_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdtar_test-test_utils.obj `if 
test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
-
 test_utils/bsdtar_test-test_main.o: test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdtar_test-test_main.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdtar_test-test_main.Tpo -c -o test_utils/bsdtar_test-test_main.o `test -f 'test_utils/test_main.c' || echo '$(srcdir)/'`test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdtar_test-test_main.Tpo test_utils/$(DEPDIR)/bsdtar_test-test_main.Po
@@ -8564,6 +8540,20 @@ test_utils/bsdtar_test-test_main.obj: te
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdtar_test-test_main.obj `if 
test -f 'test_utils/test_main.c'; then $(CYGPATH_W) 'test_utils/test_main.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_main.c'; fi`
 
+test_utils/bsdtar_test-test_utils.o: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdtar_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo -c -o test_utils/bsdtar_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdtar_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdtar_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdtar_test-test_utils.o `test 
-f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+
+test_utils/bsdtar_test-test_utils.obj: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdtar_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo -c -o test_utils/bsdtar_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdtar_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdtar_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdtar_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdtar_test-test_utils.obj `if 
test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
+
 tar/test/bsdtar_test-test_0.o: tar/test/test_0.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdtar_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tar/test/bsdtar_test-test_0.o -MD -MP -MF 
tar/test/$(DEPDIR)/bsdtar_test-test_0.Tpo -c -o tar/test/bsdtar_test-test_0.o `test -f 'tar/test/test_0.c' || echo '$(srcdir)/'`tar/test/test_0.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_0.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_0.Po
@@ -9614,20 +9604,6 @@ unzip/bsdunzip-la_getline.obj: unzip/la_
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unzip/bsdunzip-la_getline.obj `if test -f 
'unzip/la_getline.c'; then $(CYGPATH_W) 'unzip/la_getline.c'; else $(CYGPATH_W) '$(srcdir)/unzip/la_getline.c'; fi`
 
-test_utils/bsdunzip_test-test_utils.o: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdunzip_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo -c -o test_utils/bsdunzip_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdunzip_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdunzip_test-test_utils.o 
`test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-
-test_utils/bsdunzip_test-test_utils.obj: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdunzip_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo -c -o test_utils/bsdunzip_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdunzip_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdunzip_test-test_utils.obj 
`if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
-
 test_utils/bsdunzip_test-test_main.o: test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdunzip_test-test_main.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdunzip_test-test_main.Tpo -c -o test_utils/bsdunzip_test-test_main.o `test -f 'test_utils/test_main.c' || echo '$(srcdir)/'`test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdunzip_test-test_main.Tpo test_utils/$(DEPDIR)/bsdunzip_test-test_main.Po
@@ -9642,6 +9618,20 @@ test_utils/bsdunzip_test-test_main.obj: 
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdunzip_test-test_main.obj 
`if test -f 'test_utils/test_main.c'; then $(CYGPATH_W) 'test_utils/test_main.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_main.c'; fi`
 
+test_utils/bsdunzip_test-test_utils.o: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdunzip_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo -c -o test_utils/bsdunzip_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdunzip_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdunzip_test-test_utils.o 
`test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+
+test_utils/bsdunzip_test-test_utils.obj: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/bsdunzip_test-test_utils.obj -MD -MP -MF 
test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo -c -o test_utils/bsdunzip_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) 
'$(srcdir)/test_utils/test_utils.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Tpo test_utils/$(DEPDIR)/bsdunzip_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/bsdunzip_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/bsdunzip_test-test_utils.obj 
`if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
+
 unzip/test/bsdunzip_test-test_0.o: unzip/test/test_0.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bsdunzip_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unzip/test/bsdunzip_test-test_0.o -MD -MP -MF 
unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Tpo -c -o unzip/test/bsdunzip_test-test_0.o `test -f 'unzip/test/test_0.c' || echo '$(srcdir)/'`unzip/test/test_0.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Tpo unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Po
@@ -10468,20 +10458,6 @@ libarchive/test-archive_read_support_fil
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_read_support_filter_all.obj `if test -f 'libarchive/archive_read_support_filter_all.c'; then $(CYGPATH_W) 'libarchive/archive_read_support_filter_all.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_read_support_filter_all.c'; fi`
 
-libarchive/test-archive_read_support_filter_bzip2.o: libarchive/archive_read_support_filter_bzip2.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_read_support_filter_bzip2.o 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo -c -o libarchive/test-archive_read_support_filter_bzip2.o `test -f 'libarchive/archive_read_support_filter_bzip2.c' || echo 
'$(srcdir)/'`libarchive/archive_read_support_filter_bzip2.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_read_support_filter_bzip2.c' object='libarchive/test-archive_read_support_filter_bzip2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_read_support_filter_bzip2.o `test -f 'libarchive/archive_read_support_filter_bzip2.c' || echo '$(srcdir)/'`libarchive/archive_read_support_filter_bzip2.c
-
-libarchive/test-archive_read_support_filter_bzip2.obj: libarchive/archive_read_support_filter_bzip2.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_read_support_filter_bzip2.obj -MD -MP -MF libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo -c -o libarchive/test-archive_read_support_filter_bzip2.obj `if test 
-f 'libarchive/archive_read_support_filter_bzip2.c'; then $(CYGPATH_W) 'libarchive/archive_read_support_filter_bzip2.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_read_support_filter_bzip2.c'; 
fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_read_support_filter_bzip2.c' object='libarchive/test-archive_read_support_filter_bzip2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_read_support_filter_bzip2.obj `if test -f 'libarchive/archive_read_support_filter_bzip2.c'; then $(CYGPATH_W) 'libarchive/archive_read_support_filter_bzip2.c'; else 
$(CYGPATH_W) '$(srcdir)/libarchive/archive_read_support_filter_bzip2.c'; fi`
-
 libarchive/test-archive_read_support_filter_by_code.o: libarchive/archive_read_support_filter_by_code.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_read_support_filter_by_code.o -MD -MP -MF libarchive/$(DEPDIR)/test-archive_read_support_filter_by_code.Tpo -c -o libarchive/test-archive_read_support_filter_by_code.o `test 
-f 'libarchive/archive_read_support_filter_by_code.c' || echo '$(srcdir)/'`libarchive/archive_read_support_filter_by_code.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_read_support_filter_by_code.Tpo libarchive/$(DEPDIR)/test-archive_read_support_filter_by_code.Po
@@ -10496,6 +10472,20 @@ libarchive/test-archive_read_support_fil
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_read_support_filter_by_code.obj `if test -f 'libarchive/archive_read_support_filter_by_code.c'; then $(CYGPATH_W) 'libarchive/archive_read_support_filter_by_code.c'; else 
$(CYGPATH_W) '$(srcdir)/libarchive/archive_read_support_filter_by_code.c'; fi`
 
+libarchive/test-archive_read_support_filter_bzip2.o: libarchive/archive_read_support_filter_bzip2.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_read_support_filter_bzip2.o 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo -c -o libarchive/test-archive_read_support_filter_bzip2.o `test -f 'libarchive/archive_read_support_filter_bzip2.c' || echo 
'$(srcdir)/'`libarchive/archive_read_support_filter_bzip2.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_read_support_filter_bzip2.c' object='libarchive/test-archive_read_support_filter_bzip2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_read_support_filter_bzip2.o `test -f 'libarchive/archive_read_support_filter_bzip2.c' || echo '$(srcdir)/'`libarchive/archive_read_support_filter_bzip2.c
+
+libarchive/test-archive_read_support_filter_bzip2.obj: libarchive/archive_read_support_filter_bzip2.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_read_support_filter_bzip2.obj -MD -MP -MF libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo -c -o libarchive/test-archive_read_support_filter_bzip2.obj `if test 
-f 'libarchive/archive_read_support_filter_bzip2.c'; then $(CYGPATH_W) 'libarchive/archive_read_support_filter_bzip2.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_read_support_filter_bzip2.c'; 
fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Tpo libarchive/$(DEPDIR)/test-archive_read_support_filter_bzip2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_read_support_filter_bzip2.c' object='libarchive/test-archive_read_support_filter_bzip2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_read_support_filter_bzip2.obj `if test -f 'libarchive/archive_read_support_filter_bzip2.c'; then $(CYGPATH_W) 'libarchive/archive_read_support_filter_bzip2.c'; else 
$(CYGPATH_W) '$(srcdir)/libarchive/archive_read_support_filter_bzip2.c'; fi`
+
 libarchive/test-archive_read_support_filter_compress.o: libarchive/archive_read_support_filter_compress.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_read_support_filter_compress.o -MD -MP -MF libarchive/$(DEPDIR)/test-archive_read_support_filter_compress.Tpo -c -o libarchive/test-archive_read_support_filter_compress.o 
`test -f 'libarchive/archive_read_support_filter_compress.c' || echo '$(srcdir)/'`libarchive/archive_read_support_filter_compress.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_read_support_filter_compress.Tpo libarchive/$(DEPDIR)/test-archive_read_support_filter_compress.Po
@@ -11000,90 +10990,6 @@ libarchive/test-archive_write.obj: libar
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libarchive/test-archive_write.obj `if 
test -f 'libarchive/archive_write.c'; then $(CYGPATH_W) 'libarchive/archive_write.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write.c'; fi`
 
-libarchive/test-archive_write_disk_posix.o: libarchive/archive_write_disk_posix.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_disk_posix.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo -c -o libarchive/test-archive_write_disk_posix.o `test -f 'libarchive/archive_write_disk_posix.c' || echo 
'$(srcdir)/'`libarchive/archive_write_disk_posix.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_posix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_posix.c' object='libarchive/test-archive_write_disk_posix.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_posix.o `test -f 'libarchive/archive_write_disk_posix.c' || echo '$(srcdir)/'`libarchive/archive_write_disk_posix.c
-
-libarchive/test-archive_write_disk_posix.obj: libarchive/archive_write_disk_posix.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_disk_posix.obj -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo -c -o libarchive/test-archive_write_disk_posix.obj `if test -f 'libarchive/archive_write_disk_posix.c'; then $(CYGPATH_W) 
'libarchive/archive_write_disk_posix.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_disk_posix.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_posix.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_posix.c' object='libarchive/test-archive_write_disk_posix.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_posix.obj `if test -f 'libarchive/archive_write_disk_posix.c'; then $(CYGPATH_W) 'libarchive/archive_write_disk_posix.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_disk_posix.c'; fi`
-
-libarchive/test-archive_write_disk_set_standard_lookup.o: libarchive/archive_write_disk_set_standard_lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_write_disk_set_standard_lookup.o -MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.o `test -f 'libarchive/archive_write_disk_set_standard_lookup.c' || echo '$(srcdir)/'`libarchive/archive_write_disk_set_standard_lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_set_standard_lookup.c' object='libarchive/test-archive_write_disk_set_standard_lookup.o' libtool=no 
@AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.o `test -f 'libarchive/archive_write_disk_set_standard_lookup.c' || echo '$(srcdir)/'`libarchive/archive_write_disk_set_standard_lookup.c
-
-libarchive/test-archive_write_disk_set_standard_lookup.obj: libarchive/archive_write_disk_set_standard_lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_write_disk_set_standard_lookup.obj -MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.obj `if test -f 'libarchive/archive_write_disk_set_standard_lookup.c'; then $(CYGPATH_W) 'libarchive/archive_write_disk_set_standard_lookup.c'; 
else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_disk_set_standard_lookup.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_set_standard_lookup.c' object='libarchive/test-archive_write_disk_set_standard_lookup.obj' libtool=no 
@AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.obj `if test -f 'libarchive/archive_write_disk_set_standard_lookup.c'; then $(CYGPATH_W) 'libarchive/archive_write_disk_set_standard_lookup.c'; 
else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_disk_set_standard_lookup.c'; fi`
-
-libarchive/test-archive_write_open_fd.o: libarchive/archive_write_open_fd.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_fd.o -MD -MP -MF 
libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo -c -o libarchive/test-archive_write_open_fd.o `test -f 'libarchive/archive_write_open_fd.c' || echo '$(srcdir)/'`libarchive/archive_write_open_fd.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo libarchive/$(DEPDIR)/test-archive_write_open_fd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_fd.c' object='libarchive/test-archive_write_open_fd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libarchive/test-archive_write_open_fd.o 
`test -f 'libarchive/archive_write_open_fd.c' || echo '$(srcdir)/'`libarchive/archive_write_open_fd.c
-
-libarchive/test-archive_write_open_fd.obj: libarchive/archive_write_open_fd.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_fd.obj -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo -c -o libarchive/test-archive_write_open_fd.obj `if test -f 'libarchive/archive_write_open_fd.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_fd.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_fd.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo libarchive/$(DEPDIR)/test-archive_write_open_fd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_fd.c' object='libarchive/test-archive_write_open_fd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_fd.obj `if test -f 'libarchive/archive_write_open_fd.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_fd.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_fd.c'; fi`
-
-libarchive/test-archive_write_open_file.o: libarchive/archive_write_open_file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_file.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo -c -o libarchive/test-archive_write_open_file.o `test -f 'libarchive/archive_write_open_file.c' || echo 
'$(srcdir)/'`libarchive/archive_write_open_file.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo libarchive/$(DEPDIR)/test-archive_write_open_file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_file.c' object='libarchive/test-archive_write_open_file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_file.o `test -f 'libarchive/archive_write_open_file.c' || echo '$(srcdir)/'`libarchive/archive_write_open_file.c
-
-libarchive/test-archive_write_open_file.obj: libarchive/archive_write_open_file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_file.obj -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo -c -o libarchive/test-archive_write_open_file.obj `if test -f 'libarchive/archive_write_open_file.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_file.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_file.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo libarchive/$(DEPDIR)/test-archive_write_open_file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_file.c' object='libarchive/test-archive_write_open_file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_file.obj `if test -f 'libarchive/archive_write_open_file.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_file.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_file.c'; fi`
-
-libarchive/test-archive_write_open_filename.o: libarchive/archive_write_open_filename.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_filename.o -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo -c -o libarchive/test-archive_write_open_filename.o `test -f 'libarchive/archive_write_open_filename.c' || echo 
'$(srcdir)/'`libarchive/archive_write_open_filename.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo libarchive/$(DEPDIR)/test-archive_write_open_filename.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_filename.c' object='libarchive/test-archive_write_open_filename.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_filename.o `test -f 'libarchive/archive_write_open_filename.c' || echo '$(srcdir)/'`libarchive/archive_write_open_filename.c
-
-libarchive/test-archive_write_open_filename.obj: libarchive/archive_write_open_filename.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_filename.obj -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo -c -o libarchive/test-archive_write_open_filename.obj `if test -f 'libarchive/archive_write_open_filename.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_filename.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_filename.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo libarchive/$(DEPDIR)/test-archive_write_open_filename.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_filename.c' object='libarchive/test-archive_write_open_filename.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_filename.obj `if test -f 'libarchive/archive_write_open_filename.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_filename.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_filename.c'; fi`
-
-libarchive/test-archive_write_open_memory.o: libarchive/archive_write_open_memory.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_memory.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo -c -o libarchive/test-archive_write_open_memory.o `test -f 'libarchive/archive_write_open_memory.c' || echo 
'$(srcdir)/'`libarchive/archive_write_open_memory.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo libarchive/$(DEPDIR)/test-archive_write_open_memory.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_memory.c' object='libarchive/test-archive_write_open_memory.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_memory.o `test -f 'libarchive/archive_write_open_memory.c' || echo '$(srcdir)/'`libarchive/archive_write_open_memory.c
-
-libarchive/test-archive_write_open_memory.obj: libarchive/archive_write_open_memory.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_memory.obj -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo -c -o libarchive/test-archive_write_open_memory.obj `if test -f 'libarchive/archive_write_open_memory.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_memory.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_memory.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo libarchive/$(DEPDIR)/test-archive_write_open_memory.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_memory.c' object='libarchive/test-archive_write_open_memory.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_memory.obj `if test -f 'libarchive/archive_write_open_memory.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_memory.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_memory.c'; fi`
-
 libarchive/test-archive_write_add_filter.o: libarchive/archive_write_add_filter.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_add_filter.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_add_filter.Tpo -c -o libarchive/test-archive_write_add_filter.o `test -f 'libarchive/archive_write_add_filter.c' || echo 
'$(srcdir)/'`libarchive/archive_write_add_filter.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_add_filter.Tpo libarchive/$(DEPDIR)/test-archive_write_add_filter.Po
@@ -11294,6 +11200,90 @@ libarchive/test-archive_write_add_filter
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_add_filter_zstd.obj `if test -f 'libarchive/archive_write_add_filter_zstd.c'; then $(CYGPATH_W) 'libarchive/archive_write_add_filter_zstd.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_add_filter_zstd.c'; fi`
 
+libarchive/test-archive_write_disk_posix.o: libarchive/archive_write_disk_posix.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_disk_posix.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo -c -o libarchive/test-archive_write_disk_posix.o `test -f 'libarchive/archive_write_disk_posix.c' || echo 
'$(srcdir)/'`libarchive/archive_write_disk_posix.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_posix.c' object='libarchive/test-archive_write_disk_posix.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_posix.o `test -f 'libarchive/archive_write_disk_posix.c' || echo '$(srcdir)/'`libarchive/archive_write_disk_posix.c
+
+libarchive/test-archive_write_disk_posix.obj: libarchive/archive_write_disk_posix.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_disk_posix.obj -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo -c -o libarchive/test-archive_write_disk_posix.obj `if test -f 'libarchive/archive_write_disk_posix.c'; then $(CYGPATH_W) 
'libarchive/archive_write_disk_posix.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_disk_posix.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_posix.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_posix.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_posix.c' object='libarchive/test-archive_write_disk_posix.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_posix.obj `if test -f 'libarchive/archive_write_disk_posix.c'; then $(CYGPATH_W) 'libarchive/archive_write_disk_posix.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_disk_posix.c'; fi`
+
+libarchive/test-archive_write_disk_set_standard_lookup.o: libarchive/archive_write_disk_set_standard_lookup.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_write_disk_set_standard_lookup.o -MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.o `test -f 'libarchive/archive_write_disk_set_standard_lookup.c' || echo '$(srcdir)/'`libarchive/archive_write_disk_set_standard_lookup.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_set_standard_lookup.c' object='libarchive/test-archive_write_disk_set_standard_lookup.o' libtool=no 
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.o `test -f 'libarchive/archive_write_disk_set_standard_lookup.c' || echo '$(srcdir)/'`libarchive/archive_write_disk_set_standard_lookup.c
+
+libarchive/test-archive_write_disk_set_standard_lookup.obj: libarchive/archive_write_disk_set_standard_lookup.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libarchive/test-archive_write_disk_set_standard_lookup.obj -MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.obj `if test -f 'libarchive/archive_write_disk_set_standard_lookup.c'; then $(CYGPATH_W) 'libarchive/archive_write_disk_set_standard_lookup.c'; 
else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_disk_set_standard_lookup.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Tpo libarchive/$(DEPDIR)/test-archive_write_disk_set_standard_lookup.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_disk_set_standard_lookup.c' object='libarchive/test-archive_write_disk_set_standard_lookup.obj' libtool=no 
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_disk_set_standard_lookup.obj `if test -f 'libarchive/archive_write_disk_set_standard_lookup.c'; then $(CYGPATH_W) 'libarchive/archive_write_disk_set_standard_lookup.c'; 
else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_disk_set_standard_lookup.c'; fi`
+
+libarchive/test-archive_write_open_fd.o: libarchive/archive_write_open_fd.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_fd.o -MD -MP -MF 
libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo -c -o libarchive/test-archive_write_open_fd.o `test -f 'libarchive/archive_write_open_fd.c' || echo '$(srcdir)/'`libarchive/archive_write_open_fd.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo libarchive/$(DEPDIR)/test-archive_write_open_fd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_fd.c' object='libarchive/test-archive_write_open_fd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libarchive/test-archive_write_open_fd.o 
`test -f 'libarchive/archive_write_open_fd.c' || echo '$(srcdir)/'`libarchive/archive_write_open_fd.c
+
+libarchive/test-archive_write_open_fd.obj: libarchive/archive_write_open_fd.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_fd.obj -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo -c -o libarchive/test-archive_write_open_fd.obj `if test -f 'libarchive/archive_write_open_fd.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_fd.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_fd.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_fd.Tpo libarchive/$(DEPDIR)/test-archive_write_open_fd.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_fd.c' object='libarchive/test-archive_write_open_fd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_fd.obj `if test -f 'libarchive/archive_write_open_fd.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_fd.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_fd.c'; fi`
+
+libarchive/test-archive_write_open_file.o: libarchive/archive_write_open_file.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_file.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo -c -o libarchive/test-archive_write_open_file.o `test -f 'libarchive/archive_write_open_file.c' || echo 
'$(srcdir)/'`libarchive/archive_write_open_file.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo libarchive/$(DEPDIR)/test-archive_write_open_file.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_file.c' object='libarchive/test-archive_write_open_file.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_file.o `test -f 'libarchive/archive_write_open_file.c' || echo '$(srcdir)/'`libarchive/archive_write_open_file.c
+
+libarchive/test-archive_write_open_file.obj: libarchive/archive_write_open_file.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_file.obj -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo -c -o libarchive/test-archive_write_open_file.obj `if test -f 'libarchive/archive_write_open_file.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_file.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_file.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_file.Tpo libarchive/$(DEPDIR)/test-archive_write_open_file.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_file.c' object='libarchive/test-archive_write_open_file.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_file.obj `if test -f 'libarchive/archive_write_open_file.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_file.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_file.c'; fi`
+
+libarchive/test-archive_write_open_filename.o: libarchive/archive_write_open_filename.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_filename.o -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo -c -o libarchive/test-archive_write_open_filename.o `test -f 'libarchive/archive_write_open_filename.c' || echo 
'$(srcdir)/'`libarchive/archive_write_open_filename.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo libarchive/$(DEPDIR)/test-archive_write_open_filename.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_filename.c' object='libarchive/test-archive_write_open_filename.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_filename.o `test -f 'libarchive/archive_write_open_filename.c' || echo '$(srcdir)/'`libarchive/archive_write_open_filename.c
+
+libarchive/test-archive_write_open_filename.obj: libarchive/archive_write_open_filename.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_filename.obj -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo -c -o libarchive/test-archive_write_open_filename.obj `if test -f 'libarchive/archive_write_open_filename.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_filename.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_filename.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_filename.Tpo libarchive/$(DEPDIR)/test-archive_write_open_filename.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_filename.c' object='libarchive/test-archive_write_open_filename.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_filename.obj `if test -f 'libarchive/archive_write_open_filename.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_filename.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_filename.c'; fi`
+
+libarchive/test-archive_write_open_memory.o: libarchive/archive_write_open_memory.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_memory.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo -c -o libarchive/test-archive_write_open_memory.o `test -f 'libarchive/archive_write_open_memory.c' || echo 
'$(srcdir)/'`libarchive/archive_write_open_memory.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo libarchive/$(DEPDIR)/test-archive_write_open_memory.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_memory.c' object='libarchive/test-archive_write_open_memory.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_memory.o `test -f 'libarchive/archive_write_open_memory.c' || echo '$(srcdir)/'`libarchive/archive_write_open_memory.c
+
+libarchive/test-archive_write_open_memory.obj: libarchive/archive_write_open_memory.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_open_memory.obj -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo -c -o libarchive/test-archive_write_open_memory.obj `if test -f 'libarchive/archive_write_open_memory.c'; then $(CYGPATH_W) 
'libarchive/archive_write_open_memory.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_open_memory.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_open_memory.Tpo libarchive/$(DEPDIR)/test-archive_write_open_memory.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_open_memory.c' object='libarchive/test-archive_write_open_memory.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_open_memory.obj `if test -f 'libarchive/archive_write_open_memory.c'; then $(CYGPATH_W) 'libarchive/archive_write_open_memory.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_open_memory.c'; fi`
+
 libarchive/test-archive_write_set_format.o: libarchive/archive_write_set_format.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format.o -MD -MP 
-MF libarchive/$(DEPDIR)/test-archive_write_set_format.Tpo -c -o libarchive/test-archive_write_set_format.o `test -f 'libarchive/archive_write_set_format.c' || echo 
'$(srcdir)/'`libarchive/archive_write_set_format.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format.Po
@@ -11420,6 +11410,20 @@ libarchive/test-archive_write_set_format
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_set_format_filter_by_ext.obj `if test -f 'libarchive/archive_write_set_format_filter_by_ext.c'; then $(CYGPATH_W) 'libarchive/archive_write_set_format_filter_by_ext.c'; 
else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_set_format_filter_by_ext.c'; fi`
 
+libarchive/test-archive_write_set_format_gnutar.o: libarchive/archive_write_set_format_gnutar.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format_gnutar.o 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo -c -o libarchive/test-archive_write_set_format_gnutar.o `test -f 'libarchive/archive_write_set_format_gnutar.c' || echo 
'$(srcdir)/'`libarchive/archive_write_set_format_gnutar.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_set_format_gnutar.c' object='libarchive/test-archive_write_set_format_gnutar.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_set_format_gnutar.o `test -f 'libarchive/archive_write_set_format_gnutar.c' || echo '$(srcdir)/'`libarchive/archive_write_set_format_gnutar.c
+
+libarchive/test-archive_write_set_format_gnutar.obj: libarchive/archive_write_set_format_gnutar.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format_gnutar.obj 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo -c -o libarchive/test-archive_write_set_format_gnutar.obj `if test -f 'libarchive/archive_write_set_format_gnutar.c'; then 
$(CYGPATH_W) 'libarchive/archive_write_set_format_gnutar.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_set_format_gnutar.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_set_format_gnutar.c' object='libarchive/test-archive_write_set_format_gnutar.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_set_format_gnutar.obj `if test -f 'libarchive/archive_write_set_format_gnutar.c'; then $(CYGPATH_W) 'libarchive/archive_write_set_format_gnutar.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_set_format_gnutar.c'; fi`
+
 libarchive/test-archive_write_set_format_iso9660.o: libarchive/archive_write_set_format_iso9660.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format_iso9660.o 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_set_format_iso9660.Tpo -c -o libarchive/test-archive_write_set_format_iso9660.o `test -f 'libarchive/archive_write_set_format_iso9660.c' || echo 
'$(srcdir)/'`libarchive/archive_write_set_format_iso9660.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format_iso9660.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format_iso9660.Po
@@ -11518,20 +11522,6 @@ libarchive/test-archive_write_set_format
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_set_format_v7tar.obj `if test -f 'libarchive/archive_write_set_format_v7tar.c'; then $(CYGPATH_W) 'libarchive/archive_write_set_format_v7tar.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_set_format_v7tar.c'; fi`
 
-libarchive/test-archive_write_set_format_gnutar.o: libarchive/archive_write_set_format_gnutar.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format_gnutar.o 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo -c -o libarchive/test-archive_write_set_format_gnutar.o `test -f 'libarchive/archive_write_set_format_gnutar.c' || echo 
'$(srcdir)/'`libarchive/archive_write_set_format_gnutar.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_set_format_gnutar.c' object='libarchive/test-archive_write_set_format_gnutar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_set_format_gnutar.o `test -f 'libarchive/archive_write_set_format_gnutar.c' || echo '$(srcdir)/'`libarchive/archive_write_set_format_gnutar.c
-
-libarchive/test-archive_write_set_format_gnutar.obj: libarchive/archive_write_set_format_gnutar.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format_gnutar.obj 
-MD -MP -MF libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo -c -o libarchive/test-archive_write_set_format_gnutar.obj `if test -f 'libarchive/archive_write_set_format_gnutar.c'; then 
$(CYGPATH_W) 'libarchive/archive_write_set_format_gnutar.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/archive_write_set_format_gnutar.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format_gnutar.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='libarchive/archive_write_set_format_gnutar.c' object='libarchive/test-archive_write_set_format_gnutar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_write_set_format_gnutar.obj `if test -f 'libarchive/archive_write_set_format_gnutar.c'; then $(CYGPATH_W) 'libarchive/archive_write_set_format_gnutar.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_write_set_format_gnutar.c'; fi`
-
 libarchive/test-archive_write_set_format_warc.o: libarchive/archive_write_set_format_warc.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_write_set_format_warc.o -MD 
-MP -MF libarchive/$(DEPDIR)/test-archive_write_set_format_warc.Tpo -c -o libarchive/test-archive_write_set_format_warc.o `test -f 'libarchive/archive_write_set_format_warc.c' || echo 
'$(srcdir)/'`libarchive/archive_write_set_format_warc.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_write_set_format_warc.Tpo libarchive/$(DEPDIR)/test-archive_write_set_format_warc.Po
@@ -11784,20 +11774,6 @@ libarchive/test-archive_disk_acl_freebsd
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libarchive/test-archive_disk_acl_freebsd.obj `if test -f 'libarchive/archive_disk_acl_freebsd.c'; then $(CYGPATH_W) 'libarchive/archive_disk_acl_freebsd.c'; else $(CYGPATH_W) 
'$(srcdir)/libarchive/archive_disk_acl_freebsd.c'; fi`
 
-test_utils/libarchive_test-test_utils.o: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/libarchive_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo -c -o test_utils/libarchive_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo test_utils/$(DEPDIR)/libarchive_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/libarchive_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/libarchive_test-test_utils.o 
`test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
-
-test_utils/libarchive_test-test_utils.obj: test_utils/test_utils.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/libarchive_test-test_utils.obj -MD -MP 
-MF test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo -c -o test_utils/libarchive_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else 
$(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo test_utils/$(DEPDIR)/libarchive_test-test_utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/libarchive_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
test_utils/libarchive_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
-
 test_utils/libarchive_test-test_main.o: test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/libarchive_test-test_main.o -MD -MP -MF 
test_utils/$(DEPDIR)/libarchive_test-test_main.Tpo -c -o test_utils/libarchive_test-test_main.o `test -f 'test_utils/test_main.c' || echo '$(srcdir)/'`test_utils/test_main.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/libarchive_test-test_main.Tpo test_utils/$(DEPDIR)/libarchive_test-test_main.Po
@@ -11812,6 +11788,20 @@ test_utils/libarchive_test-test_main.obj
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
test_utils/libarchive_test-test_main.obj `if test -f 'test_utils/test_main.c'; then $(CYGPATH_W) 'test_utils/test_main.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_main.c'; fi`
 
+test_utils/libarchive_test-test_utils.o: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/libarchive_test-test_utils.o -MD -MP -MF 
test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo -c -o test_utils/libarchive_test-test_utils.o `test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo test_utils/$(DEPDIR)/libarchive_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/libarchive_test-test_utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_utils/libarchive_test-test_utils.o 
`test -f 'test_utils/test_utils.c' || echo '$(srcdir)/'`test_utils/test_utils.c
+
+test_utils/libarchive_test-test_utils.obj: test_utils/test_utils.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_utils/libarchive_test-test_utils.obj -MD -MP 
-MF test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo -c -o test_utils/libarchive_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else 
$(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test_utils/$(DEPDIR)/libarchive_test-test_utils.Tpo test_utils/$(DEPDIR)/libarchive_test-test_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='test_utils/test_utils.c' object='test_utils/libarchive_test-test_utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
test_utils/libarchive_test-test_utils.obj `if test -f 'test_utils/test_utils.c'; then $(CYGPATH_W) 'test_utils/test_utils.c'; else $(CYGPATH_W) '$(srcdir)/test_utils/test_utils.c'; fi`
+
 libarchive/test/test-read_open_memory.o: libarchive/test/read_open_memory.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test/test-read_open_memory.o -MD -MP -MF 
libarchive/test/$(DEPDIR)/test-read_open_memory.Tpo -c -o libarchive/test/test-read_open_memory.o `test -f 'libarchive/test/read_open_memory.c' || echo '$(srcdir)/'`libarchive/test/read_open_memory.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-read_open_memory.Tpo libarchive/test/$(DEPDIR)/test-read_open_memory.Po
@@ -18474,25 +18464,25 @@ distclean-local:
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
 # above.
-libarchive/test/list.h: Makefile
+libarchive/test/list.h: $(libarchive_test_SOURCES)
        $(MKDIR_P) libarchive/test
-       cat $(top_srcdir)/libarchive/test/test_*.c | grep '^DEFINE_TEST' > libarchive/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
-tar/test/list.h: Makefile
+tar/test/list.h: $(bsdtar_test_SOURCES)
        $(MKDIR_P) tar/test
-       cat $(top_srcdir)/tar/test/test_*.c | grep '^DEFINE_TEST' > tar/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
-cpio/test/list.h: Makefile
+cpio/test/list.h: $(bsdcpio_test_SOURCES)
        $(MKDIR_P) cpio/test
-       cat $(top_srcdir)/cpio/test/test_*.c | grep '^DEFINE_TEST' > cpio/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
-cat/test/list.h: Makefile
+cat/test/list.h: $(bsdcat_test_SOURCES)
        $(MKDIR_P) cat/test
-       cat $(top_srcdir)/cat/test/test_*.c | grep '^DEFINE_TEST' > cat/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
-unzip/test/list.h: Makefile
+unzip/test/list.h: $(bsdunzip_test_SOURCES)
        $(MKDIR_P) unzip/test
-       cat $(top_srcdir)/unzip/test/test_*.c | grep '^DEFINE_TEST' > unzip/test/list.h
+       grep -h '^DEFINE_TEST(' $^ | LC_COLLATE=C sort > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

Index: pkgsrc/archivers/libarchive/files/NEWS
diff -u pkgsrc/archivers/libarchive/files/NEWS:1.23 pkgsrc/archivers/libarchive/files/NEWS:1.24
--- pkgsrc/archivers/libarchive/files/NEWS:1.23 Thu Nov 20 06:08:23 2025
+++ pkgsrc/archivers/libarchive/files/NEWS      Tue Dec 23 14:01:22 2025
@@ -1,8 +1,10 @@
-Nov 17, 2026: libarchive 3.8.3 released
+Dec 01, 2025: libarchive 3.8.4 released
 
-Oct 15, 2026: libarchive 3.8.2 released
+Nov 17, 2025: libarchive 3.8.3 released
 
-Jun 01, 2026: libarchive 3.8.1 released
+Oct 15, 2025: libarchive 3.8.2 released
+
+Jun 01, 2025: libarchive 3.8.1 released
 
 May 20, 2025: libarchive 3.8.0 released
 

Index: pkgsrc/archivers/libarchive/files/configure
diff -u pkgsrc/archivers/libarchive/files/configure:1.32 pkgsrc/archivers/libarchive/files/configure:1.33
--- pkgsrc/archivers/libarchive/files/configure:1.32    Thu Nov 20 06:08:23 2025
+++ pkgsrc/archivers/libarchive/files/configure Tue Dec 23 14:01:22 2025
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for libarchive 3.8.3.
+# Generated by GNU Autoconf 2.72 for libarchive 3.8.4.
 #
 # Report bugs to <libarchive-discuss%googlegroups.com@localhost>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libarchive'
 PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='3.8.3'
-PACKAGE_STRING='libarchive 3.8.3'
+PACKAGE_VERSION='3.8.4'
+PACKAGE_STRING='libarchive 3.8.4'
 PACKAGE_BUGREPORT='libarchive-discuss%googlegroups.com@localhost'
 PACKAGE_URL=''
 
@@ -1442,7 +1442,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures libarchive 3.8.3 to adapt to many kinds of systems.
+'configure' configures libarchive 3.8.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1513,7 +1513,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libarchive 3.8.3:";;
+     short | recursive ) echo "Configuration of libarchive 3.8.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1698,7 +1698,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libarchive configure 3.8.3
+libarchive configure 3.8.4
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2518,7 +2518,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libarchive $as_me 3.8.3, which was
+It was created by libarchive $as_me 3.8.4, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4002,7 +4002,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libarchive'
- VERSION='3.8.3'
+ VERSION='3.8.4'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -4099,7 +4099,7 @@ AM_DEFAULT_VERBOSITY=0
 
 # Libtool interface version bumps on any API change, so increments
 # whenever libarchive minor version does.
-ARCHIVE_MINOR=$(( (3008003 / 1000) % 1000 ))
+ARCHIVE_MINOR=$(( (3008004 / 1000) % 1000 ))
 # Libarchive 2.7 == libtool interface 9 = 2 + 7
 # Libarchive 2.8 == libtool interface 10 = 2 + 8
 # Libarchive 2.9 == libtool interface 11 = 2 + 9
@@ -4107,7 +4107,7 @@ ARCHIVE_MINOR=$(( (3008003 / 1000) % 100
 # Libarchive 3.1 == libtool interface 13
 ARCHIVE_INTERFACE=`echo $((13 + ${ARCHIVE_MINOR}))`
 # Libarchive revision is bumped on any source change === libtool revision
-ARCHIVE_REVISION=$(( 3008003 % 1000 ))
+ARCHIVE_REVISION=$(( 3008004 % 1000 ))
 # Libarchive minor is bumped on any interface addition === libtool age
 ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR
 
@@ -4116,33 +4116,33 @@ ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFA
 printf "%s\n" "#define __LIBARCHIVE_CONFIG_H_INCLUDED 1" >>confdefs.h
 
 
-printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.8.3\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.8.4\"" >>confdefs.h
 
 
-printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3008003\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3008004\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.8.3\"" >>confdefs.h
+printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.8.4\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.8.3\"" >>confdefs.h
+printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.8.4\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.8.3\"" >>confdefs.h
+printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.8.4\"" >>confdefs.h
 
 
-printf "%s\n" "#define BSDUNZIP_VERSION_STRING \"3.8.3\"" >>confdefs.h
+printf "%s\n" "#define BSDUNZIP_VERSION_STRING \"3.8.4\"" >>confdefs.h
 
 
 # The shell variables here must be the same as the AC_SUBST() variables
 # below, but the shell variable names apparently cannot be the same as
 # the m4 macro names above.  Why?  Ask autoconf.
-BSDCPIO_VERSION_STRING=3.8.3
-BSDTAR_VERSION_STRING=3.8.3
-BSDCAT_VERSION_STRING=3.8.3
-BSDUNZIP_VERSION_STRING=3.8.3
-LIBARCHIVE_VERSION_STRING=3.8.3
-LIBARCHIVE_VERSION_NUMBER=3008003
+BSDCPIO_VERSION_STRING=3.8.4
+BSDTAR_VERSION_STRING=3.8.4
+BSDCAT_VERSION_STRING=3.8.4
+BSDUNZIP_VERSION_STRING=3.8.4
+LIBARCHIVE_VERSION_STRING=3.8.4
+LIBARCHIVE_VERSION_NUMBER=3008004
 
 # Substitute the above version numbers into the various files below.
 # Yes, I believe this is the fourth time we define what are essentially
@@ -26364,7 +26364,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libarchive $as_me 3.8.3, which was
+This file was extended by libarchive $as_me 3.8.4, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26432,7 +26432,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-libarchive config.status 3.8.3
+libarchive config.status 3.8.4
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

Index: pkgsrc/archivers/libarchive/files/configure.ac
diff -u pkgsrc/archivers/libarchive/files/configure.ac:1.31 pkgsrc/archivers/libarchive/files/configure.ac:1.32
--- pkgsrc/archivers/libarchive/files/configure.ac:1.31 Thu Nov 20 06:08:24 2025
+++ pkgsrc/archivers/libarchive/files/configure.ac      Tue Dec 23 14:01:22 2025
@@ -4,8 +4,8 @@ dnl First, define all of the version num
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[3.8.3])
-m4_define([LIBARCHIVE_VERSION_N],[3008003])
+m4_define([LIBARCHIVE_VERSION_S],[3.8.4])
+m4_define([LIBARCHIVE_VERSION_N],[3008004])
 
 dnl bsdtar and bsdcpio versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())

Index: pkgsrc/archivers/libarchive/files/build/version
diff -u pkgsrc/archivers/libarchive/files/build/version:1.18 pkgsrc/archivers/libarchive/files/build/version:1.19
--- pkgsrc/archivers/libarchive/files/build/version:1.18        Thu Nov 20 06:08:24 2025
+++ pkgsrc/archivers/libarchive/files/build/version     Tue Dec 23 14:01:22 2025
@@ -1 +1 @@
-3008003
+3008004

Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.18        Thu Nov 20 06:08:24 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html     Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.18 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.18    Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.18 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.18        Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html     Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.18   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.18      Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html   Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:39 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.18       Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html    Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:39 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.18 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.18   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.18   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.18 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.18        Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html     Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:39 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/tar.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.18 pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.19
--- pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.18  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/tar.5.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:39 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>

Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.17    Thu Nov 20 06:08:24 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.17        Thu Nov 20 06:08:24 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html     Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.17  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.17  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.17    Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.17 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.17  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.17  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.17    Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.17  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.17     Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html  Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.17    Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.17     Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html  Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.17      Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html   Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.17 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.17 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.17 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.17    Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.17    Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.17 pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.18
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.17   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>

Index: pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.12 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.13
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.12   Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html        Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:01 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>

Index: pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.14 pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.15
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.14  Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html       Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:02 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:37 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
Index: pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.14 pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.15
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.14 Thu Nov 20 06:08:25 2025
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html      Tue Dec 23 14:01:22 2025
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.23.0 -->
-<!-- CreationDate: Mon Nov 17 22:19:03 2025 -->
+<!-- CreationDate: Mon Dec  1 12:42:38 2025 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>

Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_util.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/bsdtar.1.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/cpio.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/mtree.5.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/tar.5.pdf
Binary files are different

Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_acl.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_linkify.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_paths.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_perms.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_stat.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_time.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_data.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_extract.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_filter.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_format.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_free.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_header.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_new.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_open.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_set_options.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_blocksize.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_data.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_filter.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_finish_entry.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_format.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_free.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_header.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_new.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_open.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_options.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/libarchive_changes.3.pdf
Binary files are different

Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_misc.3.pdf
Binary files are different

Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf
Binary files are different
Index: pkgsrc/archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf
Binary files are different

Index: pkgsrc/archivers/libarchive/files/libarchive/archive.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.24 pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.25
--- pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.24 Thu Nov 20 06:08:27 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive.h      Tue Dec 23 14:01:23 2025
@@ -34,7 +34,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define        ARCHIVE_VERSION_NUMBER 3008003
+#define        ARCHIVE_VERSION_NUMBER 3008004
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */
@@ -177,7 +177,7 @@ __LA_DECL int               archive_version_number(vo
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define        ARCHIVE_VERSION_ONLY_STRING "3.8.3"
+#define        ARCHIVE_VERSION_ONLY_STRING "3.8.4"
 #define        ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
 __LA_DECL const char * archive_version_string(void);
 

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c:1.8  Sun Nov  2 08:52:14 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c      Tue Dec 23 14:01:23 2025
@@ -490,9 +490,9 @@ aes_ctr_update(archive_crypto_ctx *ctx, 
     size_t in_len, uint8_t * const out, size_t *out_len)
 {
        uint8_t *const ebuf = ctx->encr_buf;
-       unsigned pos = ctx->encr_pos;
-       unsigned max = (unsigned)((in_len < *out_len)? in_len: *out_len);
-       unsigned i;
+       size_t pos = ctx->encr_pos;
+       size_t max = (in_len < *out_len)? in_len: *out_len;
+       size_t i;
 
        for (i = 0; i < max; ) {
                if (pos == AES_BLOCK_SIZE) {
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor_private.h:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor_private.h:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor_private.h:1.8  Sun Nov  2 08:52:14 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor_private.h      Tue Dec 23 14:01:23 2025
@@ -56,10 +56,10 @@ int __libarchive_cryptor_build_hack(void
 typedef struct {
        CCCryptorRef    ctx;
        uint8_t         key[AES_MAX_KEY_SIZE];
-       unsigned        key_len;
+       size_t          key_len;
        uint8_t         nonce[AES_BLOCK_SIZE];
        uint8_t         encr_buf[AES_BLOCK_SIZE];
-       unsigned        encr_pos;
+       size_t          encr_pos;
 } archive_crypto_ctx;
 
 #elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H) && _WIN32_WINNT >= _WIN32_WINNT_VISTA

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.20 pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.21
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.20   Thu Nov 20 06:08:27 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h        Tue Dec 23 14:01:23 2025
@@ -28,7 +28,7 @@
 #define        ARCHIVE_ENTRY_H_INCLUDED
 
 /* Note: Compiler will complain if this does not match archive.h! */
-#define        ARCHIVE_VERSION_NUMBER 3008003
+#define        ARCHIVE_VERSION_NUMBER 3008004
 
 /*
  * Note: archive_entry.h is for use outside of libarchive; the
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.20 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.21
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.20       Thu Nov 20 06:08:27 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c    Tue Dec 23 14:01:23 2025
@@ -254,7 +254,7 @@ archive_read_disk_entry_from_file(struct
        if (S_ISLNK(st->st_mode)) {
                size_t linkbuffer_len = st->st_size;
                char *linkbuffer;
-               int lnklen;
+               ssize_t lnklen;
 
                linkbuffer = malloc(linkbuffer_len + 1);
                if (linkbuffer == NULL) {
@@ -892,7 +892,7 @@ setup_sparse_fiemap(struct archive_read_
        for (iters = 0; ; ++iters) {
                int i, r;
 
-               r = ioctl(*fd, FS_IOC_FIEMAP, fm); 
+               r = ioctl(*fd, FS_IOC_FIEMAP, fm);
                if (r < 0) {
                        /* When something error happens, it is better we
                         * should return ARCHIVE_OK because an earlier
@@ -1079,4 +1079,3 @@ setup_sparse(struct archive_read_disk *a
 #endif
 
 #endif /* !defined(_WIN32) || defined(__CYGWIN__) */
-

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.14 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.15
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.14 Thu Nov 20 06:08:27 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c      Tue Dec 23 14:01:23 2025
@@ -2018,11 +2018,8 @@ tree_dup(int fd)
        }
 #endif /* F_DUPFD_CLOEXEC */
        new_fd = dup(fd);
-       if (new_fd != -1) {
-               __archive_ensure_cloexec_flag(new_fd);
-               return (new_fd);
-       }
-       return (-1);
+       __archive_ensure_cloexec_flag(new_fd);
+       return (new_fd);
 }
 
 /*
@@ -2144,16 +2141,11 @@ tree_reopen(struct tree *t, const char *
         * so try again for execute. The consequences of not opening this are
         * unhelpful and unnecessary errors later.
         */
-       if (t->initial_dir_fd < 0) {
+       if (t->initial_dir_fd < 0)
                t->initial_dir_fd = open(".", o_flag | O_CLOEXEC);
-               if (t->initial_dir_fd < 0)
-                       return NULL;
-       }
 #endif
        __archive_ensure_cloexec_flag(t->initial_dir_fd);
        t->working_dir_fd = tree_dup(t->initial_dir_fd);
-       if (t->working_dir_fd < 0)
-               return NULL;
        return (t);
 }
 
@@ -2359,15 +2351,20 @@ static int
 tree_dir_next_posix(struct tree *t)
 {
        int r;
+#if defined(HAVE_FDOPENDIR)
+       int fd;
+#endif
        const char *name;
        size_t namelen;
 
        if (t->d == NULL) {
 
 #if defined(HAVE_FDOPENDIR)
-               int fd = tree_dup(t->working_dir_fd);
-               if (fd != -1)
-                       t->d = fdopendir(fd);
+               if (t->working_dir_fd >= 0) {
+                       fd = tree_dup(t->working_dir_fd);
+                       if (fd != -1)
+                               t->d = fdopendir(fd);
+               }
 #else /* HAVE_FDOPENDIR */
                if (tree_enter_working_dir(t) == 0) {
                        t->d = opendir(".");
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write.c:1.14 pkgsrc/archivers/libarchive/files/libarchive/archive_write.c:1.15
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write.c:1.14   Sun Nov  2 08:52:14 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write.c        Tue Dec 23 14:01:23 2025
@@ -821,7 +821,7 @@ _archive_write_data(struct archive *_a, 
 {
        struct archive_write *a = (struct archive_write *)_a;
        const size_t max_write = INT_MAX;
-       int ret;
+       ssize_t ret;
 
        archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
            ARCHIVE_STATE_DATA, "archive_write_data");

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.17 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.18
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.17       Sun Nov  2 08:52:14 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c    Tue Dec 23 14:01:23 2025
@@ -1254,7 +1254,7 @@ parse_file(struct archive_read *a, struc
                                archive_entry_filetype(entry) == AE_IFDIR) {
                        mtree->fd = open(path, O_RDONLY | O_BINARY | O_CLOEXEC);
                        __archive_ensure_cloexec_flag(mtree->fd);
-                       if (mtree->fd < 0 && (
+                       if (mtree->fd == -1 && (
 #if defined(_WIN32) && !defined(__CYGWIN__)
         /*
          * On Windows, attempting to open a file with an
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.17 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.18
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.17        Thu Nov 20 06:08:27 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c     Tue Dec 23 14:01:23 2025
@@ -2561,9 +2561,9 @@ _archive_write_disk_close(struct archive
                         * for directories. For other file types
                         * we need to verify via fstat() or lstat()
                         */
-                       if (fd < 0 || p->filetype != AE_IFDIR) {
+                       if (fd == -1 || p->filetype != AE_IFDIR) {
 #if HAVE_FSTAT
-                               if (fd >= 0 && (
+                               if (fd > 0 && (
                                    fstat(fd, &st) != 0 ||
                                    la_verify_filetype(st.st_mode,
                                    p->filetype) == 0)) {
@@ -4447,7 +4447,7 @@ fixup_appledouble(struct archive_write_d
         */
        fd = open(pathname, O_RDONLY | O_BINARY | O_CLOEXEC);
        __archive_ensure_cloexec_flag(fd);
-       if (fd < 0) {
+       if (fd == -1) {
                archive_set_error(&a->archive, errno,
                    "Failed to open a restoring file");
                ret = ARCHIVE_WARN;

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c:1.5  Tue Jul  1 15:14:44 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c      Tue Dec 23 14:01:23 2025
@@ -333,7 +333,7 @@ archive_libbsdxml_version(void)
 const char *
 archive_libxml2_version(void)
 {
-#if HAVE_LIBXML_XMLREADER_H && HAVE_LIBXML2
+#if HAVE_LIBXML_XMLVERSION_H && HAVE_LIBXML2
        return LIBXML_DOTTED_VERSION;
 #else
        return NULL;

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c:1.10 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c:1.11
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c:1.10    Sun Nov  2 08:52:15 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c Tue Dec 23 14:01:24 2025
@@ -1000,13 +1000,13 @@ xmlwrite_heap(struct archive_write *a, s
        const char *encname;
        int r;
 
-       r = xmlwrite_fstring(a, writer, "length", "%ju", heap->length);
+       r = xmlwrite_fstring(a, writer, "length", "%ju", (uintmax_t)heap->length);
        if (r < 0)
                return (ARCHIVE_FATAL);
-       r = xmlwrite_fstring(a, writer, "offset", "%ju", heap->temp_offset);
+       r = xmlwrite_fstring(a, writer, "offset", "%ju", (uintmax_t)heap->temp_offset);
        if (r < 0)
                return (ARCHIVE_FATAL);
-       r = xmlwrite_fstring(a, writer, "size", "%ju", heap->size);
+       r = xmlwrite_fstring(a, writer, "size", "%ju", (uintmax_t)heap->size);
        if (r < 0)
                return (ARCHIVE_FATAL);
        switch (heap->compression) {
@@ -1356,7 +1356,7 @@ make_file_entry(struct archive_write *a,
         * Make a inode entry, "<inode>".
         */
        r = xmlwrite_fstring(a, writer, "inode",
-           "%jd", archive_entry_ino64(file->entry));
+           "%jd", (intmax_t)archive_entry_ino64(file->entry));
        if (r < 0)
                return (ARCHIVE_FATAL);
        if (archive_entry_dev(file->entry) != 0) {
@@ -1378,7 +1378,7 @@ make_file_entry(struct archive_write *a,
         * Make a user entry, "<uid>" and "<user>.
         */
        r = xmlwrite_fstring(a, writer, "uid",
-           "%d", archive_entry_uid(file->entry));
+           "%jd", (intmax_t)archive_entry_uid(file->entry));
        if (r < 0)
                return (ARCHIVE_FATAL);
        r = archive_entry_uname_l(file->entry, &p, &len, xar->sconv);
@@ -1404,7 +1404,7 @@ make_file_entry(struct archive_write *a,
         * Make a group entry, "<gid>" and "<group>.
         */
        r = xmlwrite_fstring(a, writer, "gid",
-           "%d", archive_entry_gid(file->entry));
+           "%jd", (intmax_t)archive_entry_gid(file->entry));
        if (r < 0)
                return (ARCHIVE_FATAL);
        r = archive_entry_gname_l(file->entry, &p, &len, xar->sconv);

Index: pkgsrc/archivers/libarchive/files/libarchive/test/list.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.20 pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.21
--- pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.20       Thu Nov 20 06:08:27 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/test/list.h    Tue Dec 23 14:01:24 2025
@@ -1,36 +1,32 @@
 DEFINE_TEST(test_7zip_filename_encoding_UTF16_win)
+DEFINE_TEST(test_acl_from_text)
 DEFINE_TEST(test_acl_nfs4)
-DEFINE_TEST(test_acl_pax_posix1e)
 DEFINE_TEST(test_acl_pax_nfs4)
+DEFINE_TEST(test_acl_pax_posix1e)
 DEFINE_TEST(test_acl_platform_nfs4)
-DEFINE_TEST(test_acl_platform_posix1e_restore)
 DEFINE_TEST(test_acl_platform_posix1e_read)
+DEFINE_TEST(test_acl_platform_posix1e_restore)
 DEFINE_TEST(test_acl_posix1e)
-DEFINE_TEST(test_acl_from_text)
 DEFINE_TEST(test_acl_to_text)
+DEFINE_TEST(test_ar_mode)
 DEFINE_TEST(test_archive_api_feature)
 DEFINE_TEST(test_archive_clear_error)
 DEFINE_TEST(test_archive_cmdline)
-DEFINE_TEST(test_archive_md5)
-DEFINE_TEST(test_archive_rmd160)
-DEFINE_TEST(test_archive_sha1)
-DEFINE_TEST(test_archive_sha256)
-DEFINE_TEST(test_archive_sha384)
-DEFINE_TEST(test_archive_sha512)
 DEFINE_TEST(test_archive_match_owner)
 DEFINE_TEST(test_archive_match_path)
 DEFINE_TEST(test_archive_match_time)
+DEFINE_TEST(test_archive_md5)
 DEFINE_TEST(test_archive_parse_date)
 DEFINE_TEST(test_archive_pathmatch)
 DEFINE_TEST(test_archive_read_add_passphrase)
 DEFINE_TEST(test_archive_read_add_passphrase_incorrect_sequance)
-DEFINE_TEST(test_archive_read_add_passphrase_single)
 DEFINE_TEST(test_archive_read_add_passphrase_multiple)
+DEFINE_TEST(test_archive_read_add_passphrase_multiple_with_callback)
+DEFINE_TEST(test_archive_read_add_passphrase_multiple_with_callback2)
 DEFINE_TEST(test_archive_read_add_passphrase_set_callback1)
 DEFINE_TEST(test_archive_read_add_passphrase_set_callback2)
 DEFINE_TEST(test_archive_read_add_passphrase_set_callback3)
-DEFINE_TEST(test_archive_read_add_passphrase_multiple_with_callback)
-DEFINE_TEST(test_archive_read_add_passphrase_multiple_with_callback2)
+DEFINE_TEST(test_archive_read_add_passphrase_single)
 DEFINE_TEST(test_archive_read_ahead_eof)
 DEFINE_TEST(test_archive_read_close_twice)
 DEFINE_TEST(test_archive_read_close_twice_open_fd)
@@ -44,15 +40,20 @@ DEFINE_TEST(test_archive_read_set_format
 DEFINE_TEST(test_archive_read_set_option)
 DEFINE_TEST(test_archive_read_set_options)
 DEFINE_TEST(test_archive_read_support)
+DEFINE_TEST(test_archive_rmd160)
 DEFINE_TEST(test_archive_set_error)
+DEFINE_TEST(test_archive_sha1)
+DEFINE_TEST(test_archive_sha256)
+DEFINE_TEST(test_archive_sha384)
+DEFINE_TEST(test_archive_sha512)
 DEFINE_TEST(test_archive_string)
-DEFINE_TEST(test_archive_string_sort)
 DEFINE_TEST(test_archive_string_conversion)
 DEFINE_TEST(test_archive_string_conversion_utf16_utf8)
 DEFINE_TEST(test_archive_string_conversion_utf8_utf16)
-DEFINE_TEST(test_archive_string_update_utf8_win)
-DEFINE_TEST(test_archive_string_update_utf8_utf8)
+DEFINE_TEST(test_archive_string_sort)
 DEFINE_TEST(test_archive_string_update_utf8_koi8)
+DEFINE_TEST(test_archive_string_update_utf8_utf8)
+DEFINE_TEST(test_archive_string_update_utf8_win)
 DEFINE_TEST(test_archive_write_add_filter_by_name_b64encode)
 DEFINE_TEST(test_archive_write_add_filter_by_name_bzip2)
 DEFINE_TEST(test_archive_write_add_filter_by_name_compress)
@@ -90,30 +91,29 @@ DEFINE_TEST(test_archive_write_set_forma
 DEFINE_TEST(test_archive_write_set_format_by_name_shar)
 DEFINE_TEST(test_archive_write_set_format_by_name_shardump)
 DEFINE_TEST(test_archive_write_set_format_by_name_ustar)
-DEFINE_TEST(test_archive_write_set_format_by_name_v7tar)
 DEFINE_TEST(test_archive_write_set_format_by_name_v7)
+DEFINE_TEST(test_archive_write_set_format_by_name_v7tar)
 DEFINE_TEST(test_archive_write_set_format_by_name_warc)
 DEFINE_TEST(test_archive_write_set_format_by_name_xar)
 DEFINE_TEST(test_archive_write_set_format_by_name_zip)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_7zip)
-DEFINE_TEST(test_archive_write_set_format_filter_by_ext_zip)
-DEFINE_TEST(test_archive_write_set_format_filter_by_ext_jar)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_a)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_ar)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_cpio)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_iso)
+DEFINE_TEST(test_archive_write_set_format_filter_by_ext_jar)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar)
-DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar_gz)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar_bz2)
+DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar_bz2_def_zip)
+DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar_gz)
 DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar_xz)
+DEFINE_TEST(test_archive_write_set_format_filter_by_ext_zip)
 DEFINE_TEST(test_archive_write_set_format_filter_by_no_ext_def_zip)
-DEFINE_TEST(test_archive_write_set_format_filter_by_ext_tar_bz2_def_zip)
 DEFINE_TEST(test_archive_write_set_format_option)
 DEFINE_TEST(test_archive_write_set_option)
 DEFINE_TEST(test_archive_write_set_options)
 DEFINE_TEST(test_archive_write_set_passphrase)
 DEFINE_TEST(test_archive_write_set_passphrase_callback)
-DEFINE_TEST(test_ar_mode)
 DEFINE_TEST(test_bad_fd)
 DEFINE_TEST(test_compat_bzip2)
 DEFINE_TEST(test_compat_cpio)
@@ -129,8 +129,8 @@ DEFINE_TEST(test_compat_perl_archive_tar
 DEFINE_TEST(test_compat_plexus_archiver_tar)
 DEFINE_TEST(test_compat_solaris_pax_sparse)
 DEFINE_TEST(test_compat_solaris_tar_acl)
-DEFINE_TEST(test_compat_star_acl_posix1e)
 DEFINE_TEST(test_compat_star_acl_nfs4)
+DEFINE_TEST(test_compat_star_acl_posix1e)
 DEFINE_TEST(test_compat_tar_directory)
 DEFINE_TEST(test_compat_tar_hardlink)
 DEFINE_TEST(test_compat_uudecode)
@@ -150,6 +150,7 @@ DEFINE_TEST(test_entry)
 DEFINE_TEST(test_entry_strmode)
 DEFINE_TEST(test_extattr_freebsd)
 DEFINE_TEST(test_filter_count)
+DEFINE_TEST(test_fully_sparse_files)
 DEFINE_TEST(test_fuzz_ar)
 DEFINE_TEST(test_fuzz_cab)
 DEFINE_TEST(test_fuzz_cpio)
@@ -159,40 +160,44 @@ DEFINE_TEST(test_fuzz_mtree)
 DEFINE_TEST(test_fuzz_rar)
 DEFINE_TEST(test_fuzz_tar)
 DEFINE_TEST(test_fuzz_zip)
-DEFINE_TEST(test_gnutar_filename_encoding_UTF8_CP866)
-DEFINE_TEST(test_gnutar_filename_encoding_KOI8R_UTF8)
-DEFINE_TEST(test_gnutar_filename_encoding_KOI8R_CP866)
 DEFINE_TEST(test_gnutar_filename_encoding_CP1251_UTF8)
-DEFINE_TEST(test_gnutar_filename_encoding_ru_RU_CP1251)
-DEFINE_TEST(test_gnutar_filename_encoding_Russian_Russia)
-DEFINE_TEST(test_gnutar_filename_encoding_EUCJP_UTF8)
-DEFINE_TEST(test_gnutar_filename_encoding_EUCJP_CP932)
 DEFINE_TEST(test_gnutar_filename_encoding_CP932_UTF8)
+DEFINE_TEST(test_gnutar_filename_encoding_EUCJP_CP932)
+DEFINE_TEST(test_gnutar_filename_encoding_EUCJP_UTF8)
+DEFINE_TEST(test_gnutar_filename_encoding_KOI8R_CP866)
+DEFINE_TEST(test_gnutar_filename_encoding_KOI8R_UTF8)
+DEFINE_TEST(test_gnutar_filename_encoding_Russian_Russia)
 DEFINE_TEST(test_gnutar_filename_encoding_UTF16_win)
+DEFINE_TEST(test_gnutar_filename_encoding_UTF8_CP866)
+DEFINE_TEST(test_gnutar_filename_encoding_ru_RU_CP1251)
 DEFINE_TEST(test_link_resolver)
 DEFINE_TEST(test_link_resolver_unicode_win)
 DEFINE_TEST(test_open_failure)
 DEFINE_TEST(test_open_fd)
 DEFINE_TEST(test_open_file)
 DEFINE_TEST(test_open_filename)
-DEFINE_TEST(test_pax_filename_encoding_KOI8R)
+DEFINE_TEST(test_pax_filename_encoding)
 DEFINE_TEST(test_pax_filename_encoding_CP1251)
-DEFINE_TEST(test_pax_filename_encoding_EUCJP)
 DEFINE_TEST(test_pax_filename_encoding_CP932)
+DEFINE_TEST(test_pax_filename_encoding_EUCJP)
+DEFINE_TEST(test_pax_filename_encoding_KOI8R)
 DEFINE_TEST(test_pax_filename_encoding_KOI8R_BINARY)
 DEFINE_TEST(test_pax_filename_encoding_KOI8R_CP1251)
 DEFINE_TEST(test_pax_filename_encoding_UTF16_win)
-DEFINE_TEST(test_pax_filename_encoding)
 DEFINE_TEST(test_pax_xattr_header)
+DEFINE_TEST(test_read_append_filter)
+DEFINE_TEST(test_read_append_filter_program)
+DEFINE_TEST(test_read_append_filter_wrong_program)
+DEFINE_TEST(test_read_append_wrong_filter)
 DEFINE_TEST(test_read_data_large)
 DEFINE_TEST(test_read_disk)
 DEFINE_TEST(test_read_disk_directory_traversals)
 DEFINE_TEST(test_read_disk_entry_from_file)
 DEFINE_TEST(test_read_extract)
 DEFINE_TEST(test_read_file_nonexistent)
-DEFINE_TEST(test_read_filter_compress_truncated)
 DEFINE_TEST(test_read_filter_compress_empty2)
 DEFINE_TEST(test_read_filter_compress_invalid)
+DEFINE_TEST(test_read_filter_compress_truncated)
 DEFINE_TEST(test_read_filter_grzip)
 DEFINE_TEST(test_read_filter_gzip_recursive)
 DEFINE_TEST(test_read_filter_lrzip)
@@ -202,86 +207,86 @@ DEFINE_TEST(test_read_filter_program)
 DEFINE_TEST(test_read_filter_program_signature)
 DEFINE_TEST(test_read_filter_uudecode)
 DEFINE_TEST(test_read_filter_uudecode_base64)
-DEFINE_TEST(test_read_filter_uudecode_raw)
 DEFINE_TEST(test_read_filter_uudecode_base64_raw)
+DEFINE_TEST(test_read_filter_uudecode_raw)
 DEFINE_TEST(test_read_format_7zip)
 DEFINE_TEST(test_read_format_7zip_bzip2)
-DEFINE_TEST(test_read_format_7zip_from_fd)
 DEFINE_TEST(test_read_format_7zip_copy)
 DEFINE_TEST(test_read_format_7zip_deflate)
-DEFINE_TEST(test_read_format_7zip_zstd)
-DEFINE_TEST(test_read_format_7zip_zstd_solid)
-DEFINE_TEST(test_read_format_7zip_zstd_bcj)
-DEFINE_TEST(test_read_format_7zip_zstd_nobcj)
+DEFINE_TEST(test_read_format_7zip_deflate_arm64)
+DEFINE_TEST(test_read_format_7zip_deflate_powerpc)
 DEFINE_TEST(test_read_format_7zip_empty)
+DEFINE_TEST(test_read_format_7zip_encryption_data)
+DEFINE_TEST(test_read_format_7zip_encryption_header)
+DEFINE_TEST(test_read_format_7zip_encryption_partially)
+DEFINE_TEST(test_read_format_7zip_extract_second)
+DEFINE_TEST(test_read_format_7zip_from_fd)
+DEFINE_TEST(test_read_format_7zip_issue2765)
 DEFINE_TEST(test_read_format_7zip_lzma1)
 DEFINE_TEST(test_read_format_7zip_lzma2)
-DEFINE_TEST(test_read_format_7zip_zstd_arm)
 DEFINE_TEST(test_read_format_7zip_lzma2_arm)
-DEFINE_TEST(test_read_format_7zip_ppmd)
 DEFINE_TEST(test_read_format_7zip_lzma2_arm64)
-DEFINE_TEST(test_read_format_7zip_deflate_arm64)
-DEFINE_TEST(test_read_format_7zip_win_attrib)
-DEFINE_TEST(test_read_format_7zip_sfx_pe)
-DEFINE_TEST(test_read_format_7zip_sfx_modified_pe)
-DEFINE_TEST(test_read_format_7zip_sfx_elf)
-DEFINE_TEST(test_read_format_7zip_extract_second)
+DEFINE_TEST(test_read_format_7zip_lzma2_powerpc)
 DEFINE_TEST(test_read_format_7zip_lzma2_riscv)
 DEFINE_TEST(test_read_format_7zip_lzma2_sparc)
-DEFINE_TEST(test_read_format_7zip_zstd_sparc)
-DEFINE_TEST(test_read_format_7zip_deflate_powerpc)
-DEFINE_TEST(test_read_format_7zip_lzma2_powerpc)
-DEFINE_TEST(test_read_format_7zip_encryption_data)
-DEFINE_TEST(test_read_format_7zip_encryption_header)
-DEFINE_TEST(test_read_format_7zip_encryption_partially)
-DEFINE_TEST(test_read_format_7zip_issue2765)
 DEFINE_TEST(test_read_format_7zip_malformed)
 DEFINE_TEST(test_read_format_7zip_packinfo_digests)
+DEFINE_TEST(test_read_format_7zip_ppmd)
+DEFINE_TEST(test_read_format_7zip_sfx_elf)
+DEFINE_TEST(test_read_format_7zip_sfx_modified_pe)
+DEFINE_TEST(test_read_format_7zip_sfx_pe)
+DEFINE_TEST(test_read_format_7zip_win_attrib)
+DEFINE_TEST(test_read_format_7zip_zstd)
+DEFINE_TEST(test_read_format_7zip_zstd_arm)
+DEFINE_TEST(test_read_format_7zip_zstd_bcj)
+DEFINE_TEST(test_read_format_7zip_zstd_nobcj)
+DEFINE_TEST(test_read_format_7zip_zstd_solid)
+DEFINE_TEST(test_read_format_7zip_zstd_sparc)
 DEFINE_TEST(test_read_format_ar)
 DEFINE_TEST(test_read_format_cab)
 DEFINE_TEST(test_read_format_cab_filename)
 DEFINE_TEST(test_read_format_cpio_afio)
 DEFINE_TEST(test_read_format_cpio_afio_broken)
+DEFINE_TEST(test_read_format_cpio_bin)
+DEFINE_TEST(test_read_format_cpio_bin_Z)
 DEFINE_TEST(test_read_format_cpio_bin_be)
 DEFINE_TEST(test_read_format_cpio_bin_bz2)
-DEFINE_TEST(test_read_format_cpio_bin)
 DEFINE_TEST(test_read_format_cpio_bin_gz)
 DEFINE_TEST(test_read_format_cpio_bin_le)
 DEFINE_TEST(test_read_format_cpio_bin_lzip)
 DEFINE_TEST(test_read_format_cpio_bin_lzma)
 DEFINE_TEST(test_read_format_cpio_bin_xz)
-DEFINE_TEST(test_read_format_cpio_bin_Z)
-DEFINE_TEST(test_read_format_cpio_filename_eucJP_UTF8)
-DEFINE_TEST(test_read_format_cpio_filename_UTF8_eucJP)
-DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_jp)
+DEFINE_TEST(test_read_format_cpio_filename_CP866_CP1251)
+DEFINE_TEST(test_read_format_cpio_filename_CP866_CP1251_win)
 DEFINE_TEST(test_read_format_cpio_filename_CP866_KOI8R)
 DEFINE_TEST(test_read_format_cpio_filename_CP866_UTF8)
+DEFINE_TEST(test_read_format_cpio_filename_KOI8R_CP1251)
 DEFINE_TEST(test_read_format_cpio_filename_KOI8R_CP866)
 DEFINE_TEST(test_read_format_cpio_filename_KOI8R_UTF8)
-DEFINE_TEST(test_read_format_cpio_filename_UTF8_KOI8R)
+DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP1251)
 DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP866)
+DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP932)
+DEFINE_TEST(test_read_format_cpio_filename_UTF8_KOI8R)
+DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_jp)
 DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_ru)
+DEFINE_TEST(test_read_format_cpio_filename_UTF8_eucJP)
 DEFINE_TEST(test_read_format_cpio_filename_eucJP_CP932)
-DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP932)
-DEFINE_TEST(test_read_format_cpio_filename_CP866_CP1251)
-DEFINE_TEST(test_read_format_cpio_filename_CP866_CP1251_win)
-DEFINE_TEST(test_read_format_cpio_filename_KOI8R_CP1251)
-DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP1251)
+DEFINE_TEST(test_read_format_cpio_filename_eucJP_UTF8)
 DEFINE_TEST(test_read_format_cpio_odc)
 DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm)
-DEFINE_TEST(test_read_format_cpio_svr4c_Z)
 DEFINE_TEST(test_read_format_cpio_svr4_gzip)
 DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm)
+DEFINE_TEST(test_read_format_cpio_svr4c_Z)
 DEFINE_TEST(test_read_format_empty)
-DEFINE_TEST(test_read_format_gtar_filename_eucJP_UTF8)
+DEFINE_TEST(test_read_format_gtar_filename_CP866_CP1251)
+DEFINE_TEST(test_read_format_gtar_filename_CP866_CP1251_win)
 DEFINE_TEST(test_read_format_gtar_filename_CP866_KOI8R)
 DEFINE_TEST(test_read_format_gtar_filename_CP866_UTF8)
+DEFINE_TEST(test_read_format_gtar_filename_KOI8R_CP1251)
 DEFINE_TEST(test_read_format_gtar_filename_KOI8R_CP866)
 DEFINE_TEST(test_read_format_gtar_filename_KOI8R_UTF8)
 DEFINE_TEST(test_read_format_gtar_filename_eucJP_CP932)
-DEFINE_TEST(test_read_format_gtar_filename_CP866_CP1251)
-DEFINE_TEST(test_read_format_gtar_filename_CP866_CP1251_win)
-DEFINE_TEST(test_read_format_gtar_filename_KOI8R_CP1251)
+DEFINE_TEST(test_read_format_gtar_filename_eucJP_UTF8)
 DEFINE_TEST(test_read_format_gtar_gz)
 DEFINE_TEST(test_read_format_gtar_lzma)
 DEFINE_TEST(test_read_format_gtar_redundant_L)
@@ -289,23 +294,24 @@ DEFINE_TEST(test_read_format_gtar_sparse
 DEFINE_TEST(test_read_format_gtar_sparse_length)
 DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
 DEFINE_TEST(test_read_format_huge_rpm)
+DEFINE_TEST(test_read_format_iso_Z)
+DEFINE_TEST(test_read_format_iso_multi_extent)
+DEFINE_TEST(test_read_format_iso_xorriso)
 DEFINE_TEST(test_read_format_isojoliet_bz2)
 DEFINE_TEST(test_read_format_isojoliet_long)
 DEFINE_TEST(test_read_format_isojoliet_rr)
 DEFINE_TEST(test_read_format_isojoliet_versioned)
-DEFINE_TEST(test_read_format_iso_multi_extent)
 DEFINE_TEST(test_read_format_isorr_bz2)
 DEFINE_TEST(test_read_format_isorr_ce)
 DEFINE_TEST(test_read_format_isorr_new_bz2)
 DEFINE_TEST(test_read_format_isorr_rr_moved)
-DEFINE_TEST(test_read_format_iso_xorriso)
-DEFINE_TEST(test_read_format_iso_Z)
 DEFINE_TEST(test_read_format_isozisofs_bz2)
-DEFINE_TEST(test_read_format_lha_bugfix_0)
 DEFINE_TEST(test_read_format_lha)
+DEFINE_TEST(test_read_format_lha_bugfix_0)
 DEFINE_TEST(test_read_format_lha_filename)
 DEFINE_TEST(test_read_format_lha_filename_UTF16)
 DEFINE_TEST(test_read_format_mtree)
+DEFINE_TEST(test_read_format_mtree_crash747)
 DEFINE_TEST(test_read_format_mtree_filenames_only)
 DEFINE_TEST(test_read_format_mtree_nochange)
 DEFINE_TEST(test_read_format_mtree_nomagic_v1_form)
@@ -314,104 +320,104 @@ DEFINE_TEST(test_read_format_mtree_nomag
 DEFINE_TEST(test_read_format_mtree_nonexistent_contents_file)
 DEFINE_TEST(test_read_format_mtree_noprint)
 DEFINE_TEST(test_read_format_mtree_tab)
-DEFINE_TEST(test_read_format_mtree_crash747)
 DEFINE_TEST(test_read_format_pax_bz2)
-DEFINE_TEST(test_read_format_rar5_set_format)
-DEFINE_TEST(test_read_format_rar5_stored)
+DEFINE_TEST(test_read_format_rar4_encrypted)
+DEFINE_TEST(test_read_format_rar4_encrypted_filenames)
+DEFINE_TEST(test_read_format_rar4_solid_encrypted)
+DEFINE_TEST(test_read_format_rar4_solid_encrypted_filenames)
+DEFINE_TEST(test_read_format_rar5_arm_filter)
+DEFINE_TEST(test_read_format_rar5_arm_filter_on_window_boundary)
+DEFINE_TEST(test_read_format_rar5_bad_window_size_in_multiarchive_file)
+DEFINE_TEST(test_read_format_rar5_blake2)
+DEFINE_TEST(test_read_format_rar5_block_by_block)
+DEFINE_TEST(test_read_format_rar5_block_size_is_too_small)
 DEFINE_TEST(test_read_format_rar5_compressed)
-DEFINE_TEST(test_read_format_rar5_multiple_files)
-DEFINE_TEST(test_read_format_rar5_multiple_files_solid)
+DEFINE_TEST(test_read_format_rar5_data_ready_pointer_leak)
+DEFINE_TEST(test_read_format_rar5_decode_number_out_of_bounds_read)
+DEFINE_TEST(test_read_format_rar5_different_solid_window_size)
+DEFINE_TEST(test_read_format_rar5_different_window_size)
+DEFINE_TEST(test_read_format_rar5_different_winsize_on_merge)
+DEFINE_TEST(test_read_format_rar5_distance_overflow)
+DEFINE_TEST(test_read_format_rar5_encrypted)
+DEFINE_TEST(test_read_format_rar5_encrypted_filenames)
+DEFINE_TEST(test_read_format_rar5_extra_field_version)
+DEFINE_TEST(test_read_format_rar5_extract_win32)
+DEFINE_TEST(test_read_format_rar5_fileattr)
+DEFINE_TEST(test_read_format_rar5_hardlink)
+DEFINE_TEST(test_read_format_rar5_invalid_dict_reference)
+DEFINE_TEST(test_read_format_rar5_invalidhash_and_validhtime_exfld)
+DEFINE_TEST(test_read_format_rar5_leftshift1)
+DEFINE_TEST(test_read_format_rar5_leftshift2)
 DEFINE_TEST(test_read_format_rar5_multiarchive_skip_all)
 DEFINE_TEST(test_read_format_rar5_multiarchive_skip_all_but_first)
 DEFINE_TEST(test_read_format_rar5_multiarchive_skip_all_but_second)
-DEFINE_TEST(test_read_format_rar5_blake2)
-DEFINE_TEST(test_read_format_rar5_arm_filter)
-DEFINE_TEST(test_read_format_rar5_stored_skip_all)
-DEFINE_TEST(test_read_format_rar5_stored_skip_in_part)
-DEFINE_TEST(test_read_format_rar5_stored_skip_all_but_first)
-DEFINE_TEST(test_read_format_rar5_stored_skip_all_in_part)
 DEFINE_TEST(test_read_format_rar5_multiarchive_solid_extr_all)
 DEFINE_TEST(test_read_format_rar5_multiarchive_solid_skip_all)
 DEFINE_TEST(test_read_format_rar5_multiarchive_solid_skip_all_but_first)
+DEFINE_TEST(test_read_format_rar5_multiarchive_solid_skip_all_but_last)
 DEFINE_TEST(test_read_format_rar5_multiarchive_solid_skip_all_but_scnd)
 DEFINE_TEST(test_read_format_rar5_multiarchive_solid_skip_all_but_third)
-DEFINE_TEST(test_read_format_rar5_multiarchive_solid_skip_all_but_last)
+DEFINE_TEST(test_read_format_rar5_multiple_files)
+DEFINE_TEST(test_read_format_rar5_multiple_files_solid)
+DEFINE_TEST(test_read_format_rar5_nonempty_dir_data)
+DEFINE_TEST(test_read_format_rar5_nonempty_dir_stream)
+DEFINE_TEST(test_read_format_rar5_only_crypt_exfld)
+DEFINE_TEST(test_read_format_rar5_only_unsupported_exfld)
+DEFINE_TEST(test_read_format_rar5_owner)
+DEFINE_TEST(test_read_format_rar5_read_data_block_uninitialized_offset)
+DEFINE_TEST(test_read_format_rar5_readtables_overflow)
+DEFINE_TEST(test_read_format_rar5_set_format)
+DEFINE_TEST(test_read_format_rar5_sfx)
+DEFINE_TEST(test_read_format_rar5_solid_encrypted)
+DEFINE_TEST(test_read_format_rar5_solid_encrypted_filenames)
 DEFINE_TEST(test_read_format_rar5_solid_skip_all)
 DEFINE_TEST(test_read_format_rar5_solid_skip_all_but_first)
-DEFINE_TEST(test_read_format_rar5_solid_skip_all_but_second)
 DEFINE_TEST(test_read_format_rar5_solid_skip_all_but_last)
-DEFINE_TEST(test_read_format_rar5_extract_win32)
-DEFINE_TEST(test_read_format_rar5_unicode)
-DEFINE_TEST(test_read_format_rar5_block_by_block)
-DEFINE_TEST(test_read_format_rar5_owner)
+DEFINE_TEST(test_read_format_rar5_solid_skip_all_but_second)
+DEFINE_TEST(test_read_format_rar5_stored)
+DEFINE_TEST(test_read_format_rar5_stored_skip_all)
+DEFINE_TEST(test_read_format_rar5_stored_skip_all_but_first)
+DEFINE_TEST(test_read_format_rar5_stored_skip_all_in_part)
+DEFINE_TEST(test_read_format_rar5_stored_skip_in_part)
 DEFINE_TEST(test_read_format_rar5_symlink)
-DEFINE_TEST(test_read_format_rar5_hardlink)
-DEFINE_TEST(test_read_format_rar5_extra_field_version)
-DEFINE_TEST(test_read_format_rar5_readtables_overflow)
-DEFINE_TEST(test_read_format_rar5_leftshift1)
-DEFINE_TEST(test_read_format_rar5_leftshift2)
 DEFINE_TEST(test_read_format_rar5_truncated_huff)
-DEFINE_TEST(test_read_format_rar5_invalid_dict_reference)
-DEFINE_TEST(test_read_format_rar5_distance_overflow)
-DEFINE_TEST(test_read_format_rar5_nonempty_dir_stream)
-DEFINE_TEST(test_read_format_rar5_nonempty_dir_data)
-DEFINE_TEST(test_read_format_rar5_fileattr)
-DEFINE_TEST(test_read_format_rar5_different_window_size)
+DEFINE_TEST(test_read_format_rar5_unicode)
 DEFINE_TEST(test_read_format_rar5_window_buf_and_size_desync)
-DEFINE_TEST(test_read_format_rar5_arm_filter_on_window_boundary)
-DEFINE_TEST(test_read_format_rar5_different_solid_window_size)
-DEFINE_TEST(test_read_format_rar5_different_winsize_on_merge)
-DEFINE_TEST(test_read_format_rar5_block_size_is_too_small)
-DEFINE_TEST(test_read_format_rar5_sfx)
-DEFINE_TEST(test_read_format_rar5_decode_number_out_of_bounds_read)
-DEFINE_TEST(test_read_format_rar5_bad_window_size_in_multiarchive_file)
-DEFINE_TEST(test_read_format_rar5_read_data_block_uninitialized_offset)
-DEFINE_TEST(test_read_format_rar5_data_ready_pointer_leak)
-DEFINE_TEST(test_read_format_rar5_only_crypt_exfld)
-DEFINE_TEST(test_read_format_rar5_only_unsupported_exfld)
-DEFINE_TEST(test_read_format_rar5_invalidhash_and_validhtime_exfld)
-DEFINE_TEST(test_read_format_rar_set_format)
 DEFINE_TEST(test_read_format_rar_basic)
-DEFINE_TEST(test_read_format_rar_subblock)
-DEFINE_TEST(test_read_format_rar_noeof)
-DEFINE_TEST(test_read_format_rar_unicode_UTF8)
-DEFINE_TEST(test_read_format_rar_unicode_CP932)
+DEFINE_TEST(test_read_format_rar_binary)
+DEFINE_TEST(test_read_format_rar_compress_best)
 DEFINE_TEST(test_read_format_rar_compress_normal)
+DEFINE_TEST(test_read_format_rar_encryption_data)
+DEFINE_TEST(test_read_format_rar_encryption_header)
+DEFINE_TEST(test_read_format_rar_encryption_partially)
+DEFINE_TEST(test_read_format_rar_endarc_huge)
+DEFINE_TEST(test_read_format_rar_filter)
+DEFINE_TEST(test_read_format_rar_invalid1)
 DEFINE_TEST(test_read_format_rar_multi_lzss_blocks)
-DEFINE_TEST(test_read_format_rar_compress_best)
-DEFINE_TEST(test_read_format_rar_ppmd_lzss_conversion)
-DEFINE_TEST(test_read_format_rar_binary)
-DEFINE_TEST(test_read_format_rar_windows)
 DEFINE_TEST(test_read_format_rar_multivolume)
-DEFINE_TEST(test_read_format_rar_multivolume_w)
+DEFINE_TEST(test_read_format_rar_multivolume_seek_data)
+DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
 DEFINE_TEST(test_read_format_rar_multivolume_skip)
-DEFINE_TEST(test_read_format_rar_sfx)
 DEFINE_TEST(test_read_format_rar_multivolume_stored_file)
 DEFINE_TEST(test_read_format_rar_multivolume_stored_file_skip)
-DEFINE_TEST(test_read_format_rar_multivolume_seek_data)
-DEFINE_TEST(test_read_format_rar_multivolume_seek_multiple_files)
 DEFINE_TEST(test_read_format_rar_multivolume_uncompressed_files)
-DEFINE_TEST(test_read_format_rar_endarc_huge)
+DEFINE_TEST(test_read_format_rar_multivolume_w)
+DEFINE_TEST(test_read_format_rar_newsub_huge)
+DEFINE_TEST(test_read_format_rar_noeof)
+DEFINE_TEST(test_read_format_rar_overflow)
+DEFINE_TEST(test_read_format_rar_ppmd_lzss_conversion)
 DEFINE_TEST(test_read_format_rar_ppmd_use_after_free)
 DEFINE_TEST(test_read_format_rar_ppmd_use_after_free2)
-DEFINE_TEST(test_read_format_rar_newsub_huge)
+DEFINE_TEST(test_read_format_rar_set_format)
+DEFINE_TEST(test_read_format_rar_sfx)
+DEFINE_TEST(test_read_format_rar_subblock)
 DEFINE_TEST(test_read_format_rar_symlink_huge)
-DEFINE_TEST(test_read_format_rar4_encrypted)
-DEFINE_TEST(test_read_format_rar4_encrypted_filenames)
-DEFINE_TEST(test_read_format_rar4_solid_encrypted)
-DEFINE_TEST(test_read_format_rar4_solid_encrypted_filenames)
-DEFINE_TEST(test_read_format_rar5_encrypted)
-DEFINE_TEST(test_read_format_rar5_encrypted_filenames)
-DEFINE_TEST(test_read_format_rar5_solid_encrypted)
-DEFINE_TEST(test_read_format_rar5_solid_encrypted_filenames)
-DEFINE_TEST(test_read_format_rar_encryption_data)
-DEFINE_TEST(test_read_format_rar_encryption_header)
-DEFINE_TEST(test_read_format_rar_encryption_partially)
-DEFINE_TEST(test_read_format_rar_filter)
-DEFINE_TEST(test_read_format_rar_invalid1)
-DEFINE_TEST(test_read_format_rar_overflow)
+DEFINE_TEST(test_read_format_rar_unicode_CP932)
+DEFINE_TEST(test_read_format_rar_unicode_UTF8)
+DEFINE_TEST(test_read_format_rar_windows)
 DEFINE_TEST(test_read_format_raw)
 DEFINE_TEST(test_read_format_tar)
+DEFINE_TEST(test_read_format_tar_V_negative_size)
 DEFINE_TEST(test_read_format_tar_concatenated)
 DEFINE_TEST(test_read_format_tar_empty_filename)
 DEFINE_TEST(test_read_format_tar_empty_pax)
@@ -422,7 +428,6 @@ DEFINE_TEST(test_read_format_tar_mac_met
 DEFINE_TEST(test_read_format_tar_pax_g_large)
 DEFINE_TEST(test_read_format_tar_pax_large_attr)
 DEFINE_TEST(test_read_format_tar_pax_negative_time)
-DEFINE_TEST(test_read_format_tar_V_negative_size)
 DEFINE_TEST(test_read_format_tbz)
 DEFINE_TEST(test_read_format_tgz)
 DEFINE_TEST(test_read_format_tlz)
@@ -432,62 +437,49 @@ DEFINE_TEST(test_read_format_ustar_filen
 DEFINE_TEST(test_read_format_warc)
 DEFINE_TEST(test_read_format_warc_incomplete)
 DEFINE_TEST(test_read_format_xar)
-DEFINE_TEST(test_read_format_xar_duplicate_filename_node)
 DEFINE_TEST(test_read_format_xar_doublelink)
-DEFINE_TEST(test_read_format_zip_utf8_paths)
+DEFINE_TEST(test_read_format_xar_duplicate_filename_node)
 DEFINE_TEST(test_read_format_zip)
-DEFINE_TEST(test_read_format_zip_ppmd_one_file)
-DEFINE_TEST(test_read_format_zip_ppmd_one_file_blockread)
-DEFINE_TEST(test_read_format_zip_ppmd_multi)
-DEFINE_TEST(test_read_format_zip_ppmd_multi_blockread)
-DEFINE_TEST(test_read_format_zip_lzma_one_file)
-DEFINE_TEST(test_read_format_zip_lzma_one_file_blockread)
-DEFINE_TEST(test_read_format_zip_lzma_multi)
-DEFINE_TEST(test_read_format_zip_lzma_multi_blockread)
-DEFINE_TEST(test_read_format_zip_bzip2_one_file)
-DEFINE_TEST(test_read_format_zip_bzip2_one_file_blockread)
+DEFINE_TEST(test_read_format_zip_7z_deflate)
+DEFINE_TEST(test_read_format_zip_7z_lzma)
+DEFINE_TEST(test_read_format_zip_bz2_hang_on_invalid)
 DEFINE_TEST(test_read_format_zip_bzip2_multi)
 DEFINE_TEST(test_read_format_zip_bzip2_multi_blockread)
-DEFINE_TEST(test_read_format_zip_zstd_one_file)
-DEFINE_TEST(test_read_format_zip_zstd_one_file_blockread)
-DEFINE_TEST(test_read_format_zip_zstd_multi)
-DEFINE_TEST(test_read_format_zip_zstd_multi_blockread)
-DEFINE_TEST(test_read_format_zip_xz_multi)
-DEFINE_TEST(test_read_format_zip_xz_multi_blockread)
-DEFINE_TEST(test_read_format_zip_ppmd8_crash_1)
-DEFINE_TEST(test_read_format_zip_bz2_hang_on_invalid)
-DEFINE_TEST(test_read_format_zip_ppmd8_crash_2)
-DEFINE_TEST(test_read_format_zip_lzma_alone_leak)
-DEFINE_TEST(test_read_format_zip_lzma_stream_end)
-DEFINE_TEST(test_read_format_zip_lzma_stream_end_blockread)
-DEFINE_TEST(test_read_format_zip_7z_lzma)
-DEFINE_TEST(test_read_format_zip_7z_deflate)
+DEFINE_TEST(test_read_format_zip_bzip2_one_file)
+DEFINE_TEST(test_read_format_zip_bzip2_one_file_blockread)
 DEFINE_TEST(test_read_format_zip_comment_stored)
 DEFINE_TEST(test_read_format_zip_encryption_data)
 DEFINE_TEST(test_read_format_zip_encryption_header)
 DEFINE_TEST(test_read_format_zip_encryption_partially)
 DEFINE_TEST(test_read_format_zip_extra_padding)
-DEFINE_TEST(test_read_format_zip_filename_CP932_eucJP)
-DEFINE_TEST(test_read_format_zip_filename_CP932_UTF8)
-DEFINE_TEST(test_read_format_zip_filename_UTF8_eucJP)
-DEFINE_TEST(test_read_format_zip_filename_UTF8_UTF8)
+DEFINE_TEST(test_read_format_zip_filename_CP866_CP1251)
+DEFINE_TEST(test_read_format_zip_filename_CP866_CP1251_win)
 DEFINE_TEST(test_read_format_zip_filename_CP866_KOI8R)
 DEFINE_TEST(test_read_format_zip_filename_CP866_UTF8)
+DEFINE_TEST(test_read_format_zip_filename_CP932_CP932)
+DEFINE_TEST(test_read_format_zip_filename_CP932_UTF8)
+DEFINE_TEST(test_read_format_zip_filename_CP932_eucJP)
+DEFINE_TEST(test_read_format_zip_filename_KOI8R_CP1251)
 DEFINE_TEST(test_read_format_zip_filename_KOI8R_CP866)
 DEFINE_TEST(test_read_format_zip_filename_KOI8R_UTF8)
-DEFINE_TEST(test_read_format_zip_filename_UTF8_KOI8R)
+DEFINE_TEST(test_read_format_zip_filename_KOI8R_UTF8_2)
+DEFINE_TEST(test_read_format_zip_filename_UTF8_CP1251)
 DEFINE_TEST(test_read_format_zip_filename_UTF8_CP866)
-DEFINE_TEST(test_read_format_zip_filename_UTF8_UTF8_ru)
-DEFINE_TEST(test_read_format_zip_filename_CP932_CP932)
 DEFINE_TEST(test_read_format_zip_filename_UTF8_CP932)
-DEFINE_TEST(test_read_format_zip_filename_CP866_CP1251)
-DEFINE_TEST(test_read_format_zip_filename_CP866_CP1251_win)
-DEFINE_TEST(test_read_format_zip_filename_KOI8R_CP1251)
-DEFINE_TEST(test_read_format_zip_filename_UTF8_CP1251)
-DEFINE_TEST(test_read_format_zip_filename_KOI8R_UTF8_2)
+DEFINE_TEST(test_read_format_zip_filename_UTF8_KOI8R)
+DEFINE_TEST(test_read_format_zip_filename_UTF8_UTF8)
+DEFINE_TEST(test_read_format_zip_filename_UTF8_UTF8_ru)
+DEFINE_TEST(test_read_format_zip_filename_UTF8_eucJP)
 DEFINE_TEST(test_read_format_zip_high_compression)
 DEFINE_TEST(test_read_format_zip_high_compression2)
 DEFINE_TEST(test_read_format_zip_jar)
+DEFINE_TEST(test_read_format_zip_lzma_alone_leak)
+DEFINE_TEST(test_read_format_zip_lzma_multi)
+DEFINE_TEST(test_read_format_zip_lzma_multi_blockread)
+DEFINE_TEST(test_read_format_zip_lzma_one_file)
+DEFINE_TEST(test_read_format_zip_lzma_one_file_blockread)
+DEFINE_TEST(test_read_format_zip_lzma_stream_end)
+DEFINE_TEST(test_read_format_zip_lzma_stream_end_blockread)
 DEFINE_TEST(test_read_format_zip_mac_metadata)
 DEFINE_TEST(test_read_format_zip_malformed)
 DEFINE_TEST(test_read_format_zip_msdos)
@@ -496,15 +488,28 @@ DEFINE_TEST(test_read_format_zip_nofilet
 DEFINE_TEST(test_read_format_zip_padded1)
 DEFINE_TEST(test_read_format_zip_padded2)
 DEFINE_TEST(test_read_format_zip_padded3)
+DEFINE_TEST(test_read_format_zip_ppmd8_crash_1)
+DEFINE_TEST(test_read_format_zip_ppmd8_crash_2)
+DEFINE_TEST(test_read_format_zip_ppmd_multi)
+DEFINE_TEST(test_read_format_zip_ppmd_multi_blockread)
+DEFINE_TEST(test_read_format_zip_ppmd_one_file)
+DEFINE_TEST(test_read_format_zip_ppmd_one_file_blockread)
 DEFINE_TEST(test_read_format_zip_sfx)
 DEFINE_TEST(test_read_format_zip_traditional_encryption_data)
+DEFINE_TEST(test_read_format_zip_utf8_paths)
 DEFINE_TEST(test_read_format_zip_winzip_aes128)
 DEFINE_TEST(test_read_format_zip_winzip_aes256)
-DEFINE_TEST(test_read_format_zip_winzip_aes256_stored)
 DEFINE_TEST(test_read_format_zip_winzip_aes256_large)
+DEFINE_TEST(test_read_format_zip_winzip_aes256_stored)
 DEFINE_TEST(test_read_format_zip_with_invalid_traditional_eocd)
+DEFINE_TEST(test_read_format_zip_xz_multi)
+DEFINE_TEST(test_read_format_zip_xz_multi_blockread)
 DEFINE_TEST(test_read_format_zip_zip64a)
 DEFINE_TEST(test_read_format_zip_zip64b)
+DEFINE_TEST(test_read_format_zip_zstd_multi)
+DEFINE_TEST(test_read_format_zip_zstd_multi_blockread)
+DEFINE_TEST(test_read_format_zip_zstd_one_file)
+DEFINE_TEST(test_read_format_zip_zstd_one_file_blockread)
 DEFINE_TEST(test_read_large)
 DEFINE_TEST(test_read_pax_empty_val_no_nl)
 DEFINE_TEST(test_read_pax_truncated)
@@ -513,10 +518,6 @@ DEFINE_TEST(test_read_pax_xattr_schily)
 DEFINE_TEST(test_read_position)
 DEFINE_TEST(test_read_set_format)
 DEFINE_TEST(test_read_set_wrong_format)
-DEFINE_TEST(test_read_append_filter)
-DEFINE_TEST(test_read_append_wrong_filter)
-DEFINE_TEST(test_read_append_filter_program)
-DEFINE_TEST(test_read_append_filter_wrong_program)
 DEFINE_TEST(test_read_too_many_filters)
 DEFINE_TEST(test_read_truncated)
 DEFINE_TEST(test_read_truncated_filter_bzip2)
@@ -528,24 +529,23 @@ DEFINE_TEST(test_read_truncated_filter_l
 DEFINE_TEST(test_read_truncated_filter_xz)
 DEFINE_TEST(test_short_writes)
 DEFINE_TEST(test_sparse_basic)
-DEFINE_TEST(test_fully_sparse_files)
 DEFINE_TEST(test_tar_filenames)
 DEFINE_TEST(test_tar_large)
-DEFINE_TEST(test_ustar_filename_encoding_UTF8_CP866)
-DEFINE_TEST(test_ustar_filename_encoding_KOI8R_UTF8)
-DEFINE_TEST(test_ustar_filename_encoding_KOI8R_CP866)
 DEFINE_TEST(test_ustar_filename_encoding_CP1251_UTF8)
-DEFINE_TEST(test_ustar_filename_encoding_ru_RU_CP1251)
-DEFINE_TEST(test_ustar_filename_encoding_Russian_Russia)
-DEFINE_TEST(test_ustar_filename_encoding_EUCJP_UTF8)
-DEFINE_TEST(test_ustar_filename_encoding_EUCJP_CP932)
 DEFINE_TEST(test_ustar_filename_encoding_CP932_UTF8)
+DEFINE_TEST(test_ustar_filename_encoding_EUCJP_CP932)
+DEFINE_TEST(test_ustar_filename_encoding_EUCJP_UTF8)
+DEFINE_TEST(test_ustar_filename_encoding_KOI8R_CP866)
+DEFINE_TEST(test_ustar_filename_encoding_KOI8R_UTF8)
+DEFINE_TEST(test_ustar_filename_encoding_Russian_Russia)
 DEFINE_TEST(test_ustar_filename_encoding_UTF16_win)
+DEFINE_TEST(test_ustar_filename_encoding_UTF8_CP866)
+DEFINE_TEST(test_ustar_filename_encoding_ru_RU_CP1251)
 DEFINE_TEST(test_ustar_filenames)
 DEFINE_TEST(test_warn_missing_hardlink_target)
+DEFINE_TEST(test_write_disk)
 DEFINE_TEST(test_write_disk_appledouble)
 DEFINE_TEST(test_write_disk_appledouble_zip)
-DEFINE_TEST(test_write_disk)
 DEFINE_TEST(test_write_disk_failures)
 DEFINE_TEST(test_write_disk_fixup)
 DEFINE_TEST(test_write_disk_hardlink)
@@ -554,11 +554,11 @@ DEFINE_TEST(test_write_disk_lookup)
 DEFINE_TEST(test_write_disk_mac_metadata)
 DEFINE_TEST(test_write_disk_no_hfs_compression)
 DEFINE_TEST(test_write_disk_perms)
+DEFINE_TEST(test_write_disk_secure)
 DEFINE_TEST(test_write_disk_secure744)
 DEFINE_TEST(test_write_disk_secure745)
 DEFINE_TEST(test_write_disk_secure746a)
 DEFINE_TEST(test_write_disk_secure746b)
-DEFINE_TEST(test_write_disk_secure)
 DEFINE_TEST(test_write_disk_secure_noabsolutepaths)
 DEFINE_TEST(test_write_disk_sparse)
 DEFINE_TEST(test_write_disk_symlink)
@@ -570,12 +570,12 @@ DEFINE_TEST(test_write_filter_gzip)
 DEFINE_TEST(test_write_filter_gzip_timestamp)
 DEFINE_TEST(test_write_filter_lrzip)
 DEFINE_TEST(test_write_filter_lz4)
-DEFINE_TEST(test_write_filter_lz4_disable_stream_checksum)
-DEFINE_TEST(test_write_filter_lz4_enable_block_checksum)
+DEFINE_TEST(test_write_filter_lz4_block_dependence)
 DEFINE_TEST(test_write_filter_lz4_block_size_4)
 DEFINE_TEST(test_write_filter_lz4_block_size_5)
 DEFINE_TEST(test_write_filter_lz4_block_size_6)
-DEFINE_TEST(test_write_filter_lz4_block_dependence)
+DEFINE_TEST(test_write_filter_lz4_disable_stream_checksum)
+DEFINE_TEST(test_write_filter_lz4_enable_block_checksum)
 DEFINE_TEST(test_write_filter_lzip)
 DEFINE_TEST(test_write_filter_lzma)
 DEFINE_TEST(test_write_filter_lzop)
@@ -608,43 +608,43 @@ DEFINE_TEST(test_write_format_cpio_odc)
 DEFINE_TEST(test_write_format_gnutar)
 DEFINE_TEST(test_write_format_gnutar_filenames)
 DEFINE_TEST(test_write_format_gnutar_linknames)
-DEFINE_TEST(test_write_format_iso9660_boot)
 DEFINE_TEST(test_write_format_iso9660)
+DEFINE_TEST(test_write_format_iso9660_boot)
 DEFINE_TEST(test_write_format_iso9660_empty)
 DEFINE_TEST(test_write_format_iso9660_filename)
 DEFINE_TEST(test_write_format_iso9660_zisofs)
-DEFINE_TEST(test_write_format_mtree_absolute_path)
 DEFINE_TEST(test_write_format_mtree)
-DEFINE_TEST(test_write_format_mtree_no_leading_dotslash)
+DEFINE_TEST(test_write_format_mtree_absolute_path)
 DEFINE_TEST(test_write_format_mtree_classic)
 DEFINE_TEST(test_write_format_mtree_classic_indent)
-DEFINE_TEST(test_write_format_mtree_fflags)
-DEFINE_TEST(test_write_format_mtree_no_separator)
-DEFINE_TEST(test_write_format_mtree_digests_no_digests_set_no_data)
-DEFINE_TEST(test_write_format_mtree_digests_no_digests_set_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_no_digests_set_non_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_md5_digest_set_non_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_no_data)
+DEFINE_TEST(test_write_format_mtree_digests_no_digests_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_no_digests_set_no_data)
+DEFINE_TEST(test_write_format_mtree_digests_no_digests_set_non_empty_data)
 DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_rmd160_digest_set_non_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha1_digest_set_non_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha256_digest_set_non_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha384_digest_set_non_empty_data)
-DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_empty_data)
+DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_no_data)
 DEFINE_TEST(test_write_format_mtree_digests_sha512_digest_set_non_empty_data)
+DEFINE_TEST(test_write_format_mtree_fflags)
+DEFINE_TEST(test_write_format_mtree_no_leading_dotslash)
+DEFINE_TEST(test_write_format_mtree_no_separator)
 DEFINE_TEST(test_write_format_mtree_quoted_filename)
 DEFINE_TEST(test_write_format_pax)
-DEFINE_TEST(test_write_format_raw_b64)
 DEFINE_TEST(test_write_format_raw)
+DEFINE_TEST(test_write_format_raw_b64)
 DEFINE_TEST(test_write_format_shar_empty)
 DEFINE_TEST(test_write_format_tar)
 DEFINE_TEST(test_write_format_tar_empty)
@@ -655,35 +655,35 @@ DEFINE_TEST(test_write_format_warc)
 DEFINE_TEST(test_write_format_warc_empty)
 DEFINE_TEST(test_write_format_xar)
 DEFINE_TEST(test_write_format_xar_empty)
-DEFINE_TEST(test_write_format_zip64_stream)
 DEFINE_TEST(test_write_format_zip)
 DEFINE_TEST(test_write_format_zip64)
-DEFINE_TEST(test_write_format_zip_traditional_pkware_encryption)
-DEFINE_TEST(test_write_format_zip_winzip_aes128_encryption)
-DEFINE_TEST(test_write_format_zip_winzip_aes256_encryption)
+DEFINE_TEST(test_write_format_zip64_stream)
 DEFINE_TEST(test_write_format_zip_compression_bzip2)
 DEFINE_TEST(test_write_format_zip_compression_lzmaxz)
 DEFINE_TEST(test_write_format_zip_compression_store)
 DEFINE_TEST(test_write_format_zip_compression_zstd)
 DEFINE_TEST(test_write_format_zip_empty)
 DEFINE_TEST(test_write_format_zip_empty_zip64)
-DEFINE_TEST(test_write_format_zip_size_unset)
 DEFINE_TEST(test_write_format_zip_file)
 DEFINE_TEST(test_write_format_zip_file_zip64)
 DEFINE_TEST(test_write_format_zip_large)
+DEFINE_TEST(test_write_format_zip_size_unset)
 DEFINE_TEST(test_write_format_zip_stream)
+DEFINE_TEST(test_write_format_zip_traditional_pkware_encryption)
 DEFINE_TEST(test_write_format_zip_windows_path)
+DEFINE_TEST(test_write_format_zip_winzip_aes128_encryption)
+DEFINE_TEST(test_write_format_zip_winzip_aes256_encryption)
 DEFINE_TEST(test_write_format_zip_zip64_oversize)
 DEFINE_TEST(test_write_open_memory)
 DEFINE_TEST(test_write_read_format_zip)
-DEFINE_TEST(test_write_read_format_zip_improved_streaming)
 DEFINE_TEST(test_write_read_format_zip64)
 DEFINE_TEST(test_write_read_format_zip64_improved_streaming)
+DEFINE_TEST(test_write_read_format_zip_improved_streaming)
 DEFINE_TEST(test_xattr_platform)
-DEFINE_TEST(test_zip_filename_encoding_UTF8)
+DEFINE_TEST(test_zip_filename_encoding_CP932)
+DEFINE_TEST(test_zip_filename_encoding_EUCJP)
 DEFINE_TEST(test_zip_filename_encoding_KOI8R)
-DEFINE_TEST(test_zip_filename_encoding_ru_RU_CP1251)
 DEFINE_TEST(test_zip_filename_encoding_Russian_Russia)
-DEFINE_TEST(test_zip_filename_encoding_EUCJP)
-DEFINE_TEST(test_zip_filename_encoding_CP932)
 DEFINE_TEST(test_zip_filename_encoding_UTF16_win)
+DEFINE_TEST(test_zip_filename_encoding_UTF8)
+DEFINE_TEST(test_zip_filename_encoding_ru_RU_CP1251)

Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c:1.3     Sat Oct 19 05:39:59 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c Tue Dec 23 14:01:24 2025
@@ -202,7 +202,7 @@ static int64_t
 file_skip(struct archive *a, void *data, int64_t request)
 {
   struct mydata *mydata = (struct mydata *)data;
-  int64_t result = lseek(mydata->fd, SEEK_CUR, request);
+  int64_t result = lseek(mydata->fd, request, SEEK_CUR);
   if (result >= 0)
     return result;
   archive_set_error(a, errno, "Error seeking in '%s'", mydata->filename);

Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c:1.9       Mon Apr 28 10:31:34 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c   Tue Dec 23 14:01:24 2025
@@ -94,21 +94,21 @@ searchgid(void)
        close(fd);
 }
 
-static int
+static long
 altgid(void)
 {
        searchgid();
        return (_alt_gid);
 }
 
-static int
+static long
 invalidgid(void)
 {
        searchgid();
        return (_invalid_gid);
 }
 
-static int
+static long
 defaultgid(void)
 {
        searchgid();

Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c:1.5     Sun Nov  2 08:52:15 2025
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c Tue Dec 23 14:01:24 2025
@@ -40,7 +40,8 @@ DEFINE_TEST(test_write_filter_bzip2)
        size_t buffsize, datasize;
        char path[16];
        size_t used1, used2;
-       int i, r, use_prog;
+       ssize_t r;
+       int i, use_prog;
 
        buffsize = 2000000;
        assert(NULL != (buff = malloc(buffsize)));

Index: pkgsrc/archivers/libarchive/files/tar/subst.c
diff -u pkgsrc/archivers/libarchive/files/tar/subst.c:1.11 pkgsrc/archivers/libarchive/files/tar/subst.c:1.12
--- pkgsrc/archivers/libarchive/files/tar/subst.c:1.11  Sun Nov  2 08:52:15 2025
+++ pkgsrc/archivers/libarchive/files/tar/subst.c       Tue Dec 23 14:01:24 2025
@@ -235,7 +235,9 @@ apply_substitution(struct bsdtar *bsdtar
                        (*result)[0] = 0;
                }
 
-               while (1) {
+               char isEnd = 0;
+               do {
+            isEnd = *name == '\0';
                        if (regexec(&rule->re, name, 10, matches, 0))
                                break;
 
@@ -290,12 +292,15 @@ apply_substitution(struct bsdtar *bsdtar
                        }
 
                        realloc_strcat(result, rule->result + j);
-
-                       name += matches[0].rm_eo;
-
-                       if (!rule->global)
-                               break;
-               }
+                       if (matches[0].rm_eo > 0) {
+                name += matches[0].rm_eo;
+            } else {
+                // We skip a character because the match is 0-length
+                // so we need to add it to the output
+                realloc_strncat(result, name, 1);
+                name += 1;
+            }
+               } while (rule->global && !isEnd); // Testing one step after because sed et al. run 0-length patterns a last time on the empty string at the end
        }
 
        if (got_match)

Index: pkgsrc/archivers/libarchive/files/tar/test/list.h
diff -u pkgsrc/archivers/libarchive/files/tar/test/list.h:1.14 pkgsrc/archivers/libarchive/files/tar/test/list.h:1.15
--- pkgsrc/archivers/libarchive/files/tar/test/list.h:1.14      Thu Nov 20 06:08:28 2025
+++ pkgsrc/archivers/libarchive/files/tar/test/list.h   Tue Dec 23 14:01:24 2025
@@ -3,45 +3,50 @@ DEFINE_TEST(test_basic)
 DEFINE_TEST(test_copy)
 DEFINE_TEST(test_crlf_mtree)
 DEFINE_TEST(test_empty_mtree)
+DEFINE_TEST(test_extract_tar_Z)
+DEFINE_TEST(test_extract_tar_absolute_paths)
 DEFINE_TEST(test_extract_tar_bz2)
 DEFINE_TEST(test_extract_tar_grz)
 DEFINE_TEST(test_extract_tar_gz)
 DEFINE_TEST(test_extract_tar_lrz)
-DEFINE_TEST(test_extract_tar_lz4)
 DEFINE_TEST(test_extract_tar_lz)
+DEFINE_TEST(test_extract_tar_lz4)
 DEFINE_TEST(test_extract_tar_lzma)
 DEFINE_TEST(test_extract_tar_lzo)
 DEFINE_TEST(test_extract_tar_xz)
-DEFINE_TEST(test_extract_tar_Z)
 DEFINE_TEST(test_extract_tar_zstd)
 DEFINE_TEST(test_format_newc)
 DEFINE_TEST(test_help)
 DEFINE_TEST(test_leading_slash)
 DEFINE_TEST(test_list_item)
 DEFINE_TEST(test_missing_file)
+DEFINE_TEST(test_option_C_mtree)
+DEFINE_TEST(test_option_C_upper)
+DEFINE_TEST(test_option_H_upper)
+DEFINE_TEST(test_option_L_upper)
+DEFINE_TEST(test_option_O_upper)
+DEFINE_TEST(test_option_T_upper)
+DEFINE_TEST(test_option_U_upper)
+DEFINE_TEST(test_option_X_upper)
 DEFINE_TEST(test_option_a)
 DEFINE_TEST(test_option_acls)
-DEFINE_TEST(test_option_b64encode)
 DEFINE_TEST(test_option_b)
-DEFINE_TEST(test_option_C_mtree)
-DEFINE_TEST(test_option_C_upper)
+DEFINE_TEST(test_option_b64encode)
 DEFINE_TEST(test_option_exclude)
 DEFINE_TEST(test_option_exclude_vcs)
 DEFINE_TEST(test_option_fflags)
 DEFINE_TEST(test_option_gid_gname)
 DEFINE_TEST(test_option_group)
 DEFINE_TEST(test_option_grzip)
-DEFINE_TEST(test_option_H_upper)
-DEFINE_TEST(test_option_ignore_zeros_mode_t)
-DEFINE_TEST(test_option_ignore_zeros_mode_x)
 DEFINE_TEST(test_option_ignore_zeros_mode_c)
 DEFINE_TEST(test_option_ignore_zeros_mode_r)
+DEFINE_TEST(test_option_ignore_zeros_mode_t)
 DEFINE_TEST(test_option_ignore_zeros_mode_u)
+DEFINE_TEST(test_option_ignore_zeros_mode_x)
 DEFINE_TEST(test_option_j)
 DEFINE_TEST(test_option_k)
 DEFINE_TEST(test_option_keep_newer_files)
 DEFINE_TEST(test_option_lrzip)
-DEFINE_TEST(test_option_L_upper)
 DEFINE_TEST(test_option_lz4)
 DEFINE_TEST(test_option_lzma)
 DEFINE_TEST(test_option_lzop)
@@ -50,20 +55,15 @@ DEFINE_TEST(test_option_n)
 DEFINE_TEST(test_option_newer_than)
 DEFINE_TEST(test_option_nodump)
 DEFINE_TEST(test_option_older_than)
-DEFINE_TEST(test_option_O_upper)
 DEFINE_TEST(test_option_owner)
 DEFINE_TEST(test_option_passphrase)
-DEFINE_TEST(test_extract_tar_absolute_paths)
 DEFINE_TEST(test_option_q)
 DEFINE_TEST(test_option_r)
-DEFINE_TEST(test_option_safe_writes)
 DEFINE_TEST(test_option_s)
-DEFINE_TEST(test_option_T_upper)
+DEFINE_TEST(test_option_safe_writes)
 DEFINE_TEST(test_option_uid_uname)
 DEFINE_TEST(test_option_uuencode)
-DEFINE_TEST(test_option_U_upper)
 DEFINE_TEST(test_option_xattrs)
-DEFINE_TEST(test_option_X_upper)
 DEFINE_TEST(test_option_xz)
 DEFINE_TEST(test_option_z)
 DEFINE_TEST(test_option_zstd)

Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c:1.8 pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c:1.9
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c:1.8      Mon Apr 28 10:31:35 2025
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c  Tue Dec 23 14:01:24 2025
@@ -42,7 +42,13 @@ DEFINE_TEST(test_option_s)
        systemf("%s -cf test1_2.tar -s /d1/d2/ in/d1/foo", testprog);
        systemf("%s -xf test1_2.tar -C test1", testprog);
        assertFileContents("foo", 3, "test1/in/d2/foo");
-
+       systemf("%s -cf test1_3.tar -s /o/#/g in/d1/foo", testprog);
+       systemf("%s -xf test1_3.tar -C test1", testprog);
+       assertFileContents("foo", 3, "test1/in/d1/f##");
+       // For the 0-length pattern check, remember that "test1/" isn't part of the string affected by the regexp
+       systemf("%s -cf test1_4.tar -s /f*/\\<~\\>/g in/d1/foo", testprog);
+       systemf("%s -xf test1_4.tar -C test1", testprog);
+       assertFileContents("foo", 3, "test1/<>i<>n<>/<>d<>1<>/<f><>o<>o<>");
        /*
         * Test 2: Basic substitution when extracting archive.
         */



Home | Main Index | Thread Index | Old Index