[Midnightbsd-cvs] [MidnightBSD/src] d4bd62: Vendor import of libarchive 3.8.5

Lucas Holt noreply at github.com
Sun Jun 7 00:20:22 EDT 2026 

  Branch: refs/heads/stable/4.0
  Home:   https://github.com/MidnightBSD/src
  Commit: d4bd62179a944687e3e3241855613c5498dbc2c0
      https://github.com/MidnightBSD/src/commit/d4bd62179a944687e3e3241855613c5498dbc2c0
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-04-22 (Wed, 22 Apr 2026)

  Changed paths:
    M .cirrus.yml
    M .github/workflows/ci.yml
    M .github/workflows/cifuzz.yml
    M .github/workflows/codeql.yml
    M .github/workflows/scorecard.yml
    M CMakeLists.txt
    M Makefile.am
    M NEWS
    M README.md
    M SECURITY.md
    M build/ci/cirrus_ci/ci.sh
    M build/ci/github_actions/install-macos-dependencies.sh
    M build/cmake/config.h.in
    M build/version
    M cat/CMakeLists.txt
    M cat/bsdcat.c
    M cat/cmdline.c
    M configure.ac
    M contrib/android/Android.mk
    M contrib/android/config/android.h
    M contrib/android/config/linux_host.h
    M contrib/android/config/windows_host.h
    M contrib/android/include/android_lf.h
    A contrib/oss-fuzz/fuzz_helpers.h
    A contrib/oss-fuzz/libarchive_7zip_fuzzer.cc
    A contrib/oss-fuzz/libarchive_7zip_fuzzer.dict
    A contrib/oss-fuzz/libarchive_7zip_fuzzer.options
    A contrib/oss-fuzz/libarchive_ar_fuzzer.cc
    A contrib/oss-fuzz/libarchive_ar_fuzzer.dict
    A contrib/oss-fuzz/libarchive_cab_fuzzer.cc
    A contrib/oss-fuzz/libarchive_cab_fuzzer.dict
    A contrib/oss-fuzz/libarchive_cpio_fuzzer.cc
    A contrib/oss-fuzz/libarchive_cpio_fuzzer.dict
    A contrib/oss-fuzz/libarchive_encryption_fuzzer.cc
    A contrib/oss-fuzz/libarchive_encryption_fuzzer.options
    A contrib/oss-fuzz/libarchive_entry_fuzzer.cc
    A contrib/oss-fuzz/libarchive_filter_fuzzer.cc
    A contrib/oss-fuzz/libarchive_filter_fuzzer.dict
    A contrib/oss-fuzz/libarchive_filter_fuzzer.options
    M contrib/oss-fuzz/libarchive_fuzzer.cc
    A contrib/oss-fuzz/libarchive_fuzzer.dict
    A contrib/oss-fuzz/libarchive_fuzzer.options
    A contrib/oss-fuzz/libarchive_iso9660_fuzzer.cc
    A contrib/oss-fuzz/libarchive_iso9660_fuzzer.dict
    A contrib/oss-fuzz/libarchive_iso9660_fuzzer.options
    A contrib/oss-fuzz/libarchive_lha_fuzzer.cc
    A contrib/oss-fuzz/libarchive_lha_fuzzer.dict
    A contrib/oss-fuzz/libarchive_linkify_fuzzer.cc
    A contrib/oss-fuzz/libarchive_match_fuzzer.cc
    A contrib/oss-fuzz/libarchive_mtree_fuzzer.cc
    A contrib/oss-fuzz/libarchive_mtree_fuzzer.dict
    A contrib/oss-fuzz/libarchive_rar5_fuzzer.cc
    A contrib/oss-fuzz/libarchive_rar5_fuzzer.dict
    A contrib/oss-fuzz/libarchive_rar_fuzzer.cc
    A contrib/oss-fuzz/libarchive_read_disk_fuzzer.cc
    A contrib/oss-fuzz/libarchive_roundtrip_fuzzer.cc
    A contrib/oss-fuzz/libarchive_roundtrip_fuzzer.options
    A contrib/oss-fuzz/libarchive_seek_fuzzer.cc
    A contrib/oss-fuzz/libarchive_seek_fuzzer.options
    A contrib/oss-fuzz/libarchive_string_fuzzer.cc
    A contrib/oss-fuzz/libarchive_tar_fuzzer.cc
    A contrib/oss-fuzz/libarchive_tar_fuzzer.dict
    A contrib/oss-fuzz/libarchive_warc_fuzzer.cc
    A contrib/oss-fuzz/libarchive_warc_fuzzer.dict
    A contrib/oss-fuzz/libarchive_write_disk_fuzzer.cc
    A contrib/oss-fuzz/libarchive_write_disk_fuzzer.options
    A contrib/oss-fuzz/libarchive_write_fuzzer.cc
    A contrib/oss-fuzz/libarchive_xar_fuzzer.cc
    A contrib/oss-fuzz/libarchive_xar_fuzzer.dict
    A contrib/oss-fuzz/libarchive_xar_fuzzer.options
    A contrib/oss-fuzz/libarchive_zip_fuzzer.cc
    A contrib/oss-fuzz/libarchive_zip_fuzzer.dict
    M contrib/oss-fuzz/oss-fuzz-build.sh
    M cpio/CMakeLists.txt
    M cpio/cmdline.c
    M cpio/cpio.c
    M cpio/cpio_windows.c
    M cpio/test/CMakeLists.txt
    M cpio/test/test_owner_parse.c
    M libarchive/CMakeLists.txt
    M libarchive/archive.h
    M libarchive/archive_acl.c
    M libarchive/archive_check_magic.c
    M libarchive/archive_cryptor.c
    M libarchive/archive_cryptor_private.h
    M libarchive/archive_disk_acl_darwin.c
    M libarchive/archive_entry.h
    M libarchive/archive_entry_paths.3
    M libarchive/archive_entry_stat.3
    M libarchive/archive_entry_stat.c
    M libarchive/archive_parse_date.c
    M libarchive/archive_platform.h
    A libarchive/archive_platform_stat.h
    M libarchive/archive_private.h
    M libarchive/archive_read.c
    M libarchive/archive_read_disk_entry_from_file.c
    M libarchive/archive_read_disk_posix.c
    M libarchive/archive_read_disk_windows.c
    M libarchive/archive_read_open_fd.c
    M libarchive/archive_read_open_file.c
    M libarchive/archive_read_open_filename.c
    M libarchive/archive_read_set_format.c
    M libarchive/archive_read_support_filter_lz4.c
    M libarchive/archive_read_support_filter_program.c
    M libarchive/archive_read_support_filter_uu.c
    M libarchive/archive_read_support_filter_zstd.c
    M libarchive/archive_read_support_format_7zip.c
    M libarchive/archive_read_support_format_cab.c
    M libarchive/archive_read_support_format_cpio.c
    M libarchive/archive_read_support_format_lha.c
    M libarchive/archive_read_support_format_mtree.c
    M libarchive/archive_read_support_format_rar.c
    M libarchive/archive_read_support_format_rar5.c
    M libarchive/archive_read_support_format_tar.c
    M libarchive/archive_read_support_format_warc.c
    M libarchive/archive_read_support_format_xar.c
    M libarchive/archive_read_support_format_zip.c
    M libarchive/archive_string.c
    M libarchive/archive_string.h
    M libarchive/archive_string_sprintf.c
    M libarchive/archive_util.c
    M libarchive/archive_version_details.c
    M libarchive/archive_windows.c
    M libarchive/archive_windows.h
    M libarchive/archive_write.c
    M libarchive/archive_write_add_filter_bzip2.c
    M libarchive/archive_write_add_filter_gzip.c
    M libarchive/archive_write_add_filter_program.c
    M libarchive/archive_write_add_filter_zstd.c
    M libarchive/archive_write_disk_posix.c
    M libarchive/archive_write_disk_windows.c
    M libarchive/archive_write_open_fd.c
    M libarchive/archive_write_open_file.c
    M libarchive/archive_write_open_filename.c
    M libarchive/archive_write_open_memory.c
    M libarchive/archive_write_set_format_7zip.c
    M libarchive/archive_write_set_format_mtree.c
    M libarchive/archive_write_set_format_shar.c
    M libarchive/archive_write_set_format_ustar.c
    M libarchive/archive_write_set_format_xar.c
    M libarchive/archive_write_set_format_zip.c
    M libarchive/filter_fork_posix.c
    A libarchive/module.modulemap
    M libarchive/test/CMakeLists.txt
    M libarchive/test/test_acl_nfs4.c
    M libarchive/test/test_acl_posix1e.c
    M libarchive/test/test_archive_parse_date.c
    M libarchive/test/test_archive_read_multiple_data_objects.c
    M libarchive/test/test_archive_string.c
    M libarchive/test/test_archive_string_conversion.c
    M libarchive/test/test_compat_lz4.c
    A libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu
    M libarchive/test/test_compat_lzip.c
    M libarchive/test/test_entry.c
    M libarchive/test/test_read_filter_gzip_recursive.c
    M libarchive/test/test_read_format_7zip.c
    A libarchive/test/test_read_format_7zip_issue2765.7z.uu
    A libarchive/test/test_read_format_7zip_issue2765.c
    M libarchive/test/test_read_format_rar5.c
    A libarchive/test/test_read_format_rar5_dirdata.rar.uu
    A libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
    A libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu
    A libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu
    A libarchive/test/test_read_format_tar_V_negative_size.c
    A libarchive/test/test_read_format_tar_V_negative_size.tar.uu
    M libarchive/test/test_read_set_format.c
    M libarchive/test/test_write_disk_perms.c
    M libarchive/test/test_write_filter_bzip2.c
    M libarchive/test/test_write_filter_gzip.c
    M libarchive/test/test_write_filter_gzip_timestamp.c
    M libarchive/test/test_write_format_mtree_preset_digests.c
    A libarchive_fe/lafe_err.c
    A libarchive_fe/lafe_err.h
    M libarchive_fe/line_reader.c
    M libarchive_fe/passphrase.c
    M tar/CMakeLists.txt
    M tar/bsdtar.c
    M tar/bsdtar.h
    M tar/bsdtar_windows.c
    M tar/bsdtar_windows.h
    M tar/cmdline.c
    M tar/creation_set.c
    M tar/read.c
    M tar/subst.c
    M tar/test/CMakeLists.txt
    A tar/test/test_crlf_mtree.c
    M tar/test/test_option_s.c
    M tar/test/test_option_safe_writes.c
    M tar/util.c
    M tar/write.c
    M test_utils/test_common.h
    M test_utils/test_main.c
    M unzip/CMakeLists.txt
    M unzip/bsdunzip.c
    M unzip/cmdline.c
    M unzip/la_queue.h
    M unzip/test/CMakeLists.txt
    M unzip/test/test_C.c
    M unzip/test/test_L.c
    M unzip/test/test_P_encryption.c
    M unzip/test/test_basic.c
    M unzip/test/test_d.c
    M unzip/test/test_doubledash.c
    M unzip/test/test_glob.c
    M unzip/test/test_j.c
    M unzip/test/test_n.c
    M unzip/test/test_o.c
    M unzip/test/test_p.c
    M unzip/test/test_q.c
    M unzip/test/test_singlefile.c
    M unzip/test/test_t.c
    M unzip/test/test_x.c

  Log Message:
  -----------
  Vendor import of libarchive 3.8.5


  Commit: 42a6989552031e996b15dbb1a4d18598adcf0181
      https://github.com/MidnightBSD/src/commit/42a6989552031e996b15dbb1a4d18598adcf0181
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-06-06 (Sat, 06 Jun 2026)

  Changed paths:
    M .cirrus.yml
    M CMakeLists.txt
    M Makefile.am
    M NEWS
    M README.md
    M build/cmake/config.h.in
    M build/version
    M configure.ac
    M contrib/android/Android.mk
    M contrib/oss-fuzz/libarchive_linkify_fuzzer.cc
    M contrib/untar.c
    M cpio/CMakeLists.txt
    M cpio/cmdline.c
    M cpio/cpio.c
    M cpio/cpio.h
    M cpio/test/test_format_newc.c
    M libarchive/archive.h
    M libarchive/archive_acl.c
    M libarchive/archive_check_magic.c
    M libarchive/archive_cryptor_private.h
    M libarchive/archive_entry.h
    M libarchive/archive_hmac.c
    M libarchive/archive_options.c
    M libarchive/archive_pathmatch.c
    M libarchive/archive_ppmd8.c
    M libarchive/archive_ppmd8_private.h
    M libarchive/archive_read.c
    M libarchive/archive_read_append_filter.c
    M libarchive/archive_read_disk_posix.c
    M libarchive/archive_read_disk_windows.c
    M libarchive/archive_read_open_filename.c
    M libarchive/archive_read_support_filter_grzip.c
    M libarchive/archive_read_support_filter_lz4.c
    M libarchive/archive_read_support_filter_lzop.c
    M libarchive/archive_read_support_filter_program.c
    M libarchive/archive_read_support_format_7zip.c
    M libarchive/archive_read_support_format_cab.c
    M libarchive/archive_read_support_format_cpio.c
    M libarchive/archive_read_support_format_iso9660.c
    M libarchive/archive_read_support_format_lha.c
    M libarchive/archive_read_support_format_mtree.c
    M libarchive/archive_read_support_format_rar.c
    M libarchive/archive_read_support_format_rar5.c
    M libarchive/archive_read_support_format_tar.c
    M libarchive/archive_read_support_format_xar.c
    M libarchive/archive_read_support_format_zip.c
    M libarchive/archive_string.c
    M libarchive/archive_write.c
    M libarchive/archive_write_add_filter_b64encode.c
    M libarchive/archive_write_add_filter_bzip2.c
    M libarchive/archive_write_add_filter_gzip.c
    M libarchive/archive_write_add_filter_lrzip.c
    M libarchive/archive_write_add_filter_lz4.c
    M libarchive/archive_write_add_filter_lzop.c
    M libarchive/archive_write_add_filter_uuencode.c
    M libarchive/archive_write_add_filter_xz.c
    M libarchive/archive_write_add_filter_zstd.c
    M libarchive/archive_write_disk_posix.c
    M libarchive/archive_write_disk_windows.c
    M libarchive/archive_write_set_format_7zip.c
    M libarchive/archive_write_set_format_cpio_binary.c
    M libarchive/archive_write_set_format_cpio_newc.c
    M libarchive/archive_write_set_format_cpio_odc.c
    M libarchive/archive_write_set_format_gnutar.c
    M libarchive/archive_write_set_format_iso9660.c
    M libarchive/archive_write_set_format_mtree.c
    M libarchive/archive_write_set_format_pax.c
    M libarchive/archive_write_set_format_ustar.c
    M libarchive/archive_write_set_format_v7tar.c
    M libarchive/archive_write_set_format_xar.c
    M libarchive/archive_write_set_format_zip.c
    M libarchive/test/CMakeLists.txt
    M libarchive/test/test_acl_text.c
    M libarchive/test/test_archive_pathmatch.c
    M libarchive/test/test_archive_string_conversion.c
    M libarchive/test/test_gnutar_filename_encoding.c
    M libarchive/test/test_read_format_7zip.c
    M libarchive/test/test_read_format_7zip_malformed.c
    A libarchive/test/test_read_format_7zip_malformed3.7z.uu
    A libarchive/test/test_read_format_7zip_sfx_elf64trunc.elf.uu
    A libarchive/test/test_read_format_cab_lzx_oob.c
    A libarchive/test/test_read_format_cab_lzx_oob.cab.uu
    A libarchive/test/test_read_format_cab_skip_malformed.c
    A libarchive/test/test_read_format_cab_skip_malformed.cab.uu
    A libarchive/test/test_read_format_iso_zisofs_overflow.c
    A libarchive/test/test_read_format_iso_zisofs_overflow.iso.uu
    A libarchive/test/test_read_format_lha_oversize_header.c
    A libarchive/test/test_read_format_lha_oversize_header.lzh.uu
    A libarchive/test/test_read_format_rar5_loop_bug.c
    A libarchive/test/test_read_format_rar5_loop_bug.rar.uu
    M libarchive/test/test_read_set_format.c
    M libarchive/test/test_ustar_filename_encoding.c
    A libarchive/test/test_v7tar_filename_encoding.c
    M libarchive/test/test_warn_missing_hardlink_target.c
    M libarchive/test/test_write_disk.c
    M libarchive/test/test_write_disk_perms.c
    M libarchive/test/test_zip_filename_encoding.c
    R libarchive_fe/err.c
    R libarchive_fe/err.h
    A libarchive_fe/lafe_getline.c
    A libarchive_fe/lafe_getline.h
    M tar/bsdtar.c
    M tar/read.c
    M tar/util.c
    M tar/write.c
    M test_utils/test_common.h
    M test_utils/test_main.c
    M unzip/CMakeLists.txt
    M unzip/bsdunzip.c
    R unzip/la_getline.c
    R unzip/la_getline.h
    M unzip/test/CMakeLists.txt

  Log Message:
  -----------
  Vendor import of libarchive 3.8.7


  Commit: ae169a9f08364e592524221652f4abd96ddaa548
      https://github.com/MidnightBSD/src/commit/ae169a9f08364e592524221652f4abd96ddaa548
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-06-07 (Sun, 07 Jun 2026)

  Changed paths:
    M contrib/libarchive/NEWS
    M contrib/libarchive/README.md
    M contrib/libarchive/SECURITY.md
    M contrib/libarchive/build/ci/github_actions/install-macos-dependencies.sh
    M contrib/libarchive/cat/bsdcat.c
    M contrib/libarchive/cat/cmdline.c
    A contrib/libarchive/contrib/oss-fuzz/fuzz_helpers.h
    A contrib/libarchive/contrib/oss-fuzz/libarchive_7zip_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_7zip_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_7zip_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_ar_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_ar_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_cab_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_cab_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_cpio_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_cpio_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_encryption_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_encryption_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_entry_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_filter_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_filter_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_filter_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_iso9660_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_iso9660_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_iso9660_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_lha_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_lha_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_linkify_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_match_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_mtree_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_mtree_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_rar5_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_rar5_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_rar_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_read_disk_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_roundtrip_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_roundtrip_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_seek_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_seek_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_string_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_tar_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_tar_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_warc_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_warc_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_write_disk_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_write_disk_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_write_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_xar_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_xar_fuzzer.dict
    A contrib/libarchive/contrib/oss-fuzz/libarchive_xar_fuzzer.options
    A contrib/libarchive/contrib/oss-fuzz/libarchive_zip_fuzzer.cc
    A contrib/libarchive/contrib/oss-fuzz/libarchive_zip_fuzzer.dict
    M contrib/libarchive/cpio/cmdline.c
    M contrib/libarchive/cpio/cpio.c
    M contrib/libarchive/cpio/cpio.h
    M contrib/libarchive/cpio/test/test_format_newc.c
    M contrib/libarchive/cpio/test/test_owner_parse.c
    M contrib/libarchive/libarchive/archive.h
    M contrib/libarchive/libarchive/archive_acl.c
    M contrib/libarchive/libarchive/archive_check_magic.c
    M contrib/libarchive/libarchive/archive_cryptor.c
    M contrib/libarchive/libarchive/archive_cryptor_private.h
    M contrib/libarchive/libarchive/archive_entry.h
    M contrib/libarchive/libarchive/archive_entry_paths.3
    M contrib/libarchive/libarchive/archive_entry_stat.3
    M contrib/libarchive/libarchive/archive_entry_stat.c
    M contrib/libarchive/libarchive/archive_hmac.c
    M contrib/libarchive/libarchive/archive_options.c
    M contrib/libarchive/libarchive/archive_parse_date.c
    M contrib/libarchive/libarchive/archive_pathmatch.c
    M contrib/libarchive/libarchive/archive_platform.h
    A contrib/libarchive/libarchive/archive_platform_stat.h
    M contrib/libarchive/libarchive/archive_ppmd8.c
    M contrib/libarchive/libarchive/archive_ppmd8_private.h
    M contrib/libarchive/libarchive/archive_private.h
    M contrib/libarchive/libarchive/archive_read.c
    M contrib/libarchive/libarchive/archive_read_append_filter.c
    M contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
    M contrib/libarchive/libarchive/archive_read_disk_posix.c
    M contrib/libarchive/libarchive/archive_read_open_fd.c
    M contrib/libarchive/libarchive/archive_read_open_file.c
    M contrib/libarchive/libarchive/archive_read_open_filename.c
    M contrib/libarchive/libarchive/archive_read_set_format.c
    M contrib/libarchive/libarchive/archive_read_support_filter_grzip.c
    M contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
    M contrib/libarchive/libarchive/archive_read_support_filter_lzop.c
    M contrib/libarchive/libarchive/archive_read_support_filter_program.c
    M contrib/libarchive/libarchive/archive_read_support_filter_uu.c
    M contrib/libarchive/libarchive/archive_read_support_filter_zstd.c
    M contrib/libarchive/libarchive/archive_read_support_format_7zip.c
    M contrib/libarchive/libarchive/archive_read_support_format_cab.c
    M contrib/libarchive/libarchive/archive_read_support_format_cpio.c
    M contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
    M contrib/libarchive/libarchive/archive_read_support_format_lha.c
    M contrib/libarchive/libarchive/archive_read_support_format_mtree.c
    M contrib/libarchive/libarchive/archive_read_support_format_rar.c
    M contrib/libarchive/libarchive/archive_read_support_format_rar5.c
    M contrib/libarchive/libarchive/archive_read_support_format_tar.c
    M contrib/libarchive/libarchive/archive_read_support_format_warc.c
    M contrib/libarchive/libarchive/archive_read_support_format_xar.c
    M contrib/libarchive/libarchive/archive_read_support_format_zip.c
    M contrib/libarchive/libarchive/archive_string.c
    M contrib/libarchive/libarchive/archive_string.h
    M contrib/libarchive/libarchive/archive_string_sprintf.c
    M contrib/libarchive/libarchive/archive_util.c
    M contrib/libarchive/libarchive/archive_version_details.c
    M contrib/libarchive/libarchive/archive_write.c
    M contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c
    M contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c
    M contrib/libarchive/libarchive/archive_write_add_filter_gzip.c
    M contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c
    M contrib/libarchive/libarchive/archive_write_add_filter_lz4.c
    M contrib/libarchive/libarchive/archive_write_add_filter_lzop.c
    M contrib/libarchive/libarchive/archive_write_add_filter_program.c
    M contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c
    M contrib/libarchive/libarchive/archive_write_add_filter_xz.c
    M contrib/libarchive/libarchive/archive_write_add_filter_zstd.c
    M contrib/libarchive/libarchive/archive_write_disk_posix.c
    M contrib/libarchive/libarchive/archive_write_open_fd.c
    M contrib/libarchive/libarchive/archive_write_open_file.c
    M contrib/libarchive/libarchive/archive_write_open_filename.c
    M contrib/libarchive/libarchive/archive_write_open_memory.c
    M contrib/libarchive/libarchive/archive_write_set_format_7zip.c
    M contrib/libarchive/libarchive/archive_write_set_format_cpio_binary.c
    M contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c
    M contrib/libarchive/libarchive/archive_write_set_format_cpio_odc.c
    M contrib/libarchive/libarchive/archive_write_set_format_gnutar.c
    M contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
    M contrib/libarchive/libarchive/archive_write_set_format_mtree.c
    M contrib/libarchive/libarchive/archive_write_set_format_pax.c
    M contrib/libarchive/libarchive/archive_write_set_format_shar.c
    M contrib/libarchive/libarchive/archive_write_set_format_ustar.c
    M contrib/libarchive/libarchive/archive_write_set_format_v7tar.c
    M contrib/libarchive/libarchive/archive_write_set_format_xar.c
    M contrib/libarchive/libarchive/archive_write_set_format_zip.c
    M contrib/libarchive/libarchive/filter_fork_posix.c
    A contrib/libarchive/libarchive/module.modulemap
    M contrib/libarchive/libarchive/test/test_acl_nfs4.c
    M contrib/libarchive/libarchive/test/test_acl_posix1e.c
    M contrib/libarchive/libarchive/test/test_acl_text.c
    M contrib/libarchive/libarchive/test/test_archive_parse_date.c
    M contrib/libarchive/libarchive/test/test_archive_pathmatch.c
    M contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c
    M contrib/libarchive/libarchive/test/test_archive_string.c
    M contrib/libarchive/libarchive/test/test_archive_string_conversion.c
    M contrib/libarchive/libarchive/test/test_compat_lz4.c
    A contrib/libarchive/libarchive/test/test_compat_lz4_skippable_frames_B4.tar.lz4.uu
    M contrib/libarchive/libarchive/test/test_compat_lzip.c
    M contrib/libarchive/libarchive/test/test_entry.c
    M contrib/libarchive/libarchive/test/test_gnutar_filename_encoding.c
    M contrib/libarchive/libarchive/test/test_read_filter_gzip_recursive.c
    M contrib/libarchive/libarchive/test/test_read_format_7zip.c
    A contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.7z.uu
    A contrib/libarchive/libarchive/test/test_read_format_7zip_issue2765.c
    M contrib/libarchive/libarchive/test/test_read_format_7zip_malformed.c
    A contrib/libarchive/libarchive/test/test_read_format_7zip_malformed3.7z.uu
    A contrib/libarchive/libarchive/test/test_read_format_7zip_sfx_elf64trunc.elf.uu
    A contrib/libarchive/libarchive/test/test_read_format_cab_lzx_oob.c
    A contrib/libarchive/libarchive/test/test_read_format_cab_lzx_oob.cab.uu
    A contrib/libarchive/libarchive/test/test_read_format_cab_skip_malformed.c
    A contrib/libarchive/libarchive/test/test_read_format_cab_skip_malformed.cab.uu
    A contrib/libarchive/libarchive/test/test_read_format_iso_zisofs_overflow.c
    A contrib/libarchive/libarchive/test/test_read_format_iso_zisofs_overflow.iso.uu
    A contrib/libarchive/libarchive/test/test_read_format_lha_oversize_header.c
    A contrib/libarchive/libarchive/test/test_read_format_lha_oversize_header.lzh.uu
    M contrib/libarchive/libarchive/test/test_read_format_rar5.c
    A contrib/libarchive/libarchive/test/test_read_format_rar5_dirdata.rar.uu
    A contrib/libarchive/libarchive/test/test_read_format_rar5_invalid_hash_valid_htime_exfld.rar.uu
    A contrib/libarchive/libarchive/test/test_read_format_rar5_loop_bug.c
    A contrib/libarchive/libarchive/test/test_read_format_rar5_loop_bug.rar.uu
    A contrib/libarchive/libarchive/test/test_read_format_rar5_only_crypt_exfld.rar.uu
    A contrib/libarchive/libarchive/test/test_read_format_rar5_unsupported_exfld.rar.uu
    A contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.c
    A contrib/libarchive/libarchive/test/test_read_format_tar_V_negative_size.tar.uu
    M contrib/libarchive/libarchive/test/test_read_set_format.c
    M contrib/libarchive/libarchive/test/test_ustar_filename_encoding.c
    A contrib/libarchive/libarchive/test/test_v7tar_filename_encoding.c
    M contrib/libarchive/libarchive/test/test_warn_missing_hardlink_target.c
    M contrib/libarchive/libarchive/test/test_write_disk.c
    M contrib/libarchive/libarchive/test/test_write_disk_perms.c
    M contrib/libarchive/libarchive/test/test_write_filter_bzip2.c
    M contrib/libarchive/libarchive/test/test_write_filter_gzip.c
    M contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c
    M contrib/libarchive/libarchive/test/test_zip_filename_encoding.c
    R contrib/libarchive/libarchive_fe/err.c
    R contrib/libarchive/libarchive_fe/err.h
    A contrib/libarchive/libarchive_fe/lafe_err.c
    A contrib/libarchive/libarchive_fe/lafe_err.h
    A contrib/libarchive/libarchive_fe/lafe_getline.c
    A contrib/libarchive/libarchive_fe/lafe_getline.h
    M contrib/libarchive/libarchive_fe/line_reader.c
    M contrib/libarchive/libarchive_fe/passphrase.c
    M contrib/libarchive/tar/bsdtar.c
    M contrib/libarchive/tar/bsdtar.h
    M contrib/libarchive/tar/cmdline.c
    M contrib/libarchive/tar/creation_set.c
    M contrib/libarchive/tar/read.c
    M contrib/libarchive/tar/subst.c
    A contrib/libarchive/tar/test/test_crlf_mtree.c
    M contrib/libarchive/tar/test/test_option_s.c
    M contrib/libarchive/tar/test/test_option_safe_writes.c
    M contrib/libarchive/tar/util.c
    M contrib/libarchive/tar/write.c
    M contrib/libarchive/test_utils/test_common.h
    M contrib/libarchive/test_utils/test_main.c
    M contrib/libarchive/unzip/bsdunzip.c
    M contrib/libarchive/unzip/cmdline.c
    R contrib/libarchive/unzip/la_getline.c
    R contrib/libarchive/unzip/la_getline.h
    M contrib/libarchive/unzip/la_queue.h
    M contrib/libarchive/unzip/test/test_C.c
    M contrib/libarchive/unzip/test/test_L.c
    M contrib/libarchive/unzip/test/test_P_encryption.c
    M contrib/libarchive/unzip/test/test_basic.c
    M contrib/libarchive/unzip/test/test_d.c
    M contrib/libarchive/unzip/test/test_doubledash.c
    M contrib/libarchive/unzip/test/test_glob.c
    M contrib/libarchive/unzip/test/test_j.c
    M contrib/libarchive/unzip/test/test_n.c
    M contrib/libarchive/unzip/test/test_o.c
    M contrib/libarchive/unzip/test/test_p.c
    M contrib/libarchive/unzip/test/test_q.c
    M contrib/libarchive/unzip/test/test_singlefile.c
    M contrib/libarchive/unzip/test/test_t.c
    M contrib/libarchive/unzip/test/test_x.c

  Log Message:
  -----------
  Merge commit '42a6989552031e996b15dbb1a4d18598adcf0181' into stable/4.0

# Conflicts:
#	contrib/libarchive/.cirrus.yml
#	contrib/libarchive/.github/workflows/ci.yml
#	contrib/libarchive/.github/workflows/cifuzz.yml
#	contrib/libarchive/.github/workflows/codeql.yml
#	contrib/libarchive/.github/workflows/scorecard.yml
#	contrib/libarchive/CMakeLists.txt
#	contrib/libarchive/Makefile.am
#	contrib/libarchive/build/ci/cirrus_ci/ci.sh
#	contrib/libarchive/build/cmake/config.h.in
#	contrib/libarchive/build/version
#	contrib/libarchive/cat/CMakeLists.txt
#	contrib/libarchive/configure.ac
#	contrib/libarchive/contrib/android/Android.mk
#	contrib/libarchive/contrib/android/config/android.h
#	contrib/libarchive/contrib/android/config/linux_host.h
#	contrib/libarchive/contrib/android/config/windows_host.h
#	contrib/libarchive/contrib/android/include/android_lf.h
#	contrib/libarchive/contrib/oss-fuzz/libarchive_fuzzer.cc
#	contrib/libarchive/contrib/oss-fuzz/oss-fuzz-build.sh
#	contrib/libarchive/contrib/untar.c
#	contrib/libarchive/cpio/CMakeLists.txt
#	contrib/libarchive/cpio/cpio_windows.c
#	contrib/libarchive/cpio/test/CMakeLists.txt
#	contrib/libarchive/libarchive/CMakeLists.txt
#	contrib/libarchive/libarchive/archive_disk_acl_darwin.c
#	contrib/libarchive/libarchive/archive_read_disk_windows.c
#	contrib/libarchive/libarchive/archive_windows.c
#	contrib/libarchive/libarchive/archive_windows.h
#	contrib/libarchive/libarchive/archive_write_disk_windows.c
#	contrib/libarchive/libarchive/test/CMakeLists.txt
#	contrib/libarchive/tar/CMakeLists.txt
#	contrib/libarchive/tar/bsdtar_windows.c
#	contrib/libarchive/tar/bsdtar_windows.h
#	contrib/libarchive/tar/test/CMakeLists.txt
#	contrib/libarchive/unzip/CMakeLists.txt
#	contrib/libarchive/unzip/test/CMakeLists.txt


  Commit: ea0450f8f4528a3bb7712806d922d6700a151ebb
      https://github.com/MidnightBSD/src/commit/ea0450f8f4528a3bb7712806d922d6700a151ebb
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-06-07 (Sun, 07 Jun 2026)

  Changed paths:
    M contrib/libarchive/libarchive/archive_string.c
    M contrib/libarchive/test_utils/test_main.c

  Log Message:
  -----------
  libarchive: apply local patches from FreeBSD stable/14

Staticize tuser, ouid, tuid, ogid, tgid in test_utils/test_main.c to
avoid -Wmissing-variable-declarations errors (FreeBSD commit 2e83ec426ee2,
upstream PR #2962).

Force GNU iconv compatibility on FreeBSD and MidnightBSD: native iconv(3)
returns the POSIX-specified count of invalid characters, but
iconv_strncat_in_locale() assumes GNU iconv semantics; set
ICONV_SET_ILSEQ_INVALID to restore the expected -1 behavior (FreeBSD
commit 5fd06985f8f0, upstream PR #3056).

Co-Authored-By: Claude Sonnet 4.6 <noreply at anthropic.com>


Compare: https://github.com/MidnightBSD/src/compare/b81e6542b9f5...ea0450f8f452

To unsubscribe from these emails, change your notification settings at https://github.com/MidnightBSD/src/settings/notifications

More information about the Midnightbsd-cvs mailing list