[Midnightbsd-cvs] [MidnightBSD/src] 42a698: Vendor import of libarchive 3.8.7

Lucas Holt noreply at github.com
Sun Jun 7 00:13:18 EDT 2026


  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  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: 5833e87ee15c319be61688b5c4dfdf36162ef1f1
      https://github.com/MidnightBSD/src/commit/5833e87ee15c319be61688b5c4dfdf36162ef1f1
  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/contrib/oss-fuzz/libarchive_linkify_fuzzer.cc
    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/libarchive/archive.h
    M contrib/libarchive/libarchive/archive_acl.c
    M contrib/libarchive/libarchive/archive_check_magic.c
    M contrib/libarchive/libarchive/archive_cryptor_private.h
    M contrib/libarchive/libarchive/archive_entry.h
    M contrib/libarchive/libarchive/archive_hmac.c
    M contrib/libarchive/libarchive/archive_options.c
    M contrib/libarchive/libarchive/archive_pathmatch.c
    M contrib/libarchive/libarchive/archive_ppmd8.c
    M contrib/libarchive/libarchive/archive_ppmd8_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_posix.c
    M contrib/libarchive/libarchive/archive_read_open_filename.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_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_xar.c
    M contrib/libarchive/libarchive/archive_read_support_format_zip.c
    M contrib/libarchive/libarchive/archive_string.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_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_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_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/test/test_acl_text.c
    M contrib/libarchive/libarchive/test/test_archive_pathmatch.c
    M contrib/libarchive/libarchive/test/test_archive_string_conversion.c
    M contrib/libarchive/libarchive/test/test_gnutar_filename_encoding.c
    M contrib/libarchive/libarchive/test/test_read_format_7zip.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
    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
    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_zip_filename_encoding.c
    R contrib/libarchive/libarchive_fe/err.c
    R contrib/libarchive/libarchive_fe/err.h
    A contrib/libarchive/libarchive_fe/lafe_getline.c
    A contrib/libarchive/libarchive_fe/lafe_getline.h
    M contrib/libarchive/tar/bsdtar.c
    M contrib/libarchive/tar/read.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
    R contrib/libarchive/unzip/la_getline.c
    R contrib/libarchive/unzip/la_getline.h

  Log Message:
  -----------
  Merge commit '42a6989552031e996b15dbb1a4d18598adcf0181'

# Conflicts:
#	contrib/libarchive/.cirrus.yml
#	contrib/libarchive/CMakeLists.txt
#	contrib/libarchive/Makefile.am
#	contrib/libarchive/build/cmake/config.h.in
#	contrib/libarchive/build/version
#	contrib/libarchive/configure.ac
#	contrib/libarchive/contrib/android/Android.mk
#	contrib/libarchive/contrib/untar.c
#	contrib/libarchive/cpio/CMakeLists.txt
#	contrib/libarchive/libarchive/archive_read_disk_windows.c
#	contrib/libarchive/libarchive/archive_write_disk_windows.c
#	contrib/libarchive/libarchive/test/CMakeLists.txt
#	contrib/libarchive/unzip/CMakeLists.txt
#	contrib/libarchive/unzip/test/CMakeLists.txt


  Commit: dd76d2261ffb6e9bbb5be7d54852e72fccb43cc0
      https://github.com/MidnightBSD/src/commit/dd76d2261ffb6e9bbb5be7d54852e72fccb43cc0
  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/6f0dea9ac881...dd76d2261ffb

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