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: Fri Apr 12 15:39:58 UTC 2024
Modified Files:
pkgsrc/archivers/libarchive: Makefile.common
pkgsrc/archivers/libarchive/files: CMakeLists.txt Makefile.am
Makefile.in NEWS config.h.in configure configure.ac
pkgsrc/archivers/libarchive/files/build: version
pkgsrc/archivers/libarchive/files/build/cmake: config.h.in
pkgsrc/archivers/libarchive/files/cat: bsdcat.1 bsdcat.c bsdcat.h
pkgsrc/archivers/libarchive/files/cat/test: list.h
pkgsrc/archivers/libarchive/files/contrib: untar.c
pkgsrc/archivers/libarchive/files/contrib/shar: shar.1 shar.c
pkgsrc/archivers/libarchive/files/cpio: bsdcpio.1 cmdline.c cpio.c
cpio.h cpio_platform.h cpio_windows.c
pkgsrc/archivers/libarchive/files/cpio/test: list.h test.h test_0.c
test_basic.c test_extract_cpio_Z.c test_extract_cpio_bz2.c
test_extract_cpio_grz.c test_extract_cpio_gz.c
test_extract_cpio_lrz.c test_extract_cpio_lz.c
test_extract_cpio_lzma.c test_extract_cpio_lzo.c
test_extract_cpio_xz.c test_extract_cpio_zstd.c test_format_newc.c
test_gcpio_compat.c test_gcpio_compat_ref.bin.uu
test_gcpio_compat_ref.crc.uu test_gcpio_compat_ref.newc.uu
test_gcpio_compat_ref.ustar.uu test_option_0.c test_option_a.c
test_option_b64encode.c test_option_c.c test_option_d.c
test_option_f.c test_option_f.cpio.uu test_option_grzip.c
test_option_help.c test_option_lrzip.c test_option_lzop.c
test_option_m.c test_option_m.cpio.uu test_option_t.c
test_option_t.cpio.uu test_option_t.stdout.uu
test_option_tv.stdout.uu test_option_u.c test_option_uuencode.c
test_option_xz.c test_option_y.c test_option_z.c test_option_zstd.c
test_owner_parse.c
pkgsrc/archivers/libarchive/files/doc/html: Makefile
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/man: Makefile
archive_write_set_options.3 bsdtar.1
pkgsrc/archivers/libarchive/files/doc/pdf: Makefile 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/doc/text: Makefile
archive_write_set_options.3.txt bsdtar.1.txt
pkgsrc/archivers/libarchive/files/doc/wiki: Makefile
ManPageArchiveWriteSetOptions3.wiki ManPageBsdtar1.wiki
pkgsrc/archivers/libarchive/files/libarchive: CMakeLists.txt archive.h
archive_acl.c archive_acl_private.h archive_check_magic.c
archive_cmdline.c archive_cmdline_private.h archive_crc32.h
archive_cryptor.c archive_endian.h archive_entry.3 archive_entry.c
archive_entry.h archive_entry_copy_bhfi.c archive_entry_copy_stat.c
archive_entry_link_resolver.c archive_entry_locale.h
archive_entry_private.h archive_entry_sparse.c archive_entry_stat.c
archive_entry_strmode.c archive_entry_time.3 archive_getdate.c
archive_getdate.h archive_match.c archive_options.c
archive_options_private.h archive_pathmatch.c archive_pathmatch.h
archive_platform.h archive_platform_acl.h archive_platform_xattr.h
archive_private.h archive_read.3 archive_read.c
archive_read_add_passphrase.3 archive_read_add_passphrase.c
archive_read_append_filter.c archive_read_data.3
archive_read_data_into_fd.c archive_read_disk.3
archive_read_disk_entry_from_file.c archive_read_disk_posix.c
archive_read_disk_private.h archive_read_disk_set_standard_lookup.c
archive_read_disk_windows.c archive_read_extract.3
archive_read_extract.c archive_read_filter.3 archive_read_format.3
archive_read_free.3 archive_read_header.3 archive_read_new.3
archive_read_open.3 archive_read_open_fd.c archive_read_open_file.c
archive_read_open_filename.c archive_read_open_memory.c
archive_read_private.h archive_read_set_format.c
archive_read_set_options.3 archive_read_set_options.c
archive_read_support_filter_all.c
archive_read_support_filter_bzip2.c
archive_read_support_filter_compress.c
archive_read_support_filter_grzip.c
archive_read_support_filter_gzip.c
archive_read_support_filter_lrzip.c
archive_read_support_filter_lz4.c
archive_read_support_filter_lzop.c
archive_read_support_filter_none.c
archive_read_support_filter_program.c
archive_read_support_filter_rpm.c archive_read_support_filter_uu.c
archive_read_support_filter_xz.c archive_read_support_filter_zstd.c
archive_read_support_format_7zip.c
archive_read_support_format_all.c archive_read_support_format_ar.c
archive_read_support_format_by_code.c
archive_read_support_format_cpio.c
archive_read_support_format_empty.c
archive_read_support_format_iso9660.c
archive_read_support_format_mtree.c
archive_read_support_format_rar.c
archive_read_support_format_rar5.c
archive_read_support_format_raw.c archive_read_support_format_tar.c
archive_read_support_format_warc.c
archive_read_support_format_xar.c archive_read_support_format_zip.c
archive_string.c archive_string.h archive_string_composition.h
archive_string_sprintf.c archive_util.3 archive_util.c
archive_version_details.c archive_virtual.c archive_windows.c
archive_windows.h archive_write.3 archive_write.c
archive_write_add_filter.c archive_write_add_filter_b64encode.c
archive_write_add_filter_by_name.c archive_write_add_filter_bzip2.c
archive_write_add_filter_compress.c
archive_write_add_filter_grzip.c archive_write_add_filter_gzip.c
archive_write_add_filter_lrzip.c archive_write_add_filter_lz4.c
archive_write_add_filter_lzop.c archive_write_add_filter_none.c
archive_write_add_filter_program.c
archive_write_add_filter_uuencode.c archive_write_add_filter_xz.c
archive_write_add_filter_zstd.c archive_write_blocksize.3
archive_write_data.3 archive_write_disk.3
archive_write_disk_posix.c archive_write_disk_private.h
archive_write_disk_set_standard_lookup.c
archive_write_disk_windows.c archive_write_filter.3
archive_write_finish_entry.3 archive_write_format.3
archive_write_free.3 archive_write_header.3 archive_write_new.3
archive_write_open.3 archive_write_open_fd.c
archive_write_open_file.c archive_write_open_filename.c
archive_write_open_memory.c archive_write_private.h
archive_write_set_format.c archive_write_set_format_7zip.c
archive_write_set_format_ar.c archive_write_set_format_by_name.c
archive_write_set_format_cpio_newc.c
archive_write_set_format_gnutar.c archive_write_set_format_mtree.c
archive_write_set_format_pax.c archive_write_set_format_private.h
archive_write_set_format_shar.c archive_write_set_format_ustar.c
archive_write_set_format_v7tar.c archive_write_set_format_warc.c
archive_write_set_format_xar.c archive_write_set_format_zip.c
archive_write_set_options.3 archive_write_set_options.c
archive_write_set_passphrase.3 config_freebsd.h cpio.5
filter_fork.h filter_fork_posix.c libarchive-formats.5 libarchive.3
libarchive_changes.3 libarchive_internals.3 mtree.5 tar.5
pkgsrc/archivers/libarchive/files/libarchive/test: CMakeLists.txt
list.h read_open_memory.c test_acl_nfs4.c test_acl_pax.c
test_acl_platform_nfs4.c test_acl_platform_posix1e.c
test_acl_posix1e.c test_archive_api_feature.c
test_archive_clear_error.c test_archive_cmdline.c
test_archive_getdate.c test_archive_match_owner.c
test_archive_match_path.c test_archive_match_time.c
test_archive_pathmatch.c test_archive_read_close_twice.c
test_archive_read_close_twice_open_fd.c
test_archive_read_close_twice_open_filename.c
test_archive_read_multiple_data_objects.c
test_archive_read_next_header_empty.c
test_archive_read_next_header_raw.c test_archive_read_open2.c
test_archive_read_set_filter_option.c
test_archive_read_set_format_option.c
test_archive_read_set_option.c test_archive_read_set_options.c
test_archive_read_support.c test_archive_set_error.c
test_archive_string.c test_archive_string_conversion.c
test_archive_string_conversion.txt.Z.uu
test_archive_write_add_filter_by_name.c
test_archive_write_set_filter_option.c
test_archive_write_set_format_by_name.c
test_archive_write_set_format_filter_by_ext.c
test_archive_write_set_format_option.c
test_archive_write_set_option.c test_archive_write_set_options.c
test_bad_fd.c test_compat_bzip2.c test_compat_cpio.c
test_compat_gtar.c test_compat_gzip.c test_compat_lzip.c
test_compat_lzma.c test_compat_lzop.c test_compat_mac.c
test_compat_solaris_pax_sparse.c test_compat_solaris_tar_acl.c
test_compat_tar_hardlink.c test_compat_tar_hardlink_1.tar.uu
test_compat_uudecode.c test_compat_xz.c test_compat_zip.c
test_compat_zip_1.zip.uu test_compat_zip_8.zip.uu
test_compat_zstd.c test_empty_write.c test_entry.c
test_entry_strmode.c test_extattr_freebsd.c test_filter_count.c
test_fuzz.c test_gnutar_filename_encoding.c test_link_resolver.c
test_open_failure.c test_open_fd.c test_open_file.c
test_open_filename.c test_pax_filename_encoding.c
test_pax_xattr_header.c
test_rar_multivolume_single_file.part1.rar.uu
test_rar_multivolume_single_file.part2.rar.uu
test_rar_multivolume_single_file.part3.rar.uu
test_rar_multivolume_uncompressed_files.part01.rar.uu
test_rar_multivolume_uncompressed_files.part02.rar.uu
test_rar_multivolume_uncompressed_files.part03.rar.uu
test_rar_multivolume_uncompressed_files.part04.rar.uu
test_rar_multivolume_uncompressed_files.part05.rar.uu
test_rar_multivolume_uncompressed_files.part06.rar.uu
test_rar_multivolume_uncompressed_files.part07.rar.uu
test_rar_multivolume_uncompressed_files.part08.rar.uu
test_rar_multivolume_uncompressed_files.part09.rar.uu
test_rar_multivolume_uncompressed_files.part10.rar.uu
test_read_data_large.c test_read_disk.c
test_read_disk_directory_traversals.c
test_read_disk_entry_from_file.c test_read_extract.c
test_read_file_nonexistent.c test_read_filter_lrzip.tar.lrz.uu
test_read_filter_program.c test_read_filter_program_signature.c
test_read_filter_uudecode.c test_read_format_7zip.c
test_read_format_7zip_copy.7z.uu
test_read_format_7zip_packinfo_digests.c test_read_format_ar.c
test_read_format_cab.c test_read_format_cab_filename.c
test_read_format_cab_filename_cp932.cab.uu
test_read_format_cpio_afio.c test_read_format_cpio_bin.c
test_read_format_cpio_bin_Z.c test_read_format_cpio_bin_be.c
test_read_format_cpio_bin_bz2.c test_read_format_cpio_bin_gz.c
test_read_format_cpio_bin_lzip.c test_read_format_cpio_bin_lzma.c
test_read_format_cpio_bin_xz.c test_read_format_cpio_filename.c
test_read_format_cpio_filename_cp866.cpio.uu
test_read_format_cpio_filename_eucjp.cpio.uu
test_read_format_cpio_filename_koi8r.cpio.uu
test_read_format_cpio_filename_utf8_jp.cpio.uu
test_read_format_cpio_filename_utf8_ru.cpio.uu
test_read_format_cpio_odc.c test_read_format_cpio_svr4_gzip.c
test_read_format_cpio_svr4c_Z.c test_read_format_empty.c
test_read_format_gtar_filename.c
test_read_format_gtar_filename_cp866.tar.Z.uu
test_read_format_gtar_filename_eucjp.tar.Z.uu
test_read_format_gtar_filename_koi8r.tar.Z.uu
test_read_format_gtar_gz.c test_read_format_gtar_lzma.c
test_read_format_gtar_sparse.c
test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
test_read_format_iso_Z.c test_read_format_iso_multi_extent.c
test_read_format_iso_xorriso.c test_read_format_isojoliet_bz2.c
test_read_format_isojoliet_long.c test_read_format_isojoliet_rr.c
test_read_format_isojoliet_versioned.c test_read_format_isorr_bz2.c
test_read_format_isorr_ce.c test_read_format_isorr_new_bz2.c
test_read_format_isorr_rr_moved.c test_read_format_isozisofs_bz2.c
test_read_format_lha.c test_read_format_lha_filename.c
test_read_format_lha_filename_cp932.lzh.uu
test_read_format_lha_filename_utf16.c
test_read_format_lha_filename_utf16.lzh.uu test_read_format_mtree.c
test_read_format_pax_bz2.c test_read_format_rar.c
test_read_format_rar.rar.uu test_read_format_rar5.c
test_read_format_rar_binary_data.rar.uu
test_read_format_rar_compress_best.rar.uu
test_read_format_rar_compress_normal.rar.uu
test_read_format_rar_multi_lzss_blocks.rar.uu
test_read_format_rar_multivolume.part0001.rar.uu
test_read_format_rar_multivolume.part0002.rar.uu
test_read_format_rar_multivolume.part0003.rar.uu
test_read_format_rar_multivolume.part0004.rar.uu
test_read_format_rar_noeof.rar.uu
test_read_format_rar_ppmd_lzss_conversion.rar.uu
test_read_format_rar_sfx.exe.uu
test_read_format_rar_subblock.rar.uu
test_read_format_rar_windows.rar.uu test_read_format_raw.c
test_read_format_tar.c test_read_format_tar_empty_filename.c
test_read_format_tar_empty_filename.tar.uu
test_read_format_tar_filename.c test_read_format_tbz.c
test_read_format_tgz.c test_read_format_tlz.c
test_read_format_txz.c test_read_format_tz.c
test_read_format_ustar_filename.c test_read_format_xar.c
test_read_format_zip.c test_read_format_zip_7075_utf8_paths.c
test_read_format_zip_comment_stored.c
test_read_format_zip_filename.c
test_read_format_zip_filename_cp866.zip.uu
test_read_format_zip_filename_cp932.zip.uu
test_read_format_zip_filename_koi8r.zip.uu
test_read_format_zip_filename_utf8_jp.zip.uu
test_read_format_zip_filename_utf8_ru.zip.uu
test_read_format_zip_filename_utf8_ru2.zip.uu
test_read_format_zip_high_compression.c test_read_format_zip_jar.c
test_read_format_zip_mac_metadata.c
test_read_format_zip_malformed.c test_read_format_zip_nested.c
test_read_format_zip_nofiletype.c test_read_format_zip_padded.c
test_read_format_zip_sfx.c
test_read_format_zip_traditional_encryption_data.c
test_read_format_zip_with_invalid_traditional_eocd.c
test_read_format_zip_zip64.c test_read_large.c
test_read_large_splitted_rar_aa.uu
test_read_large_splitted_rar_ab.uu
test_read_large_splitted_rar_ac.uu
test_read_large_splitted_rar_ad.uu
test_read_large_splitted_rar_ae.uu test_read_pax_truncated.c
test_read_position.c test_read_splitted_rar_aa.uu
test_read_splitted_rar_ab.uu test_read_splitted_rar_ac.uu
test_read_splitted_rar_ad.uu test_read_truncated.c
test_read_truncated_filter.c test_sparse_basic.c
test_splitted_rar_seek_support_aa.uu
test_splitted_rar_seek_support_ab.uu
test_splitted_rar_seek_support_ac.uu test_tar_filenames.c
test_tar_large.c test_ustar_filename_encoding.c
test_ustar_filenames.c test_write_disk.c
test_write_disk_appledouble.c test_write_disk_failures.c
test_write_disk_hardlink.c test_write_disk_hfs_compression.c
test_write_disk_lookup.c test_write_disk_mac_metadata.c
test_write_disk_no_hfs_compression.c test_write_disk_perms.c
test_write_disk_secure.c test_write_disk_sparse.c
test_write_disk_symlink.c test_write_disk_times.c
test_write_filter_b64encode.c test_write_filter_bzip2.c
test_write_filter_compress.c test_write_filter_gzip.c
test_write_filter_gzip_timestamp.c test_write_filter_lzip.c
test_write_filter_lzma.c test_write_filter_lzop.c
test_write_filter_program.c test_write_filter_uuencode.c
test_write_filter_xz.c test_write_filter_zstd.c
test_write_format_7zip.c test_write_format_7zip_empty.c
test_write_format_7zip_large.c test_write_format_ar.c
test_write_format_cpio.c test_write_format_cpio_empty.c
test_write_format_cpio_newc.c test_write_format_cpio_odc.c
test_write_format_gnutar.c test_write_format_iso9660.c
test_write_format_mtree.c test_write_format_mtree_absolute_path.c
test_write_format_mtree_classic.c
test_write_format_mtree_classic_indent.c
test_write_format_mtree_fflags.c
test_write_format_mtree_no_separator.c
test_write_format_mtree_quoted_filename.c test_write_format_pax.c
test_write_format_shar_empty.c test_write_format_tar.c
test_write_format_tar_empty.c test_write_format_tar_sparse.c
test_write_format_tar_ustar.c test_write_format_tar_v7tar.c
test_write_format_xar.c test_write_format_xar_empty.c
test_write_format_zip.c test_write_format_zip_empty.c
test_write_format_zip_file.c test_write_format_zip_file_zip64.c
test_write_open_memory.c test_zip_filename_encoding.c
pkgsrc/archivers/libarchive/files/libarchive_fe: err.c err.h
line_reader.c passphrase.c
pkgsrc/archivers/libarchive/files/tar: bsdtar.1 bsdtar.c bsdtar.h
bsdtar_platform.h bsdtar_windows.c bsdtar_windows.h cmdline.c
creation_set.c read.c subst.c util.c write.c
pkgsrc/archivers/libarchive/files/tar/test: CMakeLists.txt list.h
test.h test_0.c test_basic.c test_copy.c test_extract_tar_Z.c
test_extract_tar_bz2.c test_extract_tar_grz.c test_extract_tar_gz.c
test_extract_tar_lrz.c test_extract_tar_lz.c
test_extract_tar_lzma.c test_extract_tar_lzo.c
test_extract_tar_xz.c test_extract_tar_zstd.c test_format_newc.c
test_help.c test_option_C_mtree.c test_option_C_upper.c
test_option_H_upper.c test_option_L_upper.c test_option_O_upper.c
test_option_T_upper.c test_option_U_upper.c test_option_X_upper.c
test_option_a.c test_option_acls.c test_option_b.c
test_option_b64encode.c test_option_exclude.c test_option_fflags.c
test_option_gid_gname.c test_option_grzip.c test_option_j.c
test_option_k.c test_option_keep_newer_files.c test_option_lrzip.c
test_option_lzma.c test_option_lzop.c test_option_n.c
test_option_newer_than.c test_option_nodump.c
test_option_older_than.c test_option_q.c test_option_r.c
test_option_s.c test_option_uid_uname.c test_option_uuencode.c
test_option_xattrs.c test_option_xz.c test_option_z.c
test_option_zstd.c test_patterns.c test_print_longpath.c
test_stdio.c test_strip_components.c test_symlink_dir.c
pkgsrc/archivers/libarchive/files/test_utils: test_common.h test_main.c
pkgsrc/archivers/libarchive/files/unzip: bsdunzip.c
Log Message:
libarchive: updated to 3.7.3
Libarchive 3.7.3 is a feature, security and bugfix release.
New features:
PCRE2 support
add trailing letter b to bsdtar(1) substitute pattern
add support for long options "--group" and "--owner" to tar(1)
Security fixes:
Fix possible vulnerability in tar error reporting introduced in f27c173
Important bugfixes:
ISO9660: preserve the natural order of links
rar5: fix decoding unicode filenames on Windows
rar5: fix infinite loop if during rar5 decompression the last block produced no data
xz filter: fix incorrect eof at the end of an lzip member
zip: fix end-of-data marker processing when decompressing zip archives
multiple bsdunzip(1) fixes
filetime truncation fix on Windows
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/archivers/libarchive/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/libarchive/files/CMakeLists.txt
cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/libarchive/files/Makefile.am
cvs rdiff -u -r1.15 -r1.16 pkgsrc/archivers/libarchive/files/Makefile.in
cvs rdiff -u -r1.14 -r1.15 pkgsrc/archivers/libarchive/files/NEWS
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/libarchive/files/config.h.in
cvs rdiff -u -r1.23 -r1.24 pkgsrc/archivers/libarchive/files/configure
cvs rdiff -u -r1.22 -r1.23 pkgsrc/archivers/libarchive/files/configure.ac
cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/libarchive/files/build/version
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/build/cmake/config.h.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/libarchive/files/cat/bsdcat.1 \
pkgsrc/archivers/libarchive/files/cat/bsdcat.c \
pkgsrc/archivers/libarchive/files/cat/bsdcat.h
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/libarchive/files/cat/test/list.h
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/libarchive/files/contrib/untar.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/contrib/shar/shar.1
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/contrib/shar/shar.c
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/cpio/bsdcpio.1 \
pkgsrc/archivers/libarchive/files/cpio/cmdline.c \
pkgsrc/archivers/libarchive/files/cpio/cpio.h
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/libarchive/files/cpio/cpio.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/cpio/cpio_platform.h
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/cpio/cpio_windows.c
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/cpio/test/list.h
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/libarchive/files/cpio/test/test.h \
pkgsrc/archivers/libarchive/files/cpio/test/test_format_newc.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_c.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/libarchive/files/cpio/test/test_0.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat.c
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/cpio/test/test_basic.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_0.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_zstd.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_b64encode.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_grzip.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_lrzip.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_lzop.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_uuencode.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_xz.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_d.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.cpio.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_help.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.cpio.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.cpio.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.stdout.uu \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_tv.stdout.uu
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_a.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_u.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_z.c
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_option_y.c \
pkgsrc/archivers/libarchive/files/cpio/test/test_owner_parse.c
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/doc/html/Makefile \
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.9 -r1.10 \
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.3 -r1.4 \
pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html
cvs rdiff -u -r1.5 -r1.6 \
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.10 -r1.11 pkgsrc/archivers/libarchive/files/doc/man/Makefile
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/doc/man/archive_write_set_options.3
cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/doc/pdf/Makefile \
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.9 -r1.10 \
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.3 -r1.4 \
pkgsrc/archivers/libarchive/files/doc/pdf/archive_entry_misc.3.pdf
cvs rdiff -u -r1.5 -r1.6 \
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.10 -r1.11 \
pkgsrc/archivers/libarchive/files/doc/text/Makefile
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/doc/text/archive_write_set_options.3.txt
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/doc/wiki/Makefile
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/libarchive/CMakeLists.txt \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_windows.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_windows.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_write.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c
cvs rdiff -u -r1.15 -r1.16 \
pkgsrc/archivers/libarchive/files/libarchive/archive.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/libarchive/archive_acl.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_stat.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_match.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_append_filter.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_data_into_fd.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_filter.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_string_sprintf.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_util.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_program.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_format.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_open.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_fd.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_file.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c \
pkgsrc/archivers/libarchive/files/libarchive/filter_fork.h
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/libarchive/archive_acl_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_crc32.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_locale.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_sparse.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_time.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_options.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_data.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_format.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_format.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_all.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_string_composition.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_warc.c \
pkgsrc/archivers/libarchive/files/libarchive/filter_fork_posix.c
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/libarchive/archive_check_magic.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_endian.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_fd.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_memory.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_virtual.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_memory.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c \
pkgsrc/archivers/libarchive/files/libarchive/cpio.5 \
pkgsrc/archivers/libarchive/files/libarchive/libarchive.3
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_options_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_platform_acl.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_platform_xattr.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_free.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_header.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_new.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_blocksize.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_free.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_header.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_new.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_passphrase.3
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_read.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_windows.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_file.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_string.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_write.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_windows.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_zip.c \
pkgsrc/archivers/libarchive/files/libarchive/libarchive-formats.5 \
pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3 \
pkgsrc/archivers/libarchive/files/libarchive/mtree.5 \
pkgsrc/archivers/libarchive/files/libarchive/tar.5
cvs rdiff -u -r1.13 -r1.14 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c
cvs rdiff -u -r1.11 -r1.12 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_util.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_shar.c \
pkgsrc/archivers/libarchive/files/libarchive/config_freebsd.h
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_stat.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_entry_strmode.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_open.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_program.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_raw.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_data.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_filter.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_finish_entry.3 \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.3 \
pkgsrc/archivers/libarchive/files/libarchive/libarchive_changes.3
cvs rdiff -u -r1.14 -r1.15 \
pkgsrc/archivers/libarchive/files/libarchive/archive_platform.h
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_tar.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_none.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_none.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_private.h \
pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.c
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c \
pkgsrc/archivers/libarchive/files/libarchive/archive_string.c
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt
cvs rdiff -u -r1.11 -r1.12 \
pkgsrc/archivers/libarchive/files/libarchive/test/list.h
cvs rdiff -u -r1.7 -r1.8 \
pkgsrc/archivers/libarchive/files/libarchive/test/read_open_memory.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_entry.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_extract.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_raw.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_sparse_basic.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_nfs4.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_posix1e.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_cmdline.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_getdate.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_support.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_bzip2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_cpio.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gzip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_mac.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_uudecode.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_xz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zstd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_open_failure.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_open_file.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_open_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_failures.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_times.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_compress.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_program.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_xz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_pax.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gtar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tbz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tgz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_large.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_ar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_pax.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_bad_fd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_empty_write.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_xar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_position.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_filenames.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filenames.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_open_memory.c
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_api_feature.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_data_large.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_secure.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_clear_error.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_owner.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_path.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_open2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_set_error.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzop.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_filter_count.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_time.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzma.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink_1.tar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_1.zip.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_entry_strmode.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_link_resolver.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_open_fd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar5.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tlz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_txz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_fuzz.c \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_mtree.c
cvs rdiff -u -r1.10 -r1.11 \
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/libarchive_fe/err.c \
pkgsrc/archivers/libarchive/files/libarchive_fe/line_reader.c
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/archivers/libarchive/files/libarchive_fe/err.h
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c
cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/libarchive/files/tar/bsdtar.1 \
pkgsrc/archivers/libarchive/files/tar/write.c
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/libarchive/files/tar/bsdtar.c \
pkgsrc/archivers/libarchive/files/tar/bsdtar.h
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/tar/bsdtar_platform.h \
pkgsrc/archivers/libarchive/files/tar/creation_set.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/tar/cmdline.c \
pkgsrc/archivers/libarchive/files/tar/util.c
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/libarchive/files/tar/read.c \
pkgsrc/archivers/libarchive/files/tar/subst.c
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/tar/test/CMakeLists.txt
cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/tar/test/list.h \
pkgsrc/archivers/libarchive/files/tar/test/test_copy.c
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/libarchive/files/tar/test/test.h
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/libarchive/files/tar/test/test_0.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_b.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_n.c \
pkgsrc/archivers/libarchive/files/tar/test/test_patterns.c \
pkgsrc/archivers/libarchive/files/tar/test/test_symlink_dir.c
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/archivers/libarchive/files/tar/test/test_basic.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_Z.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_bz2.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_grz.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_gz.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lrz.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lz.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzma.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzo.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_xz.c \
pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_zstd.c \
pkgsrc/archivers/libarchive/files/tar/test/test_format_newc.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_O_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_exclude.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_k.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_keep_newer_files.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_newer_than.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_older_than.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_zstd.c \
pkgsrc/archivers/libarchive/files/tar/test/test_print_longpath.c
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/archivers/libarchive/files/tar/test/test_help.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_H_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_L_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_U_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_lzma.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_r.c \
pkgsrc/archivers/libarchive/files/tar/test/test_strip_components.c
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/archivers/libarchive/files/tar/test/test_option_C_mtree.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_C_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_T_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_X_upper.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_a.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_acls.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_b64encode.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_fflags.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_gid_gname.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_grzip.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_j.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_lrzip.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_lzop.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_nodump.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_q.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_uid_uname.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_uuencode.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_xattrs.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_xz.c \
pkgsrc/archivers/libarchive/files/tar/test/test_option_z.c
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c \
pkgsrc/archivers/libarchive/files/tar/test/test_stdio.c
cvs rdiff -u -r1.9 -r1.10 \
pkgsrc/archivers/libarchive/files/test_utils/test_common.h
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/archivers/libarchive/files/test_utils/test_main.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/archivers/libarchive/files/unzip/bsdunzip.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.15 pkgsrc/archivers/libarchive/Makefile.common:1.16
--- pkgsrc/archivers/libarchive/Makefile.common:1.15 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/Makefile.common Fri Apr 12 15:39:46 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.15 2024/01/18 18:00:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2024/04/12 15:39:46 adam Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile
-DISTNAME= libarchive-3.7.2
+DISTNAME= libarchive-3.7.3
CATEGORIES= archivers
MASTER_SITES= https://www.libarchive.org/downloads/
DISTFILES= # empty
Index: pkgsrc/archivers/libarchive/files/CMakeLists.txt
diff -u pkgsrc/archivers/libarchive/files/CMakeLists.txt:1.10 pkgsrc/archivers/libarchive/files/CMakeLists.txt:1.11
--- pkgsrc/archivers/libarchive/files/CMakeLists.txt:1.10 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/CMakeLists.txt Fri Apr 12 15:39:46 2024
@@ -6,6 +6,9 @@ endif()
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW) #3.12.0 `find_package()`` uses ``<PackageName>_ROOT`` variables.
endif()
+if(POLICY CMP0075)
+ cmake_policy(SET CMP0075 NEW) #3.12.0 `check_include_file()`` and friends use ``CMAKE_REQUIRED_LIBRARIES``.
+endif()
#
PROJECT(libarchive C)
#
@@ -20,6 +23,7 @@ endif()
# Release : Release build
# RelWithDebInfo : Release build with Debug Info
# MinSizeRel : Release Min Size build
+# None : No build type
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
ENDIF(NOT CMAKE_BUILD_TYPE)
@@ -31,12 +35,12 @@ IF("${cached_type}" STREQUAL "UNINITIALI
ENDIF("${cached_type}" STREQUAL "UNINITIALIZED")
# Check the Build Type.
IF(NOT "${CMAKE_BUILD_TYPE}"
- MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)\$")
+ MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel|None)\$")
MESSAGE(FATAL_ERROR
"Unknown keyword for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
- "Acceptable keywords: Debug,Release,RelWithDebInfo,MinSizeRel")
+ "Acceptable keywords: Debug,Release,RelWithDebInfo,MinSizeRel,None")
ENDIF(NOT "${CMAKE_BUILD_TYPE}"
- MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)\$")
+ MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel|None)\$")
# On MacOS, prefer MacPorts libraries to system libraries.
# I haven't come up with a compelling argument for this to be conditional.
@@ -124,8 +128,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$"
# either of the following two, yet neither is supported as of 3.0.2
# - check_linker_flag - does not exist
# - try_compile - does not support linker flags
- #
- # The CI fails with this on MacOS
IF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
# Place the functions and data into separate sections, allowing the linker
# to garbage collect the unused ones.
@@ -135,6 +137,9 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$"
# Printing the discarded section is "too much", so enable on demand.
#SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -Wl,--print-gc-sections")
#SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--print-gc-sections")
+ ELSE()
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip")
ENDIF(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
CMAKE_C_COMPILER_ID MATCHES "^Clang$")
@@ -216,6 +221,7 @@ OPTION(ENABLE_BZip2 "Enable the use of t
OPTION(ENABLE_LIBXML2 "Enable the use of the system libxml2 library if found" ON)
OPTION(ENABLE_EXPAT "Enable the use of the system EXPAT library if found" ON)
OPTION(ENABLE_PCREPOSIX "Enable the use of the system PCREPOSIX library if found" ON)
+OPTION(ENABLE_PCRE2POSIX "Enable the use of the system PCRE2POSIX library if found" ON)
OPTION(ENABLE_LIBGCC "Enable the use of the system LibGCC library if found" ON)
# CNG is used for encrypt/decrypt Zip archives on Windows.
OPTION(ENABLE_CNG "Enable the use of CNG(Crypto Next Generation)" ON)
@@ -523,7 +529,7 @@ IF(LIBLZMA_FOUND)
"#include <lzma.h>\nint main() {return (int)lzma_version_number(); }"
"WITHOUT_LZMA_API_STATIC;LZMA_API_STATIC")
CHECK_C_SOURCE_COMPILES(
- "#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
+ "#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){int ignored __attribute__((unused)); ignored = lzma_stream_encoder_mt(0, 0); return 0;}"
HAVE_LZMA_STREAM_ENCODER_MT)
IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
ADD_DEFINITIONS(-DLZMA_API_STATIC)
@@ -654,7 +660,7 @@ IF(ZSTD_FOUND)
SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY})
SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR})
CHECK_FUNCTION_EXISTS(ZSTD_decompressStream HAVE_LIBZSTD)
- CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD_COMPRESSOR)
+ CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_ZSTD_compressStream)
#
# TODO: test for static library.
#
@@ -1187,7 +1193,7 @@ ENDIF(ENABLE_ICONV)
#
# Find Libxml2
#
-IF(ENABLE_LIBXML2)
+IF(ENABLE_LIBXML2 AND HAVE_ICONV)
FIND_PACKAGE(LibXml2)
ELSE()
SET(LIBXML2_FOUND FALSE)
@@ -1348,6 +1354,68 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_R
MARK_AS_ADVANCED(CLEAR LIBGCC_LIBRARIES)
ENDIF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$")
+IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCRE2POSIX)$")
+ #
+ # If requested, try finding library for PCRE2POSIX
+ #
+ IF(ENABLE_LIBGCC)
+ FIND_PACKAGE(LIBGCC)
+ ELSE()
+ MESSAGE(FATAL_ERROR "libgcc not found.")
+ SET(LIBGCC_FOUND FALSE) # Override cached value
+ ENDIF()
+ IF(ENABLE_PCRE2POSIX)
+ FIND_PACKAGE(PCRE2POSIX)
+ ELSE()
+ SET(PCRE2POSIX_FOUND FALSE) # Override cached value
+ ENDIF()
+ IF(PCRE2POSIX_FOUND)
+ INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIR})
+ LIST(APPEND ADDITIONAL_LIBS ${PCRE2POSIX_LIBRARIES})
+ # Test if a macro is needed for the library.
+ TRY_MACRO_FOR_LIBRARY(
+ "${PCRE2_INCLUDE_DIR}" "${PCRE2POSIX_LIBRARIES}"
+ COMPILES
+ "#include <pcre2posix.h>\nint main() {regex_t r;return pcre2_regcomp(&r, \"\", 0);}"
+ "WITHOUT_PCRE2_STATIC;PCRE2_STATIC")
+ IF(NOT WITHOUT_PCRE2_STATIC AND PCRE2_STATIC)
+ ADD_DEFINITIONS(-DPCRE2_STATIC)
+ ELSEIF(NOT WITHOUT_PCRE2_STATIC AND NOT PCRE2_STATIC AND PCRE2_FOUND)
+ # Determine if pcre2 static libraries are to be used.
+ LIST(APPEND ADDITIONAL_LIBS ${PCRE2_LIBRARIES})
+ SET(TMP_LIBRARIES ${PCRE2POSIX_LIBRARIES} ${PCRE2_LIBRARIES})
+ MESSAGE(STATUS "trying again with -lpcre2-8 included")
+ TRY_MACRO_FOR_LIBRARY(
+ "${PCRE2_INCLUDE_DIR}" "${TMP_LIBRARIES}"
+ COMPILES
+ "#include <pcre2posix.h>\nint main() {regex_t r;return pcre2_regcomp(&r, \"\", 0);}"
+ "WITHOUT_PCRE2_STATIC;PCRE2_STATIC")
+ IF(NOT WITHOUT_PCRE2_STATIC AND PCRE2_STATIC)
+ ADD_DEFINITIONS(-DPCRE2_STATIC)
+ ELSEIF(NOT WITHOUT_PCRE2_STATIC AND NOT PCRE2_STATIC AND MSVC AND LIBGCC_FOUND)
+ # When doing a Visual Studio build using pcre2 static libraries
+ # built using the mingw toolchain, -lgcc is needed to resolve
+ # ___chkstk_ms.
+ MESSAGE(STATUS "Visual Studio build detected, trying again with -lgcc included")
+ LIST(APPEND ADDITIONAL_LIBS ${LIBGCC_LIBRARIES})
+ SET(TMP_LIBRARIES ${PCRE2POSIX_LIBRARIES} ${PCRE2_LIBRARIES} ${LIBGCC_LIBRARIES})
+ TRY_MACRO_FOR_LIBRARY(
+ "${PCRE2_INCLUDE_DIR}" "${TMP_LIBRARIES}"
+ COMPILES
+ "#include <pcre2posix.h>\nint main() {regex_t r;return pcre2_regcomp(&r, \"\", 0);}"
+ "WITHOUT_PCRE2_STATIC;PCRE2_STATIC")
+ IF(NOT WITHOUT_PCRE2_STATIC AND PCRE2_STATIC)
+ ADD_DEFINITIONS(-DPCRE2_STATIC)
+ ENDIF(NOT WITHOUT_PCRE2_STATIC AND PCRE2_STATIC)
+ ENDIF(NOT WITHOUT_PCRE2_STATIC AND PCRE2_STATIC)
+ ENDIF(NOT WITHOUT_PCRE2_STATIC AND PCRE2_STATIC)
+ ENDIF(PCRE2POSIX_FOUND)
+ MARK_AS_ADVANCED(CLEAR PCRE2_INCLUDE_DIR)
+ MARK_AS_ADVANCED(CLEAR PCRE2POSIX_LIBRARIES)
+ MARK_AS_ADVANCED(CLEAR PCRE2_LIBRARIES)
+ MARK_AS_ADVANCED(CLEAR LIBGCC_LIBRARIES)
+ENDIF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCRE2POSIX)$")
+
#
# Check functions
#
Index: pkgsrc/archivers/libarchive/files/Makefile.am
diff -u pkgsrc/archivers/libarchive/files/Makefile.am:1.13 pkgsrc/archivers/libarchive/files/Makefile.am:1.14
--- pkgsrc/archivers/libarchive/files/Makefile.am:1.13 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/Makefile.am Fri Apr 12 15:39:46 2024
@@ -289,7 +289,7 @@ endif
# -no-undefined marks that libarchive doesn't rely on symbols
# defined in the application. This is mandatory for cygwin.
-libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) $(GC_SECTIONS)
+libarchive_la_LDFLAGS= -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) $(DEAD_CODE_REMOVAL)
libarchive_la_LIBADD= $(LTLIBICONV)
# Manpages to install
@@ -633,13 +633,15 @@ libarchive_test_SOURCES= \
libarchive/test/test_write_format_xar.c \
libarchive/test/test_write_format_xar_empty.c \
libarchive/test/test_write_format_zip.c \
+ libarchive/test/test_write_format_zip64_stream.c \
libarchive/test/test_write_format_zip_compression_store.c \
- libarchive/test/test_write_format_zip_entry_size_unset.c \
libarchive/test/test_write_format_zip_empty.c \
libarchive/test/test_write_format_zip_empty_zip64.c \
+ libarchive/test/test_write_format_zip_entry_size_unset.c \
libarchive/test/test_write_format_zip_file.c \
libarchive/test/test_write_format_zip_file_zip64.c \
libarchive/test/test_write_format_zip_large.c \
+ libarchive/test/test_write_format_zip_stream.c \
libarchive/test/test_write_format_zip_zip64.c \
libarchive/test/test_write_open_memory.c \
libarchive/test/test_write_read_format_zip.c \
@@ -690,6 +692,8 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_compat_lz4_B7BD.tar.lz4.uu \
libarchive/test/test_compat_lzip_1.tlz.uu \
libarchive/test/test_compat_lzip_2.tlz.uu \
+ libarchive/test/test_compat_lzip_3.lz.uu \
+ libarchive/test/test_compat_lzip_4.tlz.uu \
libarchive/test/test_compat_lzma_1.tlz.uu \
libarchive/test/test_compat_lzma_2.tlz.uu \
libarchive/test/test_compat_lzma_3.tlz.uu \
@@ -1050,7 +1054,7 @@ endif
bsdtar_LDADD= libarchive.la libarchive_fe.la $(LTLIBICONV)
bsdtar_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdtar_ccstatic) $(PLATFORMCPPFLAGS)
-bsdtar_LDFLAGS= $(bsdtar_ldstatic) $(GC_SECTIONS)
+bsdtar_LDFLAGS= $(bsdtar_ldstatic) $(DEAD_CODE_REMOVAL)
bsdtar_EXTRA_DIST= \
tar/bsdtar.1 \
@@ -1110,6 +1114,7 @@ bsdtar_test_SOURCES= \
tar/test/test_option_exclude_vcs.c \
tar/test/test_option_fflags.c \
tar/test/test_option_gid_gname.c \
+ tar/test/test_option_group.c \
tar/test/test_option_grzip.c \
tar/test/test_option_ignore_zeros.c \
tar/test/test_option_j.c \
@@ -1123,6 +1128,7 @@ bsdtar_test_SOURCES= \
tar/test/test_option_newer_than.c \
tar/test/test_option_nodump.c \
tar/test/test_option_older_than.c \
+ tar/test/test_option_owner.c \
tar/test/test_option_passphrase.c \
tar/test/test_option_q.c \
tar/test/test_option_r.c \
@@ -1216,7 +1222,7 @@ endif
bsdcpio_LDADD= libarchive_fe.la libarchive.la $(LTLIBICONV)
bsdcpio_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcpio_ccstatic) $(PLATFORMCPPFLAGS)
-bsdcpio_LDFLAGS= $(bsdcpio_ldstatic) $(GC_SECTIONS)
+bsdcpio_LDFLAGS= $(bsdcpio_ldstatic) $(DEAD_CODE_REMOVAL)
bsdcpio_EXTRA_DIST= \
cpio/bsdcpio.1 \
@@ -1370,7 +1376,7 @@ endif
bsdcat_LDADD= libarchive_fe.la libarchive.la $(LTLIBICONV)
bsdcat_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcat_ccstatic) $(PLATFORMCPPFLAGS)
-bsdcat_LDFLAGS= $(bsdcat_ldstatic) $(GC_SECTIONS)
+bsdcat_LDFLAGS= $(bsdcat_ldstatic) $(DEAD_CODE_REMOVAL)
bsdcat_EXTRA_DIST= \
cat/bsdcat.1 \
@@ -1478,7 +1484,7 @@ endif
bsdunzip_LDADD= libarchive_fe.la libarchive.la $(LTLIBICONV)
bsdunzip_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdunzip_ccstatic) $(PLATFORMCPPFLAGS)
-bsdunzip_LDFLAGS= $(bsdunzip_ldstatic) $(GC_SECTIONS)
+bsdunzip_LDFLAGS= $(bsdunzip_ldstatic) $(DEAD_CODE_REMOVAL)
bsdunzip_EXTRA_DIST= \
unzip/bsdunzip.1 \
@@ -1503,6 +1509,7 @@ bsdunzip_test_SOURCES= \
unzip/test/test.h \
unzip/test/test_0.c \
unzip/test/test_basic.c \
+ unzip/test/test_doubledash.c \
unzip/test/test_glob.c \
unzip/test/test_not_exist.c \
unzip/test/test_singlefile.c \
@@ -1519,7 +1526,8 @@ bsdunzip_test_SOURCES= \
unzip/test/test_version.c \
unzip/test/test_x.c \
unzip/test/test_Z1.c \
- unzip/test/test_P_encryption.c
+ unzip/test/test_P_encryption.c \
+ unzip/test/test_I.c
bsdunzip_test_CPPFLAGS= \
-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
@@ -1547,4 +1555,5 @@ bsdunzip_test_EXTRA_DIST= \
unzip/test/test_encrypted.zip.uu \
unzip/test/test_singlefile.zip.uu \
unzip/test/test_t_bad.zip.uu \
+ unzip/test/test_I.zip.uu \
unzip/test/CMakeLists.txt
Index: pkgsrc/archivers/libarchive/files/Makefile.in
diff -u pkgsrc/archivers/libarchive/files/Makefile.in:1.15 pkgsrc/archivers/libarchive/files/Makefile.in:1.16
--- pkgsrc/archivers/libarchive/files/Makefile.in:1.15 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/Makefile.in Fri Apr 12 15:39:46 2024
@@ -627,6 +627,7 @@ am_bsdtar_test_OBJECTS = $(am__objects_1
tar/test/bsdtar_test-test_option_exclude_vcs.$(OBJEXT) \
tar/test/bsdtar_test-test_option_fflags.$(OBJEXT) \
tar/test/bsdtar_test-test_option_gid_gname.$(OBJEXT) \
+ tar/test/bsdtar_test-test_option_group.$(OBJEXT) \
tar/test/bsdtar_test-test_option_grzip.$(OBJEXT) \
tar/test/bsdtar_test-test_option_ignore_zeros.$(OBJEXT) \
tar/test/bsdtar_test-test_option_j.$(OBJEXT) \
@@ -640,6 +641,7 @@ am_bsdtar_test_OBJECTS = $(am__objects_1
tar/test/bsdtar_test-test_option_newer_than.$(OBJEXT) \
tar/test/bsdtar_test-test_option_nodump.$(OBJEXT) \
tar/test/bsdtar_test-test_option_older_than.$(OBJEXT) \
+ tar/test/bsdtar_test-test_option_owner.$(OBJEXT) \
tar/test/bsdtar_test-test_option_passphrase.$(OBJEXT) \
tar/test/bsdtar_test-test_option_q.$(OBJEXT) \
tar/test/bsdtar_test-test_option_r.$(OBJEXT) \
@@ -672,6 +674,7 @@ am__objects_13 = test_utils/bsdunzip_tes
am_bsdunzip_test_OBJECTS = $(am__objects_13) \
unzip/test/bsdunzip_test-test_0.$(OBJEXT) \
unzip/test/bsdunzip_test-test_basic.$(OBJEXT) \
+ unzip/test/bsdunzip_test-test_doubledash.$(OBJEXT) \
unzip/test/bsdunzip_test-test_glob.$(OBJEXT) \
unzip/test/bsdunzip_test-test_not_exist.$(OBJEXT) \
unzip/test/bsdunzip_test-test_singlefile.$(OBJEXT) \
@@ -688,7 +691,8 @@ am_bsdunzip_test_OBJECTS = $(am__objects
unzip/test/bsdunzip_test-test_version.$(OBJEXT) \
unzip/test/bsdunzip_test-test_x.$(OBJEXT) \
unzip/test/bsdunzip_test-test_Z1.$(OBJEXT) \
- unzip/test/bsdunzip_test-test_P_encryption.$(OBJEXT)
+ unzip/test/bsdunzip_test-test_P_encryption.$(OBJEXT) \
+ unzip/test/bsdunzip_test-test_I.$(OBJEXT)
bsdunzip_test_OBJECTS = $(am_bsdunzip_test_OBJECTS)
bsdunzip_test_DEPENDENCIES = libarchive_fe.la
am__libarchive_test_SOURCES_DIST = libarchive/archive_acl.c \
@@ -1109,13 +1113,15 @@ am__libarchive_test_SOURCES_DIST = libar
libarchive/test/test_write_format_xar.c \
libarchive/test/test_write_format_xar_empty.c \
libarchive/test/test_write_format_zip.c \
+ libarchive/test/test_write_format_zip64_stream.c \
libarchive/test/test_write_format_zip_compression_store.c \
- libarchive/test/test_write_format_zip_entry_size_unset.c \
libarchive/test/test_write_format_zip_empty.c \
libarchive/test/test_write_format_zip_empty_zip64.c \
+ libarchive/test/test_write_format_zip_entry_size_unset.c \
libarchive/test/test_write_format_zip_file.c \
libarchive/test/test_write_format_zip_file_zip64.c \
libarchive/test/test_write_format_zip_large.c \
+ libarchive/test/test_write_format_zip_stream.c \
libarchive/test/test_write_format_zip_zip64.c \
libarchive/test/test_write_open_memory.c \
libarchive/test/test_write_read_format_zip.c \
@@ -1526,13 +1532,15 @@ am_libarchive_test_OBJECTS = $(am__objec
libarchive/test/test-test_write_format_xar.$(OBJEXT) \
libarchive/test/test-test_write_format_xar_empty.$(OBJEXT) \
libarchive/test/test-test_write_format_zip.$(OBJEXT) \
+ libarchive/test/test-test_write_format_zip64_stream.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_compression_store.$(OBJEXT) \
- libarchive/test/test-test_write_format_zip_entry_size_unset.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_empty.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_empty_zip64.$(OBJEXT) \
+ libarchive/test/test-test_write_format_zip_entry_size_unset.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_file.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_file_zip64.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_large.$(OBJEXT) \
+ libarchive/test/test-test_write_format_zip_stream.$(OBJEXT) \
libarchive/test/test-test_write_format_zip_zip64.$(OBJEXT) \
libarchive/test/test-test_write_open_memory.$(OBJEXT) \
libarchive/test/test-test_write_read_format_zip.$(OBJEXT) \
@@ -2158,6 +2166,7 @@ am__depfiles_remade = cat/$(DEPDIR)/bsdc
libarchive/test/$(DEPDIR)/test-test_write_format_xar.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_xar_empty.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip.Po \
+ libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty_zip64.Po \
@@ -2165,6 +2174,7 @@ am__depfiles_remade = cat/$(DEPDIR)/bsdc
libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip_file_zip64.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip_large.Po \
+ libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Po \
libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Po \
libarchive/test/$(DEPDIR)/test-test_write_open_memory.Po \
libarchive/test/$(DEPDIR)/test-test_write_read_format_zip.Po \
@@ -2214,6 +2224,7 @@ am__depfiles_remade = cat/$(DEPDIR)/bsdc
tar/test/$(DEPDIR)/bsdtar_test-test_option_exclude_vcs.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_fflags.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_gid_gname.Po \
+ tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_ignore_zeros.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_j.Po \
@@ -2227,6 +2238,7 @@ am__depfiles_remade = cat/$(DEPDIR)/bsdc
tar/test/$(DEPDIR)/bsdtar_test-test_option_newer_than.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_nodump.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_older_than.Po \
+ tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_q.Po \
tar/test/$(DEPDIR)/bsdtar_test-test_option_r.Po \
@@ -2260,11 +2272,13 @@ am__depfiles_remade = cat/$(DEPDIR)/bsdc
unzip/$(DEPDIR)/bsdunzip-la_getline.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_C.Po \
+ unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_L.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_P_encryption.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_Z1.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_basic.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_d.Po \
+ unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_j.Po \
unzip/test/$(DEPDIR)/bsdunzip_test-test_n.Po \
@@ -2572,6 +2586,7 @@ CPPFLAGS = @CPPFLAGS@
CSCOPE = @CSCOPE@
CTAGS = @CTAGS@
CYGPATH_W = @CYGPATH_W@
+DEAD_CODE_REMOVAL = @DEAD_CODE_REMOVAL@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
@@ -2584,7 +2599,6 @@ EGREP = @EGREP@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GC_SECTIONS = @GC_SECTIONS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -2891,7 +2905,7 @@ libarchive_la_SOURCES = libarchive/archi
# -no-undefined marks that libarchive doesn't rely on symbols
# defined in the application. This is mandatory for cygwin.
-libarchive_la_LDFLAGS = -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) $(GC_SECTIONS)
+libarchive_la_LDFLAGS = -no-undefined -version-info $(ARCHIVE_LIBTOOL_VERSION) $(DEAD_CODE_REMOVAL)
libarchive_la_LIBADD = $(LTLIBICONV)
# Manpages to install
@@ -3238,13 +3252,15 @@ libarchive_test_SOURCES = \
libarchive/test/test_write_format_xar.c \
libarchive/test/test_write_format_xar_empty.c \
libarchive/test/test_write_format_zip.c \
+ libarchive/test/test_write_format_zip64_stream.c \
libarchive/test/test_write_format_zip_compression_store.c \
- libarchive/test/test_write_format_zip_entry_size_unset.c \
libarchive/test/test_write_format_zip_empty.c \
libarchive/test/test_write_format_zip_empty_zip64.c \
+ libarchive/test/test_write_format_zip_entry_size_unset.c \
libarchive/test/test_write_format_zip_file.c \
libarchive/test/test_write_format_zip_file_zip64.c \
libarchive/test/test_write_format_zip_large.c \
+ libarchive/test/test_write_format_zip_stream.c \
libarchive/test/test_write_format_zip_zip64.c \
libarchive/test/test_write_open_memory.c \
libarchive/test/test_write_read_format_zip.c \
@@ -3286,6 +3302,8 @@ libarchive_test_EXTRA_DIST = \
libarchive/test/test_compat_lz4_B7BD.tar.lz4.uu \
libarchive/test/test_compat_lzip_1.tlz.uu \
libarchive/test/test_compat_lzip_2.tlz.uu \
+ libarchive/test/test_compat_lzip_3.lz.uu \
+ libarchive/test/test_compat_lzip_4.tlz.uu \
libarchive/test/test_compat_lzma_1.tlz.uu \
libarchive/test/test_compat_lzma_2.tlz.uu \
libarchive/test/test_compat_lzma_3.tlz.uu \
@@ -3627,7 +3645,7 @@ bsdtar_DEPENDENCIES = libarchive.la liba
@STATIC_BSDTAR_TRUE@bsdtar_ccstatic = -DLIBARCHIVE_STATIC
bsdtar_LDADD = libarchive.la libarchive_fe.la $(LTLIBICONV)
bsdtar_CPPFLAGS = -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdtar_ccstatic) $(PLATFORMCPPFLAGS)
-bsdtar_LDFLAGS = $(bsdtar_ldstatic) $(GC_SECTIONS)
+bsdtar_LDFLAGS = $(bsdtar_ldstatic) $(DEAD_CODE_REMOVAL)
bsdtar_EXTRA_DIST = \
tar/bsdtar.1 \
tar/bsdtar_windows.h \
@@ -3681,6 +3699,7 @@ bsdtar_test_SOURCES = \
tar/test/test_option_exclude_vcs.c \
tar/test/test_option_fflags.c \
tar/test/test_option_gid_gname.c \
+ tar/test/test_option_group.c \
tar/test/test_option_grzip.c \
tar/test/test_option_ignore_zeros.c \
tar/test/test_option_j.c \
@@ -3694,6 +3713,7 @@ bsdtar_test_SOURCES = \
tar/test/test_option_newer_than.c \
tar/test/test_option_nodump.c \
tar/test/test_option_older_than.c \
+ tar/test/test_option_owner.c \
tar/test/test_option_passphrase.c \
tar/test/test_option_q.c \
tar/test/test_option_r.c \
@@ -3762,7 +3782,7 @@ bsdcpio_DEPENDENCIES = libarchive.la lib
@STATIC_BSDCPIO_TRUE@bsdcpio_ccstatic = -DLIBARCHIVE_STATIC
bsdcpio_LDADD = libarchive_fe.la libarchive.la $(LTLIBICONV)
bsdcpio_CPPFLAGS = -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcpio_ccstatic) $(PLATFORMCPPFLAGS)
-bsdcpio_LDFLAGS = $(bsdcpio_ldstatic) $(GC_SECTIONS)
+bsdcpio_LDFLAGS = $(bsdcpio_ldstatic) $(DEAD_CODE_REMOVAL)
bsdcpio_EXTRA_DIST = \
cpio/bsdcpio.1 \
cpio/cpio_windows.h \
@@ -3889,7 +3909,7 @@ bsdcat_DEPENDENCIES = libarchive.la liba
@STATIC_BSDCAT_TRUE@bsdcat_ccstatic = -DLIBARCHIVE_STATIC
bsdcat_LDADD = libarchive_fe.la libarchive.la $(LTLIBICONV)
bsdcat_CPPFLAGS = -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcat_ccstatic) $(PLATFORMCPPFLAGS)
-bsdcat_LDFLAGS = $(bsdcat_ldstatic) $(GC_SECTIONS)
+bsdcat_LDFLAGS = $(bsdcat_ldstatic) $(DEAD_CODE_REMOVAL)
bsdcat_EXTRA_DIST = \
cat/bsdcat.1 \
cat/CMakeLists.txt
@@ -3969,7 +3989,7 @@ bsdunzip_DEPENDENCIES = libarchive.la li
@STATIC_BSDUNZIP_TRUE@bsdunzip_ccstatic = -DLIBARCHIVE_STATIC
bsdunzip_LDADD = libarchive_fe.la libarchive.la $(LTLIBICONV)
bsdunzip_CPPFLAGS = -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdunzip_ccstatic) $(PLATFORMCPPFLAGS)
-bsdunzip_LDFLAGS = $(bsdunzip_ldstatic) $(GC_SECTIONS)
+bsdunzip_LDFLAGS = $(bsdunzip_ldstatic) $(DEAD_CODE_REMOVAL)
bsdunzip_EXTRA_DIST = \
unzip/bsdunzip.1 \
unzip/CMakeLists.txt
@@ -3989,6 +4009,7 @@ bsdunzip_test_SOURCES = \
unzip/test/test.h \
unzip/test/test_0.c \
unzip/test/test_basic.c \
+ unzip/test/test_doubledash.c \
unzip/test/test_glob.c \
unzip/test/test_not_exist.c \
unzip/test/test_singlefile.c \
@@ -4005,7 +4026,8 @@ bsdunzip_test_SOURCES = \
unzip/test/test_version.c \
unzip/test/test_x.c \
unzip/test/test_Z1.c \
- unzip/test/test_P_encryption.c
+ unzip/test/test_P_encryption.c \
+ unzip/test/test_I.c
bsdunzip_test_CPPFLAGS = \
-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
@@ -4025,6 +4047,7 @@ bsdunzip_test_EXTRA_DIST = \
unzip/test/test_encrypted.zip.uu \
unzip/test/test_singlefile.zip.uu \
unzip/test/test_t_bad.zip.uu \
+ unzip/test/test_I.zip.uu \
unzip/test/CMakeLists.txt
all: $(BUILT_SOURCES) config.h
@@ -4849,6 +4872,8 @@ tar/test/bsdtar_test-test_option_fflags.
tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
tar/test/bsdtar_test-test_option_gid_gname.$(OBJEXT): \
tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
+tar/test/bsdtar_test-test_option_group.$(OBJEXT): \
+ tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
tar/test/bsdtar_test-test_option_grzip.$(OBJEXT): \
tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
tar/test/bsdtar_test-test_option_ignore_zeros.$(OBJEXT): \
@@ -4875,6 +4900,8 @@ tar/test/bsdtar_test-test_option_nodump.
tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
tar/test/bsdtar_test-test_option_older_than.$(OBJEXT): \
tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
+tar/test/bsdtar_test-test_option_owner.$(OBJEXT): \
+ tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
tar/test/bsdtar_test-test_option_passphrase.$(OBJEXT): \
tar/test/$(am__dirstamp) tar/test/$(DEPDIR)/$(am__dirstamp)
tar/test/bsdtar_test-test_option_q.$(OBJEXT): \
@@ -4948,6 +4975,9 @@ unzip/test/bsdunzip_test-test_0.$(OBJEXT
unzip/test/bsdunzip_test-test_basic.$(OBJEXT): \
unzip/test/$(am__dirstamp) \
unzip/test/$(DEPDIR)/$(am__dirstamp)
+unzip/test/bsdunzip_test-test_doubledash.$(OBJEXT): \
+ unzip/test/$(am__dirstamp) \
+ unzip/test/$(DEPDIR)/$(am__dirstamp)
unzip/test/bsdunzip_test-test_glob.$(OBJEXT): \
unzip/test/$(am__dirstamp) \
unzip/test/$(DEPDIR)/$(am__dirstamp)
@@ -4989,6 +5019,8 @@ unzip/test/bsdunzip_test-test_Z1.$(OBJEX
unzip/test/bsdunzip_test-test_P_encryption.$(OBJEXT): \
unzip/test/$(am__dirstamp) \
unzip/test/$(DEPDIR)/$(am__dirstamp)
+unzip/test/bsdunzip_test-test_I.$(OBJEXT): unzip/test/$(am__dirstamp) \
+ unzip/test/$(DEPDIR)/$(am__dirstamp)
bsdunzip_test$(EXEEXT): $(bsdunzip_test_OBJECTS) $(bsdunzip_test_DEPENDENCIES) $(EXTRA_bsdunzip_test_DEPENDENCIES)
@rm -f bsdunzip_test$(EXEEXT)
@@ -6185,10 +6217,10 @@ libarchive/test/test-test_write_format_x
libarchive/test/test-test_write_format_zip.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
-libarchive/test/test-test_write_format_zip_compression_store.$(OBJEXT): \
+libarchive/test/test-test_write_format_zip64_stream.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
-libarchive/test/test-test_write_format_zip_entry_size_unset.$(OBJEXT): \
+libarchive/test/test-test_write_format_zip_compression_store.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
libarchive/test/test-test_write_format_zip_empty.$(OBJEXT): \
@@ -6197,6 +6229,9 @@ libarchive/test/test-test_write_format_z
libarchive/test/test-test_write_format_zip_empty_zip64.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
+libarchive/test/test-test_write_format_zip_entry_size_unset.$(OBJEXT): \
+ libarchive/test/$(am__dirstamp) \
+ libarchive/test/$(DEPDIR)/$(am__dirstamp)
libarchive/test/test-test_write_format_zip_file.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
@@ -6206,6 +6241,9 @@ libarchive/test/test-test_write_format_z
libarchive/test/test-test_write_format_zip_large.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
+libarchive/test/test-test_write_format_zip_stream.$(OBJEXT): \
+ libarchive/test/$(am__dirstamp) \
+ libarchive/test/$(DEPDIR)/$(am__dirstamp)
libarchive/test/test-test_write_format_zip_zip64.$(OBJEXT): \
libarchive/test/$(am__dirstamp) \
libarchive/test/$(DEPDIR)/$(am__dirstamp)
@@ -6849,6 +6887,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_xar.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_xar_empty.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty_zip64.Po@am__quote@ # am--include-marker
@@ -6856,6 +6895,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_file_zip64.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_large.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_open_memory.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@libarchive/test/$(DEPDIR)/test-test_write_read_format_zip.Po@am__quote@ # am--include-marker
@@ -6907,6 +6947,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_exclude_vcs.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_fflags.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_gid_gname.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_ignore_zeros.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_j.Po@am__quote@ # am--include-marker
@@ -6920,6 +6961,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_newer_than.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_nodump.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_older_than.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_q.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@tar/test/$(DEPDIR)/bsdtar_test-test_option_r.Po@am__quote@ # am--include-marker
@@ -6953,11 +6995,13 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@unzip/$(DEPDIR)/bsdunzip-la_getline.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_C.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_L.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_P_encryption.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_Z1.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_basic.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_d.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_j.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@unzip/test/$(DEPDIR)/bsdunzip_test-test_n.Po@am__quote@ # am--include-marker
@@ -8716,6 +8760,20 @@ tar/test/bsdtar_test-test_option_gid_gna
@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
tar/test/bsdtar_test-test_option_gid_gname.obj `if test -f 'tar/test/test_option_gid_gname.c'; then $(CYGPATH_W) 'tar/test/test_option_gid_gname.c'; else $(CYGPATH_W)
'$(srcdir)/tar/test/test_option_gid_gname.c'; fi`
+tar/test/bsdtar_test-test_option_group.o: tar/test/test_option_group.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_option_group.o -MD -MP -MF
tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Tpo -c -o tar/test/bsdtar_test-test_option_group.o `test -f 'tar/test/test_option_group.c' || echo '$(srcdir)/'`tar/test/test_option_group.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tar/test/test_option_group.c' object='tar/test/bsdtar_test-test_option_group.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 tar/test/bsdtar_test-test_option_group.o
`test -f 'tar/test/test_option_group.c' || echo '$(srcdir)/'`tar/test/test_option_group.c
+
+tar/test/bsdtar_test-test_option_group.obj: tar/test/test_option_group.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_option_group.obj -MD -MP -MF
tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Tpo -c -o tar/test/bsdtar_test-test_option_group.obj `if test -f 'tar/test/test_option_group.c'; then $(CYGPATH_W) 'tar/test/test_option_group.c';
else $(CYGPATH_W) '$(srcdir)/tar/test/test_option_group.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tar/test/test_option_group.c' object='tar/test/bsdtar_test-test_option_group.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 tar/test/bsdtar_test-test_option_group.obj
`if test -f 'tar/test/test_option_group.c'; then $(CYGPATH_W) 'tar/test/test_option_group.c'; else $(CYGPATH_W) '$(srcdir)/tar/test/test_option_group.c'; fi`
+
tar/test/bsdtar_test-test_option_grzip.o: tar/test/test_option_grzip.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_option_grzip.o -MD -MP -MF
tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Tpo -c -o tar/test/bsdtar_test-test_option_grzip.o `test -f 'tar/test/test_option_grzip.c' || echo '$(srcdir)/'`tar/test/test_option_grzip.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Po
@@ -8898,6 +8956,20 @@ tar/test/bsdtar_test-test_option_older_t
@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
tar/test/bsdtar_test-test_option_older_than.obj `if test -f 'tar/test/test_option_older_than.c'; then $(CYGPATH_W) 'tar/test/test_option_older_than.c'; else $(CYGPATH_W)
'$(srcdir)/tar/test/test_option_older_than.c'; fi`
+tar/test/bsdtar_test-test_option_owner.o: tar/test/test_option_owner.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_option_owner.o -MD -MP -MF
tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Tpo -c -o tar/test/bsdtar_test-test_option_owner.o `test -f 'tar/test/test_option_owner.c' || echo '$(srcdir)/'`tar/test/test_option_owner.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tar/test/test_option_owner.c' object='tar/test/bsdtar_test-test_option_owner.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 tar/test/bsdtar_test-test_option_owner.o
`test -f 'tar/test/test_option_owner.c' || echo '$(srcdir)/'`tar/test/test_option_owner.c
+
+tar/test/bsdtar_test-test_option_owner.obj: tar/test/test_option_owner.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_option_owner.obj -MD -MP -MF
tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Tpo -c -o tar/test/bsdtar_test-test_option_owner.obj `if test -f 'tar/test/test_option_owner.c'; then $(CYGPATH_W) 'tar/test/test_option_owner.c';
else $(CYGPATH_W) '$(srcdir)/tar/test/test_option_owner.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tar/test/test_option_owner.c' object='tar/test/bsdtar_test-test_option_owner.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 tar/test/bsdtar_test-test_option_owner.obj
`if test -f 'tar/test/test_option_owner.c'; then $(CYGPATH_W) 'tar/test/test_option_owner.c'; else $(CYGPATH_W) '$(srcdir)/tar/test/test_option_owner.c'; fi`
+
tar/test/bsdtar_test-test_option_passphrase.o: tar/test/test_option_passphrase.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_option_passphrase.o -MD -MP
-MF tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Tpo -c -o tar/test/bsdtar_test-test_option_passphrase.o `test -f 'tar/test/test_option_passphrase.c' || echo
'$(srcdir)/'`tar/test/test_option_passphrase.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Tpo tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Po
@@ -9248,6 +9320,20 @@ unzip/test/bsdunzip_test-test_basic.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 unzip/test/bsdunzip_test-test_basic.obj
`if test -f 'unzip/test/test_basic.c'; then $(CYGPATH_W) 'unzip/test/test_basic.c'; else $(CYGPATH_W) '$(srcdir)/unzip/test/test_basic.c'; fi`
+unzip/test/bsdunzip_test-test_doubledash.o: unzip/test/test_doubledash.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_doubledash.o -MD -MP -MF
unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Tpo -c -o unzip/test/bsdunzip_test-test_doubledash.o `test -f 'unzip/test/test_doubledash.c' || echo '$(srcdir)/'`unzip/test/test_doubledash.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Tpo unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unzip/test/test_doubledash.c' object='unzip/test/bsdunzip_test-test_doubledash.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
unzip/test/bsdunzip_test-test_doubledash.o `test -f 'unzip/test/test_doubledash.c' || echo '$(srcdir)/'`unzip/test/test_doubledash.c
+
+unzip/test/bsdunzip_test-test_doubledash.obj: unzip/test/test_doubledash.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_doubledash.obj -MD -MP
-MF unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Tpo -c -o unzip/test/bsdunzip_test-test_doubledash.obj `if test -f 'unzip/test/test_doubledash.c'; then $(CYGPATH_W)
'unzip/test/test_doubledash.c'; else $(CYGPATH_W) '$(srcdir)/unzip/test/test_doubledash.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Tpo unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unzip/test/test_doubledash.c' object='unzip/test/bsdunzip_test-test_doubledash.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
unzip/test/bsdunzip_test-test_doubledash.obj `if test -f 'unzip/test/test_doubledash.c'; then $(CYGPATH_W) 'unzip/test/test_doubledash.c'; else $(CYGPATH_W) '$(srcdir)/unzip/test/test_doubledash.c';
fi`
+
unzip/test/bsdunzip_test-test_glob.o: unzip/test/test_glob.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_glob.o -MD -MP -MF
unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Tpo -c -o unzip/test/bsdunzip_test-test_glob.o `test -f 'unzip/test/test_glob.c' || echo '$(srcdir)/'`unzip/test/test_glob.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Tpo unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Po
@@ -9486,6 +9572,20 @@ unzip/test/bsdunzip_test-test_P_encrypti
@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
unzip/test/bsdunzip_test-test_P_encryption.obj `if test -f 'unzip/test/test_P_encryption.c'; then $(CYGPATH_W) 'unzip/test/test_P_encryption.c'; else $(CYGPATH_W)
'$(srcdir)/unzip/test/test_P_encryption.c'; fi`
+unzip/test/bsdunzip_test-test_I.o: unzip/test/test_I.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_I.o -MD -MP -MF
unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Tpo -c -o unzip/test/bsdunzip_test-test_I.o `test -f 'unzip/test/test_I.c' || echo '$(srcdir)/'`unzip/test/test_I.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Tpo unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unzip/test/test_I.c' object='unzip/test/bsdunzip_test-test_I.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 unzip/test/bsdunzip_test-test_I.o `test
-f 'unzip/test/test_I.c' || echo '$(srcdir)/'`unzip/test/test_I.c
+
+unzip/test/bsdunzip_test-test_I.obj: unzip/test/test_I.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_I.obj -MD -MP -MF
unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Tpo -c -o unzip/test/bsdunzip_test-test_I.obj `if test -f 'unzip/test/test_I.c'; then $(CYGPATH_W) 'unzip/test/test_I.c'; else $(CYGPATH_W)
'$(srcdir)/unzip/test/test_I.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Tpo unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='unzip/test/test_I.c' object='unzip/test/bsdunzip_test-test_I.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 unzip/test/bsdunzip_test-test_I.obj `if
test -f 'unzip/test/test_I.c'; then $(CYGPATH_W) 'unzip/test/test_I.c'; else $(CYGPATH_W) '$(srcdir)/unzip/test/test_I.c'; fi`
+
libarchive/test-archive_acl.o: libarchive/archive_acl.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test-archive_acl.o -MD -MP -MF
libarchive/$(DEPDIR)/test-archive_acl.Tpo -c -o libarchive/test-archive_acl.o `test -f 'libarchive/archive_acl.c' || echo '$(srcdir)/'`libarchive/archive_acl.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/$(DEPDIR)/test-archive_acl.Tpo libarchive/$(DEPDIR)/test-archive_acl.Po
@@ -15114,6 +15214,20 @@ libarchive/test/test-test_write_format_z
@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/test-test_write_format_zip.obj `if test -f 'libarchive/test/test_write_format_zip.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip.c'; else $(CYGPATH_W)
'$(srcdir)/libarchive/test/test_write_format_zip.c'; fi`
+libarchive/test/test-test_write_format_zip64_stream.o: libarchive/test/test_write_format_zip64_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip64_stream.o -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Tpo -c -o libarchive/test/test-test_write_format_zip64_stream.o `test
-f 'libarchive/test/test_write_format_zip64_stream.c' || echo '$(srcdir)/'`libarchive/test/test_write_format_zip64_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip64_stream.c' object='libarchive/test/test-test_write_format_zip64_stream.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/test-test_write_format_zip64_stream.o `test -f 'libarchive/test/test_write_format_zip64_stream.c' || echo '$(srcdir)/'`libarchive/test/test_write_format_zip64_stream.c
+
+libarchive/test/test-test_write_format_zip64_stream.obj: libarchive/test/test_write_format_zip64_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip64_stream.obj -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Tpo -c -o libarchive/test/test-test_write_format_zip64_stream.obj `if
test -f 'libarchive/test/test_write_format_zip64_stream.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip64_stream.c'; else $(CYGPATH_W)
'$(srcdir)/libarchive/test/test_write_format_zip64_stream.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip64_stream.c' object='libarchive/test/test-test_write_format_zip64_stream.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/test-test_write_format_zip64_stream.obj `if test -f 'libarchive/test/test_write_format_zip64_stream.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip64_stream.c'; else
$(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip64_stream.c'; fi`
+
libarchive/test/test-test_write_format_zip_compression_store.o: libarchive/test/test_write_format_zip_compression_store.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip_compression_store.o -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Tpo -c -o
libarchive/test/test-test_write_format_zip_compression_store.o `test -f 'libarchive/test/test_write_format_zip_compression_store.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_compression_store.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Po
@@ -15128,20 +15242,6 @@ libarchive/test/test-test_write_format_z
@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/test-test_write_format_zip_compression_store.obj `if test -f 'libarchive/test/test_write_format_zip_compression_store.c'; then $(CYGPATH_W)
'libarchive/test/test_write_format_zip_compression_store.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_compression_store.c'; fi`
-libarchive/test/test-test_write_format_zip_entry_size_unset.o: libarchive/test/test_write_format_zip_entry_size_unset.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip_entry_size_unset.o -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo -c -o
libarchive/test/test-test_write_format_zip_entry_size_unset.o `test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_entry_size_unset.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip_entry_size_unset.c' object='libarchive/test/test-test_write_format_zip_entry_size_unset.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/test-test_write_format_zip_entry_size_unset.o `test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_entry_size_unset.c
-
-libarchive/test/test-test_write_format_zip_entry_size_unset.obj: libarchive/test/test_write_format_zip_entry_size_unset.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip_entry_size_unset.obj -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo -c -o
libarchive/test/test-test_write_format_zip_entry_size_unset.obj `if test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c'; then $(CYGPATH_W)
'libarchive/test/test_write_format_zip_entry_size_unset.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_entry_size_unset.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip_entry_size_unset.c' object='libarchive/test/test-test_write_format_zip_entry_size_unset.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/test-test_write_format_zip_entry_size_unset.obj `if test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c'; then $(CYGPATH_W)
'libarchive/test/test_write_format_zip_entry_size_unset.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_entry_size_unset.c'; fi`
-
libarchive/test/test-test_write_format_zip_empty.o: libarchive/test/test_write_format_zip_empty.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test/test-test_write_format_zip_empty.o
-MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Tpo -c -o libarchive/test/test-test_write_format_zip_empty.o `test -f 'libarchive/test/test_write_format_zip_empty.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_empty.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Po
@@ -15170,6 +15270,20 @@ libarchive/test/test-test_write_format_z
@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/test-test_write_format_zip_empty_zip64.obj `if test -f 'libarchive/test/test_write_format_zip_empty_zip64.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip_empty_zip64.c';
else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_empty_zip64.c'; fi`
+libarchive/test/test-test_write_format_zip_entry_size_unset.o: libarchive/test/test_write_format_zip_entry_size_unset.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip_entry_size_unset.o -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo -c -o
libarchive/test/test-test_write_format_zip_entry_size_unset.o `test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_entry_size_unset.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip_entry_size_unset.c' object='libarchive/test/test-test_write_format_zip_entry_size_unset.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/test-test_write_format_zip_entry_size_unset.o `test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_entry_size_unset.c
+
+libarchive/test/test-test_write_format_zip_entry_size_unset.obj: libarchive/test/test_write_format_zip_entry_size_unset.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip_entry_size_unset.obj -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo -c -o
libarchive/test/test-test_write_format_zip_entry_size_unset.obj `if test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c'; then $(CYGPATH_W)
'libarchive/test/test_write_format_zip_entry_size_unset.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_entry_size_unset.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_entry_size_unset.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip_entry_size_unset.c' object='libarchive/test/test-test_write_format_zip_entry_size_unset.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/test-test_write_format_zip_entry_size_unset.obj `if test -f 'libarchive/test/test_write_format_zip_entry_size_unset.c'; then $(CYGPATH_W)
'libarchive/test/test_write_format_zip_entry_size_unset.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_entry_size_unset.c'; fi`
+
libarchive/test/test-test_write_format_zip_file.o: libarchive/test/test_write_format_zip_file.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test/test-test_write_format_zip_file.o
-MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Tpo -c -o libarchive/test/test-test_write_format_zip_file.o `test -f 'libarchive/test/test_write_format_zip_file.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_file.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Po
@@ -15212,6 +15326,20 @@ libarchive/test/test-test_write_format_z
@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/test-test_write_format_zip_large.obj `if test -f 'libarchive/test/test_write_format_zip_large.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip_large.c'; else $(CYGPATH_W)
'$(srcdir)/libarchive/test/test_write_format_zip_large.c'; fi`
+libarchive/test/test-test_write_format_zip_stream.o: libarchive/test/test_write_format_zip_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test/test-test_write_format_zip_stream.o
-MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Tpo -c -o libarchive/test/test-test_write_format_zip_stream.o `test -f 'libarchive/test/test_write_format_zip_stream.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip_stream.c' object='libarchive/test/test-test_write_format_zip_stream.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/test-test_write_format_zip_stream.o `test -f 'libarchive/test/test_write_format_zip_stream.c' || echo '$(srcdir)/'`libarchive/test/test_write_format_zip_stream.c
+
+libarchive/test/test-test_write_format_zip_stream.obj: libarchive/test/test_write_format_zip_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT
libarchive/test/test-test_write_format_zip_stream.obj -MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Tpo -c -o libarchive/test/test-test_write_format_zip_stream.obj `if test
-f 'libarchive/test/test_write_format_zip_stream.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip_stream.c'; else $(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_stream.c';
fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libarchive/test/test_write_format_zip_stream.c' object='libarchive/test/test-test_write_format_zip_stream.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/test-test_write_format_zip_stream.obj `if test -f 'libarchive/test/test_write_format_zip_stream.c'; then $(CYGPATH_W) 'libarchive/test/test_write_format_zip_stream.c'; else
$(CYGPATH_W) '$(srcdir)/libarchive/test/test_write_format_zip_stream.c'; fi`
+
libarchive/test/test-test_write_format_zip_zip64.o: libarchive/test/test_write_format_zip_zip64.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarchive_test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libarchive/test/test-test_write_format_zip_zip64.o
-MD -MP -MF libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Tpo -c -o libarchive/test/test-test_write_format_zip_zip64.o `test -f 'libarchive/test/test_write_format_zip_zip64.c' || echo
'$(srcdir)/'`libarchive/test/test_write_format_zip_zip64.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Tpo libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Po
@@ -16573,6 +16701,7 @@ distclean: distclean-am
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_xar.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_xar_empty.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip.Po
+ -rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty_zip64.Po
@@ -16580,6 +16709,7 @@ distclean: distclean-am
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_file_zip64.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_large.Po
+ -rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_open_memory.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_read_format_zip.Po
@@ -16631,6 +16761,7 @@ distclean: distclean-am
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_exclude_vcs.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_fflags.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_gid_gname.Po
+ -rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_ignore_zeros.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_j.Po
@@ -16644,6 +16775,7 @@ distclean: distclean-am
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_newer_than.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_nodump.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_older_than.Po
+ -rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_q.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_r.Po
@@ -16677,11 +16809,13 @@ distclean: distclean-am
-rm -f unzip/$(DEPDIR)/bsdunzip-la_getline.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_C.Po
+ -rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_L.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_P_encryption.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_Z1.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_basic.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_d.Po
+ -rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_j.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_n.Po
@@ -17345,6 +17479,7 @@ maintainer-clean: maintainer-clean-am
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_xar.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_xar_empty.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip.Po
+ -rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip64_stream.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_compression_store.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_empty_zip64.Po
@@ -17352,6 +17487,7 @@ maintainer-clean: maintainer-clean-am
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_file.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_file_zip64.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_large.Po
+ -rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_stream.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_format_zip_zip64.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_open_memory.Po
-rm -f libarchive/test/$(DEPDIR)/test-test_write_read_format_zip.Po
@@ -17403,6 +17539,7 @@ maintainer-clean: maintainer-clean-am
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_exclude_vcs.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_fflags.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_gid_gname.Po
+ -rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_group.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_grzip.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_ignore_zeros.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_j.Po
@@ -17416,6 +17553,7 @@ maintainer-clean: maintainer-clean-am
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_newer_than.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_nodump.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_older_than.Po
+ -rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_owner.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_passphrase.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_q.Po
-rm -f tar/test/$(DEPDIR)/bsdtar_test-test_option_r.Po
@@ -17449,11 +17587,13 @@ maintainer-clean: maintainer-clean-am
-rm -f unzip/$(DEPDIR)/bsdunzip-la_getline.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_0.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_C.Po
+ -rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_I.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_L.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_P_encryption.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_Z1.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_basic.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_d.Po
+ -rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_doubledash.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_glob.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_j.Po
-rm -f unzip/test/$(DEPDIR)/bsdunzip_test-test_n.Po
Index: pkgsrc/archivers/libarchive/files/NEWS
diff -u pkgsrc/archivers/libarchive/files/NEWS:1.14 pkgsrc/archivers/libarchive/files/NEWS:1.15
--- pkgsrc/archivers/libarchive/files/NEWS:1.14 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/NEWS Fri Apr 12 15:39:46 2024
@@ -1,3 +1,5 @@
+Apr 08, 2024: libarchive 3.7.3 released
+
Sep 12, 2023: libarchive 3.7.2 released
Jul 29, 2023: libarchive 3.7.1 released
Index: pkgsrc/archivers/libarchive/files/config.h.in
diff -u pkgsrc/archivers/libarchive/files/config.h.in:1.16 pkgsrc/archivers/libarchive/files/config.h.in:1.17
--- pkgsrc/archivers/libarchive/files/config.h.in:1.16 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/config.h.in Fri Apr 12 15:39:46 2024
@@ -673,6 +673,12 @@
/* Define to 1 if you have the `pcre' library (-lpcre). */
#undef HAVE_LIBPCRE
+/* Define to 1 if you have the `pcre2' library (-lpcre2). */
+#undef HAVE_LIBPCRE2
+
+/* Define to 1 if you have the `pcre2-posix' library (-lpcre2-posix). */
+#undef HAVE_LIBPCRE2_POSIX
+
/* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
#undef HAVE_LIBPCREPOSIX
@@ -697,10 +703,6 @@
/* Define to 1 if you have the `zstd' library (-lzstd). */
#undef HAVE_LIBZSTD
-/* Define to 1 if you have the `zstd' library (-lzstd) with compression
- support. */
-#undef HAVE_LIBZSTD_COMPRESSOR
-
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -870,6 +872,9 @@
/* Define to 1 if you have the <paths.h> header file. */
#undef HAVE_PATHS_H
+/* Define to 1 if you have the <pcre2posix.h> header file. */
+#undef HAVE_PCRE2POSIX_H
+
/* Define to 1 if you have the <pcreposix.h> header file. */
#undef HAVE_PCREPOSIX_H
@@ -1254,6 +1259,10 @@
/* Define to 1 if you have the <zstd.h> header file. */
#undef HAVE_ZSTD_H
+/* Define to 1 if you have the `zstd' library (-lzstd) with compression
+ support. */
+#undef HAVE_ZSTD_compressStream
+
/* Define to 1 if you have the `_fseeki64' function. */
#undef HAVE__FSEEKI64
@@ -1311,6 +1320,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to 1 if PCRE2_STATIC needs to be defined. */
+#undef PCRE2_STATIC
+
/* Define to 1 if PCRE_STATIC needs to be defined. */
#undef PCRE_STATIC
Index: pkgsrc/archivers/libarchive/files/configure
diff -u pkgsrc/archivers/libarchive/files/configure:1.23 pkgsrc/archivers/libarchive/files/configure:1.24
--- pkgsrc/archivers/libarchive/files/configure:1.23 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/configure Fri Apr 12 15:39:46 2024
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libarchive 3.7.2.
+# Generated by GNU Autoconf 2.71 for libarchive 3.7.3.
#
# Report bugs to <libarchive-discuss%googlegroups.com@localhost>.
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libarchive'
PACKAGE_TARNAME='libarchive'
-PACKAGE_VERSION='3.7.2'
-PACKAGE_STRING='libarchive 3.7.2'
+PACKAGE_VERSION='3.7.3'
+PACKAGE_STRING='libarchive 3.7.3'
PACKAGE_BUGREPORT='libarchive-discuss%googlegroups.com@localhost'
PACKAGE_URL=''
@@ -673,7 +673,7 @@ INC_SUNOS_ACL_TRUE
INC_LINUX_ACL_FALSE
INC_LINUX_ACL_TRUE
LIBOBJS
-GC_SECTIONS
+DEAD_CODE_REMOVAL
LIBXML2_PC_LIBS
LIBXML2_PC_CFLAGS
PKG_CONFIG_LIBDIR
@@ -1434,7 +1434,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.7.2 to adapt to many kinds of systems.
+\`configure' configures libarchive 3.7.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1505,7 +1505,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libarchive 3.7.2:";;
+ short | recursive ) echo "Configuration of libarchive 3.7.3:";;
esac
cat <<\_ACEOF
@@ -1555,6 +1555,8 @@ Optional Features:
use libregex POSIX regular expression support
--enable-posix-regex-lib=libpcreposix
use libpcreposix POSIX regular expression support
+ --enable-posix-regex-lib=libpcre2posix
+ use libpcre2-posix POSIX regular expression support
--disable-posix-regex-lib
don't enable POSIX regular expression support
--disable-xattr Disable Extended Attributes support (default: check)
@@ -1679,7 +1681,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libarchive configure 3.7.2
+libarchive configure 3.7.3
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2473,7 +2475,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.7.2, which was
+It was created by libarchive $as_me 3.7.3, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3753,7 +3755,7 @@ fi
# Define the identity of the package.
PACKAGE='libarchive'
- VERSION='3.7.2'
+ VERSION='3.7.3'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3926,7 +3928,7 @@ AM_BACKSLASH='\'
# Libtool interface version bumps on any API change, so increments
# whenever libarchive minor version does.
-ARCHIVE_MINOR=$(( (3007002 / 1000) % 1000 ))
+ARCHIVE_MINOR=$(( (3007003 / 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 + 8
@@ -3934,7 +3936,7 @@ ARCHIVE_MINOR=$(( (3007002 / 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=$(( 3007002 % 1000 ))
+ARCHIVE_REVISION=$(( 3007003 % 1000 ))
# Libarchive minor is bumped on any interface addition === libtool age
ARCHIVE_LIBTOOL_VERSION=$ARCHIVE_INTERFACE:$ARCHIVE_REVISION:$ARCHIVE_MINOR
@@ -3943,33 +3945,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.7.2\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_STRING \"3.7.3\"" >>confdefs.h
-printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3007002\"" >>confdefs.h
+printf "%s\n" "#define LIBARCHIVE_VERSION_NUMBER \"3007003\"" >>confdefs.h
-printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.7.2\"" >>confdefs.h
+printf "%s\n" "#define BSDCPIO_VERSION_STRING \"3.7.3\"" >>confdefs.h
-printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.7.2\"" >>confdefs.h
+printf "%s\n" "#define BSDTAR_VERSION_STRING \"3.7.3\"" >>confdefs.h
-printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.7.2\"" >>confdefs.h
+printf "%s\n" "#define BSDCAT_VERSION_STRING \"3.7.3\"" >>confdefs.h
-printf "%s\n" "#define BSDUNZIP_VERSION_STRING \"3.7.2\"" >>confdefs.h
+printf "%s\n" "#define BSDUNZIP_VERSION_STRING \"3.7.3\"" >>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.7.2
-BSDTAR_VERSION_STRING=3.7.2
-BSDCAT_VERSION_STRING=3.7.2
-BSDUNZIP_VERSION_STRING=3.7.2
-LIBARCHIVE_VERSION_STRING=3.7.2
-LIBARCHIVE_VERSION_NUMBER=3007002
+BSDCPIO_VERSION_STRING=3.7.3
+BSDTAR_VERSION_STRING=3.7.3
+BSDCAT_VERSION_STRING=3.7.3
+BSDUNZIP_VERSION_STRING=3.7.3
+LIBARCHIVE_VERSION_STRING=3.7.3
+LIBARCHIVE_VERSION_NUMBER=3007003
# Substitute the above version numbers into the various files below.
# Yes, I believe this is the fourth time we define what are essentially
@@ -16502,7 +16504,7 @@ printf "%s\n" "$ac_cv_lib_zstd_ZSTD_comp
if test "x$ac_cv_lib_zstd_ZSTD_compressStream" = xyes
then :
-printf "%s\n" "#define HAVE_LIBZSTD_COMPRESSOR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ZSTD_compressStream 1" >>confdefs.h
fi
@@ -16587,7 +16589,7 @@ else $as_nop
int
main (void)
{
-lzma_stream_encoder_mt(0, 0);
+int ignored __attribute__((unused)); ignored = lzma_stream_encoder_mt(0, 0);
;
return 0;
}
@@ -17434,6 +17436,193 @@ printf "%s\n" "no" >&6; }
posix_regex_lib_found=1
fi
fi
+if test -z $posix_regex_lib_found && (test "$enable_posix_regex_lib" = "auto" || test "$enable_posix_regex_lib" = "libpcre2posix"); then
+ ac_fn_c_check_header_compile "$LINENO" "pcre2posix.h" "ac_cv_header_pcre2posix_h" "$ac_includes_default"
+if test "x$ac_cv_header_pcre2posix_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_PCRE2POSIX_H 1" >>confdefs.h
+
+fi
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for regcomp in -lpcre2-posix" >&5
+printf %s "checking for regcomp in -lpcre2-posix... " >&6; }
+if test ${ac_cv_lib_pcre2_posix_regcomp+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre2-posix $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+char regcomp ();
+int
+main (void)
+{
+return regcomp ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_pcre2_posix_regcomp=yes
+else $as_nop
+ ac_cv_lib_pcre2_posix_regcomp=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_posix_regcomp" >&5
+printf "%s\n" "$ac_cv_lib_pcre2_posix_regcomp" >&6; }
+if test "x$ac_cv_lib_pcre2_posix_regcomp" = xyes
+then :
+ printf "%s\n" "#define HAVE_LIBPCRE2_POSIX 1" >>confdefs.h
+
+ LIBS="-lpcre2-posix $LIBS"
+
+fi
+
+ if test "x$ac_cv_lib_pcre2posix_regcomp" != xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying libpcre2posix check again with libpcre2-8" >&5
+printf "%s\n" "$as_me: trying libpcre2posix check again with libpcre2-8" >&6;}
+ unset ac_cv_lib_pcre2posix_regcomp
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pcre2_regexec in -lpcre2" >&5
+printf %s "checking for pcre2_regexec in -lpcre2... " >&6; }
+if test ${ac_cv_lib_pcre2_pcre2_regexec+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre2 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+char pcre2_regexec ();
+int
+main (void)
+{
+return pcre2_regexec ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_pcre2_pcre2_regexec=yes
+else $as_nop
+ ac_cv_lib_pcre2_pcre2_regexec=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_pcre2_regexec" >&5
+printf "%s\n" "$ac_cv_lib_pcre2_pcre2_regexec" >&6; }
+if test "x$ac_cv_lib_pcre2_pcre2_regexec" = xyes
+then :
+ printf "%s\n" "#define HAVE_LIBPCRE2 1" >>confdefs.h
+
+ LIBS="-lpcre2 $LIBS"
+
+fi
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pcre2_regcomp in -lpcre2-posix" >&5
+printf %s "checking for pcre2_regcomp in -lpcre2-posix... " >&6; }
+if test ${ac_cv_lib_pcre2_posix_pcre2_regcomp+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre2-posix $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+char pcre2_regcomp ();
+int
+main (void)
+{
+return pcre2_regcomp ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_pcre2_posix_pcre2_regcomp=yes
+else $as_nop
+ ac_cv_lib_pcre2_posix_pcre2_regcomp=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre2_posix_pcre2_regcomp" >&5
+printf "%s\n" "$ac_cv_lib_pcre2_posix_pcre2_regcomp" >&6; }
+if test "x$ac_cv_lib_pcre2_posix_pcre2_regcomp" = xyes
+then :
+ printf "%s\n" "#define HAVE_LIBPCRE2_POSIX 1" >>confdefs.h
+
+ LIBS="-lpcre2-posix $LIBS"
+
+fi
+
+ if test "x$ac_cv_lib_pcre2_pcre_exec" = xyes && test "x$ac_cv_lib_pcre2posix_regcomp" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if PCRE2_STATIC needs to be defined" >&5
+printf %s "checking if PCRE2_STATIC needs to be defined... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <pcre2posix.h>
+ int main() { return pcre2_regcomp(NULL, NULL, 0); }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ without_pcre2_static=yes
+else $as_nop
+ without_pcre2_static=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define PCRE2_STATIC
+ #include <pcre2posix.h>
+ int main() { return pcre2_regcomp(NULL, NULL, 0); }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ with_pcre2_static=yes
+else $as_nop
+ with_pcre2_static=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "x$without_pcre2_static" != xyes && test "x$with_pcre2_static" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+printf "%s\n" "#define PCRE2_STATIC 1" >>confdefs.h
+
+ elif test "x$without_pcre2_static" = xyes || test "x$with_pcre2_static" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ fi
+ posix_regex_lib_found=1
+ fi
+ else
+ posix_regex_lib_found=1
+ fi
+fi
# TODO: Give the user the option of using a pre-existing system
# libarchive. This will define HAVE_LIBARCHIVE which will cause
@@ -17523,8 +17712,8 @@ fi
done
-# Place the functions and data into separate sections, allowing the linker
-# to garbage collect the unused ones.
+# Place the functions and data into separate sections, allowing GNU style
+# linkers to garbage collect the unused ones.
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--gc-sections"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ld supports --gc-sections" >&5
@@ -17537,7 +17726,7 @@ if ac_fn_c_try_link "$LINENO"
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
- GC_SECTIONS="-Wl,--gc-sections";
+ DEAD_CODE_REMOVAL="-Wl,--gc-sections";
@@ -17620,12 +17809,37 @@ done
else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
- GC_SECTIONS="";
+ DEAD_CODE_REMOVAL="";
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
+if test "$DEAD_CODE_REMOVAL" = ""; then
+ # Macos linkers have a -dead_strip flag, which is similar to --gc-sections.
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-dead_strip"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ld supports -dead_strip" >&5
+printf %s "checking whether ld supports -dead_strip... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+static char UnusedFunc() { return 5; } int main() { return 0;}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ DEAD_CODE_REMOVAL="-Wl,-dead_strip";
+else $as_nop
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ DEAD_CODE_REMOVAL="";
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+fi
+
# Checks for typedefs, structures, and compiler characteristics.
@@ -23954,7 +24168,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.7.2, which was
+This file was extended by libarchive $as_me 3.7.3, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24022,7 +24236,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.7.2
+libarchive config.status 3.7.3
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Index: pkgsrc/archivers/libarchive/files/configure.ac
diff -u pkgsrc/archivers/libarchive/files/configure.ac:1.22 pkgsrc/archivers/libarchive/files/configure.ac:1.23
--- pkgsrc/archivers/libarchive/files/configure.ac:1.22 Thu Jan 18 18:00:11 2024
+++ pkgsrc/archivers/libarchive/files/configure.ac Fri Apr 12 15:39:46 2024
@@ -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.7.2])
-m4_define([LIBARCHIVE_VERSION_N],[3007002])
+m4_define([LIBARCHIVE_VERSION_S],[3.7.3])
+m4_define([LIBARCHIVE_VERSION_N],[3007003])
dnl bsdtar and bsdcpio versioning tracks libarchive
m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
@@ -461,7 +461,7 @@ if test "x$with_zstd" != "xno"; then
AC_CHECK_HEADERS([zstd.h])
AC_CHECK_LIB(zstd,ZSTD_decompressStream)
AC_CHECK_LIB(zstd,ZSTD_compressStream,
- AC_DEFINE([HAVE_LIBZSTD_COMPRESSOR], [1], [Define to 1 if you have the `zstd' library (-lzstd) with compression support.]))
+ AC_DEFINE([HAVE_ZSTD_compressStream], [1], [Define to 1 if you have the `zstd' library (-lzstd) with compression support.]))
fi
AC_ARG_WITH([lzma],
@@ -482,7 +482,7 @@ if test "x$with_lzma" != "xno"; then
[#if LZMA_VERSION < 50020000]
[#error unsupported]
[#endif]],
- [[lzma_stream_encoder_mt(0, 0);]])],
+ [[int ignored __attribute__((unused)); ignored = lzma_stream_encoder_mt(0, 0);]])],
[ac_cv_lzma_has_mt=yes], [ac_cv_lzma_has_mt=no])])
if test "x$ac_cv_lzma_has_mt" != xno; then
AC_DEFINE([HAVE_LZMA_STREAM_ENCODER_MT], [1], [Define to 1 if you have the `lzma_stream_encoder_mt' function.])
@@ -552,6 +552,7 @@ AC_ARG_ENABLE([posix-regex-lib],
AS_HELP_STRING([--enable-posix-regex-lib=libc], [use libc POSIX regular expression support])
AS_HELP_STRING([--enable-posix-regex-lib=libregex], [use libregex POSIX regular expression support])
AS_HELP_STRING([--enable-posix-regex-lib=libpcreposix], [use libpcreposix POSIX regular expression support])
+ AS_HELP_STRING([--enable-posix-regex-lib=libpcre2posix], [use libpcre2-posix POSIX regular expression support])
AS_HELP_STRING([--disable-posix-regex-lib], [don't enable POSIX regular expression support])],
[], [enable_posix_regex_lib=auto])
@@ -603,6 +604,39 @@ if test -z $posix_regex_lib_found && (te
posix_regex_lib_found=1
fi
fi
+if test -z $posix_regex_lib_found && (test "$enable_posix_regex_lib" = "auto" || test "$enable_posix_regex_lib" = "libpcre2posix"); then
+ AC_CHECK_HEADERS([pcre2posix.h])
+ AC_CHECK_LIB(pcre2-posix,regcomp)
+ if test "x$ac_cv_lib_pcre2posix_regcomp" != xyes; then
+ AC_MSG_NOTICE(trying libpcre2posix check again with libpcre2-8)
+ unset ac_cv_lib_pcre2posix_regcomp
+ AC_CHECK_LIB(pcre2,pcre2_regexec)
+ AC_CHECK_LIB(pcre2-posix,pcre2_regcomp)
+ if test "x$ac_cv_lib_pcre2_pcre_exec" = xyes && test "x$ac_cv_lib_pcre2posix_regcomp" = xyes; then
+ AC_MSG_CHECKING(if PCRE2_STATIC needs to be defined)
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(#include <pcre2posix.h>
+ int main() { return pcre2_regcomp(NULL, NULL, 0); })],
+ [without_pcre2_static=yes],
+ [without_pcre2_static=no])
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE(#define PCRE2_STATIC
+ #include <pcre2posix.h>
+ int main() { return pcre2_regcomp(NULL, NULL, 0); })],
+ [with_pcre2_static=yes],
+ [with_pcre2_static=no])
+ if test "x$without_pcre2_static" != xyes && test "x$with_pcre2_static" = xyes; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([PCRE2_STATIC], [1], [Define to 1 if PCRE2_STATIC needs to be defined.])
+ elif test "x$without_pcre2_static" = xyes || test "x$with_pcre2_static" = xyes; then
+ AC_MSG_RESULT(no)
+ fi
+ posix_regex_lib_found=1
+ fi
+ else
+ posix_regex_lib_found=1
+ fi
+fi
# TODO: Give the user the option of using a pre-existing system
# libarchive. This will define HAVE_LIBARCHIVE which will cause
@@ -614,21 +648,35 @@ fi
# Checks for supported compiler flags
AX_APPEND_COMPILE_FLAGS([-Wall -Wformat -Wformat-security])
-# Place the functions and data into separate sections, allowing the linker
-# to garbage collect the unused ones.
+# Place the functions and data into separate sections, allowing GNU style
+# linkers to garbage collect the unused ones.
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -Wl,--gc-sections"
AC_MSG_CHECKING([whether ld supports --gc-sections])
AC_LINK_IFELSE(
[AC_LANG_SOURCE([static char UnusedFunc() { return 5; } int main() { return 0;}])],
[AC_MSG_RESULT([yes])
- GC_SECTIONS="-Wl,--gc-sections";
+ DEAD_CODE_REMOVAL="-Wl,--gc-sections";
AX_APPEND_COMPILE_FLAGS([-ffunction-sections -fdata-sections])],
[AC_MSG_RESULT([no])
- GC_SECTIONS="";])
+ DEAD_CODE_REMOVAL="";])
LDFLAGS=$save_LDFLAGS
-AC_SUBST(GC_SECTIONS)
+if test "$DEAD_CODE_REMOVAL" == ""; then
+ # Macos linkers have a -dead_strip flag, which is similar to --gc-sections.
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,-dead_strip"
+ AC_MSG_CHECKING([whether ld supports -dead_strip])
+ AC_LINK_IFELSE(
+ [AC_LANG_SOURCE([static char UnusedFunc() { return 5; } int main() { return 0;}])],
+ [AC_MSG_RESULT([yes])
+ DEAD_CODE_REMOVAL="-Wl,-dead_strip";],
+ [AC_MSG_RESULT([no])
+ DEAD_CODE_REMOVAL="";])
+ LDFLAGS=$save_LDFLAGS
+fi
+
+AC_SUBST(DEAD_CODE_REMOVAL)
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
Index: pkgsrc/archivers/libarchive/files/build/version
diff -u pkgsrc/archivers/libarchive/files/build/version:1.9 pkgsrc/archivers/libarchive/files/build/version:1.10
--- pkgsrc/archivers/libarchive/files/build/version:1.9 Thu Jan 18 18:00:12 2024
+++ pkgsrc/archivers/libarchive/files/build/version Fri Apr 12 15:39:46 2024
@@ -1 +1 @@
-3007002
+3007003
Index: pkgsrc/archivers/libarchive/files/build/cmake/config.h.in
diff -u pkgsrc/archivers/libarchive/files/build/cmake/config.h.in:1.10 pkgsrc/archivers/libarchive/files/build/cmake/config.h.in:1.11
--- pkgsrc/archivers/libarchive/files/build/cmake/config.h.in:1.10 Thu Jan 18 18:00:12 2024
+++ pkgsrc/archivers/libarchive/files/build/cmake/config.h.in Fri Apr 12 15:39:46 2024
@@ -753,6 +753,12 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
#cmakedefine HAVE_LIBPCREPOSIX 1
+/* Define to 1 if you have the `pcre2-8' library (-lpcre2-8). */
+#cmakedefine HAVE_LIBPCRE2 1
+
+/* Define to 1 if you have the `pcreposix' library (-lpcre2posix). */
+#cmakedefine HAVE_LIBPCRE2POSIX 1
+
/* Define to 1 if you have the `xml2' library (-lxml2). */
#cmakedefine HAVE_LIBXML2 1
@@ -768,9 +774,8 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the `zstd' library (-lzstd). */
#cmakedefine HAVE_LIBZSTD 1
-/* Define to 1 if you have the `zstd' library (-lzstd) with compression
- support. */
-#cmakedefine HAVE_LIBZSTD_COMPRESSOR 1
+/* Define to 1 if you have the ZSTD_compressStream function. */
+#cmakedefine HAVE_ZSTD_compressStream 1
/* Define to 1 if you have the <limits.h> header file. */
#cmakedefine HAVE_LIMITS_H 1
@@ -926,6 +931,9 @@ typedef uint64_t uintmax_t;
/* Define to 1 if you have the <pcreposix.h> header file. */
#cmakedefine HAVE_PCREPOSIX_H 1
+/* Define to 1 if you have the <pcre2posix.h> header file. */
+#cmakedefine HAVE_PCRE2POSIX_H 1
+
/* Define to 1 if you have the `pipe' function. */
#cmakedefine HAVE_PIPE 1
Index: pkgsrc/archivers/libarchive/files/cat/bsdcat.1
diff -u pkgsrc/archivers/libarchive/files/cat/bsdcat.1:1.2 pkgsrc/archivers/libarchive/files/cat/bsdcat.1:1.3
--- pkgsrc/archivers/libarchive/files/cat/bsdcat.1:1.2 Tue May 26 09:16:40 2020
+++ pkgsrc/archivers/libarchive/files/cat/bsdcat.1 Fri Apr 12 15:39:46 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd March 1, 2014
.Dt BSDCAT 1
.Os
Index: pkgsrc/archivers/libarchive/files/cat/bsdcat.c
diff -u pkgsrc/archivers/libarchive/files/cat/bsdcat.c:1.2 pkgsrc/archivers/libarchive/files/cat/bsdcat.c:1.3
--- pkgsrc/archivers/libarchive/files/cat/bsdcat.c:1.2 Wed Apr 10 08:24:04 2019
+++ pkgsrc/archivers/libarchive/files/cat/bsdcat.c Fri Apr 12 15:39:46 2024
@@ -24,7 +24,6 @@
*/
#include "bsdcat_platform.h"
-__FBSDID("$FreeBSD$");
#include <stdio.h>
#ifdef HAVE_STDLIB_H
@@ -37,6 +36,9 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#endif
+#include <archive.h>
+#include <archive_entry.h>
+
#include "bsdcat.h"
#include "err.h"
@@ -48,7 +50,7 @@ static const char *bsdcat_current_path;
static int exit_status = 0;
-void
+static __LA_NORETURN void
usage(FILE *stream, int eval)
{
const char *p;
@@ -58,7 +60,7 @@ usage(FILE *stream, int eval)
exit(eval);
}
-static void
+static __LA_NORETURN void
version(void)
{
printf("bsdcat %s - %s \n",
@@ -67,7 +69,15 @@ version(void)
exit(0);
}
-void
+static void
+bsdcat_print_error(void)
+{
+ lafe_warnc(0, "%s: %s",
+ bsdcat_current_path, archive_error_string(a));
+ exit_status = 1;
+}
+
+static void
bsdcat_next(void)
{
if (a != NULL) {
@@ -82,15 +92,7 @@ bsdcat_next(void)
archive_read_support_format_raw(a);
}
-void
-bsdcat_print_error(void)
-{
- lafe_warnc(0, "%s: %s",
- bsdcat_current_path, archive_error_string(a));
- exit_status = 1;
-}
-
-void
+static void
bsdcat_read_to_stdout(const char* filename)
{
int r;
@@ -130,12 +132,16 @@ main(int argc, char **argv)
switch (c) {
case 'h':
usage(stdout, 0);
- break;
+ /* NOTREACHED */
+ /* Fallthrough */
case OPTION_VERSION:
version();
- break;
+ /* NOTREACHED */
+ /* Fallthrough */
default:
usage(stderr, 1);
+ /* Fallthrough */
+ /* NOTREACHED */
}
}
Index: pkgsrc/archivers/libarchive/files/cat/bsdcat.h
diff -u pkgsrc/archivers/libarchive/files/cat/bsdcat.h:1.2 pkgsrc/archivers/libarchive/files/cat/bsdcat.h:1.3
--- pkgsrc/archivers/libarchive/files/cat/bsdcat.h:1.2 Tue May 26 09:16:40 2020
+++ pkgsrc/archivers/libarchive/files/cat/bsdcat.h Fri Apr 12 15:39:46 2024
@@ -34,9 +34,6 @@
#include "config.h"
#endif
-#include <archive.h>
-#include <archive_entry.h>
-
struct bsdcat {
/* Option parser state */
int getopt_state;
@@ -53,9 +50,5 @@ enum {
};
int bsdcat_getopt(struct bsdcat *);
-void usage(FILE *stream, int eval);
-void bsdcat_next(void);
-void bsdcat_print_error(void);
-void bsdcat_read_to_stdout(const char* filename);
#endif
Index: pkgsrc/archivers/libarchive/files/cat/test/list.h
diff -u pkgsrc/archivers/libarchive/files/cat/test/list.h:1.4 pkgsrc/archivers/libarchive/files/cat/test/list.h:1.5
--- pkgsrc/archivers/libarchive/files/cat/test/list.h:1.4 Thu Jan 18 18:00:12 2024
+++ pkgsrc/archivers/libarchive/files/cat/test/list.h Fri Apr 12 15:39:47 2024
@@ -5,13 +5,13 @@ DEFINE_TEST(test_empty_xz)
DEFINE_TEST(test_empty_zstd)
DEFINE_TEST(test_error)
DEFINE_TEST(test_error_mixed)
+DEFINE_TEST(test_expand_Z)
DEFINE_TEST(test_expand_bz2)
DEFINE_TEST(test_expand_gz)
DEFINE_TEST(test_expand_lz4)
DEFINE_TEST(test_expand_mixed)
DEFINE_TEST(test_expand_plain)
DEFINE_TEST(test_expand_xz)
-DEFINE_TEST(test_expand_Z)
DEFINE_TEST(test_expand_zstd)
DEFINE_TEST(test_help)
DEFINE_TEST(test_stdin)
Index: pkgsrc/archivers/libarchive/files/contrib/untar.c
diff -u pkgsrc/archivers/libarchive/files/contrib/untar.c:1.4 pkgsrc/archivers/libarchive/files/contrib/untar.c:1.5
--- pkgsrc/archivers/libarchive/files/contrib/untar.c:1.4 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/contrib/untar.c Fri Apr 12 15:39:47 2024
@@ -37,22 +37,28 @@
#include <sys/stat.h> /* For mkdir() */
#if defined(_WIN32) && !defined(__CYGWIN__)
-#define NUM_FORMAT "zu"
-#include <direct.h>
-#elif defined(__linux__) || defined(linux) || defined(__linux)
-#define NUM_FORMAT "d"
-#else
-#define NUM_FORMAT "lu"
-#endif /* defined(_WIN32) && !defined(__CYGWIN__) */
+#include <windows.h>
+#endif
-#define TO_STRING(x) #x
-#define STR(x) TO_STRING(x)
+#define BLOCKSIZE 512
-/* Parse an octal number, ignoring leading and trailing nonsense. */
+/* System call to create a directory. */
static int
+system_mkdir(char *pathname, int mode)
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ (void)mode; /* UNUSED */
+ return _mkdir(pathname);
+#else
+ return mkdir(pathname, mode);
+#endif
+}
+
+/* Parse an octal number, ignoring leading and trailing nonsense. */
+static unsigned long
parseoct(const char *p, size_t n)
{
- int i = 0;
+ unsigned long i = 0;
while ((*p < '0' || *p > '7') && n > 0) {
++p;
@@ -72,7 +78,7 @@ static int
is_end_of_archive(const char *p)
{
int n;
- for (n = 511; n >= 0; --n)
+ for (n = 0; n < BLOCKSIZE; ++n)
if (p[n] != '\0')
return (0);
return (1);
@@ -90,12 +96,7 @@ create_dir(char *pathname, int mode)
pathname[strlen(pathname) - 1] = '\0';
/* Try creating the directory. */
-#if defined(_WIN32) && !defined(__CYGWIN__)
- r = _mkdir(pathname);
-#else
- r = mkdir(pathname, mode);
-#endif
-
+ r = system_mkdir(pathname, mode);
if (r != 0) {
/* On failure, try creating parent directory. */
p = strrchr(pathname, '/');
@@ -103,11 +104,7 @@ create_dir(char *pathname, int mode)
*p = '\0';
create_dir(pathname, 0755);
*p = '/';
-#if defined(_WIN32) && !defined(__CYGWIN__)
- r = _mkdir(pathname);
-#else
- r = mkdir(pathname, mode);
-#endif
+ r = system_mkdir(pathname, mode);
}
}
if (r != 0)
@@ -138,7 +135,7 @@ static int
verify_checksum(const char *p)
{
int n, u = 0;
- for (n = 0; n < 512; ++n) {
+ for (n = 0; n < BLOCKSIZE; ++n) {
if (n < 148 || n > 155)
/* Standard tar checksum adds unsigned bytes. */
u += ((unsigned char *)p)[n];
@@ -146,26 +143,25 @@ verify_checksum(const char *p)
u += 0x20;
}
- return (u == parseoct(p + 148, 8));
+ return (u == (int)parseoct(p + 148, 8));
}
/* Extract a tar archive. */
static void
untar(FILE *a, const char *path)
{
- enum { BUF_SIZE=512 };
- char buff[BUF_SIZE];
+ char buff[BLOCKSIZE];
FILE *f = NULL;
size_t bytes_read;
- off_t filesize;
+ unsigned long filesize;
printf("Extracting from %s\n", path);
for (;;) {
- bytes_read = fread(buff, 1, BUF_SIZE, a);
- if (bytes_read < BUF_SIZE) {
+ bytes_read = fread(buff, 1, BLOCKSIZE, a);
+ if (bytes_read < BLOCKSIZE) {
fprintf(stderr,
- "Short read on %s: expected " STR(BUF_SIZE) ", got %"NUM_FORMAT"\n",
- path, bytes_read);
+ "Short read on %s: expected %d, got %d\n",
+ path, BLOCKSIZE, (int)bytes_read);
return;
}
if (is_end_of_archive(buff)) {
@@ -178,51 +174,51 @@ untar(FILE *a, const char *path)
}
filesize = parseoct(buff + 124, 12);
switch (buff[156]) {
- case '1':
- printf(" Ignoring hardlink %s\n", buff);
- break;
- case '2':
- printf(" Ignoring symlink %s\n", buff);
- break;
- case '3':
- printf(" Ignoring character device %s\n", buff);
- break;
- case '4':
- printf(" Ignoring block device %s\n", buff);
- break;
- case '5':
- printf(" Extracting dir %s\n", buff);
- create_dir(buff, parseoct(buff + 100, 8));
- filesize = 0;
- break;
- case '6':
- printf(" Ignoring FIFO %s\n", buff);
- break;
- default:
- printf(" Extracting file %s\n", buff);
- f = create_file(buff, parseoct(buff + 100, 8));
- break;
+ case '1':
+ printf(" Ignoring hardlink %s\n", buff);
+ break;
+ case '2':
+ printf(" Ignoring symlink %s\n", buff);
+ break;
+ case '3':
+ printf(" Ignoring character device %s\n", buff);
+ break;
+ case '4':
+ printf(" Ignoring block device %s\n", buff);
+ break;
+ case '5':
+ printf(" Extracting dir %s\n", buff);
+ create_dir(buff, (int)parseoct(buff + 100, 8));
+ filesize = 0;
+ break;
+ case '6':
+ printf(" Ignoring FIFO %s\n", buff);
+ break;
+ default:
+ printf(" Extracting file %s\n", buff);
+ f = create_file(buff, (int)parseoct(buff + 100, 8));
+ break;
}
while (filesize > 0) {
- bytes_read = fread(buff, 1, BUF_SIZE, a);
- if (bytes_read < BUF_SIZE) {
+ bytes_read = fread(buff, 1, BLOCKSIZE, a);
+ if (bytes_read < BLOCKSIZE) {
fprintf(stderr,
- "Short read on %s: Expected " STR(BUF_SIZE) ", got %"NUM_FORMAT"\n",
- path, bytes_read);
+ "Short read on %s: Expected %d, got %d\n",
+ path, BLOCKSIZE, (int)bytes_read);
return;
}
- if (filesize < BUF_SIZE)
- bytes_read = filesize;
+ if (filesize < BLOCKSIZE)
+ bytes_read = (size_t)filesize;
if (f != NULL) {
if (fwrite(buff, 1, bytes_read, f)
- != bytes_read)
+ != bytes_read)
{
fprintf(stderr, "Failed write\n");
fclose(f);
f = NULL;
}
}
- filesize -= (off_t)bytes_read;
+ filesize -= bytes_read;
}
if (f != NULL) {
fclose(f);
Index: pkgsrc/archivers/libarchive/files/contrib/shar/shar.1
diff -u pkgsrc/archivers/libarchive/files/contrib/shar/shar.1:1.2 pkgsrc/archivers/libarchive/files/contrib/shar/shar.1:1.3
--- pkgsrc/archivers/libarchive/files/contrib/shar/shar.1:1.2 Tue May 26 09:16:40 2020
+++ pkgsrc/archivers/libarchive/files/contrib/shar/shar.1 Fri Apr 12 15:39:47 2024
@@ -30,7 +30,6 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)shar.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
.\"
.Dd April 17, 2008
.Dt SHAR 1
Index: pkgsrc/archivers/libarchive/files/contrib/shar/shar.c
diff -u pkgsrc/archivers/libarchive/files/contrib/shar/shar.c:1.3 pkgsrc/archivers/libarchive/files/contrib/shar/shar.c:1.4
--- pkgsrc/archivers/libarchive/files/contrib/shar/shar.c:1.3 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/contrib/shar/shar.c Fri Apr 12 15:39:47 2024
@@ -24,11 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
-#endif
-
#include <sys/stat.h>
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/cpio/bsdcpio.1
diff -u pkgsrc/archivers/libarchive/files/cpio/bsdcpio.1:1.8 pkgsrc/archivers/libarchive/files/cpio/bsdcpio.1:1.9
--- pkgsrc/archivers/libarchive/files/cpio/bsdcpio.1:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/bsdcpio.1 Fri Apr 12 15:39:47 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd September 16, 2014
.Dt CPIO 1
.Os
Index: pkgsrc/archivers/libarchive/files/cpio/cmdline.c
diff -u pkgsrc/archivers/libarchive/files/cpio/cmdline.c:1.8 pkgsrc/archivers/libarchive/files/cpio/cmdline.c:1.9
--- pkgsrc/archivers/libarchive/files/cpio/cmdline.c:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/cmdline.c Fri Apr 12 15:39:47 2024
@@ -26,7 +26,6 @@
#include "cpio_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.5 2008/12/06 07:30:40 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/cpio/cpio.h
diff -u pkgsrc/archivers/libarchive/files/cpio/cpio.h:1.8 pkgsrc/archivers/libarchive/files/cpio/cpio.h:1.9
--- pkgsrc/archivers/libarchive/files/cpio/cpio.h:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/cpio.h Fri Apr 12 15:39:47 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.7 2008/12/06 07:30:40 kientzle Exp $
*/
#ifndef CPIO_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/cpio/cpio.c
diff -u pkgsrc/archivers/libarchive/files/cpio/cpio.c:1.11 pkgsrc/archivers/libarchive/files/cpio/cpio.c:1.12
--- pkgsrc/archivers/libarchive/files/cpio/cpio.c:1.11 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/cpio.c Fri Apr 12 15:39:47 2024
@@ -26,7 +26,6 @@
#include "cpio_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle Exp $");
#include <sys/types.h>
#include <archive.h>
@@ -108,22 +107,22 @@ static int entry_to_archive(struct cpio
static int file_to_archive(struct cpio *, const char *);
static void free_cache(struct name_cache *cache);
static void list_item_verbose(struct cpio *, struct archive_entry *);
-static void long_help(void) __LA_DEAD;
+static __LA_NORETURN void long_help(void);
static const char *lookup_gname(struct cpio *, gid_t gid);
static int lookup_gname_helper(struct cpio *,
const char **name, id_t gid);
static const char *lookup_uname(struct cpio *, uid_t uid);
static int lookup_uname_helper(struct cpio *,
const char **name, id_t uid);
-static void mode_in(struct cpio *) __LA_DEAD;
-static void mode_list(struct cpio *) __LA_DEAD;
+static __LA_NORETURN void mode_in(struct cpio *);
+static __LA_NORETURN void mode_list(struct cpio *);
static void mode_out(struct cpio *);
static void mode_pass(struct cpio *, const char *);
static const char *remove_leading_slash(const char *);
static int restore_time(struct cpio *, struct archive_entry *,
const char *, int fd);
-static void usage(void) __LA_DEAD;
-static void version(void) __LA_DEAD;
+static __LA_NORETURN void usage(void);
+static __LA_NORETURN void version(void);
static const char * passphrase_callback(struct archive *, void *);
static void passphrase_free(char *);
@@ -251,7 +250,7 @@ main(int argc, char *argv[])
break;
case 'h':
long_help();
- break;
+ /* NOTREACHED */
case 'I': /* NetBSD/OpenBSD */
cpio->filename = cpio->argument;
break;
@@ -358,7 +357,7 @@ main(int argc, char *argv[])
break;
case OPTION_VERSION: /* GNU convention */
version();
- break;
+ /* NOTREACHED */
#if 0
/*
* cpio_getopt() handles -W specially, so it's not
@@ -427,7 +426,7 @@ main(int argc, char *argv[])
mode_list(cpio);
else
mode_in(cpio);
- break;
+ /* NOTREACHED */
case 'p':
if (*cpio->argv == NULL || **cpio->argv == '\0')
lafe_errc(1, 0,
Index: pkgsrc/archivers/libarchive/files/cpio/cpio_platform.h
diff -u pkgsrc/archivers/libarchive/files/cpio/cpio_platform.h:1.4 pkgsrc/archivers/libarchive/files/cpio/cpio_platform.h:1.5
--- pkgsrc/archivers/libarchive/files/cpio/cpio_platform.h:1.4 Mon Jun 20 17:24:56 2016
+++ pkgsrc/archivers/libarchive/files/cpio/cpio_platform.h Fri Apr 12 15:39:47 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/usr.bin/cpio/cpio_platform.h,v 1.2 2008/12/06 07:15:42 kientzle Exp $
*/
/*
@@ -46,16 +44,6 @@
#include "cpio_windows.h"
#endif
-/* Get a real definition for __FBSDID if we can */
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-/* If not, define it so as to avoid dangling semicolons. */
-#ifndef __FBSDID
-#define __FBSDID(a) struct _undefined_hack
-#endif
-
#ifdef HAVE_LIBARCHIVE
/* If we're using the platform libarchive, include system headers. */
#include <archive.h>
@@ -69,9 +57,11 @@
/* How to mark functions that don't return. */
#if defined(__GNUC__) && (__GNUC__ > 2 || \
(__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
-#define __LA_DEAD __attribute__((__noreturn__))
+#define __LA_NORETURN __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define __LA_NORETURN __declspec(noreturn)
#else
-#define __LA_DEAD
+#define __LA_NORETURN
#endif
#endif /* !CPIO_PLATFORM_H_INCLUDED */
Index: pkgsrc/archivers/libarchive/files/cpio/cpio_windows.c
diff -u pkgsrc/archivers/libarchive/files/cpio/cpio_windows.c:1.3 pkgsrc/archivers/libarchive/files/cpio/cpio_windows.c:1.4
--- pkgsrc/archivers/libarchive/files/cpio/cpio_windows.c:1.3 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/cpio_windows.c Fri Apr 12 15:39:47 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
Index: pkgsrc/archivers/libarchive/files/cpio/test/list.h
diff -u pkgsrc/archivers/libarchive/files/cpio/test/list.h:1.8 pkgsrc/archivers/libarchive/files/cpio/test/list.h:1.9
--- pkgsrc/archivers/libarchive/files/cpio/test/list.h:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/test/list.h Fri Apr 12 15:39:47 2024
@@ -1,34 +1,35 @@
DEFINE_TEST(test_0)
DEFINE_TEST(test_basic)
DEFINE_TEST(test_cmdline)
+DEFINE_TEST(test_extract_cpio_Z)
DEFINE_TEST(test_extract_cpio_bz2)
DEFINE_TEST(test_extract_cpio_grz)
DEFINE_TEST(test_extract_cpio_gz)
DEFINE_TEST(test_extract_cpio_lrz)
-DEFINE_TEST(test_extract_cpio_lz4)
DEFINE_TEST(test_extract_cpio_lz)
+DEFINE_TEST(test_extract_cpio_lz4)
DEFINE_TEST(test_extract_cpio_lzma)
DEFINE_TEST(test_extract_cpio_lzo)
DEFINE_TEST(test_extract_cpio_xz)
-DEFINE_TEST(test_extract_cpio_Z)
DEFINE_TEST(test_extract_cpio_zstd)
DEFINE_TEST(test_format_newc)
DEFINE_TEST(test_gcpio_compat)
DEFINE_TEST(test_missing_file)
DEFINE_TEST(test_option_0)
+DEFINE_TEST(test_option_B_upper)
+DEFINE_TEST(test_option_C_upper)
+DEFINE_TEST(test_option_J_upper)
+DEFINE_TEST(test_option_L_upper)
+DEFINE_TEST(test_option_Z_upper)
DEFINE_TEST(test_option_a)
DEFINE_TEST(test_option_b64encode)
-DEFINE_TEST(test_option_B_upper)
DEFINE_TEST(test_option_c)
-DEFINE_TEST(test_option_C_upper)
DEFINE_TEST(test_option_d)
DEFINE_TEST(test_option_f)
DEFINE_TEST(test_option_grzip)
DEFINE_TEST(test_option_help)
-DEFINE_TEST(test_option_J_upper)
DEFINE_TEST(test_option_l)
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)
@@ -42,7 +43,6 @@ DEFINE_TEST(test_option_xz)
DEFINE_TEST(test_option_y)
DEFINE_TEST(test_option_z)
DEFINE_TEST(test_option_zstd)
-DEFINE_TEST(test_option_Z_upper)
DEFINE_TEST(test_owner_parse)
DEFINE_TEST(test_passthrough_dotdot)
DEFINE_TEST(test_passthrough_reverse)
Index: pkgsrc/archivers/libarchive/files/cpio/test/test.h
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test.h:1.7 pkgsrc/archivers/libarchive/files/cpio/test/test.h:1.8
--- pkgsrc/archivers/libarchive/files/cpio/test/test.h:1.7 Sat Feb 25 21:11:19 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test.h Fri Apr 12 15:39:47 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/* Every test program should #include "test.h" as the first thing. */
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_format_newc.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_format_newc.c:1.7 pkgsrc/archivers/libarchive/files/cpio/test/test_format_newc.c:1.8
--- pkgsrc/archivers/libarchive/files/cpio/test/test_format_newc.c:1.7 Tue May 26 09:16:40 2020
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_format_newc.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_format_newc.c,v 1.2 2008/08/22 02:09:10 kientzle Exp $");
/* Number of bytes needed to pad 'n' to multiple of 'block', assuming
* that 'block' is a power of two. This trick can be more easily
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_c.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_c.c:1.7 pkgsrc/archivers/libarchive/files/cpio/test/test_option_c.c:1.8
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_c.c:1.7 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_c.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static int
is_octal(const char *p, size_t l)
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_0.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_0.c:1.4 pkgsrc/archivers/libarchive/files/cpio/test/test_0.c:1.5
--- pkgsrc/archivers/libarchive/files/cpio/test/test_0.c:1.4 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_0.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* This first test does basic sanity checks on the environment. For
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat.c:1.4 pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat.c:1.5
--- pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat.c:1.4 Sun Sep 22 09:55:07 2019
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_gcpio_compat.c,v 1.2 2008/08/22 02:27:06 kientzle Exp $");
static void
unpack_test(const char *from, const char *options, const char *se)
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_basic.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_basic.c:1.9 pkgsrc/archivers/libarchive/files/cpio/test/test_basic.c:1.10
--- pkgsrc/archivers/libarchive/files/cpio/test/test_basic.c:1.9 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_basic.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_basic.c,v 1.4 2008/08/25 06:39:29 kientzle Exp $");
static void
verify_files(const char *msg)
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_Z.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_Z)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_bz2.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_bz2)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_grz.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_grz)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_gz.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_gz)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lrz.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_lrz)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lz.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_lz)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzma.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_lzma)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_xz.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_xz)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c:1.1 Wed Apr 10 08:24:04 2019
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_zstd)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_0.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_0.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_option_0.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_0.c:1.1 Sat Jan 17 12:44:48 2015
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_0.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_0)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_zstd.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_zstd.c:1.1 pkgsrc/archivers/libarchive/files/cpio/test/test_option_zstd.c:1.2
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_zstd.c:1.1 Wed Apr 10 08:24:04 2019
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_zstd.c Fri Apr 12 15:39:48 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_zstd)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c:1.2 Mon Jun 20 17:24:56 2016
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_extract_cpio_lzo.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_cpio_lzo)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_b64encode.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_b64encode.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_option_b64encode.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_b64encode.c:1.2 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_b64encode.c Fri Apr 12 15:39:47 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_b64encode)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_grzip.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_grzip.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_option_grzip.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_grzip.c:1.2 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_grzip.c Fri Apr 12 15:39:48 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_grzip)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_lrzip.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_lrzip.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_option_lrzip.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_lrzip.c:1.2 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_lrzip.c Fri Apr 12 15:39:48 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_lrzip)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_lzop.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_lzop.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_option_lzop.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_lzop.c:1.2 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_lzop.c Fri Apr 12 15:39:48 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_lzop)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_uuencode.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_uuencode.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_option_uuencode.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_uuencode.c:1.2 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_uuencode.c Fri Apr 12 15:39:48 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_uuencode)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_xz.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_xz.c:1.2 pkgsrc/archivers/libarchive/files/cpio/test/test_option_xz.c:1.3
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_xz.c:1.2 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_xz.c Fri Apr 12 15:39:48 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_xz)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.bin.uu Fri Apr 12 15:39:47 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_gcpio_compat_ref.bin
MQW%9`*IWI('H`^@#`@````U'=YD%````"@!F:6QE```Q,C,T-38W.#D*QW%9
M`*IWI('H`^@#`@````U'=YD)````"@!L:6YK9FEL90``,3(S-#4V-S@Y"L=Q
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.crc.uu Fri Apr 12 15:39:47 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_gcpio_compat_ref.crc
M,#<P-S`R,#`S,S<W86$P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P
M,C0W,&0Y.3<W,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4Y,#`P,#`P,#`P,#`P
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.newc.uu Fri Apr 12 15:39:47 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_gcpio_compat_ref.newc
M,#<P-S`Q,#`S,S<W86$P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93@P,#`P,#`P
M,C0W,&0Y.3<W,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4Y,#`P,#`P,#`P,#`P
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_gcpio_compat_ref.ustar.uu Fri Apr 12 15:39:47 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_gcpio_compat_ref.ustar
M9FEL90``````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_d.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_d.c:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_d.c:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_d.c:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_d.c Fri Apr 12 15:39:47 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
DEFINE_TEST(test_option_d)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.c:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.c:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.c:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.c Fri Apr 12 15:39:47 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Unpack the archive in a new dir.
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.cpio.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.cpio.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.cpio.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_f.cpio.uu Fri Apr 12 15:39:47 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_option_f.cpio
M,#<P-S`W,#`P,3,Q-C(Q-38Q,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P
M,#`P,3`W,S4Q,3(U,C8P,#`P,#4P,#`P,#`P,#`P,&$Q,C,`,#<P-S`W,#`P
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_help.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_help.c:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_help.c:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_help.c:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_help.c Fri Apr 12 15:39:48 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Test that "--help", "-h", and "-W help" options all work and
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.c:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.c:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.c:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.c Fri Apr 12 15:39:48 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
DEFINE_TEST(test_option_m)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.cpio.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.cpio.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.cpio.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_m.cpio.uu Fri Apr 12 15:39:48 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_option_m.cpio
M,#<P-S`W,#`P,3,Q-#4P,#8T,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P
M,#`P,#`P,#`P,#`P,#$P,#`P,#4P,#`P,#`P,#`P,&9I;&4`,#<P-S`W,#`P
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.cpio.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.cpio.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.cpio.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.cpio.uu Fri Apr 12 15:39:48 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_option_t.cpio
M,#<P-S`W,#`P,3,Q-#4P,#8T,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P
M,#`P,#`P,#`P,#`P,#$P,#`P,#4P,#`P,#`P,#`P,&9I;&4`,#<P-S`W,#`P
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.stdout.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.stdout.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.stdout.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.stdout.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.stdout.uu Fri Apr 12 15:39:48 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_option_t.stdout
%9FEL90H`
`
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_tv.stdout.uu
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_tv.stdout.uu:1.3 pkgsrc/archivers/libarchive/files/cpio/test/test_option_tv.stdout.uu:1.4
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_tv.stdout.uu:1.3 Sat Feb 20 03:54:08 2010
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_tv.stdout.uu Fri Apr 12 15:39:48 2024
@@ -1,4 +1,3 @@
-$FreeBSD: src/usr.bin/cpio/test/test_option_tv.stdout.uu,v 1.2 2008/11/29 20:22:02 kientzle Exp $
begin 644 test_option_tv.stdout
M+7)W+7(M+7(M+2`@(#$@=&EM("`@("`@=&EM("`@("`@("`@("`@(#`@1&5C
/(#,Q("`Q.38Y(&9I;&4*
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_a.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_a.c:1.5 pkgsrc/archivers/libarchive/files/cpio/test/test_option_a.c:1.6
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_a.c:1.5 Sun Sep 22 09:55:07 2019
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_a.c Fri Apr 12 15:39:47 2024
@@ -28,7 +28,6 @@
#elif defined(HAVE_SYS_UTIME_H)
#include <sys/utime.h>
#endif
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_a.c,v 1.3 2008/08/24 06:21:00 kientzle Exp $");
static struct {
const char *name;
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_u.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_u.c:1.5 pkgsrc/archivers/libarchive/files/cpio/test/test_option_u.c:1.6
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_u.c:1.5 Sat Feb 25 21:11:19 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_u.c Fri Apr 12 15:39:48 2024
@@ -28,7 +28,6 @@
#elif defined(HAVE_SYS_UTIME_H)
#include <sys/utime.h>
#endif
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_u)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_z.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_z.c:1.5 pkgsrc/archivers/libarchive/files/cpio/test/test_option_z.c:1.6
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_z.c:1.5 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_z.c Fri Apr 12 15:39:48 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_z)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.c:1.6 pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.c:1.7
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.c:1.6 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_t.c Fri Apr 12 15:39:48 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_LOCALE_H
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_option_y.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_option_y.c:1.6 pkgsrc/archivers/libarchive/files/cpio/test/test_option_y.c:1.7
--- pkgsrc/archivers/libarchive/files/cpio/test/test_option_y.c:1.6 Tue Aug 1 22:26:22 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_option_y.c Fri Apr 12 15:39:48 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_y.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $");
DEFINE_TEST(test_option_y)
{
Index: pkgsrc/archivers/libarchive/files/cpio/test/test_owner_parse.c
diff -u pkgsrc/archivers/libarchive/files/cpio/test/test_owner_parse.c:1.6 pkgsrc/archivers/libarchive/files/cpio/test/test_owner_parse.c:1.7
--- pkgsrc/archivers/libarchive/files/cpio/test/test_owner_parse.c:1.6 Sat Feb 25 21:11:19 2017
+++ pkgsrc/archivers/libarchive/files/cpio/test/test_owner_parse.c Fri Apr 12 15:39:48 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include "../cpio.h"
#include "err.h"
Index: pkgsrc/archivers/libarchive/files/doc/html/Makefile
diff -u pkgsrc/archivers/libarchive/files/doc/html/Makefile:1.8 pkgsrc/archivers/libarchive/files/doc/html/Makefile:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/Makefile:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/Makefile Fri Apr 12 15:39:48 2024
@@ -107,15 +107,15 @@ archive_write_set_passphrase.3.html: ../
cpio.5.html: ../../libarchive/cpio.5
groff -mdoc -T html ../../libarchive/cpio.5 > cpio.5.html
+libarchive-formats.5.html: ../../libarchive/libarchive-formats.5
+ groff -mdoc -T html ../../libarchive/libarchive-formats.5 > libarchive-formats.5.html
+
libarchive.3.html: ../../libarchive/libarchive.3
groff -mdoc -T html ../../libarchive/libarchive.3 > libarchive.3.html
libarchive_changes.3.html: ../../libarchive/libarchive_changes.3
groff -mdoc -T html ../../libarchive/libarchive_changes.3 > libarchive_changes.3.html
-libarchive-formats.5.html: ../../libarchive/libarchive-formats.5
- groff -mdoc -T html ../../libarchive/libarchive-formats.5 > libarchive-formats.5.html
-
libarchive_internals.3.html: ../../libarchive/libarchive_internals.3
groff -mdoc -T html ../../libarchive/libarchive_internals.3 > libarchive_internals.3.html
@@ -130,4 +130,4 @@ bsdtar.1.html: ../../tar/bsdtar.1
bsdcpio.1.html: ../../cpio/bsdcpio.1
groff -mdoc -T html ../../cpio/bsdcpio.1 > bsdcpio.1.html
-all: 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 cpio.5.html
libarchive.3.html libarchive_changes.3.html libarchive-formats.5.
html libarchive_internals.3.html mtree.5.html tar.5.html bsdtar.1.html bsdcpio.1.html
+all: 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 cpio.5.html
libarchive-formats.5.html libarchive.3.html libarchive_changes.3.
html libarchive_internals.3.html mtree.5.html tar.5.html bsdtar.1.html bsdcpio.1.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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_acl.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:18 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_linkify.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:18 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_paths.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:18 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_perms.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:18 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_stat.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_time.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html:1.8 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_data.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_extract.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_filter.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_format.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_free.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_header.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_new.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_open.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_set_options.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_blocksize.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_data.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_filter.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_format.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_free.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_header.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_new.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_open.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.8 pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_options.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -285,20 +285,23 @@ cores.</p>
compression</b></p>
<p style="margin-left:27%;">The value is one of
-“store”, “deflate”,
-“bzip2”, “lzma1”,
-“lzma2” or “ppmd” to indicate how
-the following entries should be compressed. Note that this
-setting is ignored for directories, symbolic links, and
-other special entries.</p>
+“store”, “copy”,
+“deflate”, “bzip2”,
+“lzma1”, “lzma2” or
+“ppmd” to indicate how the following entries
+should be compressed. The values “store” and
+“copy” are synonyms. Note that this setting is
+ignored for directories, symbolic links, and other special
+entries.</p>
<p><b>compression-level</b></p>
<p style="margin-left:27%;">The value is interpreted as a
decimal integer specifying the compression level. Values
-between 0 and 9 are supported. The interpretation of the
-compression level depends on the chosen compression
-method.</p>
+between 0 and 9 are supported, with the exception of bzip2
+which only supports values between 1 and 9. The
+interpretation of the compression level depends on the
+chosen compression method.</p>
<p>Format bin <b><br>
hdrcharset</b></p>
Index: pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.8 pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.9
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html:1.8 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive_changes.3.html Fri Apr 12 15:39:49 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.3.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html:1.9 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:18 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html:1.9 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html:1.9 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_disk.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_util.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_disk.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:20 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/bsdcpio.1.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:22 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/bsdtar.1.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:22 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -301,6 +301,14 @@ will be used instead. On create, this se
that will be stored in the archive; the name will not be
verified against the system group database.</p>
+<p style="margin-top: 1em"><b>--group</b>
+<i>name</i>[:<i>gid</i>]</p>
+
+<p style="margin-left:17%;">Use the provided group, if
+<i>gid</i> is not provided, <i>name</i> can be either a
+group name or numeric id. See the <b>--gname</b> option for
+details.</p>
+
<p style="margin-top: 1em"><b>-H</b></p>
<p style="margin-left:17%; margin-top: 1em">(c and r modes
@@ -454,7 +462,9 @@ OS X specific. Archive or extract extend
file attributes using copyfile(3) in AppleDouble format.
This is the reverse of <b>--no-mac-metadata</b>. and the
default behavior in c, r, and u modes or if <b>tar</b> is
-run in x mode as root.</p>
+run in x mode as root. Currently supported only for pax
+formats (including "pax restricted", the default
+tar format for bsdtar.)</p>
<p style="margin-top: 1em"><b>-n</b>, <b>--norecurse</b>,
<b>--no-recursion</b></p>
@@ -754,17 +764,43 @@ system.</p>
<p style="margin-left:27%;">Start a new compression frame
at the beginning of each file in the archive.</p>
-<p><b>zstd:min-frame-size</b>=<i>N</i></p>
+<p><b>zstd:min-frame-in</b>=<i>N</i></p>
+
+<p style="margin-left:27%;">In combination with
+<b>zstd:frame-per-file</b>, do not start a new compression
+frame unless the uncompressed size of the current frame is
+at least <i>N</i> bytes. The number may be followed by k /
+kB, M / MB, or G / GB to indicate kilobytes, megabytes or
+gigabytes respectively.</p>
+
+<p><b>zstd:min-frame-out</b>=<i>N</i>,
+<b>zstd:min-frame-size</b>=<i>N</i></p>
<p style="margin-left:27%;">In combination with
<b>zstd:frame-per-file</b>, do not start a new compression
-frame unless the current frame is at least <i>N</i>
-bytes.</p>
+frame unless the compressed size of the current frame is at
+least <i>N</i> bytes. The number may be followed by k / kB,
+M / MB, or G / GB to indicate kilobytes, megabytes or
+gigabytes respectively.</p>
-<p><b>zstd:max-frame-size</b>=<i>N</i></p>
+<p><b>zstd:max-frame-in</b>=<i>N</i>,
+<b>zstd:max-frame-size</b>=<i>N</i></p>
<p style="margin-left:27%;">Start a new compression frame
-as soon as the current frame exceeds <i>N</i> bytes.</p>
+as soon as possible after the uncompressed size of the
+current frame exceeds <i>N</i> bytes. The number may be
+followed by k / kB, M / MB, or G / GB to indicate kilobytes,
+megabytes or gigabytes respectively. Values less than 1,024
+will be rejected.</p>
+
+<p><b>zstd:max-frame-out</b>=<i>N</i></p>
+
+<p style="margin-left:27%;">Start a new compression frame
+as soon as possible after the compressed size of the current
+frame exceeds <i>N</i> bytes. The number may be followed by
+k / kB, M / MB, or G / GB to indicate kilobytes, megabytes
+or gigabytes respectively. Values less than 1,024 will be
+rejected.</p>
<p><b>lzop:compression-level</b></p>
@@ -911,7 +947,7 @@ dd.</p>
<p style="margin-left:17%;">Modify file or archive member
names according to <i>pattern</i>. The pattern has the
-format <i>/old/new/</i>[ghHprRsS] where <i>old</i> is a
+format <i>/old/new/</i>[bghHprRsS] where <i>old</i> is a
basic regular expression, <i>new</i> is the replacement
string of the matched part, and the optional trailing
letters modify how the replacement is handled. If <i>old</i>
@@ -923,15 +959,18 @@ part and stop on the first unmatched pat
trailing s specifies that the pattern applies to the value
of symbolic links. The optional trailing p specifies that
after a successful substitution the original path name and
-the new path name should be printed to standard error.
-Optional trailing H, R, or S characters suppress
-substitutions for hardlink targets, regular filenames, or
-symlink targets, respectively. Optional trailing h, r, or s
-characters enable substitutions for hardlink targets,
-regular filenames, or symlink targets, respectively. The
-default is <i>hrs</i> which applies substitutions to all
-names. In particular, it is never necessary to specify h, r,
-or s.</p>
+the new path name should be printed to standard error. The
+optional trailing b specifies that the substitution should
+be matched from the beginning of the string rather than from
+right after the position at which the previous matching
+substitution ended. Optional trailing H, R, or S characters
+suppress substitutions for hardlink targets, regular
+filenames, or symlink targets, respectively. Optional
+trailing h, r, or s characters enable substitutions for
+hardlink targets, regular filenames, or symlink targets,
+respectively. The default is <i>hrs</i> which applies
+substitutions to all names. In particular, it is never
+necessary to specify h, r, or s.</p>
<p style="margin-top: 1em"><b>--safe-writes</b></p>
@@ -1019,6 +1058,14 @@ name is not verified against the system
or the output (in c mode) through <i>program</i> instead of
using the builtin compression support.</p>
+<p style="margin-top: 1em"><b>--owner</b>
+<i>name</i>[:<i>uid</i>]</p>
+
+<p style="margin-left:17%;">Use the provided user, if
+<i>uid</i> is not provided, <i>name</i> can be either an
+username or numeric id. See the <b>--uname</b> option for
+details.</p>
+
<p style="margin-top: 1em"><b>-v</b>, <b>--verbose</b></p>
<p style="margin-left:17%;">Produce verbose output. In
@@ -1421,7 +1468,7 @@ incompatible ways that different archive
hardlink information.)</p>
<p style="margin-left:6%; margin-top: 1em">BSD
-December 1, 2022 BSD</p>
+March 1, 2024 BSD</p>
<hr>
</body>
</html>
Index: pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html
diff -u pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.9 pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/cpio.5.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive-formats.5.html Fri Apr 12 15:39:49 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:22 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive.3.html Fri Apr 12 15:39:49 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/libarchive_internals.3.html Fri Apr 12 15:39:49 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:22 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/mtree.5.html Fri Apr 12 15:39:49 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:22 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
<!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.9 pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.10
--- pkgsrc/archivers/libarchive/files/doc/html/tar.5.html:1.9 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/tar.5.html Fri Apr 12 15:39:49 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:22 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:28 2024 -->
<!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.3 pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.4
--- pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html:1.3 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_entry_misc.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:18 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:25 2024 -->
<!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.5 pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.6
--- pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html:1.5 Thu Jan 18 18:00:13 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:19 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:26 2024 -->
<!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.5 pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.6
--- pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html:1.5 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html Fri Apr 12 15:39:48 2024
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.4 -->
-<!-- CreationDate: Mon Sep 11 22:06:21 2023 -->
+<!-- CreationDate: Sun Apr 7 22:36:27 2024 -->
<!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/man/Makefile
diff -u pkgsrc/archivers/libarchive/files/doc/man/Makefile:1.10 pkgsrc/archivers/libarchive/files/doc/man/Makefile:1.11
--- pkgsrc/archivers/libarchive/files/doc/man/Makefile:1.10 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/man/Makefile Fri Apr 12 15:39:49 2024
@@ -107,15 +107,15 @@ archive_write_set_passphrase.3: ../mdoc2
cpio.5: ../mdoc2man.awk ../../libarchive/cpio.5
awk -f ../mdoc2man.awk < ../../libarchive/cpio.5 > cpio.5
+libarchive-formats.5: ../mdoc2man.awk ../../libarchive/libarchive-formats.5
+ awk -f ../mdoc2man.awk < ../../libarchive/libarchive-formats.5 > libarchive-formats.5
+
libarchive.3: ../mdoc2man.awk ../../libarchive/libarchive.3
awk -f ../mdoc2man.awk < ../../libarchive/libarchive.3 > libarchive.3
libarchive_changes.3: ../mdoc2man.awk ../../libarchive/libarchive_changes.3
awk -f ../mdoc2man.awk < ../../libarchive/libarchive_changes.3 > libarchive_changes.3
-libarchive-formats.5: ../mdoc2man.awk ../../libarchive/libarchive-formats.5
- awk -f ../mdoc2man.awk < ../../libarchive/libarchive-formats.5 > libarchive-formats.5
-
libarchive_internals.3: ../mdoc2man.awk ../../libarchive/libarchive_internals.3
awk -f ../mdoc2man.awk < ../../libarchive/libarchive_internals.3 > libarchive_internals.3
@@ -130,4 +130,4 @@ bsdtar.1: ../mdoc2man.awk ../../tar/bsdt
bsdcpio.1: ../mdoc2man.awk ../../cpio/bsdcpio.1
awk -f ../mdoc2man.awk < ../../cpio/bsdcpio.1 > bsdcpio.1
-all: archive_entry.3 archive_entry_acl.3 archive_entry_linkify.3 archive_entry_misc.3 archive_entry_paths.3 archive_entry_perms.3 archive_entry_stat.3 archive_entry_time.3 archive_read.3
archive_read_add_passphrase.3 archive_read_data.3 archive_read_disk.3 archive_read_extract.3 archive_read_filter.3 archive_read_format.3 archive_read_free.3 archive_read_header.3 archive_read_new.3
archive_read_open.3 archive_read_set_options.3 archive_util.3 archive_write.3 archive_write_blocksize.3 archive_write_data.3 archive_write_disk.3 archive_write_filter.3 archive_write_finish_entry.3
archive_write_format.3 archive_write_free.3 archive_write_header.3 archive_write_new.3 archive_write_open.3 archive_write_set_options.3 archive_write_set_passphrase.3 cpio.5 libarchive.3
libarchive_changes.3 libarchive-formats.5 libarchive_internals.3 mtree.5 tar.5 bsdtar.1 bsdcpio.1
+all: archive_entry.3 archive_entry_acl.3 archive_entry_linkify.3 archive_entry_misc.3 archive_entry_paths.3 archive_entry_perms.3 archive_entry_stat.3 archive_entry_time.3 archive_read.3
archive_read_add_passphrase.3 archive_read_data.3 archive_read_disk.3 archive_read_extract.3 archive_read_filter.3 archive_read_format.3 archive_read_free.3 archive_read_header.3 archive_read_new.3
archive_read_open.3 archive_read_set_options.3 archive_util.3 archive_write.3 archive_write_blocksize.3 archive_write_data.3 archive_write_disk.3 archive_write_filter.3 archive_write_finish_entry.3
archive_write_format.3 archive_write_free.3 archive_write_header.3 archive_write_new.3 archive_write_open.3 archive_write_set_options.3 archive_write_set_passphrase.3 cpio.5 libarchive-formats.5
libarchive.3 libarchive_changes.3 libarchive_internals.3 mtree.5 tar.5 bsdtar.1 bsdcpio.1
Index: pkgsrc/archivers/libarchive/files/doc/man/archive_write_set_options.3
diff -u pkgsrc/archivers/libarchive/files/doc/man/archive_write_set_options.3:1.4 pkgsrc/archivers/libarchive/files/doc/man/archive_write_set_options.3:1.5
--- pkgsrc/archivers/libarchive/files/doc/man/archive_write_set_options.3:1.4 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/man/archive_write_set_options.3 Fri Apr 12 15:39:49 2024
@@ -272,6 +272,7 @@ Format 7zip
\fBcompression\fP
The value is one of
``store'',
+``copy'',
``deflate'',
``bzip2'',
``lzma1'',
@@ -279,13 +280,19 @@ The value is one of
or
``ppmd''
to indicate how the following entries should be compressed.
+The values
+``store''
+and
+``copy''
+are synonyms.
Note that this setting is ignored for directories, symbolic links,
and other special entries.
.TP
\fBcompression-level\fP
The value is interpreted as a decimal integer specifying the
compression level.
-Values between 0 and 9 are supported.
+Values between 0 and 9 are supported, with the exception of bzip2
+which only supports values between 1 and 9.
The interpretation of the compression level depends on the chosen
compression method.
.RE
Index: pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1
diff -u pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1:1.12 pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1:1.13
--- pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1:1.12 Thu Jan 18 18:00:14 2024
+++ pkgsrc/archivers/libarchive/files/doc/man/bsdtar.1 Fri Apr 12 15:39:49 2024
@@ -1,4 +1,4 @@
-.TH TAR 1 "December 1, 2022" ""
+.TH TAR 1 "March 1, 2024" ""
.SH NAME
.ad l
\fB\%tar\fP
@@ -290,6 +290,16 @@ On create, this sets the group name that
in the archive;
the name will not be verified against the system group database.
.TP
+\fB\-Fl\fP group \fIname\fP [: \fIgid\fP]
+Use the provided group, if
+\fIgid\fP
+is not provided,
+\fIname\fP
+can be either a group name or numeric id.
+See the
+\fB\-Fl\fP gname
+option for details.
+.TP
\fB\-H\fP
(c and r modes only)
Symbolic links named on the command line will be followed; the
@@ -440,6 +450,8 @@ This is the reverse of
and the default behavior in c, r, and u modes or if
\fB\%tar\fP
is run in x mode as root.
+Currently supported only for pax formats
+(including "pax restricted", the default tar format for bsdtar.)
.TP
\fB\-n\fP, \fB\-Fl\fP norecurse, \fB\-Fl\fP no-recursion
Do not operate recursively on the content of directories.
@@ -728,17 +740,119 @@ use as many threads as there are CPU cor
Start a new compression frame at the beginning of each file in the
archive.
.TP
-\fBzstd:min-frame-size\fP=\fIN\fP
+\fBzstd:min-frame-in\fP=\fIN\fP
+In combination with
+\fBzstd:frame-per-file\fP,
+do not start a new compression frame unless the uncompressed size of
+the current frame is at least
+\fIN\fP
+bytes.
+The number may be followed by
+.RS 4
+k /
+.RE
+.RS 4
+kB,
+.RE
+.RS 4
+M /
+.RE
+.RS 4
+MB,
+.RE
+or
+.RS 4
+G /
+.RE
+.RS 4
+GB
+.RE
+to indicate kilobytes, megabytes or gigabytes respectively.
+.TP
+\fBzstd:min-frame-out\fP=\fIN\fP, \fBzstd:min-frame-size\fP=\fIN\fP
In combination with
\fBzstd:frame-per-file\fP,
-do not start a new compression frame unless the current frame is at least
+do not start a new compression frame unless the compressed size of the
+current frame is at least
+\fIN\fP
+bytes.
+The number may be followed by
+.RS 4
+k /
+.RE
+.RS 4
+kB,
+.RE
+.RS 4
+M /
+.RE
+.RS 4
+MB,
+.RE
+or
+.RS 4
+G /
+.RE
+.RS 4
+GB
+.RE
+to indicate kilobytes, megabytes or gigabytes respectively.
+.TP
+\fBzstd:max-frame-in\fP=\fIN\fP, \fBzstd:max-frame-size\fP=\fIN\fP
+Start a new compression frame as soon as possible after the
+uncompressed size of the current frame exceeds
\fIN\fP
bytes.
+The number may be followed by
+.RS 4
+k /
+.RE
+.RS 4
+kB,
+.RE
+.RS 4
+M /
+.RE
+.RS 4
+MB,
+.RE
+or
+.RS 4
+G /
+.RE
+.RS 4
+GB
+.RE
+to indicate kilobytes, megabytes or gigabytes respectively.
+Values less than 1,024 will be rejected.
.TP
-\fBzstd:max-frame-size\fP=\fIN\fP
-Start a new compression frame as soon as the current frame exceeds
+\fBzstd:max-frame-out\fP=\fIN\fP
+Start a new compression frame as soon as possible after the compressed
+size of the current frame exceeds
\fIN\fP
bytes.
+The number may be followed by
+.RS 4
+k /
+.RE
+.RS 4
+kB,
+.RE
+.RS 4
+M /
+.RE
+.RS 4
+MB,
+.RE
+or
+.RS 4
+G /
+.RE
+.RS 4
+GB
+.RE
+to indicate kilobytes, megabytes or gigabytes respectively.
+Values less than 1,024 will be rejected.
.TP
\fBlzop:compression-level\fP
A decimal integer from 1 to 9 specifying the lzop compression level.
@@ -876,7 +990,7 @@ This works similar to the conv=sparse op
Modify file or archive member names according to
\fIpattern\fP.
The pattern has the format
-\fI/old/new/\fP [ghHprRsS]
+\fI/old/new/\fP [bghHprRsS]
where
\fIold\fP
is a basic regular expression,
@@ -898,6 +1012,9 @@ of symbolic links.
The optional trailing p specifies that after a successful substitution
the original path name and the new path name should be printed to
standard error.
+The optional trailing b specifies that the substitution should be
+matched from the beginning of the string rather than from right after the
+position at which the previous matching substitution ended.
Optional trailing H, R, or S characters suppress substitutions
for hardlink targets, regular filenames, or symlink targets,
respectively.
@@ -1013,6 +1130,16 @@ Pipe the input (in x or t mode) or the o
\fIprogram\fP
instead of using the builtin compression support.
.TP
+\fB\-Fl\fP owner \fIname\fP [: \fIuid\fP]
+Use the provided user, if
+\fIuid\fP
+is not provided,
+\fIname\fP
+can be either an username or numeric id.
+See the
+\fB\-Fl\fP uname
+option for details.
+.TP
\fB\-v\fP, \fB\-Fl\fP verbose
Produce verbose output.
In create and extract modes,
Index: pkgsrc/archivers/libarchive/files/doc/pdf/Makefile
diff -u pkgsrc/archivers/libarchive/files/doc/pdf/Makefile:1.8 pkgsrc/archivers/libarchive/files/doc/pdf/Makefile:1.9
--- pkgsrc/archivers/libarchive/files/doc/pdf/Makefile:1.8 Thu Jan 18 18:00:15 2024
+++ pkgsrc/archivers/libarchive/files/doc/pdf/Makefile Fri Apr 12 15:39:49 2024
@@ -107,15 +107,15 @@ archive_write_set_passphrase.3.pdf: ../.
cpio.5.pdf: ../../libarchive/cpio.5
groff -mdoc -T ps ../../libarchive/cpio.5 | ps2pdf - - > cpio.5.pdf
+libarchive-formats.5.pdf: ../../libarchive/libarchive-formats.5
+ groff -mdoc -T ps ../../libarchive/libarchive-formats.5 | ps2pdf - - > libarchive-formats.5.pdf
+
libarchive.3.pdf: ../../libarchive/libarchive.3
groff -mdoc -T ps ../../libarchive/libarchive.3 | ps2pdf - - > libarchive.3.pdf
libarchive_changes.3.pdf: ../../libarchive/libarchive_changes.3
groff -mdoc -T ps ../../libarchive/libarchive_changes.3 | ps2pdf - - > libarchive_changes.3.pdf
-libarchive-formats.5.pdf: ../../libarchive/libarchive-formats.5
- groff -mdoc -T ps ../../libarchive/libarchive-formats.5 | ps2pdf - - > libarchive-formats.5.pdf
-
libarchive_internals.3.pdf: ../../libarchive/libarchive_internals.3
groff -mdoc -T ps ../../libarchive/libarchive_internals.3 | ps2pdf - - > libarchive_internals.3.pdf
@@ -130,4 +130,4 @@ bsdtar.1.pdf: ../../tar/bsdtar.1
bsdcpio.1.pdf: ../../cpio/bsdcpio.1
groff -mdoc -T ps ../../cpio/bsdcpio.1 | ps2pdf - - > bsdcpio.1.pdf
-all: 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 cpio.5.pdf libarchive.3.pdf libarchive_changes.3.pdf
libarchive-formats.5.pdf libarchive_internals.3.pdf mtree.
5.pdf tar.5.pdf bsdtar.1.pdf bsdcpio.1.pdf
+all: 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 cpio.5.pdf libarchive-formats.5.pdf libarchive.3.pdf
libarchive_changes.3.pdf libarchive_internals.3.pdf mtree.
5.pdf tar.5.pdf bsdtar.1.pdf bsdcpio.1.pdf
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.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_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/doc/text/Makefile
diff -u pkgsrc/archivers/libarchive/files/doc/text/Makefile:1.10 pkgsrc/archivers/libarchive/files/doc/text/Makefile:1.11
--- pkgsrc/archivers/libarchive/files/doc/text/Makefile:1.10 Thu Jan 18 18:00:15 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/Makefile Fri Apr 12 15:39:50 2024
@@ -107,15 +107,15 @@ archive_write_set_passphrase.3.txt: ../.
cpio.5.txt: ../../libarchive/cpio.5
nroff -mdoc ../../libarchive/cpio.5 | col -b > cpio.5.txt
+libarchive-formats.5.txt: ../../libarchive/libarchive-formats.5
+ nroff -mdoc ../../libarchive/libarchive-formats.5 | col -b > libarchive-formats.5.txt
+
libarchive.3.txt: ../../libarchive/libarchive.3
nroff -mdoc ../../libarchive/libarchive.3 | col -b > libarchive.3.txt
libarchive_changes.3.txt: ../../libarchive/libarchive_changes.3
nroff -mdoc ../../libarchive/libarchive_changes.3 | col -b > libarchive_changes.3.txt
-libarchive-formats.5.txt: ../../libarchive/libarchive-formats.5
- nroff -mdoc ../../libarchive/libarchive-formats.5 | col -b > libarchive-formats.5.txt
-
libarchive_internals.3.txt: ../../libarchive/libarchive_internals.3
nroff -mdoc ../../libarchive/libarchive_internals.3 | col -b > libarchive_internals.3.txt
@@ -130,4 +130,4 @@ bsdtar.1.txt: ../../tar/bsdtar.1
bsdcpio.1.txt: ../../cpio/bsdcpio.1
nroff -mdoc ../../cpio/bsdcpio.1 | col -b > bsdcpio.1.txt
-all: archive_entry.3.txt archive_entry_acl.3.txt archive_entry_linkify.3.txt archive_entry_misc.3.txt archive_entry_paths.3.txt archive_entry_perms.3.txt archive_entry_stat.3.txt
archive_entry_time.3.txt archive_read.3.txt archive_read_add_passphrase.3.txt archive_read_data.3.txt archive_read_disk.3.txt archive_read_extract.3.txt archive_read_filter.3.txt
archive_read_format.3.txt archive_read_free.3.txt archive_read_header.3.txt archive_read_new.3.txt archive_read_open.3.txt archive_read_set_options.3.txt archive_util.3.txt archive_write.3.txt
archive_write_blocksize.3.txt archive_write_data.3.txt archive_write_disk.3.txt archive_write_filter.3.txt archive_write_finish_entry.3.txt archive_write_format.3.txt archive_write_free.3.txt
archive_write_header.3.txt archive_write_new.3.txt archive_write_open.3.txt archive_write_set_options.3.txt archive_write_set_passphrase.3.txt cpio.5.txt libarchive.3.txt libarchive_changes.3.txt
libarchive-formats.5.txt libarchive_internals.3.txt mtree.
5.txt tar.5.txt bsdtar.1.txt bsdcpio.1.txt
+all: archive_entry.3.txt archive_entry_acl.3.txt archive_entry_linkify.3.txt archive_entry_misc.3.txt archive_entry_paths.3.txt archive_entry_perms.3.txt archive_entry_stat.3.txt
archive_entry_time.3.txt archive_read.3.txt archive_read_add_passphrase.3.txt archive_read_data.3.txt archive_read_disk.3.txt archive_read_extract.3.txt archive_read_filter.3.txt
archive_read_format.3.txt archive_read_free.3.txt archive_read_header.3.txt archive_read_new.3.txt archive_read_open.3.txt archive_read_set_options.3.txt archive_util.3.txt archive_write.3.txt
archive_write_blocksize.3.txt archive_write_data.3.txt archive_write_disk.3.txt archive_write_filter.3.txt archive_write_finish_entry.3.txt archive_write_format.3.txt archive_write_free.3.txt
archive_write_header.3.txt archive_write_new.3.txt archive_write_open.3.txt archive_write_set_options.3.txt archive_write_set_passphrase.3.txt cpio.5.txt libarchive-formats.5.txt libarchive.3.txt
libarchive_changes.3.txt libarchive_internals.3.txt mtree.
5.txt tar.5.txt bsdtar.1.txt bsdcpio.1.txt
Index: pkgsrc/archivers/libarchive/files/doc/text/archive_write_set_options.3.txt
diff -u pkgsrc/archivers/libarchive/files/doc/text/archive_write_set_options.3.txt:1.7 pkgsrc/archivers/libarchive/files/doc/text/archive_write_set_options.3.txt:1.8
--- pkgsrc/archivers/libarchive/files/doc/text/archive_write_set_options.3.txt:1.7 Thu Jan 18 18:00:16 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/archive_write_set_options.3.txt Fri Apr 12 15:39:50 2024
@@ -152,16 +152,18 @@ OPTIONS
the number of physical CPU cores.
Format 7zip
compression
- The value is one of “store”, “deflate”, “bzip2”, “lzma1”,
- “lzma2” or “ppmd” to indicate how the following entries
- should be compressed. Note that this setting is ignored
+ The value is one of “store”, “copy”, “deflate”, “bzip2”,
+ “lzma1”, “lzma2” or “ppmd” to indicate how the following
+ entries should be compressed. The values “store” and
+ “copy” are synonyms. Note that this setting is ignored
for directories, symbolic links, and other special en‐
tries.
compression-level
The value is interpreted as a decimal integer specifying
the compression level. Values between 0 and 9 are sup‐
- ported. The interpretation of the compression level de‐
- pends on the chosen compression method.
+ ported, with the exception of bzip2 which only supports
+ values between 1 and 9. The interpretation of the com‐
+ pression level depends on the chosen compression method.
Format bin
hdrcharset
The value is used as a character set name that will be
Index: pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt
diff -u pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt:1.9 pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt:1.10
--- pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt:1.9 Thu Jan 18 18:00:16 2024
+++ pkgsrc/archivers/libarchive/files/doc/text/bsdtar.1.txt Fri Apr 12 15:39:50 2024
@@ -159,6 +159,11 @@ OPTIONS
group name that will be stored in the archive; the name will not
be verified against the system group database.
+ --group name[:gid]
+ Use the provided group, if gid is not provided, name can be ei‐
+ ther a group name or numeric id. See the --gname option for de‐
+ tails.
+
-H (c and r modes only) Symbolic links named on the command line
will be followed; the target of the link will be archived, not
the link itself.
@@ -254,7 +259,8 @@ OPTIONS
extended ACLs and extended file attributes using copyfile(3) in
AppleDouble format. This is the reverse of --no-mac-metadata.
and the default behavior in c, r, and u modes or if tar is run in
- x mode as root.
+ x mode as root. Currently supported only for pax formats (in‐
+ cluding "pax restricted", the default tar format for bsdtar.)
-n, --norecurse, --no-recursion
Do not operate recursively on the content of directories.
@@ -437,13 +443,30 @@ OPTIONS
zstd:frame-per-file
Start a new compression frame at the beginning of each
file in the archive.
- zstd:min-frame-size=N
+ zstd:min-frame-in=N
+ In combination with zstd:frame-per-file, do not start a
+ new compression frame unless the uncompressed size of the
+ current frame is at least N bytes. The number may be
+ followed by k / kB, M / MB, or G / GB to indicate kilo‐
+ bytes, megabytes or gigabytes respectively.
+ zstd:min-frame-out=N, zstd:min-frame-size=N
In combination with zstd:frame-per-file, do not start a
- new compression frame unless the current frame is at
- least N bytes.
- zstd:max-frame-size=N
- Start a new compression frame as soon as the current
- frame exceeds N bytes.
+ new compression frame unless the compressed size of the
+ current frame is at least N bytes. The number may be
+ followed by k / kB, M / MB, or G / GB to indicate kilo‐
+ bytes, megabytes or gigabytes respectively.
+ zstd:max-frame-in=N, zstd:max-frame-size=N
+ Start a new compression frame as soon as possible after
+ the uncompressed size of the current frame exceeds N
+ bytes. The number may be followed by k / kB, M / MB, or
+ G / GB to indicate kilobytes, megabytes or gigabytes re‐
+ spectively. Values less than 1,024 will be rejected.
+ zstd:max-frame-out=N
+ Start a new compression frame as soon as possible after
+ the compressed size of the current frame exceeds N bytes.
+ The number may be followed by k / kB, M / MB, or G / GB
+ to indicate kilobytes, megabytes or gigabytes respec‐
+ tively. Values less than 1,024 will be rejected.
lzop:compression-level
A decimal integer from 1 to 9 specifying the lzop com‐
pression level.
@@ -534,7 +557,7 @@ OPTIONS
-s pattern
Modify file or archive member names according to pattern. The
- pattern has the format /old/new/[ghHprRsS] where old is a basic
+ pattern has the format /old/new/[bghHprRsS] where old is a basic
regular expression, new is the replacement string of the matched
part, and the optional trailing letters modify how the replace‐
ment is handled. If old is not matched, the pattern is skipped.
@@ -545,13 +568,17 @@ OPTIONS
trailing s specifies that the pattern applies to the value of
symbolic links. The optional trailing p specifies that after a
successful substitution the original path name and the new path
- name should be printed to standard error. Optional trailing H,
- R, or S characters suppress substitutions for hardlink targets,
- regular filenames, or symlink targets, respectively. Optional
- trailing h, r, or s characters enable substitutions for hardlink
- targets, regular filenames, or symlink targets, respectively.
- The default is hrs which applies substitutions to all names. In
- particular, it is never necessary to specify h, r, or s.
+ name should be printed to standard error. The optional trailing
+ b specifies that the substitution should be matched from the be‐
+ ginning of the string rather than from right after the position
+ at which the previous matching substitution ended. Optional
+ trailing H, R, or S characters suppress substitutions for
+ hardlink targets, regular filenames, or symlink targets, respec‐
+ tively. Optional trailing h, r, or s characters enable substitu‐
+ tions for hardlink targets, regular filenames, or symlink tar‐
+ gets, respectively. The default is hrs which applies substitu‐
+ tions to all names. In particular, it is never necessary to
+ specify h, r, or s.
--safe-writes
(x mode only) Extract files atomically. By default tar unlinks
@@ -617,6 +644,10 @@ OPTIONS
Pipe the input (in x or t mode) or the output (in c mode) through
program instead of using the builtin compression support.
+ --owner name[:uid]
+ Use the provided user, if uid is not provided, name can be either
+ an username or numeric id. See the --uname option for details.
+
-v, --verbose
Produce verbose output. In create and extract modes, tar will
list each file name as it is read from or written to the archive.
@@ -863,4 +894,4 @@ BUGS
is a consequence of the incompatible ways that different archive formats
store hardlink information.)
-BSD December 1, 2022 BSD
+BSD March 1, 2024 BSD
Index: pkgsrc/archivers/libarchive/files/doc/wiki/Makefile
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/Makefile:1.8 pkgsrc/archivers/libarchive/files/doc/wiki/Makefile:1.9
--- pkgsrc/archivers/libarchive/files/doc/wiki/Makefile:1.8 Thu Jan 18 18:00:16 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/Makefile Fri Apr 12 15:39:50 2024
@@ -107,15 +107,15 @@ ManPageArchiveWriteSetPassphrase3.wiki:
ManPageCpio5.wiki: ../mdoc2wiki.awk ../../libarchive/cpio.5
awk -f ../mdoc2wiki.awk < ../../libarchive/cpio.5 > ManPageCpio5.wiki
+ManPageLibarchiveFormats5.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive-formats.5
+ awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive-formats.5 > ManPageLibarchiveFormats5.wiki
+
ManPageLibarchive3.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive.3
awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive.3 > ManPageLibarchive3.wiki
ManPageLibarchiveChanges3.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive_changes.3
awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive_changes.3 > ManPageLibarchiveChanges3.wiki
-ManPageLibarchiveFormats5.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive-formats.5
- awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive-formats.5 > ManPageLibarchiveFormats5.wiki
-
ManPageLibarchiveInternals3.wiki: ../mdoc2wiki.awk ../../libarchive/libarchive_internals.3
awk -f ../mdoc2wiki.awk < ../../libarchive/libarchive_internals.3 > ManPageLibarchiveInternals3.wiki
@@ -130,4 +130,4 @@ ManPageBsdtar1.wiki: ../mdoc2wiki.awk ..
ManPageBsdcpio1.wiki: ../mdoc2wiki.awk ../../cpio/bsdcpio.1
awk -f ../mdoc2wiki.awk < ../../cpio/bsdcpio.1 > ManPageBsdcpio1.wiki
-all: ManPageArchiveEntry3.wiki ManPageArchiveEntryAcl3.wiki ManPageArchiveEntryLinkify3.wiki ManPageArchiveEntryMisc3.wiki ManPageArchiveEntryPaths3.wiki ManPageArchiveEntryPerms3.wiki
ManPageArchiveEntryStat3.wiki ManPageArchiveEntryTime3.wiki ManPageArchiveRead3.wiki ManPageArchiveReadAddPassphrase3.wiki ManPageArchiveReadData3.wiki ManPageArchiveReadDisk3.wiki
ManPageArchiveReadExtract3.wiki ManPageArchiveReadFilter3.wiki ManPageArchiveReadFormat3.wiki ManPageArchiveReadFree3.wiki ManPageArchiveReadHeader3.wiki ManPageArchiveReadNew3.wiki
ManPageArchiveReadOpen3.wiki ManPageArchiveReadSetOptions3.wiki ManPageArchiveUtil3.wiki ManPageArchiveWrite3.wiki ManPageArchiveWriteBlocksize3.wiki ManPageArchiveWriteData3.wiki
ManPageArchiveWriteDisk3.wiki ManPageArchiveWriteFilter3.wiki ManPageArchiveWriteFinishEntry3.wiki ManPageArchiveWriteFormat3.wiki ManPageArchiveWriteFree3.wiki ManPageArchiveWriteHeader3.wiki
ManPageArchiveWriteNew3.wiki ManPageArchiveWriteOpen3.wiki ManPageArchiveWri
teSetOptions3.wiki ManPageArchiveWriteSetPassphrase3.wiki ManPageCpio5.wiki ManPageLibarchive3.wiki ManPageLibarchiveChanges3.wiki ManPageLibarchiveFormats5.wiki ManPageLibarchiveInternals3.wiki
ManPageMtree5.wiki ManPageTar5.wiki ManPageBsdtar1.wiki ManPageBsdcpio1.wiki
+all: ManPageArchiveEntry3.wiki ManPageArchiveEntryAcl3.wiki ManPageArchiveEntryLinkify3.wiki ManPageArchiveEntryMisc3.wiki ManPageArchiveEntryPaths3.wiki ManPageArchiveEntryPerms3.wiki
ManPageArchiveEntryStat3.wiki ManPageArchiveEntryTime3.wiki ManPageArchiveRead3.wiki ManPageArchiveReadAddPassphrase3.wiki ManPageArchiveReadData3.wiki ManPageArchiveReadDisk3.wiki
ManPageArchiveReadExtract3.wiki ManPageArchiveReadFilter3.wiki ManPageArchiveReadFormat3.wiki ManPageArchiveReadFree3.wiki ManPageArchiveReadHeader3.wiki ManPageArchiveReadNew3.wiki
ManPageArchiveReadOpen3.wiki ManPageArchiveReadSetOptions3.wiki ManPageArchiveUtil3.wiki ManPageArchiveWrite3.wiki ManPageArchiveWriteBlocksize3.wiki ManPageArchiveWriteData3.wiki
ManPageArchiveWriteDisk3.wiki ManPageArchiveWriteFilter3.wiki ManPageArchiveWriteFinishEntry3.wiki ManPageArchiveWriteFormat3.wiki ManPageArchiveWriteFree3.wiki ManPageArchiveWriteHeader3.wiki
ManPageArchiveWriteNew3.wiki ManPageArchiveWriteOpen3.wiki ManPageArchiveWri
teSetOptions3.wiki ManPageArchiveWriteSetPassphrase3.wiki ManPageCpio5.wiki ManPageLibarchiveFormats5.wiki ManPageLibarchive3.wiki ManPageLibarchiveChanges3.wiki ManPageLibarchiveInternals3.wiki
ManPageMtree5.wiki ManPageTar5.wiki ManPageBsdtar1.wiki ManPageBsdcpio1.wiki
Index: pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki:1.7 pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki:1.8
--- pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki:1.7 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki Fri Apr 12 15:39:50 2024
@@ -231,6 +231,7 @@ of physical CPU cores.
<dt>'''compression'''</dt><dd>
The value is one of
"store",
+"copy",
"deflate",
"bzip2",
"lzma1",
@@ -238,12 +239,18 @@ The value is one of
or
"ppmd"
to indicate how the following entries should be compressed.
+The values
+"store"
+and
+"copy"
+are synonyms.
Note that this setting is ignored for directories, symbolic links,
and other special entries.
</dd><dt>'''compression-level'''</dt><dd>
The value is interpreted as a decimal integer specifying the
compression level.
-Values between 0 and 9 are supported.
+Values between 0 and 9 are supported, with the exception of bzip2
+which only supports values between 1 and 9.
The interpretation of the compression level depends on the chosen
compression method.
</dd></dl>
Index: pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki
diff -u pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki:1.9 pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki:1.10
--- pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki:1.9 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki Fri Apr 12 15:39:50 2024
@@ -265,6 +265,15 @@ will be used instead.
On create, this sets the group name that will be stored
in the archive;
the name will not be verified against the system group database.
+</dd><dt>--group ''name''<nowiki>[</nowiki>:''gid''<nowiki>]</nowiki></dt><dd>
+Use the provided group, if
+''gid''
+is not provided,
+''name''
+can be either a group name or numeric id.
+See the
+--gname
+option for details.
</dd><dt>-H</dt><dd>
(c and r modes only)
Symbolic links named on the command line will be followed; the
@@ -396,6 +405,8 @@ This is the reverse of
and the default behavior in c, r, and u modes or if
'''tar'''
is run in x mode as root.
+Currently supported only for pax formats
+(including "pax restricted", the default tar format for bsdtar.)
</dd><dt>-n, --norecurse, --no-recursion</dt><dd>
Do not operate recursively on the content of directories.
</dd><dt>--newer ''date''</dt><dd>
@@ -639,16 +650,116 @@ use as many threads as there are CPU cor
</dd><dt>'''zstd:frame-per-file'''</dt><dd>
Start a new compression frame at the beginning of each file in the
archive.
-</dd><dt>'''zstd:min-frame-size'''=''N''</dt><dd>
+</dd><dt>'''zstd:min-frame-in'''=''N''</dt><dd>
+In combination with
+'''zstd:frame-per-file''',
+do not start a new compression frame unless the uncompressed size of
+the current frame is at least
+''N''
+bytes.
+The number may be followed by
+```text
+k /
+```
+```text
+kB,
+```
+```text
+M /
+```
+```text
+MB,
+```
+or
+```text
+G /
+```
+```text
+GB
+```
+to indicate kilobytes, megabytes or gigabytes respectively.
+</dd><dt>'''zstd:min-frame-out'''=''N'', '''zstd:min-frame-size'''=''N''</dt><dd>
In combination with
'''zstd:frame-per-file''',
-do not start a new compression frame unless the current frame is at least
+do not start a new compression frame unless the compressed size of the
+current frame is at least
+''N''
+bytes.
+The number may be followed by
+```text
+k /
+```
+```text
+kB,
+```
+```text
+M /
+```
+```text
+MB,
+```
+or
+```text
+G /
+```
+```text
+GB
+```
+to indicate kilobytes, megabytes or gigabytes respectively.
+</dd><dt>'''zstd:max-frame-in'''=''N'', '''zstd:max-frame-size'''=''N''</dt><dd>
+Start a new compression frame as soon as possible after the
+uncompressed size of the current frame exceeds
''N''
bytes.
-</dd><dt>'''zstd:max-frame-size'''=''N''</dt><dd>
-Start a new compression frame as soon as the current frame exceeds
+The number may be followed by
+```text
+k /
+```
+```text
+kB,
+```
+```text
+M /
+```
+```text
+MB,
+```
+or
+```text
+G /
+```
+```text
+GB
+```
+to indicate kilobytes, megabytes or gigabytes respectively.
+Values less than 1,024 will be rejected.
+</dd><dt>'''zstd:max-frame-out'''=''N''</dt><dd>
+Start a new compression frame as soon as possible after the compressed
+size of the current frame exceeds
''N''
bytes.
+The number may be followed by
+```text
+k /
+```
+```text
+kB,
+```
+```text
+M /
+```
+```text
+MB,
+```
+or
+```text
+G /
+```
+```text
+GB
+```
+to indicate kilobytes, megabytes or gigabytes respectively.
+Values less than 1,024 will be rejected.
</dd><dt>'''lzop:compression-level'''</dt><dd>
A decimal integer from 1 to 9 specifying the lzop compression level.
</dd><dt>'''xz:compression-level'''</dt><dd>
@@ -767,7 +878,7 @@ This works similar to the conv=sparse op
Modify file or archive member names according to
''pattern''.
The pattern has the format
-''/old/new/''<nowiki>[</nowiki>ghHprRsS<nowiki>]</nowiki>
+''/old/new/''<nowiki>[</nowiki>bghHprRsS<nowiki>]</nowiki>
where
''old''
is a basic regular expression,
@@ -789,6 +900,9 @@ of symbolic links.
The optional trailing p specifies that after a successful substitution
the original path name and the new path name should be printed to
standard error.
+The optional trailing b specifies that the substitution should be
+matched from the beginning of the string rather than from right after the
+position at which the previous matching substitution ended.
Optional trailing H, R, or S characters suppress substitutions
for hardlink targets, regular filenames, or symlink targets,
respectively.
@@ -894,6 +1008,15 @@ the name is not verified against the sys
Pipe the input (in x or t mode) or the output (in c mode) through
''program''
instead of using the builtin compression support.
+</dd><dt>--owner ''name''<nowiki>[</nowiki>:''uid''<nowiki>]</nowiki></dt><dd>
+Use the provided user, if
+''uid''
+is not provided,
+''name''
+can be either an username or numeric id.
+See the
+--uname
+option for details.
</dd><dt>-v, --verbose</dt><dd>
Produce verbose output.
In create and extract modes,
Index: pkgsrc/archivers/libarchive/files/libarchive/CMakeLists.txt
diff -u pkgsrc/archivers/libarchive/files/libarchive/CMakeLists.txt:1.9 pkgsrc/archivers/libarchive/files/libarchive/CMakeLists.txt:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/CMakeLists.txt:1.9 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/CMakeLists.txt Fri Apr 12 15:39:50 2024
@@ -252,6 +252,7 @@ ENDIF(BUILD_SHARED_LIBS)
# archive_static is a static library
ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
+TARGET_INCLUDE_DIRECTORIES(archive_static PUBLIC .)
TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
LIBARCHIVE_STATIC)
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.9 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c Fri Apr 12 15:39:51 2024
@@ -29,7 +29,6 @@
#if !defined(_WIN32) || defined(__CYGWIN__)
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_private.h:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_read_private.h:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_private.h:1.9 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_private.h Fri Apr 12 15:39:51 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_read_private.h 201088 2009-12-28 02:18:55Z kientzle $
*/
#ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_windows.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_windows.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_windows.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_windows.c:1.9 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_windows.c Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/*
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_windows.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_windows.h:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_windows.h:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_windows.h:1.9 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_windows.h Fri Apr 12 15:39:52 2024
@@ -23,8 +23,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/*
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_write.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write.c:1.9 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write.c 201099 2009-12-28 03:03:00Z kientzle $");
/*
* This file contains the "essential" portions of the write API, that
@@ -115,7 +114,7 @@ archive_write_new(void)
/* Initialize a block of nulls for padding purposes. */
a->null_length = 1024;
- nulls = (unsigned char *)calloc(1, a->null_length);
+ nulls = (unsigned char *)calloc(a->null_length, sizeof(unsigned char));
if (nulls == NULL) {
free(a);
return (NULL);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.9 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c Fri Apr 12 15:39:52 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#if !defined(_WIN32) || defined(__CYGWIN__)
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c:1.9 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ar.c Fri Apr 12 15:39:52 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_ar.c 201108 2009-12-28 03:28:21Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.15 pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.16
--- pkgsrc/archivers/libarchive/files/libarchive/archive.h:1.15 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.50 2008/05/26 17:00:22 kientzle Exp $
*/
#ifndef ARCHIVE_H_INCLUDED
@@ -36,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 3007002
+#define ARCHIVE_VERSION_NUMBER 3007003
#include <sys/stat.h>
#include <stddef.h> /* for wchar_t */
@@ -157,7 +155,7 @@ __LA_DECL int archive_version_number(vo
/*
* Textual name/version of the library, useful for version displays.
*/
-#define ARCHIVE_VERSION_ONLY_STRING "3.7.2"
+#define ARCHIVE_VERSION_ONLY_STRING "3.7.3"
#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
__LA_DECL const char * archive_version_string(void);
@@ -535,6 +533,10 @@ __LA_DECL int archive_read_open_filename
const char **_filenames, size_t _block_size);
__LA_DECL int archive_read_open_filename_w(struct archive *,
const wchar_t *_filename, size_t _block_size);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+__LA_DECL int archive_read_open_filenames_w(struct archive *,
+ const wchar_t **_filenames, size_t _block_size);
+#endif
/* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */
__LA_DECL int archive_read_open_file(struct archive *,
const char *_filename, size_t _block_size) __LA_DEPRECATED;
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.15 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.16
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.15 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Fri Apr 12 15:39:51 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD");
/* This is the tree-walking code for POSIX systems. */
#if !defined(_WIN32) || defined(__CYGWIN__)
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_acl.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_acl.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_acl.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_acl.c:1.5 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_acl.c Fri Apr 12 15:39:50 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c:1.5 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_cryptor.c Fri Apr 12 15:39:50 2024
@@ -424,8 +424,8 @@ static int
aes_ctr_release(archive_crypto_ctx *ctx)
{
EVP_CIPHER_CTX_free(ctx->ctx);
- memset(ctx->key, 0, ctx->key_len);
- memset(ctx->nonce, 0, sizeof(ctx->nonce));
+ OPENSSL_cleanse(ctx->key, ctx->key_len);
+ OPENSSL_cleanse(ctx->nonce, sizeof(ctx->nonce));
return 0;
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_stat.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_stat.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_stat.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_stat.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_stat.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_copy_stat.c 189466 2009-03-07 00:52:02Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.c:1.5 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.c Fri Apr 12 15:39:50 2024
@@ -28,10 +28,6 @@
*/
#include "archive_platform.h"
-#ifdef __FreeBSD__
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-#endif
#include <ctype.h>
#include <stdio.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_match.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_match.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_match.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_match.c:1.5 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_match.c Fri Apr 12 15:39:50 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_append_filter.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_append_filter.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_append_filter.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_append_filter.c:1.5 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_append_filter.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_data_into_fd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_data_into_fd.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_data_into_fd.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_data_into_fd.c:1.5 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_data_into_fd.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16 2008/05/23 05:01:29 cperciva Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.61 2008/05/26 17:00:22 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_filter.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_filter.3:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_filter.3:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_filter.3:1.5 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_filter.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd June 9, 2020
.Dt ARCHIVE_READ_FILTER 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c:1.5 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -374,7 +373,7 @@ uudecode_bidder_init(struct archive_read
self->code = ARCHIVE_FILTER_UU;
self->name = "uu";
- uudecode = (struct uudecode *)calloc(sizeof(*uudecode), 1);
+ uudecode = (struct uudecode *)calloc(1, sizeof(*uudecode));
out_buff = malloc(OUT_BUFF_SIZE);
in_buff = malloc(IN_BUFF_SIZE);
if (uudecode == NULL || out_buff == NULL || in_buff == NULL) {
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_string_sprintf.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_string_sprintf.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_string_sprintf.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_string_sprintf.c:1.5 Tue Aug 1 22:26:23 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_string_sprintf.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_string_sprintf.c 189435 2009-03-06 05:14:55Z kientzle $");
/*
* The use of printf()-family functions can be troublesome
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_util.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_util.3:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_util.3:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_util.3:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_util.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_UTIL 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_program.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_program.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_program.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_program.c:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_program.c Fri Apr 12 15:39:52 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_program.c 201104 2009-12-28 03:14:30Z kientzle $");
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_format.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_format.3:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_write_format.3:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_format.3:1.5 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_format.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 14, 2013
.Dt ARCHIVE_WRITE_FORMAT 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_open.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_open.3:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_write_open.3:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_open.3:1.5 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_open.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd November 12, 2020
.Dt ARCHIVE_WRITE_OPEN 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_fd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_fd.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_fd.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_fd.c:1.5 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_fd.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_open_fd.c 201093 2009-12-28 02:28:44Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_file.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_file.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_file.c:1.5 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_file.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.19 2007/01/09 08:05:56 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c Fri Apr 12 15:39:52 2024
@@ -27,8 +27,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_gnu_tar.c 191579 2009-04-27 18:35:03Z gastal $");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/filter_fork.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/filter_fork.h:1.5 pkgsrc/archivers/libarchive/files/libarchive/filter_fork.h:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/filter_fork.h:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/filter_fork.h Fri Apr 12 15:39:52 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/filter_fork.h 201087 2009-12-28 02:18:26Z kientzle $
*/
#ifndef FILTER_FORK_H
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_acl_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_acl_private.h:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_acl_private.h:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_acl_private.h:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_acl_private.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef ARCHIVE_ACL_PRIVATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_crc32.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_crc32.h:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_crc32.h:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_crc32.h:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_crc32.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_crc32.h 201102 2009-12-28 03:11:36Z kientzle $
*/
#ifndef ARCHIVE_CRC32_H
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_locale.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_locale.h:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_locale.h:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_locale.h:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_locale.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef ARCHIVE_ENTRY_LOCALE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_sparse.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_sparse.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_sparse.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_sparse.c:1.3 Tue Aug 1 22:26:23 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_sparse.c Fri Apr 12 15:39:50 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#include "archive.h"
#include "archive_entry.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_time.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_time.3:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_time.3:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_time.3:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_time.3 Fri Apr 12 15:39:50 2024
@@ -23,8 +23,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_ENTRY_TIME 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_options.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_options.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_options.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_options.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_options.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.c Fri Apr 12 15:39:50 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_STRING_H
#include <string.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_data.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_data.3:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_data.3:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_data.3:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_data.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_DATA 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_format.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_format.3:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_format.3:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_format.3:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_format.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_FORMAT 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_format.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_format.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_format.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_format.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_format.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#include "archive_read_private.h"
#include "archive_options_private.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_all.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_all.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_all.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_all.c:1.3 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_all.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#include "archive.h"
#include "archive_private.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_compress.c Fri Apr 12 15:39:51 2024
@@ -64,7 +64,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -218,7 +217,7 @@ compress_bidder_init(struct archive_read
self->code = ARCHIVE_FILTER_COMPRESS;
self->name = "compress (.Z)";
- state = (struct private_data *)calloc(sizeof(*state), 1);
+ state = (struct private_data *)calloc(1, sizeof(*state));
out_block = malloc(out_block_size);
if (state == NULL || out_block == NULL) {
free(out_block);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c Fri Apr 12 15:39:51 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -225,7 +223,7 @@ lz4_reader_init(struct archive_read_filt
self->code = ARCHIVE_FILTER_LZ4;
self->name = "lz4";
- state = (struct private_data *)calloc(sizeof(*state), 1);
+ state = (struct private_data *)calloc(1, sizeof(*state));
if (state == NULL) {
archive_set_error(&self->archive->archive, ENOMEM,
"Can't allocate data for lz4 decompression");
@@ -449,8 +447,8 @@ lz4_filter_read_descriptor(struct archiv
chsum = __archive_xxhash.XXH32(read_buf, (int)descriptor_bytes -1, 0);
chsum = (chsum >> 8) & 0xff;
chsum_verifier = read_buf[descriptor_bytes-1] & 0xff;
- if (chsum != chsum_verifier)
#ifndef DONT_FAIL_ON_CRC_ERROR
+ if (chsum != chsum_verifier)
goto malformed_error;
#endif
@@ -522,8 +520,8 @@ lz4_filter_read_data_block(struct archiv
read_buf + 4, (int)compressed_size, 0);
unsigned int chsum_block =
archive_le32dec(read_buf + 4 + compressed_size);
- if (chsum != chsum_block)
#ifndef DONT_FAIL_ON_CRC_ERROR
+ if (chsum != chsum_block)
goto malformed_error;
#endif
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c Fri Apr 12 15:39:51 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -177,7 +175,7 @@ zstd_bidder_init(struct archive_read_fil
self->code = ARCHIVE_FILTER_ZSTD;
self->name = "zstd";
- state = (struct private_data *)calloc(sizeof(*state), 1);
+ state = (struct private_data *)calloc(1, sizeof(*state));
out_block = (unsigned char *)malloc(out_block_size);
dstream = ZSTD_createDStream();
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_by_code.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c Fri Apr 12 15:39:51 2024
@@ -495,6 +495,11 @@ uint8_t bf_is_table_present(const struct
return (hdr->block_flags_u8 >> 7) & 1;
}
+static inline
+uint8_t bf_is_last_block(const struct compressed_block_header* hdr) {
+ return (hdr->block_flags_u8 >> 6) & 1;
+}
+
static inline struct rar5* get_context(struct archive_read* a) {
return (struct rar5*) a->format->data;
}
@@ -3757,7 +3762,12 @@ static int do_uncompress_file(struct arc
if(rar->cstate.last_write_ptr ==
rar->cstate.write_ptr) {
/* The block didn't generate any new data,
- * so just process a new block. */
+ * so just process a new block if this one
+ * wasn't the last block in the file. */
+ if (bf_is_last_block(&rar->last_block_hdr)) {
+ return ARCHIVE_EOF;
+ }
+
continue;
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_string_composition.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_string_composition.h:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_string_composition.h:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_string_composition.h:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_string_composition.h Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
- *
*/
/*
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c Fri Apr 12 15:39:52 2024
@@ -58,8 +58,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_compress.c 201111 2009-12-28 03:33:05Z kientzle $");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c Fri Apr 12 15:39:52 2024
@@ -25,7 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
//#undef HAVE_LZO_LZOCONF_H
//#undef HAVE_LZO_LZO1X_H
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c:1.3 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c Fri Apr 12 15:39:52 2024
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2017 Sean Purcell
+ * Copyright (c) 2023-2024 Klara, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,9 +26,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -55,15 +53,17 @@ struct private_data {
int compression_level;
int threads;
int long_distance;
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
enum {
running,
finishing,
resetting,
} state;
int frame_per_file;
- size_t min_frame_size;
- size_t max_frame_size;
+ size_t min_frame_in;
+ size_t max_frame_in;
+ size_t min_frame_out;
+ size_t max_frame_out;
size_t cur_frame;
size_t cur_frame_in;
size_t cur_frame_out;
@@ -96,7 +96,7 @@ static int archive_compressor_zstd_write
static int archive_compressor_zstd_flush(struct archive_write_filter *);
static int archive_compressor_zstd_close(struct archive_write_filter *);
static int archive_compressor_zstd_free(struct archive_write_filter *);
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
static int drive_compressor(struct archive_write_filter *,
struct private_data *, int, const void *, size_t);
#endif
@@ -130,10 +130,12 @@ archive_write_add_filter_zstd(struct arc
data->compression_level = CLEVEL_DEFAULT;
data->threads = 0;
data->long_distance = 0;
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
data->frame_per_file = 0;
- data->min_frame_size = 0;
- data->max_frame_size = SIZE_MAX;
+ data->min_frame_in = 0;
+ data->max_frame_in = SIZE_MAX;
+ data->min_frame_out = 0;
+ data->max_frame_out = SIZE_MAX;
data->cur_frame_in = 0;
data->cur_frame_out = 0;
data->cstream = ZSTD_createCStream();
@@ -162,7 +164,7 @@ static int
archive_compressor_zstd_free(struct archive_write_filter *f)
{
struct private_data *data = (struct private_data *)f->data;
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
ZSTD_freeCStream(data->cstream);
free(data->out.dst);
#else
@@ -173,7 +175,8 @@ archive_compressor_zstd_free(struct arch
return (ARCHIVE_OK);
}
-static int string_to_number(const char *string, intmax_t *numberp)
+static int
+string_to_number(const char *string, intmax_t *numberp)
{
char *end;
@@ -187,6 +190,41 @@ static int string_to_number(const char *
return (ARCHIVE_OK);
}
+static int
+string_to_size(const char *string, size_t *numberp)
+{
+ uintmax_t number;
+ char *end;
+ unsigned int shift = 0;
+
+ if (string == NULL || *string == '\0' || *string == '-')
+ return (ARCHIVE_WARN);
+ number = strtoumax(string, &end, 10);
+ if (end > string) {
+ if (*end == 'K' || *end == 'k') {
+ shift = 10;
+ end++;
+ } else if (*end == 'M' || *end == 'm') {
+ shift = 20;
+ end++;
+ } else if (*end == 'G' || *end == 'g') {
+ shift = 30;
+ end++;
+ }
+ if (*end == 'B' || *end == 'b') {
+ end++;
+ }
+ }
+ if (end == string || *end != '\0' || errno == EOVERFLOW) {
+ return (ARCHIVE_WARN);
+ }
+ if (number > (uintmax_t)SIZE_MAX >> shift) {
+ return (ARCHIVE_WARN);
+ }
+ *numberp = (size_t)(number << shift);
+ return (ARCHIVE_OK);
+}
+
/*
* Set write options.
*/
@@ -204,7 +242,7 @@ archive_compressor_zstd_options(struct a
/* If we don't have the library, hard-code the max level */
int minimum = CLEVEL_MIN;
int maximum = CLEVEL_MAX;
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
maximum = ZSTD_maxCLevel();
#if ZSTD_VERSION_NUMBER >= MINVER_MINCLEVEL
if (ZSTD_versionNumber() >= MINVER_MINCLEVEL) {
@@ -231,29 +269,33 @@ archive_compressor_zstd_options(struct a
}
data->threads = (int)threads;
return (ARCHIVE_OK);
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
} else if (strcmp(key, "frame-per-file") == 0) {
data->frame_per_file = 1;
return (ARCHIVE_OK);
- } else if (strcmp(key, "min-frame-size") == 0) {
- intmax_t min_frame_size;
- if (string_to_number(value, &min_frame_size) != ARCHIVE_OK) {
+ } else if (strcmp(key, "min-frame-in") == 0) {
+ if (string_to_size(value, &data->min_frame_in) != ARCHIVE_OK) {
return (ARCHIVE_WARN);
}
- if (min_frame_size < 0) {
+ return (ARCHIVE_OK);
+ } else if (strcmp(key, "min-frame-out") == 0 ||
+ strcmp(key, "min-frame-size") == 0) {
+ if (string_to_size(value, &data->min_frame_out) != ARCHIVE_OK) {
return (ARCHIVE_WARN);
}
- data->min_frame_size = min_frame_size;
return (ARCHIVE_OK);
- } else if (strcmp(key, "max-frame-size") == 0) {
- intmax_t max_frame_size;
- if (string_to_number(value, &max_frame_size) != ARCHIVE_OK) {
+ } else if (strcmp(key, "max-frame-in") == 0 ||
+ strcmp(key, "max-frame-size") == 0) {
+ if (string_to_size(value, &data->max_frame_in) != ARCHIVE_OK ||
+ data->max_frame_in < 1024) {
return (ARCHIVE_WARN);
}
- if (max_frame_size < 1024) {
+ return (ARCHIVE_OK);
+ } else if (strcmp(key, "max-frame-out") == 0) {
+ if (string_to_size(value, &data->max_frame_out) != ARCHIVE_OK ||
+ data->max_frame_out < 1024) {
return (ARCHIVE_WARN);
}
- data->max_frame_size = max_frame_size;
return (ARCHIVE_OK);
#endif
}
@@ -262,7 +304,7 @@ archive_compressor_zstd_options(struct a
if (string_to_number(value, &long_distance) != ARCHIVE_OK) {
return (ARCHIVE_WARN);
}
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR && ZSTD_VERSION_NUMBER >= MINVER_LONG
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream && ZSTD_VERSION_NUMBER >= MINVER_LONG
ZSTD_bounds bounds = ZSTD_cParam_getBounds(ZSTD_c_windowLog);
if (ZSTD_isError(bounds.error)) {
int max_distance = ((int)(sizeof(size_t) == 4 ? 30 : 31));
@@ -287,7 +329,7 @@ archive_compressor_zstd_options(struct a
return (ARCHIVE_WARN);
}
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
/*
* Setup callback.
*/
@@ -356,9 +398,12 @@ archive_compressor_zstd_flush(struct arc
{
struct private_data *data = (struct private_data *)f->data;
- if (data->frame_per_file && data->state == running &&
- data->cur_frame_out > data->min_frame_size)
- data->state = finishing;
+ if (data->frame_per_file && data->state == running) {
+ if (data->cur_frame_in > data->min_frame_in &&
+ data->cur_frame_out > data->min_frame_out) {
+ data->state = finishing;
+ }
+ }
return (drive_compressor(f, data, 1, NULL, 0));
}
@@ -417,9 +462,11 @@ drive_compressor(struct archive_write_fi
data->total_in += in.pos - ipos;
data->cur_frame_in += in.pos - ipos;
data->cur_frame_out += data->out.pos - opos;
- if (data->state == running &&
- data->cur_frame_in >= data->max_frame_size) {
- data->state = finishing;
+ if (data->state == running) {
+ if (data->cur_frame_in >= data->max_frame_in ||
+ data->cur_frame_out >= data->max_frame_out) {
+ data->state = finishing;
+ }
}
if (data->out.pos == data->out.size ||
(flush && data->out.pos > 0)) {
@@ -438,7 +485,7 @@ fatal:
return (ARCHIVE_FATAL);
}
-#else /* HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR */
+#else /* HAVE_ZSTD_H && HAVE_ZSTD_compressStream */
static int
archive_compressor_zstd_open(struct archive_write_filter *f)
@@ -500,4 +547,4 @@ archive_compressor_zstd_close(struct arc
return __archive_write_program_close(f, data->pdata);
}
-#endif /* HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR */
+#endif /* HAVE_ZSTD_H && HAVE_ZSTD_compressStream */
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_warc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_warc.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_warc.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_warc.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_warc.c Fri Apr 12 15:39:52 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/filter_fork_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/filter_fork_posix.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/filter_fork_posix.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/filter_fork_posix.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/filter_fork_posix.c Fri Apr 12 15:39:52 2024
@@ -30,8 +30,6 @@
#if defined(HAVE_PIPE) && defined(HAVE_FCNTL) && \
(defined(HAVE_FORK) || defined(HAVE_VFORK) || defined(HAVE_POSIX_SPAWNP))
-__FBSDID("$FreeBSD: head/lib/libarchive/filter_fork.c 182958 2008-09-12 05:33:00Z kientzle $");
-
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_check_magic.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_check_magic.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_check_magic.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_check_magic.c:1.6 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_check_magic.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_check_magic.c 201089 2009-12-28 02:20:23Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -62,7 +61,7 @@ errmsg(const char *m)
}
}
-static __LA_DEAD void
+static __LA_NORETURN void
diediedie(void)
{
#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG)
@@ -99,13 +98,12 @@ archive_handle_type_name(unsigned m)
}
}
-
-static char *
+static void
write_all_states(char *buff, unsigned int states)
{
unsigned int lowbit;
- buff[0] = '\0';
+ *buff = '\0';
/* A trick for computing the lowest set bit. */
while ((lowbit = states & (1 + ~states)) != 0) {
@@ -114,7 +112,6 @@ write_all_states(char *buff, unsigned in
if (states != 0)
strcat(buff, "/");
}
- return buff;
}
/*
@@ -160,16 +157,19 @@ __archive_check_magic(struct archive *a,
if ((a->state & state) == 0) {
/* If we're already FATAL, don't overwrite the error. */
- if (a->state != ARCHIVE_STATE_FATAL)
+ if (a->state != ARCHIVE_STATE_FATAL) {
+ write_all_states(states1, a->state);
+ write_all_states(states2, state);
archive_set_error(a, -1,
"INTERNAL ERROR: Function '%s' invoked with"
" archive structure in state '%s',"
" should be in state '%s'",
function,
- write_all_states(states1, a->state),
- write_all_states(states2, state));
+ states1,
+ states2);
+ }
a->state = ARCHIVE_STATE_FATAL;
return (ARCHIVE_FATAL);
}
- return ARCHIVE_OK;
+ return (ARCHIVE_OK);
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_endian.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_endian.h:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_endian.h:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_endian.h:1.6 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_endian.h Fri Apr 12 15:39:50 2024
@@ -23,8 +23,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_endian.h 201085 2009-12-28 02:17:15Z kientzle $
- *
* Borrowed from FreeBSD's <sys/endian.h>
*/
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3:1.6 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd April 3, 2017
.Dt ARCHIVE_READ_DISK 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_private.h:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_private.h:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_private.h:1.6 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_private.h Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_read_disk_private.h 201105 2009-12-28 03:20:54Z kientzle $
*/
#ifndef ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_fd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_fd.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_fd.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_fd.c:1.6 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_fd.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_fd.c 201103 2009-12-28 03:13:49Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_memory.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_memory.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_memory.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_memory.c:1.6 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_memory.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/06 15:51:59 kientzle Exp $");
#include <errno.h>
#include <stdlib.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c:1.6 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_all.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_all.c 174991 2007-12-30 04:58:22Z kientzle $");
#include "archive.h"
#include "archive_private.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_empty.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_empty.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_empty.c:1.6 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_empty.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_empty.c 191524 2009-04-26 18:24:14Z kientzle $");
#include "archive.h"
#include "archive_entry.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_virtual.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_virtual.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_virtual.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_virtual.c:1.6 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_virtual.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_virtual.c 201098 2009-12-28 02:58:14Z kientzle $");
#include "archive.h"
#include "archive_entry.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c:1.6 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c Fri Apr 12 15:39:52 2024
@@ -26,8 +26,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_xz.c 201108 2009-12-28 03:28:21Z kientzle $");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_private.h:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_private.h:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_private.h:1.6 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_private.h Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_write_disk_private.h 201086 2009-12-28 02:17:53Z kientzle $
*/
#ifndef ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_filename.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_filename.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_filename.c:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_filename.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_open_filename.c 191165 2009-04-17 00:39:35Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_memory.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_memory.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_memory.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_memory.c:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_open_memory.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_memory.c,v 1.3 2007/01/09 08:05:56 kientzle Exp $");
#include <errno.h>
#include <stdlib.h>
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.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_xar.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/cpio.5
diff -u pkgsrc/archivers/libarchive/files/libarchive/cpio.5:1.6 pkgsrc/archivers/libarchive/files/libarchive/cpio.5:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/cpio.5:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/cpio.5 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd December 23, 2011
.Dt CPIO 5
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/libarchive.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/libarchive.3:1.6 pkgsrc/archivers/libarchive/files/libarchive/libarchive.3:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/libarchive.3:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/libarchive.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd March 18, 2012
.Dt LIBARCHIVE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline.c:1.2 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline.c Fri Apr 12 15:39:50 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_STRING_H
# include <string.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline_private.h:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline_private.h:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline_private.h:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_cmdline_private.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef ARCHIVE_CMDLINE_PRIVATE_H
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_copy_bhfi.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#include "archive_private.h"
#include "archive_entry.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.h:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.h:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.h:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_getdate.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef ARCHIVE_GETDATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_options_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_options_private.h:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_options_private.h:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_options_private.h:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_options_private.h Fri Apr 12 15:39:50 2024
@@ -27,8 +27,6 @@
#define ARCHIVE_OPTIONS_PRIVATE_H_INCLUDED
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#include "archive_private.h"
typedef int (*option_handler)(struct archive *a,
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.h:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.h:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.h:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_pathmatch.h Fri Apr 12 15:39:50 2024
@@ -22,8 +22,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef ARCHIVE_PATHMATCH_H
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_platform_acl.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_platform_acl.h:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_platform_acl.h:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_platform_acl.h:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_platform_acl.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_platform_xattr.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_platform_xattr.h:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_platform_xattr.h:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_platform_xattr.h:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_platform_xattr.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd September 14, 2014
.Dt ARCHIVE_READ_ADD_PASSPHRASE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_add_passphrase.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_extract.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_EXTRACT 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_free.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_free.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_free.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_free.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_free.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_FREE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_header.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_header.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_header.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_header.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_header.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_HEADER 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_new.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_new.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_new.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_new.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_new.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_NEW 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c:1.2 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_bzip2.c Fri Apr 12 15:39:51 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -192,7 +190,7 @@ bzip2_reader_init(struct archive_read_fi
self->code = ARCHIVE_FILTER_BZIP2;
self->name = "bzip2";
- state = (struct private_data *)calloc(sizeof(*state), 1);
+ state = (struct private_data *)calloc(1, sizeof(*state));
out_block = (unsigned char *)malloc(out_block_size);
if (state == NULL || out_block == NULL) {
archive_set_error(&self->archive->archive, ENOMEM,
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c:1.2 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_grzip.c Fri Apr 12 15:39:51 2024
@@ -25,9 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c:1.2 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lrzip.c Fri Apr 12 15:39:51 2024
@@ -25,9 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c:1.2 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_rpm.c Fri Apr 12 15:39:51 2024
@@ -141,7 +141,7 @@ rpm_bidder_init(struct archive_read_filt
self->code = ARCHIVE_FILTER_RPM;
self->name = "rpm";
- rpm = (struct rpm *)calloc(sizeof(*rpm), 1);
+ rpm = (struct rpm *)calloc(1, sizeof(*rpm));
if (rpm == NULL) {
archive_set_error(&self->archive->archive, ENOMEM,
"Can't allocate data for rpm");
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c:1.2 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_version_details.c Fri Apr 12 15:39:52 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:14Z kientzle $");
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_grzip.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_lrzip.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_blocksize.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_blocksize.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_blocksize.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_blocksize.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_blocksize.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE_BLOCKSIZE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_free.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_free.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_free.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_free.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_free.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE_FREE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_header.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_header.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_header.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_header.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_header.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE_HEADER 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_new.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_new.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_new.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_new.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_new.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE_NEW 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_passphrase.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_passphrase.3:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_passphrase.3:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_passphrase.3:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_passphrase.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd September 21, 2014
.Dt ARCHIVE_WRITE_SET_PASSPHRASE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry.3:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_entry.3:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry.3:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry.3 Fri Apr 12 15:39:50 2024
@@ -23,8 +23,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_ENTRY 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c:1.7 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_link_resolver.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_link_resolver.c 201100 2009-12-28 03:05:31Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_private.h:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_private.h:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_private.h:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_private.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_private.h 201098 2009-12-28 02:58:14Z kientzle $
*/
#ifndef ARCHIVE_PRIVATE_H_INCLUDED
@@ -40,10 +38,12 @@
#include "archive_string.h"
#if defined(__GNUC__) && (__GNUC__ > 2 || \
- (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
-#define __LA_DEAD __attribute__((__noreturn__))
+ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define __LA_NORETURN __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define __LA_NORETURN __declspec(noreturn)
#else
-#define __LA_DEAD
+#define __LA_NORETURN
#endif
#if defined(__GNUC__) && (__GNUC__ > 2 || \
@@ -153,7 +153,7 @@ int __archive_check_magic(struct archive
return ARCHIVE_FATAL; \
} while (0)
-void __archive_errx(int retvalue, const char *msg) __LA_DEAD;
+__LA_NORETURN void __archive_errx(int retvalue, const char *msg);
void __archive_ensure_cloexec_flag(int fd);
int __archive_mktemp(const char *tmpdir);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read.3:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read.3:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read.3:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read.3 Fri Apr 12 15:39:50 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_windows.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_windows.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_windows.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_windows.c:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_windows.c Fri Apr 12 15:39:51 2024
@@ -25,7 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -2439,6 +2438,7 @@ archive_read_disk_entry_from_file(struct
return (ARCHIVE_OK);
}
+ r = ARCHIVE_OK;
if ((a->flags & ARCHIVE_READDISK_NO_SPARSE) == 0) {
r = setup_sparse_from_disk(a, entry, h);
if (fd < 0)
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_file.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_file.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_file.c:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_file.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_file.c 201093 2009-12-28 02:28:44Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -3051,8 +3050,8 @@ slurp_central_directory(struct archive_r
/* Check the EncodedHeader CRC.*/
if (r == 0 && zip->header_crc32 != next_header_crc) {
- archive_set_error(&a->archive, -1,
#ifndef DONT_FAIL_ON_CRC_ERROR
+ archive_set_error(&a->archive, -1,
"Damaged 7-Zip archive");
r = -1;
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c:1.7 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_ar.c Fri Apr 12 15:39:51 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_ar.c 201101 2009-12-28 03:06:27Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_warc.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
/**
* WARC is standardised by ISO TC46/SC4/WG12 and currently available as
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_string.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_string.h:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_string.h:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_string.h:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_string.h Fri Apr 12 15:39:51 2024
@@ -21,9 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_string.h 201092 2009-12-28 02:26:06Z kientzle $
- *
*/
#ifndef ARCHIVE_STRING_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write.3:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write.3:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write.3:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_windows.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_windows.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_windows.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_windows.c:1.7 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_windows.c Fri Apr 12 15:39:52 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#if defined(_WIN32) && !defined(__CYGWIN__)
@@ -2595,7 +2594,7 @@ set_times(struct archive_write_disk *a,
{
#define EPOC_TIME ARCHIVE_LITERAL_ULL(116444736000000000)
#define WINTIME(sec, nsec) ((Int32x32To64(sec, 10000000) + EPOC_TIME)\
- + (((nsec)/1000)*10))
+ + ((nsec)/100))
HANDLE hw = 0;
ULARGE_INTEGER wintm;
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_private.h Fri Apr 12 15:39:52 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_write_private.h 201155 2009-12-29 05:20:12Z kientzle $
*/
#ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_by_name.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_by_name.c 201168 2009-12-29 06:15:32Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c Fri Apr 12 15:39:52 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_mtree.c 201171 2009-12-29 06:39:07Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_ustar.c 191579 2009-04-27 18:35:03Z kientzle $");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_zip.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_zip.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_zip.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_zip.c Fri Apr 12 15:39:52 2024
@@ -30,7 +30,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_zip.c 201168 2009-12-29 06:15:32Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -132,7 +131,6 @@ struct zip {
enum compression entry_compression;
enum encryption entry_encryption;
int entry_flags;
- int entry_uses_zip64;
int experiments;
struct trad_enc_ctx tctx;
char tctx_valid;
@@ -523,6 +521,7 @@ archive_write_zip_header(struct archive_
int ret, ret2 = ARCHIVE_OK;
mode_t type;
int version_needed = 10;
+#define MIN_VERSION_NEEDED(x) do { if (version_needed < x) { version_needed = x; } } while (0)
/* Ignore types of entries that we don't support. */
type = archive_entry_filetype(entry);
@@ -557,12 +556,12 @@ archive_write_zip_header(struct archive_
/* Reset information from last entry. */
zip->entry_offset = zip->written_bytes;
zip->entry_uncompressed_limit = INT64_MAX;
+ /* Zero size values implies that we're using a trailing data descriptor */
zip->entry_compressed_size = 0;
zip->entry_uncompressed_size = 0;
zip->entry_compressed_written = 0;
zip->entry_uncompressed_written = 0;
zip->entry_flags = 0;
- zip->entry_uses_zip64 = 0;
zip->entry_crc32 = zip->crc32func(0, NULL, 0);
zip->entry_encryption = 0;
archive_entry_free(zip->entry);
@@ -672,11 +671,11 @@ archive_write_zip_header(struct archive_
zip->entry_crc32 = zip->crc32func(zip->entry_crc32,
(const unsigned char *)slink, slink_size);
zip->entry_compression = COMPRESSION_STORE;
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
} else if (type != AE_IFREG) {
zip->entry_compression = COMPRESSION_STORE;
zip->entry_uncompressed_limit = 0;
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
} else if (archive_entry_size_is_set(zip->entry)) {
int64_t size = archive_entry_size(zip->entry);
int64_t additional_size = 0;
@@ -689,27 +688,27 @@ archive_write_zip_header(struct archive_
if (zip->entry_compression == COMPRESSION_STORE) {
zip->entry_compressed_size = size;
zip->entry_uncompressed_size = size;
- version_needed = 10;
+ MIN_VERSION_NEEDED(10);
} else {
zip->entry_uncompressed_size = size;
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
}
if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
switch (zip->entry_encryption) {
case ENCRYPTION_TRADITIONAL:
additional_size = TRAD_HEADER_SIZE;
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
break;
case ENCRYPTION_WINZIP_AES128:
additional_size = WINZIP_AES128_HEADER_SIZE
+ AUTH_CODE_SIZE;
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
break;
case ENCRYPTION_WINZIP_AES256:
additional_size = WINZIP_AES256_HEADER_SIZE
+ AUTH_CODE_SIZE;
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
break;
case ENCRYPTION_NONE:
default:
@@ -733,8 +732,7 @@ archive_write_zip_header(struct archive_
|| (zip->entry_uncompressed_size + additional_size > ZIP_4GB_MAX)
|| (zip->entry_uncompressed_size > ZIP_4GB_MAX_UNCOMPRESSED
&& zip->entry_compression != COMPRESSION_STORE)) {
- zip->entry_uses_zip64 = 1;
- version_needed = 45;
+ MIN_VERSION_NEEDED(45);
}
/* We may know the size, but never the CRC. */
@@ -742,7 +740,6 @@ archive_write_zip_header(struct archive_
} else {
/* We don't know the size. Use the default
* compression unless specified otherwise.
- * We enable Zip64 extensions unless we're told not to.
*/
zip->entry_compression = zip->requested_compression;
@@ -752,12 +749,12 @@ archive_write_zip_header(struct archive_
zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
if ((zip->flags & ZIP_FLAG_AVOID_ZIP64) == 0) {
- zip->entry_uses_zip64 = 1;
- version_needed = 45;
+ /* We might use zip64 extensions, so require 4.5 */
+ MIN_VERSION_NEEDED(45);
} else if (zip->entry_compression == COMPRESSION_STORE) {
- version_needed = 10;
+ MIN_VERSION_NEEDED(10);
} else {
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
}
if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
@@ -765,8 +762,7 @@ archive_write_zip_header(struct archive_
case ENCRYPTION_TRADITIONAL:
case ENCRYPTION_WINZIP_AES128:
case ENCRYPTION_WINZIP_AES256:
- if (version_needed < 20)
- version_needed = 20;
+ MIN_VERSION_NEEDED(20);
break;
case ENCRYPTION_NONE:
default:
@@ -787,16 +783,8 @@ archive_write_zip_header(struct archive_
archive_le16enc(local_header + 8, zip->entry_compression);
archive_le32enc(local_header + 10,
dos_time(archive_entry_mtime(zip->entry)));
- archive_le32enc(local_header + 14, zip->entry_crc32);
- if (zip->entry_uses_zip64) {
- /* Zip64 data in the local header "must" include both
- * compressed and uncompressed sizes AND those fields
- * are included only if these are 0xffffffff;
- * THEREFORE these must be set this way, even if we
- * know one of them is smaller. */
- archive_le32enc(local_header + 18, ZIP_4GB_MAX);
- archive_le32enc(local_header + 22, ZIP_4GB_MAX);
- } else {
+ if ((zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END) == 0) {
+ archive_le32enc(local_header + 14, zip->entry_crc32);
archive_le32enc(local_header + 18, (uint32_t)zip->entry_compressed_size);
archive_le32enc(local_header + 22, (uint32_t)zip->entry_uncompressed_size);
}
@@ -842,42 +830,19 @@ archive_write_zip_header(struct archive_
* the local file header and the central directory.
* We format them once and then duplicate them. */
- /* UT timestamp, length depends on what timestamps are set. */
- memcpy(e, "UT", 2);
- archive_le16enc(e + 2,
- 1
- + (archive_entry_mtime_is_set(entry) ? 4 : 0)
- + (archive_entry_atime_is_set(entry) ? 4 : 0)
- + (archive_entry_ctime_is_set(entry) ? 4 : 0));
- e += 4;
- *e++ =
- (archive_entry_mtime_is_set(entry) ? 1 : 0)
- | (archive_entry_atime_is_set(entry) ? 2 : 0)
- | (archive_entry_ctime_is_set(entry) ? 4 : 0);
- if (archive_entry_mtime_is_set(entry)) {
- archive_le32enc(e, (uint32_t)archive_entry_mtime(entry));
- e += 4;
- }
- if (archive_entry_atime_is_set(entry)) {
- archive_le32enc(e, (uint32_t)archive_entry_atime(entry));
+ /* ux Unix extra data, length 11, version 1 */
+ if (archive_entry_uid_is_set(entry) || archive_entry_gid_is_set(entry)) {
+ /* TODO: If uid < 64k, use 2 bytes, ditto for gid. */
+ memcpy(e, "ux\013\000\001", 5);
+ e += 5;
+ *e++ = 4; /* Length of following UID */
+ archive_le32enc(e, (uint32_t)archive_entry_uid(entry));
e += 4;
- }
- if (archive_entry_ctime_is_set(entry)) {
- archive_le32enc(e, (uint32_t)archive_entry_ctime(entry));
+ *e++ = 4; /* Length of following GID */
+ archive_le32enc(e, (uint32_t)archive_entry_gid(entry));
e += 4;
}
- /* ux Unix extra data, length 11, version 1 */
- /* TODO: If uid < 64k, use 2 bytes, ditto for gid. */
- memcpy(e, "ux\013\000\001", 5);
- e += 5;
- *e++ = 4; /* Length of following UID */
- archive_le32enc(e, (uint32_t)archive_entry_uid(entry));
- e += 4;
- *e++ = 4; /* Length of following GID */
- archive_le32enc(e, (uint32_t)archive_entry_gid(entry));
- e += 4;
-
/* AES extra data field: WinZIP AES information, ID=0x9901 */
if ((zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED)
&& (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
@@ -904,7 +869,7 @@ archive_write_zip_header(struct archive_
e += 2;
}
- /* Copy UT ,ux, and AES-extra into central directory as well. */
+ /* Copy ux, AES-extra into central directory as well. */
zip->file_header_extra_offset = zip->central_directory_bytes;
cd_extra = cd_alloc(zip, e - local_extra);
memcpy(cd_extra, local_extra, e - local_extra);
@@ -916,17 +881,50 @@ archive_write_zip_header(struct archive_
* archive_write_zip_finish_entry() below.
*/
- /* "[Zip64 entry] in the local header MUST include BOTH
- * original [uncompressed] and compressed size fields." */
- if (zip->entry_uses_zip64) {
- unsigned char *zip64_start = e;
- memcpy(e, "\001\000\020\000", 4);
+ /* UT timestamp: length depends on what timestamps are set.
+ * This header appears in the Central Directory also, but
+ * according to Info-Zip specification, the CD form
+ * only holds mtime, so we format it separately. */
+ if (archive_entry_mtime_is_set(entry)
+ || archive_entry_atime_is_set(entry)
+ || archive_entry_ctime_is_set(entry)) {
+ unsigned char *ut = e;
+ memcpy(e, "UT\000\000", 4);
+ e += 4;
+ *e++ = (archive_entry_mtime_is_set(entry) ? 1 : 0)
+ | (archive_entry_atime_is_set(entry) ? 2 : 0)
+ | (archive_entry_ctime_is_set(entry) ? 4 : 0);
+ if (archive_entry_mtime_is_set(entry)) {
+ archive_le32enc(e, (uint32_t)archive_entry_mtime(entry));
+ e += 4;
+ }
+ if (archive_entry_atime_is_set(entry)) {
+ archive_le32enc(e, (uint32_t)archive_entry_atime(entry));
+ e += 4;
+ }
+ if (archive_entry_ctime_is_set(entry)) {
+ archive_le32enc(e, (uint32_t)archive_entry_ctime(entry));
+ e += 4;
+ }
+ archive_le16enc(ut + 2, e - ut - 4);
+ }
+
+ /*
+ * Note about Zip64 Extended Information Extra Field:
+ * Because libarchive always writes in a streaming
+ * fashion, we never know the CRC when we're writing
+ * the local header. So we have to use length-at-end, which
+ * prevents us from putting size information into a Zip64
+ * extra field. However, apparently some readers find it
+ * a helpful clue to have an empty such field so they
+ * can expect a 64-bit length-at-end marker.
+ */
+ if (archive_entry_size_is_set(zip->entry)
+ && (zip->entry_uncompressed_size > ZIP_4GB_MAX
+ || zip->entry_compressed_size > ZIP_4GB_MAX)) {
+ /* Header ID 0x0001, size 0 */
+ memcpy(e, "\001\000\000\000", 4);
e += 4;
- archive_le64enc(e, zip->entry_uncompressed_size);
- e += 8;
- archive_le64enc(e, zip->entry_compressed_size);
- e += 8;
- archive_le16enc(zip64_start + 2, (uint16_t)(e - (zip64_start + 4)));
}
if (zip->flags & ZIP_FLAG_EXPERIMENT_xl) {
@@ -1205,7 +1203,9 @@ archive_write_zip_finish_entry(struct ar
archive_le32enc(d + 4, 0);/* no CRC.*/
else
archive_le32enc(d + 4, zip->entry_crc32);
- if (zip->entry_uses_zip64) {
+ if (zip->entry_compressed_written > ZIP_4GB_MAX
+ || zip->entry_uncompressed_written > ZIP_4GB_MAX
+ || zip->flags & ZIP_FLAG_FORCE_ZIP64) {
archive_le64enc(d + 8,
(uint64_t)zip->entry_compressed_written);
archive_le64enc(d + 16,
@@ -1224,23 +1224,60 @@ archive_write_zip_finish_entry(struct ar
return (ARCHIVE_FATAL);
}
- /* Append Zip64 extra data to central directory information. */
- if (zip->entry_compressed_written > ZIP_4GB_MAX
- || zip->entry_uncompressed_written > ZIP_4GB_MAX
+ /* UT timestamp: Info-Zip specifies that _only_ the mtime should
+ * be recorded here; ctime and atime are also included in the
+ * local file descriptor. */
+ if (archive_entry_mtime_is_set(zip->entry)) {
+ unsigned char ut[9];
+ unsigned char *u = ut, *ud;
+ memcpy(u, "UT\005\000\001", 5);
+ u += 5;
+ archive_le32enc(u, (uint32_t)archive_entry_mtime(zip->entry));
+ u += 4;
+ ud = cd_alloc(zip, u - ut);
+ if (ud == NULL) {
+ archive_set_error(&a->archive, ENOMEM,
+ "Can't allocate zip data");
+ return (ARCHIVE_FATAL);
+ }
+ memcpy(ud, ut, u - ut);
+ }
+
+ /* Fill in size information in the central directory entry. */
+ /* Fix up central directory file header. */
+ if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
+ archive_le32enc(zip->file_header + 16, 0);/* no CRC.*/
+ else
+ archive_le32enc(zip->file_header + 16, zip->entry_crc32);
+ /* Truncate to 32 bits; we'll fix up below. */
+ archive_le32enc(zip->file_header + 20, (uint32_t)zip->entry_compressed_written);
+ archive_le32enc(zip->file_header + 24, (uint32_t)zip->entry_uncompressed_written);
+ archive_le16enc(zip->file_header + 30,
+ (uint16_t)(zip->central_directory_bytes - zip->file_header_extra_offset));
+ archive_le32enc(zip->file_header + 42, (uint32_t)zip->entry_offset);
+
+ /* If any of the values immediately above are too large, we'll
+ * need to put the corresponding value in a Zip64 extra field
+ * and set the central directory value to 0xffffffff as a flag. */
+ if (zip->entry_compressed_written >= ZIP_4GB_MAX
+ || zip->entry_uncompressed_written >= ZIP_4GB_MAX
|| zip->entry_offset > ZIP_4GB_MAX) {
unsigned char zip64[32];
unsigned char *z = zip64, *zd;
memcpy(z, "\001\000\000\000", 4);
z += 4;
if (zip->entry_uncompressed_written >= ZIP_4GB_MAX) {
+ archive_le32enc(zip->file_header + 24, ZIP_4GB_MAX);
archive_le64enc(z, zip->entry_uncompressed_written);
z += 8;
}
if (zip->entry_compressed_written >= ZIP_4GB_MAX) {
+ archive_le32enc(zip->file_header + 20, ZIP_4GB_MAX);
archive_le64enc(z, zip->entry_compressed_written);
z += 8;
}
if (zip->entry_offset >= ZIP_4GB_MAX) {
+ archive_le32enc(zip->file_header + 42, ZIP_4GB_MAX);
archive_le64enc(z, zip->entry_offset);
z += 8;
}
Index: pkgsrc/archivers/libarchive/files/libarchive/libarchive-formats.5
diff -u pkgsrc/archivers/libarchive/files/libarchive/libarchive-formats.5:1.7 pkgsrc/archivers/libarchive/files/libarchive/libarchive-formats.5:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/libarchive-formats.5:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/libarchive-formats.5 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd December 27, 2016
.Dt LIBARCHIVE-FORMATS 5
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3:1.7 pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/libarchive_internals.3 Fri Apr 12 15:39:53 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd January 26, 2011
.Dt LIBARCHIVE_INTERNALS 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/mtree.5
diff -u pkgsrc/archivers/libarchive/files/libarchive/mtree.5:1.7 pkgsrc/archivers/libarchive/files/libarchive/mtree.5:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/mtree.5:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/mtree.5 Fri Apr 12 15:39:53 2024
@@ -26,7 +26,6 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)mtree.8 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD$
.\"
.Dd September 4, 2013
.Dt MTREE 5
Index: pkgsrc/archivers/libarchive/files/libarchive/tar.5
diff -u pkgsrc/archivers/libarchive/files/libarchive/tar.5:1.7 pkgsrc/archivers/libarchive/files/libarchive/tar.5:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/tar.5:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/tar.5 Fri Apr 12 15:39:53 2024
@@ -23,8 +23,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd December 27, 2016
.Dt TAR 5
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry.c:1.13 pkgsrc/archivers/libarchive/files/libarchive/archive_entry.c:1.14
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry.c:1.13 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry.c Fri Apr 12 15:39:50 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry.c 201096 2009-12-28 02:41:27Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -372,6 +371,12 @@ archive_entry_filetype(struct archive_en
return (AE_IFMT & entry->acl.mode);
}
+int
+archive_entry_filetype_is_set(struct archive_entry *entry)
+{
+ return (entry->ae_set & AE_SET_FILETYPE);
+}
+
void
archive_entry_fflags(struct archive_entry *entry,
unsigned long *set, unsigned long *clear)
@@ -425,6 +430,12 @@ archive_entry_gid(struct archive_entry *
return (entry->ae_stat.aest_gid);
}
+int
+archive_entry_gid_is_set(struct archive_entry *entry)
+{
+ return (entry->ae_set & AE_SET_GID);
+}
+
const char *
archive_entry_gname(struct archive_entry *entry)
{
@@ -631,6 +642,12 @@ archive_entry_perm(struct archive_entry
return (~AE_IFMT & entry->acl.mode);
}
+int
+archive_entry_perm_is_set(struct archive_entry *entry)
+{
+ return (entry->ae_set & AE_SET_PERM);
+}
+
dev_t
archive_entry_rdev(struct archive_entry *entry)
{
@@ -759,6 +776,12 @@ archive_entry_uid(struct archive_entry *
return (entry->ae_stat.aest_uid);
}
+int
+archive_entry_uid_is_set(struct archive_entry *entry)
+{
+ return (entry->ae_set & AE_SET_UID);
+}
+
const char *
archive_entry_uname(struct archive_entry *entry)
{
@@ -827,6 +850,7 @@ archive_entry_set_filetype(struct archiv
entry->stat_valid = 0;
entry->acl.mode &= ~AE_IFMT;
entry->acl.mode |= AE_IFMT & type;
+ entry->ae_set |= AE_SET_FILETYPE;
}
void
@@ -861,6 +885,7 @@ archive_entry_set_gid(struct archive_ent
{
entry->stat_valid = 0;
entry->ae_stat.aest_gid = g;
+ entry->ae_set |= AE_SET_GID;
}
void
@@ -1145,6 +1170,7 @@ archive_entry_set_mode(struct archive_en
{
entry->stat_valid = 0;
entry->acl.mode = m;
+ entry->ae_set |= AE_SET_PERM | AE_SET_FILETYPE;
}
void
@@ -1220,6 +1246,7 @@ archive_entry_set_perm(struct archive_en
entry->stat_valid = 0;
entry->acl.mode &= AE_IFMT;
entry->acl.mode |= ~AE_IFMT & p;
+ entry->ae_set |= AE_SET_PERM;
}
void
@@ -1354,6 +1381,7 @@ archive_entry_set_uid(struct archive_ent
{
entry->stat_valid = 0;
entry->ae_stat.aest_uid = u;
+ entry->ae_set |= AE_SET_UID;
}
void
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.13 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.14
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c:1.13 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c Fri Apr 12 15:39:51 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 201165 2009-12-29 05:52:13Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.11 pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.12
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h:1.11 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry.h Fri Apr 12 15:39:50 2024
@@ -22,15 +22,13 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_entry.h 201096 2009-12-28 02:41:27Z kientzle $
*/
#ifndef ARCHIVE_ENTRY_H_INCLUDED
#define ARCHIVE_ENTRY_H_INCLUDED
/* Note: Compiler will complain if this does not match archive.h! */
-#define ARCHIVE_VERSION_NUMBER 3007002
+#define ARCHIVE_VERSION_NUMBER 3007003
/*
* Note: archive_entry.h is for use outside of libarchive; the
@@ -251,11 +249,13 @@ __LA_DECL int archive_entry_dev_is_set
__LA_DECL dev_t archive_entry_devmajor(struct archive_entry *);
__LA_DECL dev_t archive_entry_devminor(struct archive_entry *);
__LA_DECL __LA_MODE_T archive_entry_filetype(struct archive_entry *);
+__LA_DECL int archive_entry_filetype_is_set(struct archive_entry *);
__LA_DECL void archive_entry_fflags(struct archive_entry *,
unsigned long * /* set */,
unsigned long * /* clear */);
__LA_DECL const char *archive_entry_fflags_text(struct archive_entry *);
__LA_DECL la_int64_t archive_entry_gid(struct archive_entry *);
+__LA_DECL int archive_entry_gid_is_set(struct archive_entry *);
__LA_DECL const char *archive_entry_gname(struct archive_entry *);
__LA_DECL const char *archive_entry_gname_utf8(struct archive_entry *);
__LA_DECL const wchar_t *archive_entry_gname_w(struct archive_entry *);
@@ -274,6 +274,7 @@ __LA_DECL const char *archive_entry_path
__LA_DECL const char *archive_entry_pathname_utf8(struct archive_entry *);
__LA_DECL const wchar_t *archive_entry_pathname_w(struct archive_entry *);
__LA_DECL __LA_MODE_T archive_entry_perm(struct archive_entry *);
+__LA_DECL int archive_entry_perm_is_set(struct archive_entry *);
__LA_DECL dev_t archive_entry_rdev(struct archive_entry *);
__LA_DECL dev_t archive_entry_rdevmajor(struct archive_entry *);
__LA_DECL dev_t archive_entry_rdevminor(struct archive_entry *);
@@ -287,6 +288,7 @@ __LA_DECL const char *archive_entry_syml
__LA_DECL int archive_entry_symlink_type(struct archive_entry *);
__LA_DECL const wchar_t *archive_entry_symlink_w(struct archive_entry *);
__LA_DECL la_int64_t archive_entry_uid(struct archive_entry *);
+__LA_DECL int archive_entry_uid_is_set(struct archive_entry *);
__LA_DECL const char *archive_entry_uname(struct archive_entry *);
__LA_DECL const char *archive_entry_uname_utf8(struct archive_entry *);
__LA_DECL const wchar_t *archive_entry_uname_w(struct archive_entry *);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_util.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_util.c:1.11 pkgsrc/archivers/libarchive/files/libarchive/archive_util.c:1.12
--- pkgsrc/archivers/libarchive/files/libarchive/archive_util.c:1.11 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_util.c Fri Apr 12 15:39:51 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:14Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c:1.11 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c:1.12
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c:1.11 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_pax.c Fri Apr 12 15:39:52 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_pax.c 201162 2009-12-29 05:47:46Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_private.h:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_private.h:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_private.h:1.8 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_private.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_entry_private.h 201096 2009-12-28 02:41:27Z kientzle $
*/
#ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
@@ -147,6 +145,10 @@ struct archive_entry {
#define AE_SET_SIZE 64
#define AE_SET_INO 128
#define AE_SET_DEV 256
+#define AE_SET_PERM 512
+#define AE_SET_FILETYPE 1024
+#define AE_SET_UID 2048
+#define AE_SET_GID 4096
/*
* Use aes here so that we get transparent mbs<->wcs conversions.
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_filename.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_filename.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_filename.c:1.8 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_open_filename.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_filename.c 201093 2009-12-28 02:28:44Z kientzle $");
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
@@ -155,55 +154,73 @@ no_memory:
return (ARCHIVE_FATAL);
}
+/*
+ * This function is an implementation detail of archive_read_open_filename_w,
+ * which is exposed as a separate API on Windows.
+ */
+#if !defined(_WIN32) || defined(__CYGWIN__)
+static
+#endif
int
-archive_read_open_filename_w(struct archive *a, const wchar_t *wfilename,
+archive_read_open_filenames_w(struct archive *a, const wchar_t **wfilenames,
size_t block_size)
{
- struct read_file_data *mine = (struct read_file_data *)calloc(1,
- sizeof(*mine) + wcslen(wfilename) * sizeof(wchar_t));
- if (!mine)
+ struct read_file_data *mine;
+ const wchar_t *wfilename = NULL;
+ if (wfilenames)
+ wfilename = *(wfilenames++);
+
+ archive_clear_error(a);
+ do
{
- archive_set_error(a, ENOMEM, "No memory");
- return (ARCHIVE_FATAL);
- }
- mine->fd = -1;
- mine->block_size = block_size;
+ if (wfilename == NULL)
+ wfilename = L"";
+ mine = (struct read_file_data *)calloc(1,
+ sizeof(*mine) + wcslen(wfilename) * sizeof(wchar_t));
+ if (mine == NULL)
+ goto no_memory;
+ mine->block_size = block_size;
+ mine->fd = -1;
- if (wfilename == NULL || wfilename[0] == L'\0') {
- mine->filename_type = FNT_STDIN;
- } else {
+ if (wfilename == NULL || wfilename[0] == L'\0') {
+ mine->filename_type = FNT_STDIN;
+ } else {
#if defined(_WIN32) && !defined(__CYGWIN__)
- mine->filename_type = FNT_WCS;
- wcscpy(mine->filename.w, wfilename);
+ mine->filename_type = FNT_WCS;
+ wcscpy(mine->filename.w, wfilename);
#else
- /*
- * POSIX system does not support a wchar_t interface for
- * open() system call, so we have to translate a wchar_t
- * filename to multi-byte one and use it.
- */
- struct archive_string fn;
-
- archive_string_init(&fn);
- if (archive_string_append_from_wcs(&fn, wfilename,
- wcslen(wfilename)) != 0) {
- if (errno == ENOMEM)
- archive_set_error(a, errno,
- "Can't allocate memory");
- else
- archive_set_error(a, EINVAL,
- "Failed to convert a wide-character"
- " filename to a multi-byte filename");
+ /*
+ * POSIX system does not support a wchar_t interface for
+ * open() system call, so we have to translate a wchar_t
+ * filename to multi-byte one and use it.
+ */
+ struct archive_string fn;
+
+ archive_string_init(&fn);
+ if (archive_string_append_from_wcs(&fn, wfilename,
+ wcslen(wfilename)) != 0) {
+ if (errno == ENOMEM)
+ archive_set_error(a, errno,
+ "Can't allocate memory");
+ else
+ archive_set_error(a, EINVAL,
+ "Failed to convert a wide-character"
+ " filename to a multi-byte filename");
+ archive_string_free(&fn);
+ free(mine);
+ return (ARCHIVE_FATAL);
+ }
+ mine->filename_type = FNT_MBS;
+ strcpy(mine->filename.m, fn.s);
archive_string_free(&fn);
- free(mine);
- return (ARCHIVE_FATAL);
- }
- mine->filename_type = FNT_MBS;
- strcpy(mine->filename.m, fn.s);
- archive_string_free(&fn);
#endif
- }
- if (archive_read_append_callback_data(a, mine) != (ARCHIVE_OK))
- return (ARCHIVE_FATAL);
+ }
+ if (archive_read_append_callback_data(a, mine) != (ARCHIVE_OK))
+ return (ARCHIVE_FATAL);
+ if (wfilenames == NULL)
+ break;
+ wfilename = *(wfilenames++);
+ } while (wfilename != NULL && wfilename[0] != '\0');
archive_read_set_open_callback(a, file_open);
archive_read_set_read_callback(a, file_read);
archive_read_set_skip_callback(a, file_skip);
@@ -212,6 +229,19 @@ archive_read_open_filename_w(struct arch
archive_read_set_seek_callback(a, file_seek);
return (archive_read_open1(a));
+no_memory:
+ archive_set_error(a, ENOMEM, "No memory");
+ return (ARCHIVE_FATAL);
+}
+
+int
+archive_read_open_filename_w(struct archive *a, const wchar_t *wfilename,
+ size_t block_size)
+{
+ const wchar_t *wfilenames[2];
+ wfilenames[0] = wfilename;
+ wfilenames[1] = NULL;
+ return archive_read_open_filenames_w(a, wfilenames, block_size);
}
static int
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c:1.8 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_rar.c Fri Apr 12 15:39:51 2024
@@ -734,7 +734,7 @@ archive_read_support_format_rar(struct a
archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW,
"archive_read_support_format_rar");
- rar = (struct rar *)calloc(sizeof(*rar), 1);
+ rar = (struct rar *)calloc(1, sizeof(*rar));
if (rar == NULL)
{
archive_set_error(&a->archive, ENOMEM, "Can't allocate rar data");
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c:1.8 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_xar.c Fri Apr 12 15:39:51 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -623,8 +622,8 @@ read_toc(struct archive_read *a)
(size_t)xar->toc_chksum_size, NULL, 0);
__archive_read_consume(a, xar->toc_chksum_size);
xar->offset += xar->toc_chksum_size;
- if (r != ARCHIVE_OK)
#ifndef DONT_FAIL_ON_CRC_ERROR
+ if (r != ARCHIVE_OK)
return (ARCHIVE_FATAL);
#endif
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk.3:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk.3:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk.3:1.8 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd January 19, 2020
.Dt ARCHIVE_WRITE_DISK 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c:1.8 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_disk_set_standard_lookup.c 201083 2009-12-28 02:09:57Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format.c:1.8 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format.c 201168 2009-12-29 06:15:32Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c:1.8 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c Fri Apr 12 15:39:52 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio_newc.c 201160 2009-12-29 05:41:57Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_shar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_shar.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_shar.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_shar.c:1.8 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_shar.c Fri Apr 12 15:39:52 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_shar.c 189438 2009-03-06 05:58:56Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/config_freebsd.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/config_freebsd.h:1.8 pkgsrc/archivers/libarchive/files/libarchive/config_freebsd.h:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/config_freebsd.h:1.8 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/config_freebsd.h Fri Apr 12 15:39:52 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#define __LIBARCHIVE_CONFIG_H_INCLUDED 1
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_stat.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_stat.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_stat.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_stat.c:1.4 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_stat.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_stat.c 201100 2009-12-28 03:05:31Z kientzle $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_entry_strmode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_entry_strmode.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_entry_strmode.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_entry_strmode.c:1.4 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_entry_strmode.c Fri Apr 12 15:39:50 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.4 2008/06/15 05:14:01 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c:1.4 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_set_standard_lookup.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_set_standard_lookup.c 201109 2009-12-28 03:30:31Z kientzle $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_open.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_open.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_open.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_open.3:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_open.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_OPEN 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.3:1.4 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_set_options.3 Fri Apr 12 15:39:51 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd January 31, 2020
.Dt ARCHIVE_READ_OPTIONS 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c:1.4 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_gzip.c Fri Apr 12 15:39:51 2024
@@ -25,9 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -310,7 +307,7 @@ gzip_bidder_init(struct archive_read_fil
self->code = ARCHIVE_FILTER_GZIP;
self->name = "gzip";
- state = (struct private_data *)calloc(sizeof(*state), 1);
+ state = (struct private_data *)calloc(1, sizeof(*state));
out_block = (unsigned char *)malloc(out_block_size);
if (state == NULL || out_block == NULL) {
free(out_block);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c:1.4 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_lzop.c Fri Apr 12 15:39:51 2024
@@ -26,8 +26,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -187,7 +185,7 @@ lzop_bidder_init(struct archive_read_fil
self->code = ARCHIVE_FILTER_LZOP;
self->name = "lzop";
- state = (struct read_lzop *)calloc(sizeof(*state), 1);
+ state = (struct read_lzop *)calloc(1, sizeof(*state));
if (state == NULL) {
archive_set_error(&self->archive->archive, ENOMEM,
"Can't allocate data for lzop decompression");
@@ -282,8 +280,8 @@ consume_header(struct archive_read_filte
checksum = crc32(crc32(0, NULL, 0), p, len);
else
checksum = adler32(adler32(0, NULL, 0), p, len);
- if (archive_be32dec(p + len) != checksum)
#ifndef DONT_FAIL_ON_CRC_ERROR
+ if (archive_be32dec(p + len) != checksum)
goto corrupted;
#endif
__archive_read_filter_consume(self->upstream, len + 4);
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_program.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_program.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_program.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_program.c:1.4 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_program.c Fri Apr 12 15:39:51 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c:1.4 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_xz.c Fri Apr 12 15:39:51 2024
@@ -26,8 +26,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
@@ -478,7 +476,7 @@ xz_lzma_bidder_init(struct archive_read_
struct private_data *state;
int ret;
- state = (struct private_data *)calloc(sizeof(*state), 1);
+ state = (struct private_data *)calloc(1, sizeof(*state));
out_block = (unsigned char *)malloc(out_block_size);
if (state == NULL || out_block == NULL) {
archive_set_error(&self->archive->archive, ENOMEM,
@@ -656,13 +654,16 @@ xz_filter_read(struct archive_read_filte
struct private_data *state;
size_t decompressed;
ssize_t avail_in;
+ int64_t member_in;
int ret;
state = (struct private_data *)self->data;
+ redo:
/* Empty our output buffer. */
state->stream.next_out = state->out_block;
state->stream.avail_out = state->out_block_size;
+ member_in = state->member_in;
/* Try to fill the output buffer. */
while (state->stream.avail_out > 0 && !state->eof) {
@@ -707,9 +708,18 @@ xz_filter_read(struct archive_read_filte
decompressed = state->stream.next_out - state->out_block;
state->total_out += decompressed;
state->member_out += decompressed;
- if (decompressed == 0)
+ if (decompressed == 0) {
+ if (member_in != state->member_in &&
+ self->code == ARCHIVE_FILTER_LZIP &&
+ state->eof) {
+ ret = lzip_tail(self);
+ if (ret != ARCHIVE_OK)
+ return (ret);
+ if (!state->eof)
+ goto redo;
+ }
*p = NULL;
- else {
+ } else {
*p = state->out_block;
if (self->code == ARCHIVE_FILTER_LZIP) {
state->crc32 = lzma_crc32(state->out_block,
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_raw.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_raw.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_raw.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_raw.c:1.4 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_raw.c Fri Apr 12 15:39:51 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_raw.c 201107 2009-12-28 03:25:33Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter.c:1.4 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c:1.4 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c Fri Apr 12 15:39:52 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c:1.4 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c Fri Apr 12 15:39:52 2024
@@ -26,8 +26,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_bzip2.c 201091 2009-12-28 02:22:41Z kientzle $");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_gzip.c 201081 2009-12-28 02:04:42Z kientzle $");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_data.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_data.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_data.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_data.3:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_data.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 28, 2017
.Dt ARCHIVE_WRITE_DATA 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_filter.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_filter.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_filter.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_filter.3:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_filter.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd August 14, 2014
.Dt ARCHIVE_WRITE_FILTER 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_finish_entry.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_finish_entry.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_finish_entry.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_finish_entry.3:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_finish_entry.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd February 28, 2017
.Dt ARCHIVE_WRITE_FINISH_ENTRY 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c Fri Apr 12 15:39:52 2024
@@ -25,8 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.3:1.4 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd January 31, 2020
.Dt ARCHIVE_WRITE_OPTIONS 3
.Os
@@ -272,6 +270,7 @@ of physical CPU cores.
.It Cm compression
The value is one of
.Dq store ,
+.Dq copy ,
.Dq deflate ,
.Dq bzip2 ,
.Dq lzma1 ,
@@ -279,12 +278,18 @@ The value is one of
or
.Dq ppmd
to indicate how the following entries should be compressed.
+The values
+.Dq store
+and
+.Dq copy
+are synonyms.
Note that this setting is ignored for directories, symbolic links,
and other special entries.
.It Cm compression-level
The value is interpreted as a decimal integer specifying the
compression level.
-Values between 0 and 9 are supported.
+Values between 0 and 9 are supported, with the exception of bzip2
+which only supports values between 1 and 9.
The interpretation of the compression level depends on the chosen
compression method.
.El
Index: pkgsrc/archivers/libarchive/files/libarchive/libarchive_changes.3
diff -u pkgsrc/archivers/libarchive/files/libarchive/libarchive_changes.3:1.4 pkgsrc/archivers/libarchive/files/libarchive/libarchive_changes.3:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/libarchive_changes.3:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/libarchive_changes.3 Fri Apr 12 15:39:52 2024
@@ -22,8 +22,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd December 23, 2011
.Dt LIBARCHIVE_CHANGES 3
.Os
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_platform.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_platform.h:1.14 pkgsrc/archivers/libarchive/files/libarchive/archive_platform.h:1.15
--- pkgsrc/archivers/libarchive/files/libarchive/archive_platform.h:1.14 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_platform.h Fri Apr 12 15:39:50 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: head/lib/libarchive/archive_platform.h 201090 2009-12-28 02:22:04Z kientzle $
*/
/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */
@@ -87,19 +85,6 @@
* headers as required.
*/
-/* Get a real definition for __FBSDID or __RCSID if we can */
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-/* If not, define them so as to avoid dangling semicolons. */
-#ifndef __FBSDID
-#define __FBSDID(a) struct _undefined_hack
-#endif
-#ifndef __RCSID
-#define __RCSID(a) struct _undefined_hack
-#endif
-
/* Try to get standard C99-style integer type definitions. */
#if HAVE_INTTYPES_H
#include <inttypes.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read.c:1.12 pkgsrc/archivers/libarchive/files/libarchive/archive_read.c:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read.c:1.12 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read.c Fri Apr 12 15:39:50 2024
@@ -32,7 +32,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read.c 201157 2009-12-29 05:30:23Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c:1.12 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c:1.12 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c Fri Apr 12 15:39:51 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_iso9660.c 201246 2009-12-30 05:30:35Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -3015,6 +3014,11 @@ heap_add_entry(struct archive_read *a, s
uint64_t file_key, parent_key;
int hole, parent;
+ /* Reserve 16 bits for possible key collisions (needed for linked items) */
+ /* For ISO files with more than 65535 entries, reordering will still occur */
+ key <<= 16;
+ key += heap->used & 0xFFFF;
+
/* Expand our pending files list as necessary. */
if (heap->used >= heap->allocated) {
struct file_info **new_pending_files;
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_tar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_tar.c:1.12 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_tar.c:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_tar.c:1.12 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_tar.c Fri Apr 12 15:39:51 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_tar.c 201161 2009-12-29 05:44:39Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c:1.12 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c:1.13
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c:1.12 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_zip.c Fri Apr 12 15:39:51 2024
@@ -26,7 +26,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102 2009-12-28 03:11:36Z kientzle $");
/*
* The definitive documentation of the Zip file format is:
@@ -119,7 +118,7 @@ struct trad_enc_ctx {
/* Bits used in zip_flags. */
#define ZIP_ENCRYPTED (1 << 0)
-#define ZIP_LENGTH_AT_END (1 << 3)
+#define ZIP_LENGTH_AT_END (1 << 3) /* Also called "Streaming bit" */
#define ZIP_STRONG_ENCRYPTED (1 << 6)
#define ZIP_UTF8_NAME (1 << 11)
/* See "7.2 Single Password Symmetric Encryption Method"
@@ -166,8 +165,8 @@ struct zip {
int64_t entry_compressed_bytes_read;
int64_t entry_uncompressed_bytes_read;
- /* Running CRC32 of the decompressed data */
- unsigned long entry_crc32;
+ /* Running CRC32 of the decompressed and decrypted data */
+ unsigned long computed_crc32;
unsigned long (*crc32func)(unsigned long, const void *,
size_t);
char ignore_crc32;
@@ -945,7 +944,7 @@ zip_read_local_file_header(struct archiv
zip->end_of_entry = 0;
zip->entry_uncompressed_bytes_read = 0;
zip->entry_compressed_bytes_read = 0;
- zip->entry_crc32 = zip->crc32func(0, NULL, 0);
+ zip->computed_crc32 = zip->crc32func(0, NULL, 0);
/* Setup default conversion. */
if (zip->sconv == NULL && !zip->init_default_conversion) {
@@ -1140,7 +1139,8 @@ zip_read_local_file_header(struct archiv
"Inconsistent CRC32 values");
ret = ARCHIVE_WARN;
}
- if (zip_entry->compressed_size == 0) {
+ if (zip_entry->compressed_size == 0
+ || zip_entry->compressed_size == 0xffffffff) {
zip_entry->compressed_size
= zip_entry_central_dir.compressed_size;
} else if (zip_entry->compressed_size
@@ -1284,7 +1284,8 @@ zip_read_local_file_header(struct archiv
return ARCHIVE_FATAL;
}
} else if (0 == (zip_entry->zip_flags & ZIP_LENGTH_AT_END)
- || zip_entry->uncompressed_size > 0) {
+ || (zip_entry->uncompressed_size > 0
+ && zip_entry->uncompressed_size != 0xffffffff)) {
/* Set the size only if it's meaningful. */
archive_entry_set_size(entry, zip_entry->uncompressed_size);
}
@@ -1343,25 +1344,267 @@ check_authentication_code(struct archive
}
/*
- * Read "uncompressed" data. There are three cases:
- * 1) We know the size of the data. This is always true for the
- * seeking reader (we've examined the Central Directory already).
- * 2) ZIP_LENGTH_AT_END was set, but only the CRC was deferred.
- * Info-ZIP seems to do this; we know the size but have to grab
- * the CRC from the data descriptor afterwards.
- * 3) We're streaming and ZIP_LENGTH_AT_END was specified and
- * we have no size information. In this case, we can do pretty
- * well by watching for the data descriptor record. The data
- * descriptor is 16 bytes and includes a computed CRC that should
- * provide a strong check.
+ * The Zip end-of-file marker is inherently ambiguous. The specification
+ * in APPNOTE.TXT allows any of four possible formats, and there is no
+ * guaranteed-correct way for a reader to know a priori which one the writer
+ * will have used. The four formats are:
+ * 1. 32-bit format with an initial PK78 marker
+ * 2. 32-bit format without that marker
+ * 3. 64-bit format with the marker
+ * 4. 64-bit format without the marker
*
- * TODO: Technically, the PK\007\010 signature is optional.
- * In the original spec, the data descriptor contained CRC
- * and size fields but had no leading signature. In practice,
- * newer writers seem to provide the signature pretty consistently.
+ * Mark Adler's `sunzip` streaming unzip program solved this ambiguity
+ * by just looking at every possible combination and accepting the
+ * longest one that matches the expected values. His approach always
+ * consumes the longest possible matching EOF marker, based on an
+ * analysis of all the possible failures and how the values could
+ * overlap.
*
- * For uncompressed data, the PK\007\010 marker seems essential
- * to be sure we've actually seen the end of the entry.
+ * For example, suppose both of the first two formats listed
+ * above match. In that case, we know the next four
+ * 32-bit words match this pattern:
+ * ```
+ * [PK\07\08] [CRC32] [compressed size] [uncompressed size]
+ * ```
+ * but we know they must also match this pattern:
+ * ```
+ * [CRC32] [compressed size] [uncompressed size] [other PK marker]
+ * ```
+ *
+ * Since the first word here matches both the PK78 signature in the
+ * first form and the CRC32 in the second, we know those two values
+ * are equal, the CRC32 must be exactly 0x08074b50. Similarly, the
+ * compressed and uncompressed size must also be exactly this value.
+ * So we know these four words are all 0x08074b50. If we were to
+ * accept the shorter pattern, it would be immediately followed by
+ * another PK78 marker, which is not possible in a well-formed ZIP
+ * archive unless there is garbage between entries. This implies we
+ * should not accept the shorter form in such a case; we should accept
+ * the longer form.
+ *
+ * If the second and third possibilities above both match, we
+ * have a slightly different situation. The following words
+ * must match both the 32-bit format
+ * ```
+ * [CRC32] [compressed size] [uncompressed size] [other PK marker]
+ * ```
+ * and the 64-bit format
+ * ```
+ * [CRC32] [compressed low] [compressed high] [uncompressed low] [uncompressed high] [other PK marker]
+ * ```
+ * Since the 32-bit and 64-bit compressed sizes both match, the
+ * actualy size must fit in 32 bits, which implies the high-order
+ * word of the compressed size is zero. So we know the uncompressed
+ * low word is zero, which again implies that if we accept the shorter
+ * format, there will not be a valid PK marker following it.
+ *
+ * Similar considerations rule out the shorter form in every other
+ * possibly-ambiguous pair. So if two of the four possible formats
+ * match, we should accept the longer option.
+ *
+ * If none of the four formats matches, we know the archive must be
+ * corrupted in some fashion. In particular, it's possible that the
+ * length-at-end bit was incorrect and we should not really be looking
+ * for an EOF marker at all. To allow for this possibility, we
+ * evaluate the following words to collect data for a later error
+ * report but do not consume any bytes. We instead rely on the later
+ * search for a new PK marker to re-sync to the next well-formed
+ * entry.
+ */
+static void
+consume_end_of_file_marker(struct archive_read *a, struct zip *zip)
+{
+ const char *marker;
+ const char *p;
+ uint64_t compressed32, uncompressed32;
+ uint64_t compressed64, uncompressed64;
+ uint64_t compressed_actual, uncompressed_actual;
+ uint32_t crc32_actual;
+ const uint32_t PK78 = 0x08074B50ULL;
+ uint8_t crc32_ignored, crc32_may_be_zero;
+
+ /* If there shouldn't be a marker, don't consume it. */
+ if ((zip->entry->zip_flags & ZIP_LENGTH_AT_END) == 0) {
+ return;
+ }
+
+ /* The longest Zip end-of-file record is 24 bytes. Since an
+ * end-of-file record can never appear at the end of the
+ * archive, we know 24 bytes will be available unless
+ * the archive is severely truncated. */
+ if (NULL == (marker = __archive_read_ahead(a, 24, NULL))) {
+ return;
+ }
+ p = marker;
+
+ /* The end-of-file record comprises:
+ * = Optional PK\007\010 marker
+ * = 4-byte CRC32
+ * = Compressed size
+ * = Uncompressed size
+ *
+ * The last two fields are either both 32 bits or both 64
+ * bits. We check all possible layouts and accept any one
+ * that gives us a complete match, else we make a best-effort
+ * attempt to parse out the pieces.
+ */
+
+ /* CRC32 checking can be tricky:
+ * * Test suites sometimes ignore the CRC32
+ * * AES AE-2 always writes zero for the CRC32
+ * * AES AE-1 sometimes writes zero for the CRC32
+ */
+ crc32_ignored = zip->ignore_crc32;
+ crc32_may_be_zero = 0;
+ crc32_actual = zip->computed_crc32;
+ if (zip->hctx_valid) {
+ switch (zip->entry->aes_extra.vendor) {
+ case AES_VENDOR_AE_2:
+ crc32_actual = 0;
+ break;
+ case AES_VENDOR_AE_1:
+ default:
+ crc32_may_be_zero = 1;
+ break;
+ }
+ }
+
+ /* Values computed from the actual data in the archive. */
+ compressed_actual = (uint64_t)zip->entry_compressed_bytes_read;
+ uncompressed_actual = (uint64_t)zip->entry_uncompressed_bytes_read;
+
+
+ /* Longest: PK78 marker, all 64-bit fields (24 bytes total) */
+ if (archive_le32dec(p) == PK78
+ && ((archive_le32dec(p + 4) == crc32_actual)
+ || (crc32_may_be_zero && (archive_le32dec(p + 4) == 0))
+ || crc32_ignored)
+ && (archive_le64dec(p + 8) == compressed_actual)
+ && (archive_le64dec(p + 16) == uncompressed_actual)) {
+ if (!crc32_ignored) {
+ zip->entry->crc32 = crc32_actual;
+ }
+ zip->entry->compressed_size = compressed_actual;
+ zip->entry->uncompressed_size = uncompressed_actual;
+ zip->unconsumed += 24;
+ return;
+ }
+
+ /* No PK78 marker, 64-bit fields (20 bytes total) */
+ if (((archive_le32dec(p) == crc32_actual)
+ || (crc32_may_be_zero && (archive_le32dec(p + 4) == 0))
+ || crc32_ignored)
+ && (archive_le64dec(p + 4) == compressed_actual)
+ && (archive_le64dec(p + 12) == uncompressed_actual)) {
+ if (!crc32_ignored) {
+ zip->entry->crc32 = crc32_actual;
+ }
+ zip->entry->compressed_size = compressed_actual;
+ zip->entry->uncompressed_size = uncompressed_actual;
+ zip->unconsumed += 20;
+ return;
+ }
+
+ /* PK78 marker and 32-bit fields (16 bytes total) */
+ if (archive_le32dec(p) == PK78
+ && ((archive_le32dec(p + 4) == crc32_actual)
+ || (crc32_may_be_zero && (archive_le32dec(p + 4) == 0))
+ || crc32_ignored)
+ && (archive_le32dec(p + 8) == compressed_actual)
+ && (archive_le32dec(p + 12) == uncompressed_actual)) {
+ if (!crc32_ignored) {
+ zip->entry->crc32 = crc32_actual;
+ }
+ zip->entry->compressed_size = compressed_actual;
+ zip->entry->uncompressed_size = uncompressed_actual;
+ zip->unconsumed += 16;
+ return;
+ }
+
+ /* Shortest: No PK78 marker, all 32-bit fields (12 bytes total) */
+ if (((archive_le32dec(p) == crc32_actual)
+ || (crc32_may_be_zero && (archive_le32dec(p + 4) == 0))
+ || crc32_ignored)
+ && (archive_le32dec(p + 4) == compressed_actual)
+ && (archive_le32dec(p + 8) == uncompressed_actual)) {
+ if (!crc32_ignored) {
+ zip->entry->crc32 = crc32_actual;
+ }
+ zip->entry->compressed_size = compressed_actual;
+ zip->entry->uncompressed_size = uncompressed_actual;
+ zip->unconsumed += 12;
+ return;
+ }
+
+ /* If none of the above patterns gives us a full exact match,
+ * then there's something definitely amiss. The fallback code
+ * below will parse out some plausible values for error
+ * reporting purposes. Note that this won't actually
+ * consume anything:
+ *
+ * = If there really is a marker here, the logic to resync to
+ * the next entry will suffice to skip it.
+ *
+ * = There might not really be a marker: Corruption or bugs
+ * may have set the length-at-end bit without a marker ever
+ * having actually been written. In this case, we
+ * explicitly should not consume any bytes, since that would
+ * prevent us from correctly reading the next entry.
+ */
+ if (archive_le32dec(p) == PK78) {
+ p += 4; /* Ignore PK78 if it appears to be present */
+ }
+ zip->entry->crc32 = archive_le32dec(p); /* Parse CRC32 */
+ p += 4;
+
+ /* Consider both 32- and 64-bit interpretations */
+ compressed32 = archive_le32dec(p);
+ uncompressed32 = archive_le32dec(p + 4);
+ compressed64 = archive_le64dec(p);
+ uncompressed64 = archive_le64dec(p + 8);
+
+ /* The earlier patterns may have failed because of CRC32
+ * mismatch, so it's still possible that both sizes match.
+ * Try to match as many as we can...
+ */
+ if (compressed32 == compressed_actual
+ && uncompressed32 == uncompressed_actual) {
+ /* Both 32-bit fields match */
+ zip->entry->compressed_size = compressed32;
+ zip->entry->uncompressed_size = uncompressed32;
+ } else if (compressed64 == compressed_actual
+ || uncompressed64 == uncompressed_actual) {
+ /* One or both 64-bit fields match */
+ zip->entry->compressed_size = compressed64;
+ zip->entry->uncompressed_size = uncompressed64;
+ } else {
+ /* Zero or one 32-bit fields match */
+ zip->entry->compressed_size = compressed32;
+ zip->entry->uncompressed_size = uncompressed32;
+ }
+}
+
+/*
+ * Read "uncompressed" data.
+ *
+ * This is straightforward if we know the size of the data. This is
+ * always true for the seeking reader (we've examined the Central
+ * Directory already), and will often be true for the streaming reader
+ * (the writer was writing uncompressed so probably knows the size).
+ *
+ * If we don't know the size, then life is more interesting. Note
+ * that a careful reading of the Zip specification says that a writer
+ * must use ZIP_LENGTH_AT_END if it cannot write the CRC into the
+ * local header. And if it uses ZIP_LENGTH_AT_END, then it is
+ * prohibited from storing the sizes in the local header. This
+ * prevents fully-compliant streaming writers from providing any size
+ * clues to a streaming reader. In this case, we have to scan the
+ * data as we read to try to locate the end-of-file marker.
+ *
+ * We assume here that the end-of-file marker always has the
+ * PK\007\010 signature. Although it's technically optional, newer
+ * writers seem to provide it pretty consistently, and it's not clear
+ * how to efficiently recognize an end-of-file marker that lacks it.
*
* Returns ARCHIVE_OK if successful, ARCHIVE_FATAL otherwise, sets
* zip->end_of_entry if it consumes all of the data.
@@ -1373,18 +1616,18 @@ zip_read_data_none(struct archive_read *
struct zip *zip;
const char *buff;
ssize_t bytes_avail;
+ ssize_t trailing_extra;
int r;
(void)offset; /* UNUSED */
zip = (struct zip *)(a->format->data);
+ trailing_extra = zip->hctx_valid ? AUTH_CODE_SIZE : 0;
if (zip->entry->zip_flags & ZIP_LENGTH_AT_END) {
const char *p;
- ssize_t grabbing_bytes = 24;
+ ssize_t grabbing_bytes = 24 + trailing_extra;
- if (zip->hctx_valid)
- grabbing_bytes += AUTH_CODE_SIZE;
/* Grab at least 24 bytes. */
buff = __archive_read_ahead(a, grabbing_bytes, &bytes_avail);
if (bytes_avail < grabbing_bytes) {
@@ -1399,44 +1642,19 @@ zip_read_data_none(struct archive_read *
}
/* Check for a complete PK\007\010 signature, followed
* by the correct 4-byte CRC. */
- p = buff;
- if (zip->hctx_valid)
- p += AUTH_CODE_SIZE;
+ p = buff + trailing_extra;
if (p[0] == 'P' && p[1] == 'K'
&& p[2] == '\007' && p[3] == '\010'
- && (archive_le32dec(p + 4) == zip->entry_crc32
+ && (archive_le32dec(p + 4) == zip->computed_crc32
|| zip->ignore_crc32
|| (zip->hctx_valid
&& zip->entry->aes_extra.vendor == AES_VENDOR_AE_2))) {
- if (zip->entry->flags & LA_USED_ZIP64) {
- uint64_t compressed, uncompressed;
- zip->entry->crc32 = archive_le32dec(p + 4);
- compressed = archive_le64dec(p + 8);
- uncompressed = archive_le64dec(p + 16);
- if (compressed > INT64_MAX || uncompressed >
- INT64_MAX) {
- archive_set_error(&a->archive,
- ARCHIVE_ERRNO_FILE_FORMAT,
- "Overflow of 64-bit file sizes");
- return ARCHIVE_FAILED;
- }
- zip->entry->compressed_size = compressed;
- zip->entry->uncompressed_size = uncompressed;
- zip->unconsumed = 24;
- } else {
- zip->entry->crc32 = archive_le32dec(p + 4);
- zip->entry->compressed_size =
- archive_le32dec(p + 8);
- zip->entry->uncompressed_size =
- archive_le32dec(p + 12);
- zip->unconsumed = 16;
- }
+ zip->end_of_entry = 1;
if (zip->hctx_valid) {
r = check_authentication_code(a, buff);
if (r != ARCHIVE_OK)
return (r);
}
- zip->end_of_entry = 1;
return (ARCHIVE_OK);
}
/* If not at EOF, ensure we consume at least one byte. */
@@ -1452,11 +1670,10 @@ zip_read_data_none(struct archive_read *
else if (p[3] == '\007') { p += 1; }
else if (p[3] == '\010' && p[2] == '\007'
&& p[1] == 'K' && p[0] == 'P') {
- if (zip->hctx_valid)
- p -= AUTH_CODE_SIZE;
break;
} else { p += 4; }
}
+ p -= trailing_extra;
bytes_avail = p - buff;
} else {
if (zip->entry_bytes_remaining == 0) {
@@ -1499,59 +1716,15 @@ zip_read_data_none(struct archive_read *
bytes_avail = dec_size;
buff = (const char *)zip->decrypted_buffer;
}
- *size = bytes_avail;
zip->entry_bytes_remaining -= bytes_avail;
zip->entry_uncompressed_bytes_read += bytes_avail;
zip->entry_compressed_bytes_read += bytes_avail;
zip->unconsumed += bytes_avail;
+ *size = bytes_avail;
*_buff = buff;
return (ARCHIVE_OK);
}
-static int
-consume_optional_marker(struct archive_read *a, struct zip *zip)
-{
- if (zip->end_of_entry && (zip->entry->zip_flags & ZIP_LENGTH_AT_END)) {
- const char *p;
-
- if (NULL == (p = __archive_read_ahead(a, 24, NULL))) {
- archive_set_error(&a->archive,
- ARCHIVE_ERRNO_FILE_FORMAT,
- "Truncated ZIP end-of-file record");
- return (ARCHIVE_FATAL);
- }
- /* Consume the optional PK\007\010 marker. */
- if (p[0] == 'P' && p[1] == 'K' &&
- p[2] == '\007' && p[3] == '\010') {
- p += 4;
- zip->unconsumed = 4;
- }
- if (zip->entry->flags & LA_USED_ZIP64) {
- uint64_t compressed, uncompressed;
- zip->entry->crc32 = archive_le32dec(p);
- compressed = archive_le64dec(p + 4);
- uncompressed = archive_le64dec(p + 12);
- if (compressed > INT64_MAX ||
- uncompressed > INT64_MAX) {
- archive_set_error(&a->archive,
- ARCHIVE_ERRNO_FILE_FORMAT,
- "Overflow of 64-bit file sizes");
- return ARCHIVE_FAILED;
- }
- zip->entry->compressed_size = compressed;
- zip->entry->uncompressed_size = uncompressed;
- zip->unconsumed += 20;
- } else {
- zip->entry->crc32 = archive_le32dec(p);
- zip->entry->compressed_size = archive_le32dec(p + 4);
- zip->entry->uncompressed_size = archive_le32dec(p + 8);
- zip->unconsumed += 12;
- }
- }
-
- return (ARCHIVE_OK);
-}
-
#if HAVE_LZMA_H && HAVE_LIBLZMA
static int
zipx_xz_init(struct archive_read *a, struct zip *zip)
@@ -1803,10 +1976,6 @@ zip_read_data_zipx_xz(struct archive_rea
*size = zip->zipx_lzma_stream.total_out;
*buff = zip->uncompressed_buffer;
- ret = consume_optional_marker(a, zip);
- if (ret != ARCHIVE_OK)
- return (ret);
-
return (ARCHIVE_OK);
}
@@ -1871,8 +2040,6 @@ zip_read_data_zipx_lzma_alone(struct arc
/* This case is optional in lzma alone format. It can happen,
* but most of the files don't have it. (GitHub #1257) */
case LZMA_STREAM_END:
- lzma_end(&zip->zipx_lzma_stream);
- zip->zipx_lzma_valid = 0;
if((int64_t) zip->zipx_lzma_stream.total_in !=
zip->entry_bytes_remaining)
{
@@ -1906,21 +2073,18 @@ zip_read_data_zipx_lzma_alone(struct arc
zip->end_of_entry = 1;
}
- /* Return values. */
- *size = zip->zipx_lzma_stream.total_out;
- *buff = zip->uncompressed_buffer;
-
- /* Behave the same way as during deflate decompression. */
- ret = consume_optional_marker(a, zip);
- if (ret != ARCHIVE_OK)
- return (ret);
-
/* Free lzma decoder handle because we'll no longer need it. */
+ /* This cannot be folded into LZMA_STREAM_END handling above
+ * because the stream end marker is not required in this format. */
if(zip->end_of_entry) {
lzma_end(&zip->zipx_lzma_stream);
zip->zipx_lzma_valid = 0;
}
+ /* Return values. */
+ *size = zip->zipx_lzma_stream.total_out;
+ *buff = zip->uncompressed_buffer;
+
/* If we're here, then we're good! */
return (ARCHIVE_OK);
}
@@ -2078,10 +2242,6 @@ zip_read_data_zipx_ppmd(struct archive_r
++consumed_bytes;
} while(consumed_bytes < zip->uncompressed_buffer_size);
- /* Update pointers for libarchive. */
- *buff = zip->uncompressed_buffer;
- *size = consumed_bytes;
-
/* Update pointers so we can continue decompression in another call. */
zip->entry_bytes_remaining -= zip->zipx_ppmd_read_compressed;
zip->entry_compressed_bytes_read += zip->zipx_ppmd_read_compressed;
@@ -2093,10 +2253,9 @@ zip_read_data_zipx_ppmd(struct archive_r
zip->ppmd8_valid = 0;
}
- /* Seek for optional marker, same way as in each zip entry. */
- ret = consume_optional_marker(a, zip);
- if (ret != ARCHIVE_OK)
- return ret;
+ /* Update pointers for libarchive. */
+ *buff = zip->uncompressed_buffer;
+ *size = consumed_bytes;
return ARCHIVE_OK;
}
@@ -2238,11 +2397,6 @@ zip_read_data_zipx_bzip2(struct archive_
*size = total_out;
*buff = zip->uncompressed_buffer;
- /* Seek for optional marker, like in other entries. */
- r = consume_optional_marker(a, zip);
- if(r != ARCHIVE_OK)
- return r;
-
return ARCHIVE_OK;
}
@@ -2373,11 +2527,6 @@ zip_read_data_zipx_zstd(struct archive_r
*size = total_out;
*buff = zip->uncompressed_buffer;
- /* Seek for optional marker, like in other entries. */
- r = consume_optional_marker(a, zip);
- if(r != ARCHIVE_OK)
- return r;
-
return ARCHIVE_OK;
}
#endif
@@ -2413,7 +2562,7 @@ zip_read_data_deflate(struct archive_rea
size_t *size, int64_t *offset)
{
struct zip *zip;
- ssize_t bytes_avail;
+ ssize_t bytes_avail, to_consume = 0;
const void *compressed_buff, *sp;
int r;
@@ -2534,34 +2683,33 @@ zip_read_data_deflate(struct archive_rea
}
/* Consume as much as the compressor actually used. */
- bytes_avail = zip->stream.total_in;
+ to_consume = zip->stream.total_in;
+ __archive_read_consume(a, to_consume);
+ zip->entry_bytes_remaining -= to_consume;
+ zip->entry_compressed_bytes_read += to_consume;
+ zip->entry_uncompressed_bytes_read += zip->stream.total_out;
+
if (zip->tctx_valid || zip->cctx_valid) {
- zip->decrypted_bytes_remaining -= bytes_avail;
+ zip->decrypted_bytes_remaining -= to_consume;
if (zip->decrypted_bytes_remaining == 0)
zip->decrypted_ptr = zip->decrypted_buffer;
else
- zip->decrypted_ptr += bytes_avail;
+ zip->decrypted_ptr += to_consume;
}
- /* Calculate compressed data as much as we used.*/
if (zip->hctx_valid)
- archive_hmac_sha1_update(&zip->hctx, sp, bytes_avail);
- __archive_read_consume(a, bytes_avail);
- zip->entry_bytes_remaining -= bytes_avail;
- zip->entry_compressed_bytes_read += bytes_avail;
-
- *size = zip->stream.total_out;
- zip->entry_uncompressed_bytes_read += zip->stream.total_out;
- *buff = zip->uncompressed_buffer;
+ archive_hmac_sha1_update(&zip->hctx, sp, to_consume);
- if (zip->end_of_entry && zip->hctx_valid) {
- r = check_authentication_code(a, NULL);
- if (r != ARCHIVE_OK)
- return (r);
+ if (zip->end_of_entry) {
+ if (zip->hctx_valid) {
+ r = check_authentication_code(a, NULL);
+ if (r != ARCHIVE_OK) {
+ return (r);
+ }
+ }
}
- r = consume_optional_marker(a, zip);
- if (r != ARCHIVE_OK)
- return (r);
+ *size = zip->stream.total_out;
+ *buff = zip->uncompressed_buffer;
return (ARCHIVE_OK);
}
@@ -3029,13 +3177,27 @@ archive_read_format_zip_read_data(struct
}
if (r != ARCHIVE_OK)
return (r);
- /* Update checksum */
- if (*size)
- zip->entry_crc32 = zip->crc32func(zip->entry_crc32, *buff,
- (unsigned)*size);
- /* If we hit the end, swallow any end-of-data marker. */
+ if (*size > 0) {
+ zip->computed_crc32 = zip->crc32func(zip->computed_crc32, *buff,
+ (unsigned)*size);
+ }
+ /* If we hit the end, swallow any end-of-data marker and
+ * verify the final check values. */
if (zip->end_of_entry) {
- /* Check file size, CRC against these values. */
+ consume_end_of_file_marker(a, zip);
+
+ /* Check computed CRC against header */
+ if ((!zip->hctx_valid ||
+ zip->entry->aes_extra.vendor != AES_VENDOR_AE_2) &&
+ zip->entry->crc32 != zip->computed_crc32
+ && !zip->ignore_crc32) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "ZIP bad CRC: 0x%lx should be 0x%lx",
+ (unsigned long)zip->computed_crc32,
+ (unsigned long)zip->entry->crc32);
+ return (ARCHIVE_FAILED);
+ }
+ /* Check file size against header. */
if (zip->entry->compressed_size !=
zip->entry_compressed_bytes_read) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
@@ -3043,7 +3205,7 @@ archive_read_format_zip_read_data(struct
"(read %jd, expected %jd)",
(intmax_t)zip->entry_compressed_bytes_read,
(intmax_t)zip->entry->compressed_size);
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
/* Size field only stores the lower 32 bits of the actual
* size. */
@@ -3054,18 +3216,7 @@ archive_read_format_zip_read_data(struct
"(read %jd, expected %jd)\n",
(intmax_t)zip->entry_uncompressed_bytes_read,
(intmax_t)zip->entry->uncompressed_size);
- return (ARCHIVE_WARN);
- }
- /* Check computed CRC against header */
- if ((!zip->hctx_valid ||
- zip->entry->aes_extra.vendor != AES_VENDOR_AE_2) &&
- zip->entry->crc32 != zip->entry_crc32
- && !zip->ignore_crc32) {
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "ZIP bad CRC: 0x%lx should be 0x%lx",
- (unsigned long)zip->entry_crc32,
- (unsigned long)zip->entry->crc32);
- return (ARCHIVE_WARN);
+ return (ARCHIVE_FAILED);
}
}
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_none.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_none.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_none.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_none.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_filter_none.c Fri Apr 12 15:39:51 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#include "archive.h"
#include "archive_private.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_none.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_none.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_none.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_none.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_add_filter_none.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_none.c 201080 2009-12-28 02:03:54Z kientzle $");
#include "archive.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_private.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_private.h:1.1 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_private.h:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_private.h:1.1 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_format_private.h Fri Apr 12 15:39:52 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef ARCHIVE_WRITE_SET_FORMAT_PRIVATE_H_INCLUDED
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_set_options.c Fri Apr 12 15:39:52 2024
@@ -24,7 +24,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
#include "archive_write_private.h"
#include "archive_options_private.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c:1.10 pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c:1.11
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c:1.10 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c Fri Apr 12 15:39:51 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_cpio.c 201163 2009-12-29 05:50:34Z kientzle $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/archive_string.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_string.c:1.10 pkgsrc/archivers/libarchive/files/libarchive/archive_string.c:1.11
--- pkgsrc/archivers/libarchive/files/libarchive/archive_string.c:1.10 Thu Jan 18 18:00:18 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_string.c Fri Apr 12 15:39:51 2024
@@ -25,7 +25,6 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_string.c 201095 2009-12-28 02:33:22Z kientzle $");
/*
* Basic resizable string support, to simplify manipulating arbitrary-sized
@@ -553,6 +552,8 @@ archive_wstring_append_from_mbs_in_codep
} else
mbflag = MB_PRECOMPOSED;
+ mbflag |= MB_ERR_INVALID_CHARS;
+
buffsize = dest->length + length + 1;
do {
/* Allocate memory for WCS. */
@@ -1527,7 +1528,7 @@ get_current_codepage(void)
p = strrchr(locale, '.');
if (p == NULL)
return (GetACP());
- if (strcmp(p+1, "utf8") == 0)
+ if ((strcmp(p+1, "utf8") == 0) || (strcmp(p+1, "UTF-8") == 0))
return CP_UTF8;
cp = my_atoi(p+1);
if ((int)cp <= 0)
@@ -4227,6 +4228,17 @@ archive_mstring_update_utf8(struct archi
if (sc == NULL)
return (-1);/* Couldn't allocate memory for sc. */
r = archive_strcpy_l(&(aes->aes_mbs), utf8, sc);
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ /* On failure, make an effort to convert UTF8 to WCS as the active code page
+ * may not be able to represent all characters in the string */
+ if (r != 0) {
+ if (archive_wstring_append_from_mbs_in_codepage(&(aes->aes_wcs),
+ aes->aes_utf8.s, aes->aes_utf8.length, sc) == 0)
+ aes->aes_set = AES_SET_UTF8 | AES_SET_WCS;
+ }
+#endif
+
if (a == NULL)
free_sconv_object(sc);
if (r != 0)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt:1.9 pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt:1.9 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/CMakeLists.txt Fri Apr 12 15:39:53 2024
@@ -277,6 +277,7 @@ IF(ENABLE_TEST)
test_write_format_xar.c
test_write_format_xar_empty.c
test_write_format_zip.c
+ test_write_format_zip64_stream.c
test_write_format_zip_compression_store.c
test_write_format_zip_empty.c
test_write_format_zip_empty_zip64.c
@@ -284,6 +285,7 @@ IF(ENABLE_TEST)
test_write_format_zip_file.c
test_write_format_zip_file_zip64.c
test_write_format_zip_large.c
+ test_write_format_zip_stream.c
test_write_format_zip_zip64.c
test_write_open_memory.c
test_write_read_format_zip.c
Index: pkgsrc/archivers/libarchive/files/libarchive/test/list.h
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.11 pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.12
--- pkgsrc/archivers/libarchive/files/libarchive/test/list.h:1.11 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/list.h Fri Apr 12 15:39:53 2024
@@ -218,15 +218,15 @@ 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_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)
@@ -245,9 +245,9 @@ DEFINE_TEST(test_read_format_cpio_filena
DEFINE_TEST(test_read_format_cpio_filename_UTF8_CP1251)
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_KOI8R)
@@ -262,20 +262,20 @@ DEFINE_TEST(test_read_format_gtar_gz)
DEFINE_TEST(test_read_format_gtar_lzma)
DEFINE_TEST(test_read_format_gtar_sparse)
DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
+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)
@@ -289,6 +289,29 @@ DEFINE_TEST(test_read_format_mtree_nopri
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_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_compress_normal)
+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_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_ppmd_use_after_free)
+DEFINE_TEST(test_read_format_rar_ppmd_use_after_free2)
DEFINE_TEST(test_read_format_rar5_set_format)
DEFINE_TEST(test_read_format_rar5_stored)
DEFINE_TEST(test_read_format_rar5_compressed)
@@ -314,6 +337,7 @@ DEFINE_TEST(test_read_format_rar5_solid_
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_symlink)
@@ -337,28 +361,6 @@ 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_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_compress_normal)
-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_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_ppmd_use_after_free)
-DEFINE_TEST(test_read_format_rar_ppmd_use_after_free2)
DEFINE_TEST(test_read_format_rar_encryption_data)
DEFINE_TEST(test_read_format_rar_encryption_header)
DEFINE_TEST(test_read_format_rar_encryption_partially)
@@ -380,7 +382,6 @@ DEFINE_TEST(test_read_format_tz)
DEFINE_TEST(test_read_format_ustar_filename)
DEFINE_TEST(test_read_format_warc)
DEFINE_TEST(test_read_format_xar)
-DEFINE_TEST(test_read_format_zip_utf8_paths)
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)
@@ -408,6 +409,7 @@ DEFINE_TEST(test_read_format_zip_lzma_st
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_utf8_paths)
DEFINE_TEST(test_read_format_zip_comment_stored)
DEFINE_TEST(test_read_format_zip_encryption_data)
DEFINE_TEST(test_read_format_zip_encryption_header)
@@ -487,8 +489,8 @@ DEFINE_TEST(test_ustar_filename_encoding
DEFINE_TEST(test_ustar_filename_encoding_CP932_UTF8)
DEFINE_TEST(test_ustar_filenames)
DEFINE_TEST(test_warn_missing_hardlink_target)
-DEFINE_TEST(test_write_disk_appledouble)
DEFINE_TEST(test_write_disk)
+DEFINE_TEST(test_write_disk_appledouble)
DEFINE_TEST(test_write_disk_failures)
DEFINE_TEST(test_write_disk_fixup)
DEFINE_TEST(test_write_disk_hardlink)
@@ -497,11 +499,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_sparse)
DEFINE_TEST(test_write_disk_symlink)
DEFINE_TEST(test_write_disk_times)
@@ -548,22 +550,22 @@ 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_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)
@@ -579,6 +581,7 @@ 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_store)
DEFINE_TEST(test_write_format_zip_empty)
DEFINE_TEST(test_write_format_zip_empty_zip64)
@@ -586,6 +589,7 @@ DEFINE_TEST(test_write_format_zip_size_u
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_stream)
DEFINE_TEST(test_write_format_zip_zip64_oversize)
DEFINE_TEST(test_write_open_memory)
DEFINE_TEST(test_write_read_format_zip)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/read_open_memory.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/read_open_memory.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/read_open_memory.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/read_open_memory.c:1.7 Wed Apr 10 08:24:05 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/read_open_memory.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/read_open_memory.c 191183 2009-04-17 01:06:31Z kientzle $");
#include <errno.h>
#include <stdlib.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#if ARCHIVE_ACL_NFS4
#if HAVE_SYS_ACL_H
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip.c:1.7 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_zip.c 196962 2009-09-08 05:02:41Z kientzle $");
/* Copy this function for each test file and adjust it accordingly. */
DEFINE_TEST(test_compat_zip_1)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_entry.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_entry.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_entry.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_entry.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_entry.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_entry.c 201247 2009-12-30 05:59:21Z kientzle $");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include <limits.h>
#if defined(_WIN32) && !defined(__CYGWIN__)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_extract.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_extract.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_extract.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_extract.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_extract.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_extract.c 201247 2009-12-30 05:59:21Z kientzle $");
#define BUFF_SIZE 1000000
#define FILE_BUFF_SIZE 100000
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_raw.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_raw.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_raw.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_raw.c:1.7 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_raw.c Fri Apr 12 15:39:55 2024
@@ -26,7 +26,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_raw.c 191594 2009-04-27 20:09:05Z kientzle $");
DEFINE_TEST(test_read_format_raw)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_sparse_basic.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_sparse_basic.c:1.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_sparse_basic.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_sparse_basic.c:1.7 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_sparse_basic.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
@@ -121,7 +120,7 @@ create_sparse_file(const char *path, con
memset(buff, ' ', sizeof(buff));
handle = CreateFileA(path, GENERIC_WRITE, 0,
- NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL,
+ NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL,
NULL);
assert(handle != INVALID_HANDLE_VALUE);
assert(DeviceIoControl(handle, FSCTL_SET_SPARSE, NULL, 0,
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.7 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c:1.8
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c:1.7 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_perms.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_perms.c 201247 2009-12-30 05:59:21Z kientzle $");
#if !defined(_WIN32) || defined(__CYGWIN__)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_nfs4.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_nfs4.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_nfs4.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_nfs4.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_nfs4.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Exercise the system-independent portion of the ACL support.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_posix1e.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_posix1e.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_posix1e.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_posix1e.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_posix1e.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.6 2008/10/19 00:13:57 kientzle Exp $");
/*
* Exercise the system-independent portion of the ACL support.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_cmdline.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_cmdline.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_cmdline.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_cmdline.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_cmdline.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define __LIBARCHIVE_TEST
#include "archive_cmdline_private.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_getdate.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_getdate.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_getdate.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_getdate.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_getdate.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include <time.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c:1.2
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c:1.2 Tue Aug 1 22:26:23 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_archive_read_close_twice_open_filename)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c:1.2 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_empty.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_empty_file1(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_support.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_support.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_support.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_support.c:1.2 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_support.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Verify that the various archive_read_support_* functions
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_by_name.c Fri Apr 12 15:39:53 2024
@@ -23,9 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_format_by_name(const char *format_name, const char *compression_type,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c:1.2
pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c Fri Apr 12 15:39:53 2024
@@ -24,9 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_format_filter_by_ext(const char *output_file,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_bzip2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_bzip2.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_bzip2.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_bzip2.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_bzip2.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_bzip2.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Verify our ability to read sample files compatibly with bunzip2.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_cpio.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_cpio.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_cpio.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_cpio.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_cpio.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_cpio.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Verify our ability to read various sample files.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gzip.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gzip.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_gzip.c 191183 2009-04-17 01:06:31Z kientzle $");
/*
* Verify our ability to read sample files compatibly with gunzip.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_mac.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_mac.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_mac.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_mac.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_mac.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/* The sample has some files in a directory with a very long name. */
#define TESTPATH "abcdefghijklmnopqrstuvwxyz/" \
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_uudecode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_uudecode.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_uudecode.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_uudecode.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_uudecode.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char archive_data[] = {
"begin 644 test_read_uu.Z\n"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_xz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_xz.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_xz.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_xz.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_xz.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_xz.c 191183 2009-04-17 01:06:31Z kientzle $");
/*
* Verify our ability to read sample files compatibly with unxz.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu:1.2 Sun Sep 22 09:50:54 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu Fri Apr 12 15:39:53 2024
@@ -1,6 +1,6 @@
-begin 666 test_compat_zip_8.zip
-M4$L#!!0````(`%A\;TOY6""D$`````X````(````87)C7'1E<W3[_Z^$(96A
-MF*&$@9>!BP$`4$L!`A0`%`````@`6'QO2_E8(*00````#@````@`````````
-H`````````````&%R8UQT97-T4$L%!@`````!``$`-@```#8`````````
-`
-end
+begin 666 test_compat_zip_8.zip
+M4$L#!!0````(`%A\;TOY6""D$`````X````(````87)C7'1E<W3[_Z^$(96A
+MF*&$@9>!BP$`4$L!`A0`%`````@`6'QO2_E8(*00````#@````@`````````
+H`````````````&%R8UQT97-T4$L%!@`````!``$`-@```#8`````````
+`
+end
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zstd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zstd.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zstd.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zstd.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zstd.c Fri Apr 12 15:39:53 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
/*
* Verify our ability to read sample files compatibly with 'zstd -d'.
*
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_gnutar_filename_encoding.c Fri Apr 12 15:39:54 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
#include <locale.h>
DEFINE_TEST(test_gnutar_filename_encoding_UTF8_CP866)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_open_failure.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_open_failure.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_open_failure.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_open_failure.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_open_failure.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define MAGIC 123456789
struct my_data {
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_open_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_open_file.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_open_file.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_open_file.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_open_file.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_open_file.c 201247 2009-12-30 05:59:21Z kientzle $");
DEFINE_TEST(test_open_file)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_open_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_open_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_open_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_open_filename.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_open_filename.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_open_filename.c 191183 2009-04-17 01:06:31Z kientzle $");
static void
test_open_filename_mbs(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk_entry_from_file.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_disk_entry_from_file.c 201247 2009-12-30 05:59:21Z kientzle $");
static const char *
gname_lookup(void *d, int64_t g)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c:1.2 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_file_nonexistent.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_file_nonexistent.c 189473 2009-03-07 02:09:21Z kientzle $");
DEFINE_TEST(test_read_file_nonexistent)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c:1.2 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
/* Read archive with digests in PackInfo */
DEFINE_TEST(test_read_format_7zip_packinfo_digests)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
/*
Execute the following command to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzip.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static unsigned char archive[] = {
76, 90, 73, 80, 1, 12, 0, 99,156, 62,160, 67,124,230, 93,220,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
@@ -137,6 +136,11 @@ cleanup:
DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_jp)
{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ /* Since we explicitly DON'T set hdrcharset=UTF-8 below */
+ skipping("Windows defaults to OEMCP, not UTF-8");
+ return;
+#else
const char *refname = "test_read_format_cpio_filename_utf8_jp.cpio";
struct archive *a;
struct archive_entry *ae;
@@ -180,6 +184,7 @@ DEFINE_TEST(test_read_format_cpio_filena
/* Close the archive. */
assertEqualInt(ARCHIVE_OK, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+#endif
}
DEFINE_TEST(test_read_format_cpio_filename_CP866_KOI8R)
@@ -500,6 +505,11 @@ cleanup:
DEFINE_TEST(test_read_format_cpio_filename_UTF8_UTF8_ru)
{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ /* Since we explicitly DON'T set hdrcharset=UTF-8 below */
+ skipping("Windows defaults to OEMCP, not UTF-8");
+ return;
+#else
const char *refname = "test_read_format_cpio_filename_utf8_ru.cpio";
struct archive *a;
struct archive_entry *ae;
@@ -542,6 +552,7 @@ DEFINE_TEST(test_read_format_cpio_filena
/* Close the archive. */
assertEqualInt(ARCHIVE_OK, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+#endif
}
DEFINE_TEST(test_read_format_cpio_filename_eucJP_CP932)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_Z.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_iso_gz.c 201247 2009-12-30 05:59:21Z kientzle $");
static void
test1(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_xorriso.c Fri Apr 12 15:39:54 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
/*
Execute the following command to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_versioned.c Fri Apr 12 15:39:55 2024
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* The data for this testcase was provided by Mike Qin <mikeandmore%gmail.com@localhost>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
/*
Execute the following command to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_filename.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c:1.2 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ustar_filename.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c Fri Apr 12 15:39:55 2024
@@ -25,7 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c Fri Apr 12 15:39:55 2024
@@ -23,11 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
-
/*
* Github Issue 748 reported problems with end-of-entry handling
* with highly-compressible data. This resulted in the end of the
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Issue 822: jar files have an empty External File Attributes field which
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_malformed1(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_read_format_zip_nested)
{
@@ -50,7 +49,7 @@ DEFINE_TEST(test_read_format_zip_nested)
/* Save contents of inner Zip. */
innerLength = (size_t)archive_entry_size(ae);
- inner = calloc(innerLength, 1);
+ inner = calloc(innerLength, sizeof(char));
assertEqualInt(innerLength, archive_read_data(a, inner, innerLength));
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Issue 332: Some epub files (which are really Zip archives) have
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
verify_padded_archive(const char *refname)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c:1.2
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_read_format_zip_traditional_encryption_data)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c:1.2
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c Fri Apr 12 15:39:55 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
/*
* Issue 869: zip files without a valid EOCD header aren't loaded even if they
* have a valid ZIP64 version of said header.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Sample file was created with:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c:1.2 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filename_encoding.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_failures.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_failures.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_failures.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_failures.c:1.2 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_failures.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_failures.c 201247 2009-12-30 05:59:21Z kientzle $");
DEFINE_TEST(test_write_disk_failures)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c:1.2 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_sparse.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_sparse.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Write a file using archive_write_data call, read the file
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_times.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_times.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_times.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_times.c:1.2 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_times.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_times.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Exercise time restores in archive_write_disk(), including
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_b64encode.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* A basic exercise of b64encode reading and writing.
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.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_bzip2.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_bzip2.c 191183 2009-04-17 01:06:31Z kientzle $");
/*
* A basic exercise of bzip2 reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_compress.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_compress.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_compress.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_compress.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_compress.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress.c 189308 2009-03-03 17:02:51Z kientzle $");
/*
* A basic exercise of compress reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzip.c Fri Apr 12 15:39:56 2024
@@ -26,7 +26,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* A basic exercise of lzip reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzma.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_lzma.c 191183 2009-04-17 01:06:31Z kientzle $");
/*
* A basic exercise of lzma reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_program.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_program.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_program.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_program.c:1.2 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_program.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_program.c 201247 2009-12-30 05:59:21Z kientzle $");
static char buff[1000000];
static char buff2[64];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_uuencode.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* A basic exercise of uuencode reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_xz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_xz.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_xz.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_xz.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_xz.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_xz.c 191183 2009-04-17 01:06:31Z kientzle $");
/*
* A basic exercise of xz reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c:1.2 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_large.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
#include "test.h"
-__FBSDID("$FreeBSD$");
#define LARGE_SIZE (1*1024*1024)
static void
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c:1.2 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_gnutar.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff2[64];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar.c:1.2 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_xar(const char *option)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_xar_empty.c Fri Apr 12 15:39:56 2024
@@ -29,7 +29,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_write_format_xar_empty)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c:1.2 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_zip_filename_encoding.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include <locale.h>
@@ -71,7 +70,9 @@ DEFINE_TEST(test_zip_filename_encoding_U
/*
* Verify that UTF-8 filenames are correctly stored without
* hdrcharset=UTF-8 option.
+ * Skip on Windows where we default to OEMCP
*/
+#if !defined(_WIN32) || defined(__CYGWIN__)
a = archive_write_new();
assertEqualInt(ARCHIVE_OK, archive_write_set_format_zip(a));
assertEqualInt(ARCHIVE_OK,
@@ -90,6 +91,7 @@ DEFINE_TEST(test_zip_filename_encoding_U
* which indicates the filename charset is UTF-8. */
assertEqualInt(0x08, buff[7]);
assertEqualMem(buff + 30, "\xD0\xBF\xD1\x80\xD0\xB8", 6);
+#endif
/*
* Verify that A bit 11 of general purpose flag is not set
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_pax.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_pax.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_pax.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_pax.c:1.5 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_pax.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Exercise the system-independent portion of the ACL support.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c:1.5 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c Fri Apr 12 15:39:53 2024
@@ -23,9 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_filter_by_name(const char *filter_name, int filter_code,
@@ -38,7 +36,7 @@ test_filter_by_name(const char *filter_n
char *buff;
int r;
- assert((buff = calloc(1, buffsize)) != NULL);
+ assert((buff = calloc(buffsize, sizeof(char))) != NULL);
if (buff == NULL)
return;
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gtar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gtar.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gtar.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gtar.c:1.5 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_gtar.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_gtar.c 189308 2009-03-03 17:02:51Z kientzle $");
/*
* Verify our ability to read sample files created by GNU tar.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip.c:1.5 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#if defined(_WIN32) && !defined(__CYGWIN__)
#define close _close
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ar.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ar.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ar.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_ar.c Fri Apr 12 15:39:54 2024
@@ -26,8 +26,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_ar.c 201247 2009-12-30 05:59:21Z kientzle $");
-
DEFINE_TEST(test_read_format_ar)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $");
static unsigned char archive[] = {
199,'q',21,4,177,'y',237,'A',232,3,232,3,2,0,0,0,'p','C',244,'M',2,0,0,0,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_Z.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_Z.c 189464 2009-03-07 00:25:33Z kientzle $");
static unsigned char archive[] = {
31,157,144,199,226,'T',' ',16,'+','O',187,' ',232,6,'$',20,0,160,'!',156,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_bz2.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char archive[] = {
'B','Z','h','9','1','A','Y','&','S','Y',134,'J',208,'4',0,0,30,246,141,253,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_gz.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_gz.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
31,139,8,0,244,'M','p','C',0,3,';','^','(',202,178,177,242,173,227,11,230,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_odc.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_odc.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
static unsigned char archive[] = {
'0','7','0','7','0','7','0','0','2','0','2','5','0','7','4','6','6','1','0',
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4_gzip.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
31,139,8,0,236,'c',217,'D',0,3,'3','0','7','0','7','0','4','0','0',181,'0',
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_svr4c_Z.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c 189381 2009-03-05 00:31:48Z kientzle $");
static unsigned char archive[] = {
31,157,144,'0','n',4,132,'!',3,6,140,26,'8','n',228,16,19,195,160,'A',26,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_empty.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_empty.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_empty.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_empty.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_empty.c 189308 2009-03-03 17:02:51Z kientzle $");
static unsigned char archive[] = { 0 };
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_gz.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_gz.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
31,139,8,0,'+','e',217,'D',0,3,211,211,'g',160,'9','0',0,2,'s','S','S',16,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_pax_bz2.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_pax_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char archive[] = {
'B','Z','h','9','1','A','Y','&','S','Y',152,180,30,185,0,0,140,127,176,212,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.c:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.c Fri Apr 12 15:39:55 2024
@@ -214,6 +214,14 @@ DEFINE_TEST(test_read_format_rar_unicode
assert((a = archive_read_new()) != NULL);
assertA(0 == archive_read_support_filter_all(a));
assertA(0 == archive_read_support_format_all(a));
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ /* Windows will use OEMCP as default, but the file is UTF-8. */
+ if (ARCHIVE_OK != archive_read_set_options(a, "rar:hdrcharset=UTF-8")) {
+ skipping("This system cannot read input as UTF-8.");
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ return;
+ }
+#endif
assertA(0 == archive_read_open_filename(a, reffile, 10240));
/* First header. */
@@ -879,16 +887,9 @@ DEFINE_TEST(test_read_format_rar_windows
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
}
-DEFINE_TEST(test_read_format_rar_multivolume)
+static void
+test_read_format_rar_multivolume_test_body_helper(struct archive *a)
{
- const char *reffiles[] =
- {
- "test_read_format_rar_multivolume.part0001.rar",
- "test_read_format_rar_multivolume.part0002.rar",
- "test_read_format_rar_multivolume.part0003.rar",
- "test_read_format_rar_multivolume.part0004.rar",
- NULL
- };
int file1_size = 241647978, offset = 0;
char buff[64];
const char file1_test_txt[] = "gin-bottom: 0in\"><BR>\n</P>\n</BODY>\n"
@@ -903,13 +904,6 @@ DEFINE_TEST(test_read_format_rar_multivo
int file3_size = sizeof(file3_buff);
const char file3_test_txt[] = "test text document\r\n";
struct archive_entry *ae;
- struct archive *a;
-
- extract_reference_files(reffiles);
- assert((a = archive_read_new()) != NULL);
- assertA(0 == archive_read_support_filter_all(a));
- assertA(0 == archive_read_support_format_all(a));
- assertA(0 == archive_read_open_filenames(a, reffiles, 10240));
/* First header. */
assertA(0 == archive_read_next_header(a, &ae));
@@ -1016,6 +1010,65 @@ DEFINE_TEST(test_read_format_rar_multivo
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
}
+DEFINE_TEST(test_read_format_rar_multivolume)
+{
+ const char *reffiles[] =
+ {
+ "test_read_format_rar_multivolume.part0001.rar",
+ "test_read_format_rar_multivolume.part0002.rar",
+ "test_read_format_rar_multivolume.part0003.rar",
+ "test_read_format_rar_multivolume.part0004.rar",
+ NULL
+ };
+
+ struct archive *a;
+
+ extract_reference_files(reffiles);
+ assert((a = archive_read_new()) != NULL);
+ assertA(0 == archive_read_support_filter_all(a));
+ assertA(0 == archive_read_support_format_all(a));
+ assertA(0 == archive_read_open_filenames(a, reffiles, 10240));
+
+ test_read_format_rar_multivolume_test_body_helper(a);
+}
+
+/* As above, but using read_open_filenames_w */
+DEFINE_TEST(test_read_format_rar_multivolume_w)
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ const char *reffiles[] =
+ {
+ "test_read_format_rar_multivolume.part0001.rar",
+ "test_read_format_rar_multivolume.part0002.rar",
+ "test_read_format_rar_multivolume.part0003.rar",
+ "test_read_format_rar_multivolume.part0004.rar",
+ NULL
+ };
+
+ const wchar_t *wreffiles[] =
+ {
+ L"test_read_format_rar_multivolume.part0001.rar",
+ L"test_read_format_rar_multivolume.part0002.rar",
+ L"test_read_format_rar_multivolume.part0003.rar",
+ L"test_read_format_rar_multivolume.part0004.rar",
+ NULL
+ };
+
+ struct archive *a;
+
+ extract_reference_files(reffiles);
+ assert((a = archive_read_new()) != NULL);
+ assertA(0 == archive_read_support_filter_all(a));
+ assertA(0 == archive_read_support_format_all(a));
+ assertA(0 == archive_read_open_filenames_w(a, wreffiles, 10240));
+
+ test_read_format_rar_multivolume_test_body_helper(a);
+#else
+ skipping("archive_read_open_filenames_w is not available on this platform");
+ return;
+#endif
+}
+
DEFINE_TEST(test_read_format_rar_multivolume_skip)
{
const char *reffiles[] =
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tar.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Each of these archives is a short archive with a single entry. The
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $");
/*
* Tar entries with empty filenames are unusual, but shouldn't crash us.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tbz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tbz.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tbz.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tbz.c:1.5 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tbz.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tbz.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char archive[] = {
'B','Z','h','9','1','A','Y','&','S','Y',237,7,140,'W',0,0,27,251,144,208,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tgz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tgz.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tgz.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tgz.c:1.5 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tgz.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tgz.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tz.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tz.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tz.c:1.5 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tz.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tz.c 189381 2009-03-05 00:31:48Z kientzle $");
static unsigned char archive[] = {
31,157,144,'.',0,8,28,'H',176,160,193,131,8,19,'*','\\',200,176,'!','B',24,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large.c:1.5 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_large.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char testdata[10 * 1024 * 1024];
static unsigned char testdatacopy[10 * 1024 * 1024];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_large.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_large.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_large.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_large.c:1.5 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_large.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_tar_large.c 201247 2009-12-30 05:59:21Z kientzle $");
#include <errno.h>
#include <stdlib.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk.c:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk.c 201247 2009-12-30 05:59:21Z kientzle $");
#define UMASK 022
/*
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c:1.5 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hardlink.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_hardlink.c 201247 2009-12-30 05:59:21Z kientzle $");
#if defined(_WIN32) && !defined(__CYGWIN__)
/* Execution bits, Group members bits and others bits do not work. */
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_ar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_ar.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_ar.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_ar.c:1.5 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_ar.c Fri Apr 12 15:39:56 2024
@@ -26,7 +26,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_ar.c 189308 2009-03-03 17:02:51Z kientzle $");
static char buff[4096];
static char buff2[64];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio.c:1.5 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio.c 185672 2008-12-06 06:02:26Z kientzle $");
static void
test_format(int (*set_format)(struct archive *))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c:1.5 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_newc.c Fri Apr 12 15:39:56 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio_newc.c 201247 2009-12-30 05:59:21Z kientzle $");
-
static int
is_hex(const char *p, size_t l)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c:1.5 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_odc.c Fri Apr 12 15:39:56 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio_odc.c 201247 2009-12-30 05:59:21Z kientzle $");
-
static int
is_octal(const char *p, size_t l)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_pax.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_pax.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_pax.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_pax.c:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_pax.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff2[64];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c:1.5 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c:1.6
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c:1.5 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_shar_empty.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
/*
* Check that an "empty" shar archive is correctly created as an empty file.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_acl_freebsd.c 189427 2009-03-06 04:21:23Z kientzle $");
#if ARCHIVE_ACL_POSIX1E
#include <sys/acl.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_bad_fd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_bad_fd.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_bad_fd.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_bad_fd.c:1.4 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_bad_fd.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_bad_fd.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $");
/* Verify that attempting to open an invalid fd returns correct error. */
DEFINE_TEST(test_bad_fd)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c:1.4 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
/*
* Background: There are two written standards for the tar file format.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_empty_write.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_empty_write.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_empty_write.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_empty_write.c:1.4 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_empty_write.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_empty_write.c 189308 2009-03-03 17:02:51Z kientzle $");
DEFINE_TEST(test_empty_write)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_xar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_xar.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_xar.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_xar.c:1.4 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_xar.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define UID 1001
#define UNAME "cue"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Read a zip file that has a zip comment in the end of the central
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Read a zip file that has a zip comment in the end of the central
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c:1.4 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Read a zip file that is a SFX.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_position.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_position.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_position.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_position.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_position.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_position.c 189389 2009-03-05 02:19:42Z kientzle $");
static unsigned char nulls[1000];
static unsigned char tmp[1000];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_filenames.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_filenames.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_filenames.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_filenames.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_tar_filenames.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.10 2008/09/01 05:38:33 kientzle Exp $");
/*
* Exercise various lengths of filenames in tar archives,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filenames.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filenames.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filenames.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filenames.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_ustar_filenames.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_ustar_filenames.c 189308 2009-03-03 17:02:51Z kientzle $");
/*
* Exercise various lengths of filenames in ustar archives.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c:1.4 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_appledouble.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_ACL_H
#include <sys/acl.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c:1.4 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_lzop.c Fri Apr 12 15:39:56 2024
@@ -25,8 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
/*
* A basic exercise of lzop reading and writing.
*/
@@ -57,7 +55,7 @@ DEFINE_TEST(test_write_filter_lzop)
assert(NULL != (buff = (char *)malloc(buffsize)));
datasize = 10000;
- assert(NULL != (data = (char *)calloc(1, datasize)));
+ assert(NULL != (data = (char *)calloc(datasize, 1)));
filecount = 10;
/*
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_empty.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_tar_empty.c 189308 2009-03-03 17:02:51Z kientzle $");
/*
* Check that an "empty" tar archive is correctly created.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_ustar.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_tar_ustar.c 201247 2009-12-30 05:59:21Z kientzle $");
static int
is_null(const char *p, size_t l)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_open_memory.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_open_memory.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_open_memory.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_open_memory.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_open_memory.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_open_memory.c 189308 2009-03-03 17:02:51Z kientzle $");
/* Try to force archive_write_open_memory.c to write past the end of an array. */
static unsigned char buff[16384];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_api_feature.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_api_feature.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_api_feature.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_api_feature.c:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_api_feature.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.5 2008/05/26 17:00:24 kientzle Exp $");
DEFINE_TEST(test_archive_api_feature)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c:1.6 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_filename_encoding.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_pax_filename_encoding.c 201247 2009-12-30 05:59:21Z kientzle $");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_data_large.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_data_large.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_data_large.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_data_large.c:1.6 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_data_large.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_data_large.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Test read/write of a 10M block of data in a single operation.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c:1.6 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c Fri Apr 12 15:39:54 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse.c 189308 2009-03-03 17:02:51Z kientzle $");
-
struct contents {
int64_t o;
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c:1.6 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_bz2.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
PLEASE use old cdrtools; mkisofs version is 2.01.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c:1.6 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_pax_truncated.c 189483 2009-03-07 03:34:34Z kientzle $");
DEFINE_TEST(test_read_pax_truncated)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated.c:1.6 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_truncated.c,v 1.4 2008/09/01 05:38:33 kientzle Exp $");
static char buff[1000000];
static char buff2[100000];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_secure.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_secure.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_secure.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_secure.c:1.6 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_secure.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_secure.c 201247 2009-12-30 05:59:21Z kientzle $");
#define UMASK 022
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c:1.6 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio_empty.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Check that an "empty" cpio archive is correctly created.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar.c:1.6 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_tar.c 189308 2009-03-03 17:02:51Z kientzle $");
static char buff[1000000];
static char buff2[64];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_clear_error.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_clear_error.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_clear_error.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_clear_error.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_clear_error.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_archive_clear_error)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_owner.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_owner.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_owner.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_owner.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_owner.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_uid(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_path.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_path.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_path.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_path.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_path.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_exclusion_mbs(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice.c Fri Apr 12 15:39:53 2024
@@ -24,8 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
DEFINE_TEST(test_archive_read_close_twice)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_fd.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_archive_read_close_twice_open_fd)
{
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.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_multiple_data_objects.c Fri Apr 12 15:39:53 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#if defined(_WIN32) && !defined(__CYGWIN__)
#define open _open
@@ -185,7 +184,7 @@ file_open(struct archive *a, void *data)
mydata->fd = open(mydata->filename, O_RDONLY | O_BINARY);
if (mydata->fd >= 0)
{
- if ((mydata->buffer = (void*)calloc(1, BLOCK_SIZE)) == NULL)
+ if ((mydata->buffer = (void*)calloc(BLOCK_SIZE, 1)) == NULL)
return (ARCHIVE_FAILED);
}
}
@@ -287,7 +286,7 @@ test_customized_multiple_data_objects(vo
return;
}
assert((mydata->filename =
- (char *)calloc(1, strlen(filename) + 1)) != NULL);
+ (char *)calloc(strlen(filename) + 1, sizeof(char))) != NULL);
if (mydata->filename == NULL) {
free(mydata);
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_next_header_raw.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define DATA "random garbage for testing purposes"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_open2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_open2.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_open2.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_open2.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_open2.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static int
open_cb(struct archive *a, void *client)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_filter_option.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __m, __o, __v) \
assertEqualInt(__code, archive_read_set_filter_option(__a, __m, __o, __v))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_format_option.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __m, __o, __v) \
assertEqualInt(__code, archive_read_set_format_option(__a, __m, __o, __v))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_option.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __m, __o, __v) \
assertEqualInt(__code, archive_read_set_option(__a, __m, __o, __v))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_read_set_options.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __opts) \
assertEqualInt(__code, archive_read_set_options(__a, __opts))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_set_error.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_set_error.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_set_error.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_set_error.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_set_error.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test(struct archive *a, int code, const char *msg)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.txt.Z.uu Fri Apr 12 15:39:53 2024
@@ -1,4 +1,3 @@
-$FreeBSD$
begin 644 test_archive_string_conversion.txt.Z
M'YV0,8K`"+(#!@P:-$#`F`'CAH*`,(84/)APH8P9#P4.4<CPQD2$'"]R;)@Q
MXDB/!D%:G'&RY,:%#3]6G"$2ID.(+SO*#,G29LD@'&,(V;E0:$N<08>FG&ET
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_filter_option.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __m, __o, __v) \
assertEqualInt(__code, archive_write_set_filter_option(__a, __m, __o, __v))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_format_option.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __m, __o, __v) \
assertEqualInt(__code, archive_write_set_format_option(__a, __m, __o, __v))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_option.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __m, __o, __v) \
assertEqualInt(__code, archive_write_set_option(__a, __m, __o, __v))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_write_set_options.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define should(__a, __code, __opts) \
assertEqualInt(__code, archive_write_set_options(__a, __opts))
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzip.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
Execute the following to rebuild the data for this program:
@@ -130,6 +129,85 @@ compat_lzip(const char *name)
}
+static void
+compat_lzip_3(const char *name)
+{
+ struct archive_entry *ae;
+ struct archive *a;
+ int r;
+ const int data_size = 65537;
+ static uint8_t buff[65537];
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+ r = archive_read_support_filter_lzip(a);
+ if (r == ARCHIVE_WARN) {
+ skipping("lzip reading not fully supported on this platform");
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ return;
+ }
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_raw(a));
+ extract_reference_file(name);
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_read_open_filename(a, name, 64 * 1024));
+
+ /* Read an entry. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("data", archive_entry_pathname(ae));
+ /* Verify that whole data could be read. */
+ assertEqualInt(data_size, archive_read_data(a, buff, data_size));
+
+ /* Verify the end-of-archive. */
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+ /* Verify that the format detection worked. */
+ assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZIP);
+ assertEqualString(archive_filter_name(a, 0), "lzip");
+ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_RAW);
+
+ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+
+static void
+compat_lzip_4(const char *name)
+{
+ struct archive_entry *ae;
+ struct archive *a;
+ int r;
+
+ assert((a = archive_read_new()) != NULL);
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+ r = archive_read_support_filter_lzip(a);
+ if (r == ARCHIVE_WARN) {
+ skipping("lzip reading not fully supported on this platform");
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+ return;
+ }
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+ extract_reference_file(name);
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_read_open_filename(a, name, 64 * 1024));
+
+ /* Read an entry. */
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+ assertEqualString("test.bin", archive_entry_pathname(ae));
+
+ /* Verify the end-of-archive. */
+ archive_set_error(a, ARCHIVE_OK, NULL);
+ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+
+ /* Verify that the format detection worked. */
+ assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_LZIP);
+ assertEqualString(archive_filter_name(a, 0), "lzip");
+ assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR);
+
+ assertEqualInt(ARCHIVE_OK, archive_read_close(a));
+ assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+
+
DEFINE_TEST(test_compat_lzip)
{
/* This sample has been 'split', each piece compressed separately,
@@ -138,4 +216,9 @@ DEFINE_TEST(test_compat_lzip)
/* This sample has been compressed as a single stream, but then
* some unrelated garbage text has been appended to the end. */
compat_lzip("test_compat_lzip_2.tlz");
+
+ /* These samples have been compressed as multi stream and an eof
+ * of a member is at a read buffer boundary. */
+ compat_lzip_3("test_compat_lzip_3.lz");
+ compat_lzip_4("test_compat_lzip_4.tlz");
}
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzop.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzop.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzop.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzop.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzop.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Verify our ability to read sample files compatibly with lzop.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_pax_sparse.c Fri Apr 12 15:39:53 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
-
/*
* Verify our ability to read sample files created by Solaris pax for
* a sparse file.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_filter_count.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_filter_count.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_filter_count.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_filter_count.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_filter_count.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_file_nonexistent.c 189473 2009-03-07 02:09:21Z kientzle $");
static void read_test(const char *name);
static void write_test(void);
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c:1.1 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static struct archive_entry*
create_archive_entry(void) {
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_single_file.part1.rar
M4F%R(1H'`%IN<Q$!#0````````"(KG0BD$,`[1H``(].```#D,J\!?-C(4`4
M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S/-C(4#T8R%`/"%$
M3T-465!%($A434P@4%5"3$E#("(M+R]7,T,O+T141"!(5$U,(#0N,"!4<F%N
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_single_file.part2.rar
M4F%R(1H'`!EZ<Q$`#0````````#7@W0CD$,`[1H``(].```#.)1.%?-C(4`4
M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S/-C(4#T8R%`*0IG
M96YE<F%T92!D971A:6QE9"!L;V<@;65S<V%G97,@;VX@9F%I;'5R92X@26X@
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_single_file.part3.rar
M4F%R(1H'`!EZ<Q$`#0`````````?;70AD$,`M1@``(].```#8Z8%7O-C(4`4
M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S/-C(4#T8R%`=7-U
M86QL>2!R=6X*"6%L;"!O9B!T:&4@=&5S=',N(`H)/"]0/@H)/$Q)/CQ0(%-4
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part01.rar
M4F%R(1H'`%IN<Q$!#0````````"G@W0BD$P`C#,``(].```#]EC4PKM,-4$4
M,"(`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0R+FAT;6R`S#)?
M.T)17SM"/"%$3T-465!%($A434P@4%5"3$E#("(M+R]7,T,O+T141"!(5$U,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part02.rar
M4F%R(1H'`!EZ<Q$`#0````````#G!'0AD$P``QL``(].```#8Z8%7KM,-4$4
M,"(`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0R+FAT;6R`S#)?
M.T)17SM"(&%S<V5R=$5Q=6%L365M('1O('1E<W0@97%U86QI='D@:6YS=&5A
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part03.rar
M4F%R(1H'`!EZ<Q$`#0````````"P,W0CD%<`@3,``(].```#*23KD;M,-4$4
M,"T`I($``'1E<W1D:7)<=&5S='-U8F1I<EQ,:6)A<F-H:79E061D:6YG5&5S
M=#(N:'1M;,#,,U\[0F-?.T)I;VYS+B!)9B!T:&4@87-S97)T:6]N(&9A:6QS
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part04.rar
M4F%R(1H'`!EZ<Q$`#0````````!K>G0AD%<`W`(``(].```#8Z8%7KM,-4$4
M,"T`I($``'1E<W1D:7)<=&5S='-U8F1I<EQ,:6)A<F-H:79E061D:6YG5&5S
M=#(N:'1M;,#,,U\[0F-?.T)B>0IT:&4@87)C:&EV92!W<FET97(@:7,@=&AE
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part05.rar
M4F%R(1H'`!EZ<Q$`#0````````!U''0AD$0`+AX``(].```#8Z8%7KM,-4$4
M,!H`I($``$QI8F%R8VAI=F5!9&1I;F=497-T,BYH=&ULP,P)7SM",E\[0F9E
M<F5N8V5?9FEL92@F<75O=#MT97-T7V9O;RYT87(F<75O=#LI.SPO4%)%/CQ0
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part06.rar
M4F%R(1H'`!EZ<Q$`#0`````````*JW0CD$L`C3,``(].```#8\SY_?-C(4`4
M,"$`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0N:'1M;(#,,E\[
M0DU?.T(N+B!S971U<"!O;6ET=&5D("XN+B`J+PHF;F)S<#L@)FYB<W`[(&%S
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part07.rar
M4F%R(1H'`!EZ<Q$`#0````````!*\70AD$L`YP4``(].```#8Z8%7O-C(4`4
M,"$`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0N:'1M;(#,,E\[
M0DU?.T)I=&@@82!D;WIE;B!E;G1R:65S(&1O=VX@=&\*:G5S="!A(&9E=R!K
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part08.rar
M4F%R(1H'`!EZ<Q$`#0````````#I1G0AD%8`/R$``(].```#8Z8%7O-C(4`4
M,"P`I($``'1E<W1D:7)<=&5S='-U8F1I<EQ,:6)A<F-H:79E061D:6YG5&5S
M="YH=&ULP,PS7SM"6U\[0D-O;G1E;G1S/"]45#XL"@D\5%0@0TQ!4U,](G=E
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part09.rar
M4F%R(1H'`!EZ<Q$`#0````````"N!'0CD$,`E3,``(].```#97_()_-C(4`4
M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S`E?.T(R7SM"4STB
M=V5S=&5R;B(^/$$@3D%-13TB0F%S:6-?=&5S=%]T97)M:6YO;&]G>2(^/"]!
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part10.rar
M4F%R(1H'`!EZ<Q$`#0`````````5)G0AD$,`^@@``(].```#8Z8%7O-C(4`4
M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S`E?.T(R7SM"97AE
M<F-I<V4@8F]U;F1A<GD@8V%S97,@=VET:"!V97)Y"FQA<F=E(&5N=')I97,L
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_lrzip.tar.lrz.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_filter_lrzip.tar.lrz.uu
+begin 644 test_read_filter_lrzip.tar.lrz
M3%):20`&`"@``````````%T````!`0```@$`*`,`````#@`#`````&4`!E``
MAP``````*(%=%O"2=0L1MCAA@GB4H1+_)V=!8=DS/0JC4Z+Q&5I0A'\SJ-#.
M$U<4K-:^%:G^C3$B/80>END]NJE=5AP+]64N7$3):G02EKP>+AD`!IH`HQ(`
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_compress_program.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char archive[] = {
31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_program_signature.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static unsigned char archive[] = {
31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_filter_uudecode.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_uu.c 201248 2009-12-30 06:12:03Z kientzle $");
static const char archive[] = {
"begin 644 test_read_uu.Z\n"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_7zip_copy.7z.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_7zip_none.7z
+begin 644 test_read_format_7zip_copy.7z
M-WJ\KR<<``-!QGV(/`````````!"`````````(/;BV,@("`@("`@("`@("`@
M("`@("`@("`@("`@(&9I;&4@,2!C;VYT96YT<PIH96QL;PIH96QL;PIH96QL
M;PH!!`8``0D\``<+`0`!`0`,/``("@&J'=X/```%`1$-`&8`:0!L`&4`,0``
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cab_filename_cp932.cab.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cab_cp932.cab
+begin 644 test_read_format_cab_filename_cp932.cab
M35-#1@````"4`````````"P``````````P$!``(````(_@``;@````$``Q(%
M````````````=#ZO5"``E5R"OH+F7(J_CIHN='AT``4````%``````!T/KM4
M(`"57(*^@N9<B.J7EY5<+G1X=``I]2&+'@`*`%N`@(T`,*```0````$````!
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_cp866.cpio
+begin 644 test_read_format_cpio_filename_cp866.cpio
M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-S4U,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
M,#`P,3$U-#<S,C$U,#$P,#`P,#<P,#`P,#`P,#`P-H^0B(*%D@#P\NGWY?0P
M-S`W,#<P,#`Q,S<P,#`P,#(Q,#`W-34P,#$W-3$P,#$W-3$P,#`P,#$P,#`P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_eucjp.cpio
+begin 644 test_read_format_cpio_filename_eucjp.cpio
M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-C0T,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
M,#`P,3$U-3$U,C(U,C`P,#`P,3$P,#`P,#`P,#`Q,+3!N_HN='AT`(J_CIJ"
MJ8+(,#<P-S`W,#`P,3,W,#`P,#`R,3`P-C0T,#`Q-S4Q,#`Q-S4Q,#`P,#`Q
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_koi8r.cpio
+begin 644 test_read_format_cpio_filename_koi8r.cpio
M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-S4U,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
M,#`P,3$U-#<S,C`P,S8P,#`P,#<P,#`P,#`P,#`P-O#RZ??E]`#P\NGWY?0P
M-S`W,#<P,#`Q,S<P,#`P,#(Q,#`W-34P,#$W-3$P,#$W-3$P,#`P,#$P,#`P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_utf8_jp.cpio
+begin 644 test_read_format_cpio_filename_utf8_jp.cpio
M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-C0T,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
M,#`P,3$U-3$U,C(S-C8P,#`P,3,P,#`P,#`P,#`Q,.:\HN6MERYT>'0`BK^.
MFH*I@L@P-S`W,#<P,#`Q,S<P,#`P,#(Q,#`V-#0P,#$W-3$P,#$W-3$P,#`P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_utf8_ru.cpio
+begin 644 test_read_format_cpio_filename_utf8_ru.cpio
M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-S4U,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
M,#`P,3$U,C$U,38U,38P,#`P,34P,#`P,#`P,#`P-M"?T*#0F-"2T)70H@#P
M\NGWY?0P-S`W,#<P,#`Q,S<P,#`P,#(Q,#`W-34P,#$W-3$P,#$W-3$P,#`P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_gtar_cp866.tar.Z
+begin 644 test_read_format_gtar_filename_cp866.tar.Z
M'YV0CR`A$E1($H"#"!,J7,BPH<.'$"-*1`BC(HP;-6H`L!@#8XR-%3O6^&BQ
MI$4;`&+$J$'CQ@P9*V&0C`'#Q@T9`$#`F,BSI\^?0`'4F4,GC!P0(`",J5,F
MJ,.E39U*G4JUJM6K6'G"DY?N7CEZ6<.*'4NVK-FS:-.J7<NVK<-7X%")*B7.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_gtar_eucjp.tar.Z
+begin 644 test_read_format_gtar_filename_eucjp.tar.Z
M'YV0M(+MTN>"#AXZ`!(J7,BPH<.'$"-*G$@1`(R+,&S0H&'Q8HP;-6)TA/$Q
MY$B,&&/``!`C1HV0-63(B+F29`P:)D&LK,BSI\^?0.O,H1-&#@@0`,;4*0,T
MHE*F3:-*G4JUJM6K4Q7]<J1)4"I!R+"*'4NVK-FS:-.J7<NVK=NHR7H5//BV
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_gtar_koi8r.tar.Z
+begin 644 test_read_format_gtar_filename_koi8r.tar.Z
M'YV0T*0ENU:,&H"#"!,J7,BPH<.'$"-*1`BC(HP;-6H`L!@#8XR-%3O6^&BQ
MI$4;`&+$J$'CQ@P9%6>@A*&RAHP;`$#`F,BSI\^?0`'4F4,GC!P0(`",J5,F
MJ,.E39U*G4JUJM6K6'G"DY?N7CEZ6<.*'4NVK-FS:-.J7<NVK<.M7;^ZG<NP
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu:1.1 Sat Jan 17 12:44:50 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_lha_cp932.lzh
+begin 644 test_read_format_lha_filename_cp932.lzh
M30`M;&@P+0@````(````*:2#32`"&4A-!P!&I`,```L``8J_CIHN='AT&P!!
M-'"`))KERP%TJNDQFN7+`72JZ3&:Y<L!!@``T2,'``"*OXZ:@JF"R$L`+6QH
M,"T$````!````#RD@TT@`NA;30<`1J0#```)``&57"YT>'0;`$&:91,VFN7+
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c:1.1 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu:1.1 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu Fri Apr 12 15:39:55 2024
@@ -1,19 +1,19 @@
-begin 644 test_read_format_lha_filename_utf16.lzh
-M@0`M;&@P+0P````,````L/5872`"IW%-!P!&I`,```T``5]?7U]?7RYT>'0*
-M``)?7U]?7U__%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``1`$7<`-8`Q`#\`/8`
-MY`#__QL`078S<F.15=4!]0V8@I%5U0'U#9B"D575`08```\:!P``PZ3#ML.\
-MPX3#EL.<90`M;&AD+0``````````PX"D72`"``!-!P!&I`,```,``0H``E]?
-M7U]?7_\%`$`0`!$`1=P`U@#$`/P`]@#D`/__&P!!FDHB>9B"U0$H^DQ_F(+5
-M`2CZ3'^8@M4!!@``GW<'``!J`"UL:#`M&0```!D```!V)L1=(`*CNTT'`$:D
-M`P``#0`!@V6#6(-G+G1X=`H``E]?7U]?7_\1`$7<`-8`Q`#\`/8`Y`#__QL`
-M00IF#4J@E-4!L"5C?'65U0&P)6-\=975`08``$%^!P``5&5S="!I;B!*87!A
-M;F5S92!+871A:V%N87L`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-
-M``%?7U]?7U\N='AT"@`"@V6#6(-G_Q<`1.0`]@#\`,0`U@#<`"X`=`!X`'0`
-M"P!%QC"Y,,@P__\;`$'D5O!-H)35`?4-F(*15=4!Y%;P3:"4U0$&``"A+0<`
-M`,.DP[;#O,.$PY;#G%0`+6QH9"T``````````-3`PET@`@``30<`1J0#```#
-M``$*``*#98-8@V?_!0!`$``;`$%%!\Y.H)35`3/_]%&@E-4!,__T4:"4U0$&
-M``!>;@<``&8`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-``%?7U]?
-M7U\N='AT%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``;`$'D5O!-H)35`?4-F(*1
-@5=4!Y%;P3:"4U0$&``"M>`<``,.DP[;#O,.$PY;#G`#D
-`
-end
+begin 644 test_read_format_lha_filename_utf16.lzh
+M@0`M;&@P+0P````,````L/5872`"IW%-!P!&I`,```T``5]?7U]?7RYT>'0*
+M``)?7U]?7U__%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``1`$7<`-8`Q`#\`/8`
+MY`#__QL`078S<F.15=4!]0V8@I%5U0'U#9B"D575`08```\:!P``PZ3#ML.\
+MPX3#EL.<90`M;&AD+0``````````PX"D72`"``!-!P!&I`,```,``0H``E]?
+M7U]?7_\%`$`0`!$`1=P`U@#$`/P`]@#D`/__&P!!FDHB>9B"U0$H^DQ_F(+5
+M`2CZ3'^8@M4!!@``GW<'``!J`"UL:#`M&0```!D```!V)L1=(`*CNTT'`$:D
+M`P``#0`!@V6#6(-G+G1X=`H``E]?7U]?7_\1`$7<`-8`Q`#\`/8`Y`#__QL`
+M00IF#4J@E-4!L"5C?'65U0&P)6-\=975`08``$%^!P``5&5S="!I;B!*87!A
+M;F5S92!+871A:V%N87L`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-
+M``%?7U]?7U\N='AT"@`"@V6#6(-G_Q<`1.0`]@#\`,0`U@#<`"X`=`!X`'0`
+M"P!%QC"Y,,@P__\;`$'D5O!-H)35`?4-F(*15=4!Y%;P3:"4U0$&``"A+0<`
+M`,.DP[;#O,.$PY;#G%0`+6QH9"T``````````-3`PET@`@``30<`1J0#```#
+M``$*``*#98-8@V?_!0!`$``;`$%%!\Y.H)35`3/_]%&@E-4!,__T4:"4U0$&
+M``!>;@<``&8`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-``%?7U]?
+M7U\N='AT%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``;`$'D5O!-H)35`?4-F(*1
+@5=4!Y%;P3:"4U0$&``"M>`<``,.DP[;#O,.$PY;#G`#D
+`
+end
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar.rar
M4F%R(1H'`,^0<P``#0````````"$4G0@D#(`%````!0````#0J+(OK=VVCX4
M,`@`I($``'1E<W0N='AT@`BW=MH^MW;:/G1E<W0@=&5X="!D;V-U;65N=`T*
MG2]T()`R``@````(`````WM$R;;13-@^%#`(`/^A``!T97-T;&EN:\`(T4S8
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_binary_data.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_binary_data.rar
M4F%R(1H'`,^0<P``#0````````!W#G2@D#D`E`H0````$``#OES$M0V6!S\=
M-0\`I($``')A;F1O;5]D871A+F)I;H#,#98'/Q*6!S\1#\T0T54`#0Z16Z5B
MZ6W>FQ_"3YH!RD,Z.<P&4ZSGQ+1(6^9/\HXB^LD*'EY-":6Y)MO'@@4>_X"C
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_best.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_compress_best.rar
M4F%R(1H'`,^0<P``#0````````"/6W0@D$,`\A8``(].```#8Z8%7C:SVCX=
M-1D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6R`S#:SVC[E:?8^IQ@[
MY,&O-%WTZIVL0'K=[L^M$"SZ*I?&B@$S2EO?UM\%P_[#*[0L[1)9)\]U]*;T
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_compress_normal.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_compress_normal.rar
M4F%R(1H'`,^0<P``#0````````!.!G0@D$,`LQL``(].```#8Z8%7C:SVCX=
M,QD`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6R`S#:SVCZ4:NT^#!U1
M#,S1%\6=F]T/PH[-`V-[U)/P29F;F3P#KD;FQC9X>MJ;G<[Z6"DBFSK*16$E
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multi_lzss_blocks.rar
M4F%R(1H'`,^0<P``#0````````"5L73`D$0`(TT``"<M,P$#<!6B:RZ@[CX=
M,QH`I($``&UU;'1I7VQZ<W-?8FQO8VMS7W1E<W0N='ATP,PNH.X^+:#N/@W!
ME1$,S1$`%=F]SKX56/`,:6:25T-W=Y;Z1J;2>M#'TZD7E[>^E"B3)2K$2:-U
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0001.rar
M4F%R(1H'`%IN<Q$!#0`````````SE'3"D$<`\>D``&I!9PX#@*>#,/AM$C\=
M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,SX;1(_P&X2
M/Z<8.^3!KS1=].J=K$!ZW>[/K1`L^BJ7QHH!,TI;W];?!</^PRNT+.T262?/
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0002.rar
M4F%R(1H'`!EZ<Q$`#0````````#NWW3#D$<`\>D``&I!9PX#%Y:4IOAM$C\=
M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,SX;1(_P&X2
M/___________________________________________________________
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0003.rar
M4F%R(1H'`!EZ<Q$`#0````````#U+'3!D$<`^-T``&I!9PX#=T0K]_AM$C\=
M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,SX;1(_P&X2
M/QOK1E#^H^/%2CSU*]SFZB-O0P7.9&(^"2;U+Z.1_C%^3WOV,>5:-FN$2BNW
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0004.rar
M4F%R(1H'`!EZ<Q$`#0````````!AIG3!D$,`/`L``(].```#8Z8%7L"!$C\=
M-1D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S,"!$C_!@1(_'H$B
MVRP\K;>5J2C]?9NI\:;KW2+#TR@_Y5=4S)O&)O_B>J0/A0T-,@"ER';1YX:$
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_noeof.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_noeof.rar
M4F%R(1H'`,^0<P``#0````````"$4G0@D#(`%````!0````#0J+(OK=VVCX4
M,`@`I($``'1E<W0N='AT@`BW=MH^MW;:/G1E<W0@=&5X="!D;V-U;65N=`T*
`
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_ppmd_lzss_conversion.rar
M4F%R(1H'`,^0<P``#0````````!R,W3`D$<`VK$"`&I!9PX#=T0K]VL`!S\=
M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,B$``<_&[\&
M/Z<8.^3!KS1=].J=K$!ZW>[/K1`L^BJ7QHH!,TI;W];?!</^PRNT+.T262?/
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_sfx.exe.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_sfx.exe
M35J0``,````$````__\``+@`````````0```````````````````````````
M````````````````````Z`````X?N@X`M`G-(;@!3,TA5&AI<R!P<F]G<F%M
M(&-A;FYO="!B92!R=6X@:6X@1$]3(&UO9&4N#0T*)`````````#3[14&EXQ[
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_subblock.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_subblock.rar
M4F%R(1H'`,^0<P``#0`````````##'H`@",`(@```!T````#&WQ`G@`````=
M,P,``````$--5`@!"+Z0\5[-83@7PT#<+OM\M_$>H5JAD)Q_9XLAN3)VO("$
M4G0@D#(`%````!0````#0J+(OK=VVCX4,`@`I($``'1E<W0N='AT@`BW=MH^
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar_windows.rar.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_windows.rar
M4F%R(1H'`,^0<P``#0````````"6GW0@D$,`$````!`````"\1+6EVQA$C\4
M,!``(````'1E<W1D:7)<=&5S="YT>'3POU/A"W5A$C_#FG]U81(_PYI_=&5S
M="!T97AT(&9I;&4-"D."=""0.P`0````$`````+Q$M:7;&$2/Q0P"``@````
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp866.zip.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_cp866.zip
+begin 644 test_read_format_zip_filename_cp866.zip
M4$L#!`H``````%VEAS[,X8$4!@````8````&`!P`CY"(@H62550)``-!HYU-
M0:.=375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*``````!=I8<^S.&!%`8`
M```&````!@`<`*_@J**EXE54"0`#0:.=34&CG4UU>`L``03I`P``!.D#``#P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_cp932.zip.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_cp932.zip
+begin 644 test_read_format_zip_filename_cp932.zip
M4$L#!`H``````/94=#Z"B='W!0````4````1````E5R"OH+F+XCJEY>57"YT
M>'1(96QL;U!+`P0*``````"W5'0^W)UO0@4````%````#P```)5<@KZ"YB^*
MOXZ:+G1X=&MA;FII4$L!`A0+"@``````]E1T/H*)T?<%````!0```!$`````
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_koi8r.zip
+begin 644 test_read_format_zip_filename_koi8r.zip
M4$L#!`H``````+&CAS[,X8$4!@````8````&`!P`T-+)U\74550)``,>H)U-
M'J"=375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*``````"QHX<^S.&!%`8`
M```&````!@`<`/#RZ??E]%54"0`#'J"=31Z@G4UU>`L``03I`P``!.D#``#P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_utf8.zip
+begin 644 test_read_format_zip_filename_utf8_jp.zip
M4$L#!`H```@``,E4=#X````````````````*`!P`Z*&HXX&@XX*(+U54"0`#
MBEJ%3;[UBDUU>`L``03M`P``!`$"``!02P,$"@``"```]51T/H*)T?<%````
M!0```!<`'`#HH:CC@:#C@H@OY+B`Z*:GZ*&H+G1X=%54"0`#WEJ%31KLBDUU
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_utf8_ru.zip
+begin 644 test_read_format_zip_filename_utf8_ru.zip
M4$L#!`H```@``,NC/S[,X8$4!@````8````,`!P`T)_0H-"8T)+0E="B550)
M``-.G49-'J"=375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*```(``!KI3\^
MS.&!%`8````&````#``<`-"_T8#0N-"RT+71@E54"0`#6J!&31Z@G4UU>`L`
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu:1.1
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_utf8_ru2.zip
+begin 644 test_read_format_zip_filename_utf8_ru2.zip
M4$L#!`H``````.:PCC[,X8$4!@````8````&`!P`\/+I]^7T550)``.`\:9-
MI6>G375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*```(``!KI3\^S.&!%`8`
M```&````#``<`-"_T8#0N-"RT+71@E54"0`#6J!&357SIDUU>`L``03I`P``
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_aa.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_aa
M4F%R(1H'`,^0<P``#0````````!R,W3`D$<`VK$"`&I!9PX#=T0K]VL`!S\=
M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,B$``<_&[\&
M/Z<8.^3!KS1=].J=K$!ZW>[/K1`L^BJ7QHH!,TI;W];?!</^PRNT+.T262?/
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ab.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ab
M````````````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ac.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ac
M____________________________________________________________
M____________________________________________________________
M____________________________________________________________
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ad.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ad
M>WI\4,Y&PE_B_KBY3_KR8A*=V5Y9^":+9OY.2W-%I:#J"YC[#9]&6)@HH1ZH
MV*<8TFQK2]$<A645.":BA=R^<=NOJ(%,H)2+!9H%.!"J[E>+2^(@3/9+1"6W
M2O)L"JZC)MCDJG+%_;+=UEV.2(I,V[T@E<XQKA"\G.*'GD,QF_.C^"NU*.#4
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_large_splitted_rar_ae.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ae
M____________________________________________________________
M____________________________________________________________
M____________________________________________________________
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_aa.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_aa
M4F%R(1H'`,^0<P``#0````````"$4G0@D#(`%````!0````#0J+(OK=VVCX4
M,`@`I($``'1E<W0N='AT@`BW=MH^MW;:/G1E<W0@=&5X="!D;V-U;65N=`T*
*G2]T()`R``@`````
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ab.uu Fri Apr 12 15:39:55 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_ab
M``@````#>T3)MM%,V#X4,`@`_Z$``'1E<W1L:6YKP`C13-@^4%_:/G1E<W0N
M='ATS>!T()`Z`!0````4`````T*BR+YC=]H^%#`0`*2!``!T97-T9&ER7'1E
*<W0N='ATP,QC=P``
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ac.uu Fri Apr 12 15:39:56 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_ac
MVCYC=]H^=&5S="!T97AT(&1O8W5M96YT#0JAR'3@D#$````````````#````
M`&-WVCX4,`<`[4$``'1E<W1D:7+`S&-WVCYD=]H^YN=TX)`V````````````
*`P````"=J]4^%```
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_splitted_rar_ad.uu Fri Apr 12 15:39:56 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_ad
D,`P`[4$``'1E<W1E;7!T>61I<H#,G:O5/L5=VC[$/7L`0`<`
`
end
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_aa.uu Fri Apr 12 15:39:56 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_splitted_rar_seek_support_aa
M4F%R(1H'`,^0<P``#0````````"X!'0@D$,`CTX``(].```#8Z8%7F!.(4`4
M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S&!.(4!B3B%`/"%$
M3T-465!%($A434P@4%5"3$E#("(M+R]7,T,O+T141"!(5$U,(#0N,"!4<F%N
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ab.uu Fri Apr 12 15:39:56 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_splitted_rar_seek_support_ab
M;&]G(&UE<W-A9V5S(&]N(&9A:6QU<F4N($EN('!A<G1I8W5L87(L('1H97D@
M<')I;G0*=&AE('9A;'5E(&]F(&)O=&@@87)G=6UE;G1S.R!T:&ES(&=R96%T
M;'D@<VEM<&QI9FEE<R!D:6%G;F]S:6YG"F9A:6QU<F5S+B`*/"]0/@H\2#$@
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_splitted_rar_seek_support_ac.uu Fri Apr 12 15:39:56 2024
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_splitted_rar_seek_support_ac
M<F]M(&-O;F9I9RYH+B`H268@=&AE('1E<W1S('5S92!T:&4@<V%M92`\5%0@
M0TQ!4U,](G=E<W1E<FXB/DA!5D5?/"]45#X*"6UA8W)O<R!A<R!T:&4@8V]D
M92!B96EN9R!T97-T960@=&AE;B!C;VYF:6=U<F%T:6]N('!R;V)L96US('=I
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_lookup.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
group_cleanup(void *d)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip_timestamp.c Fri Apr 12 15:39:56 2024
@@ -26,7 +26,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_write_filter_gzip_timestamp)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
#include "test.h"
-__FBSDID("$FreeBSD$");
static void
test_basic(const char *compression_type)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_7zip_empty.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Test writing an empty archive.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_absolute_path.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff[4096];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff[4096];
static struct {
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_classic_indent.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff[4096];
static struct {
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_fflags.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_no_separator.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree_quoted_filename.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff[4096];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c:1.1 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c:1.2
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_v7tar.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static int
is_null(const char *p, size_t l)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_time.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_time.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_time.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_time.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_match_time.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define __LIBARCHIVE_BUILD 1
#include "archive_getdate.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_pathmatch.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define __LIBARCHIVE_TEST
#include "archive_pathmatch.h"
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define __LIBARCHIVE_TEST
#include "archive_string.h"
@@ -406,7 +405,7 @@ DEFINE_TEST(test_archive_string_sort)
srand((unsigned int)time(NULL));
size = sizeof(strings) / sizeof(char *);
- assert((test_strings = (char **)calloc(1, sizeof(strings))) != NULL);
+ assert((test_strings = (char **)calloc(size, sizeof(char *))) != NULL);
for (i = 0; i < (size - 1); i++)
assert((test_strings[i] = strdup(strings[i])) != NULL);
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_archive_string_conversion.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#include <locale.h>
@@ -42,8 +41,7 @@ if [ ! -f ${if} ]; then
exit 0
fi
of=test_archive_string_conversion.txt.Z
-echo "\$FreeBSD\$" > ${of}.uu
-awk -F ';' '$0 ~/^[0-9A-F]+/ {printf "%s;%s\n", $2, $3}' ${if} | compress | uuencode ${of} >> ${of}.uu
+awk -F ';' '$0 ~/^[0-9A-F]+/ {printf "%s;%s\n", $2, $3}' ${if} | compress | uuencode ${of} > ${of}.uu
exit 1
*/
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzma.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzma.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzma.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzma.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_lzma.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_lzma.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_solaris_tar_acl.c Fri Apr 12 15:39:53 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Verify reading entries with POSIX.1e and NFSv4 ACLs from archives created
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink_1.tar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink_1.tar.uu:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink_1.tar.uu:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink_1.tar.uu:1.3 Sat Feb 20 03:54:10 2010
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_tar_hardlink_1.tar.uu Fri Apr 12 15:39:53 2024
@@ -1,4 +1,3 @@
-$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu,v 1.1 2008/01/31 07:47:38 kientzle Exp $
begin 644 test_compat_tar_hardlink_1.tar
M>&UC9"TS+C,N,B]D;V-S7V0O4D5!1$UF````````````````````````````
M````````````````````````````````````````````````````````````
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_1.zip.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_1.zip.uu:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_1.zip.uu:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_1.zip.uu:1.3 Sat Feb 20 03:54:10 2010
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_compat_zip_1.zip.uu Fri Apr 12 15:39:53 2024
@@ -1,4 +1,3 @@
-$FreeBSD: src/lib/libarchive/test/test_compat_zip_1.zip.uu,v 1.2 2008/06/30 15:49:12 des Exp $
begin 644 test_compat_zip_1.zip
M4$L#!!0`"``(``B$@S<````````````````4````345402U)3D8O34%.249%
M4U0N34;S3<S+3$LM+M$-2RTJSLS/LU(PU#/@Y7+,0Q)Q+$A,SDA5`(H!)<U!
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_entry_strmode.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_entry_strmode.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_entry_strmode.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_entry_strmode.c:1.3 Sat Feb 20 03:54:10 2010
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_entry_strmode.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_entry_strmode.c 201247 2009-12-30 05:59:21Z kientzle $");
DEFINE_TEST(test_entry_strmode)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c:1.3 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c Fri Apr 12 15:39:53 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_extattr_freebsd.c 201247 2009-12-30 05:59:21Z kientzle $");
#if defined(__FreeBSD__) && __FreeBSD__ > 4
#include <sys/extattr.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_link_resolver.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_link_resolver.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_link_resolver.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_link_resolver.c:1.3 Sat Feb 20 03:54:10 2010
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_link_resolver.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_link_resolver.c,v 1.2 2008/06/15 04:31:43 kientzle Exp $");
static void test_linkify_tar(void)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_open_fd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_open_fd.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_open_fd.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_open_fd.c:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_open_fd.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_open_fd.c 201247 2009-12-30 05:59:21Z kientzle $");
#if defined(_WIN32) && !defined(__CYGWIN__)
#define open _open
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_disk.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_disk.c 201247 2009-12-30 05:59:21Z kientzle $");
static void
gname_cleanup(void *d)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_afio.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
execute the following to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_be.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_be.c 191592 2009-04-27 19:30:09Z kientzle $");
DEFINE_TEST(test_read_format_cpio_bin_be)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_lzma.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_lzma.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char archive[] = {
93, 0, 0,128, 0,255,255,255,255,255,255,255,255, 0, 99,156,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_cpio_bin_xz.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_xz.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_lzma.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_lzma.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
0x5d, 0x0, 0x0, 0x80, 0x0, 0x0, 0x28, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu:1.3
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu:1.3 Sat Feb 20 03:54:11 2010
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu Fri Apr 12 15:39:54 2024
@@ -1,4 +1,3 @@
-$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
begin 644 test_read_format_gtar_sparse_1_17_posix10_modified.tar
M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
M````````````````````````````````````````````````````````````
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_iso_multi_extent.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_iso_multi_extent.c 201247 2009-12-30 05:59:21Z kientzle $");
DEFINE_TEST(test_read_format_iso_multi_extent)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_bz2.c Fri Apr 12 15:39:54 2024
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_long.c Fri Apr 12 15:39:54 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_long.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following to rebuild the data for this program:
@@ -115,7 +114,7 @@ DEFINE_TEST(test_read_format_isojoliet_l
pathname[102] = '3';
pathname[103] = '\0';
assertEqualInt(0, archive_read_next_header(a, &ae));
- assertEqualString("hardlink", archive_entry_pathname(ae));
+ assertEqualString(pathname, archive_entry_pathname(ae));
assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
assert(archive_entry_hardlink(ae) == NULL);
assertEqualInt(6, archive_entry_size(ae));
@@ -129,9 +128,9 @@ DEFINE_TEST(test_read_format_isojoliet_l
/* Second name for the same regular file (this happens to be
* returned second, so does get marked as a hardlink). */
assertEqualInt(0, archive_read_next_header(a, &ae));
- assertEqualString(pathname, archive_entry_pathname(ae));
+ assertEqualString("hardlink", archive_entry_pathname(ae));
assertEqualInt(AE_IFREG, archive_entry_filetype(ae));
- assertEqualString("hardlink", archive_entry_hardlink(ae));
+ assertEqualString(pathname, archive_entry_hardlink(ae));
assert(!archive_entry_size_is_set(ae));
assertEqualInt(archive_entry_is_encrypted(ae), 0);
assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isojoliet_rr.c Fri Apr 12 15:39:54 2024
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_rr.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_ce.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_ce.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following command to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_new_bz2.c Fri Apr 12 15:39:55 2024
@@ -23,8 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_new_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
-
/*
PLEASE use latest cdrtools at least mkisofs version is 2.01.01a63 or later.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isorr_rr_moved.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_rr_moved.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following command to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c:1.3 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_isozisofs_bz2.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isozisofs_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
Execute the following command to rebuild the data for this program:
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar5.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar5.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar5.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar5.c:1.3 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_rar5.c Fri Apr 12 15:39:55 2024
@@ -806,6 +806,36 @@ DEFINE_TEST(test_read_format_rar5_extrac
EPILOGUE();
}
+DEFINE_TEST(test_read_format_rar5_unicode)
+{
+#if !defined(WIN32) || defined(__CYGWIN__)
+ skipping("Skipping test on non-Windows");
+ return;
+#else
+ /* Corresponds to the names:
+ * 👋🌎.txt
+ * 𝒮𝓎𝓂𝒷𝑜𝓁𝒾𝒸 𝐿𝒾𝓃𝓀.txt
+ * Ⓗⓐⓡⓓ Ⓛⓘⓝⓚ.txt */
+ const wchar_t* emoji_name = L"\U0001f44b\U0001f30e.txt";
+ const wchar_t* italic_name = L"\U0001d4ae\U0001d4ce\U0001d4c2\U0001d4b7\U0001d45c\U0001d4c1\U0001d4be\U0001d4b8 \U0001d43f\U0001d4be\U0001d4c3\U0001d4c0.txt";
+ const wchar_t* circle_name = L"\u24bd\u24d0\u24e1\u24d3 \u24c1\u24d8\u24dd\u24da.txt";
+
+ PROLOGUE("test_read_format_rar5_unicode.rar");
+ assertA(0 == archive_read_next_header(a, &ae));
+ assertEqualWString(emoji_name, archive_entry_pathname_w(ae));
+ assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644);
+ assertA(0 == archive_read_next_header(a, &ae));
+ assertEqualWString(circle_name, archive_entry_pathname_w(ae));
+ assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644);
+ assertEqualWString(emoji_name, archive_entry_hardlink_w(ae));
+ assertA(0 == archive_read_next_header(a, &ae));
+ assertEqualWString(italic_name, archive_entry_pathname_w(ae));
+ assertEqualInt(archive_entry_mode(ae), AE_IFLNK | 0644);
+ assertEqualWString(emoji_name, archive_entry_symlink_w(ae));
+ EPILOGUE();
+#endif
+}
+
DEFINE_TEST(test_read_format_rar5_block_by_block)
{
/* This test uses strange buffer sizes intentionally. */
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu:1.3
pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu:1.3 Sat Feb 20 03:54:11 2010
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tar_empty_filename.tar.uu Fri Apr 12 15:39:55 2024
@@ -1,5 +1,4 @@
-$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
-begin 644 test_compat_tar_1.tar
+begin 644 test_read_format_tar_empty_filename.tar
M````````````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
M`````````````#`P,#<W-2``,#`Q-S4P(``P,#`P,#`@`#`P,#`P,#`P,#`P
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tlz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tlz.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tlz.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tlz.c:1.3 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_tlz.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tlz.c 201247 2009-12-30 05:59:21Z kientzle $");
static unsigned char archive[] = {
93, 0, 0,128, 0,255,255,255,255,255,255,255,255, 0, 23, 0,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_txz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_txz.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_txz.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_txz.c:1.3 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_txz.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_txz.c 191183 2009-04-17 01:06:31Z kientzle $");
static unsigned char archive[] = {
253, 55,122, 88, 90, 0, 0, 4,230,214,180, 70, 2, 0, 33, 1,
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip_filename.c Fri Apr 12 15:39:55 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD");
#include <locale.h>
@@ -1179,6 +1178,11 @@ next_test:
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
/*
+ * By default, Windows will create an sconv_default object, which will
+ * interpret filenames as OEMCP
+ */
+#if !defined(_WIN32) || defined(__CYGWIN__)
+ /*
* Read filename in en_US.UTF-8 without "hdrcharset=KOI8-R" option.
* The filename we can properly read is only second file.
*/
@@ -1221,4 +1225,5 @@ next_test:
/* Close the archive. */
assertEqualInt(ARCHIVE_OK, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+#endif
}
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Check that we generate an error message when reading a truncated
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_hfs_compression.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_XATTR_H
#include <sys/xattr.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_mac_metadata.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_ACL_H
#include <sys/acl.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_no_hfs_compression.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_XATTR_H
#include <sys/xattr.h>
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c:1.3 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c Fri Apr 12 15:39:56 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_symlink.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Exercise symlink recreation.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_compress_gzip.c 191183 2009-04-17 01:06:31Z kientzle $");
/*
* A basic exercise of gzip reading and writing.
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_write_filter_zstd)
{
@@ -133,36 +132,110 @@ DEFINE_TEST(test_write_filter_zstd)
archive_write_set_filter_option(a, NULL, "threads", "-1")); /* negative */
assertEqualIntA(a, ARCHIVE_OK,
archive_write_set_filter_option(a, NULL, "threads", "4"));
-#if HAVE_ZSTD_H && HAVE_LIBZSTD_COMPRESSOR
+#if HAVE_ZSTD_H && HAVE_ZSTD_compressStream
/* frame-per-file: boolean */
assertEqualIntA(a, ARCHIVE_OK,
archive_write_set_filter_option(a, NULL, "frame-per-file", ""));
- /* min-frame-size: >= 0 */
+ /* min-frame-in: >= 0 */
assertEqualIntA(a, ARCHIVE_FAILED,
- archive_write_set_filter_option(a, NULL, "min-frame-size", ""));
+ archive_write_set_filter_option(a, NULL, "min-frame-out", ""));
assertEqualIntA(a, ARCHIVE_FAILED,
- archive_write_set_filter_option(a, NULL, "min-frame-size", "-1"));
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "-1"));
assertEqualIntA(a, ARCHIVE_OK,
- archive_write_set_filter_option(a, NULL, "min-frame-size", "0"));
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "0"));
assertEqualIntA(a, ARCHIVE_OK,
- archive_write_set_filter_option(a, NULL, "min-frame-size", "1048576"));
- /* max-frame-size: >= 1024 */
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1048576"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1k"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1kB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1M"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1MB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1G"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-out", "1GB"));
+ /* min-frame-out: >= 0 */
assertEqualIntA(a, ARCHIVE_FAILED,
- archive_write_set_filter_option(a, NULL, "max-frame-size", ""));
+ archive_write_set_filter_option(a, NULL, "min-frame-in", ""));
assertEqualIntA(a, ARCHIVE_FAILED,
- archive_write_set_filter_option(a, NULL, "max-frame-size", "-1"));
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "-1"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "0"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1048576"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1k"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1kB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1M"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1MB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1G"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "min-frame-in", "1GB"));
+ /* max-frame-in: >= 1024 */
+ assertEqualIntA(a, ARCHIVE_FAILED,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", ""));
assertEqualIntA(a, ARCHIVE_FAILED,
- archive_write_set_filter_option(a, NULL, "max-frame-size", "0"));
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "-1"));
assertEqualIntA(a, ARCHIVE_FAILED,
- archive_write_set_filter_option(a, NULL, "max-frame-size", "1023"));
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "0"));
+ assertEqualIntA(a, ARCHIVE_FAILED,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1023"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1024"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1048576"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1k"));
assertEqualIntA(a, ARCHIVE_OK,
- archive_write_set_filter_option(a, NULL, "max-frame-size", "1024"));
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1kB"));
assertEqualIntA(a, ARCHIVE_OK,
- archive_write_set_filter_option(a, NULL, "max-frame-size", "1048576"));
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1M"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1MB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1G"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-in", "1GB"));
+ /* max-frame-out: >= 1024 */
+ assertEqualIntA(a, ARCHIVE_FAILED,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", ""));
+ assertEqualIntA(a, ARCHIVE_FAILED,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "-1"));
+ assertEqualIntA(a, ARCHIVE_FAILED,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "0"));
+ assertEqualIntA(a, ARCHIVE_FAILED,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1023"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1024"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1048576"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1k"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1kB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1M"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1MB"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1G"));
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "max-frame-out", "1GB"));
#endif
#if ZSTD_VERSION_NUMBER >= MINVER_LONG
- assertEqualIntA(a, ARCHIVE_OK,
- archive_write_set_filter_option(a, NULL, "long", "27"));
+ if ((int)(sizeof(size_t) == 4))
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "long", "26"));
+ else
+ assertEqualIntA(a, ARCHIVE_OK,
+ archive_write_set_filter_option(a, NULL, "long", "27"));
assertEqualIntA(a, ARCHIVE_FAILED,
archive_write_set_filter_option(a, NULL, "long", "-1")); /* negative */
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_iso9660.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff2[64];
DEFINE_TEST(test_write_format_iso9660)
@@ -385,14 +384,14 @@ DEFINE_TEST(test_write_format_iso9660)
assertEqualInt(2048, archive_entry_size(ae));
/*
- * Read "hardlnk"
+ * Read "file"
*/
assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
assertEqualInt(2, archive_entry_atime(ae));
assertEqualInt(3, archive_entry_birthtime(ae));
assertEqualInt(4, archive_entry_ctime(ae));
assertEqualInt(5, archive_entry_mtime(ae));
- assertEqualString("hardlnk", archive_entry_pathname(ae));
+ assertEqualString("file", archive_entry_pathname(ae));
assert((AE_IFREG | 0555) == archive_entry_mode(ae));
assertEqualInt(2, archive_entry_nlink(ae));
assertEqualInt(8, archive_entry_size(ae));
@@ -400,15 +399,15 @@ DEFINE_TEST(test_write_format_iso9660)
assertEqualMem(buff2, "12345678", 8);
/*
- * Read "file"
+ * Read "hardlnk"
*/
assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
assertEqualInt(2, archive_entry_atime(ae));
assertEqualInt(3, archive_entry_birthtime(ae));
assertEqualInt(4, archive_entry_ctime(ae));
assertEqualInt(5, archive_entry_mtime(ae));
- assertEqualString("file", archive_entry_pathname(ae));
- assertEqualString("hardlnk", archive_entry_hardlink(ae));
+ assertEqualString("hardlnk", archive_entry_pathname(ae));
+ assertEqualString("file", archive_entry_hardlink(ae));
assert((AE_IFREG | 0555) == archive_entry_mode(ae));
assertEqualInt(2, archive_entry_nlink(ae));
assertEqualInt(0, archive_entry_size(ae));
@@ -982,13 +981,13 @@ DEFINE_TEST(test_write_format_iso9660)
assertEqualInt(2048, archive_entry_size(ae));
/*
- * Read "hardlink"
+ * Read "file"
*/
assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
assertEqualInt(5, archive_entry_atime(ae));
assertEqualInt(5, archive_entry_ctime(ae));
assertEqualInt(5, archive_entry_mtime(ae));
- assertEqualString("HARDLNK", archive_entry_pathname(ae));
+ assertEqualString("FILE", archive_entry_pathname(ae));
assertEqualString(NULL, archive_entry_hardlink(ae));
assert((AE_IFREG | 0400) == archive_entry_mode(ae));
assertEqualInt(8, archive_entry_size(ae));
@@ -996,15 +995,15 @@ DEFINE_TEST(test_write_format_iso9660)
assertEqualMem(buff2, "12345678", 8);
/*
- * Read "file"
+ * Read "hardlnk"
*/
assertEqualIntA(a, 0, archive_read_next_header(a, &ae));
assertEqualInt(5, archive_entry_atime(ae));
assertEqualInt(0, archive_entry_birthtime(ae));
assertEqualInt(5, archive_entry_ctime(ae));
assertEqualInt(5, archive_entry_mtime(ae));
- assertEqualString("FILE", archive_entry_pathname(ae));
- assertEqualString("HARDLNK", archive_entry_hardlink(ae));
+ assertEqualString("HARDLNK", archive_entry_pathname(ae));
+ assertEqualString("FILE", archive_entry_hardlink(ae));
assert((AE_IFREG | 0400) == archive_entry_mode(ae));
assertEqualInt(2, archive_entry_nlink(ae));
assertEqualInt(0, archive_entry_size(ae));
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree.c:1.3 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_mtree.c Fri Apr 12 15:39:56 2024
@@ -25,7 +25,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_mtree.c 191183 2009-04-17 01:06:31Z kientzle $");
static char buff[4096];
static struct {
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c:1.3 Tue May 26 09:16:42 2020
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c Fri Apr 12 15:39:56 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static char buff[1000000];
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip.c:1.3 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip.c Fri Apr 12 15:39:56 2024
@@ -30,7 +30,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* This test doesn't actually check that the zip writer is
@@ -290,9 +289,11 @@ verify_contents(struct archive *a, int s
assertEqualString("file", archive_entry_pathname(ae));
if (seeking) {
assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae));
+ assert(archive_entry_size_is_set(ae));
+ assertEqualInt(8, archive_entry_size(ae));
+ } else {
+ assertEqualInt(0, archive_entry_size_is_set(ae));
}
- assert(archive_entry_size_is_set(ae));
- assertEqualInt(8, archive_entry_size(ae));
if (content) {
assertEqualIntA(a, 8,
archive_read_data(a, filedata, sizeof(filedata)));
@@ -308,9 +309,11 @@ verify_contents(struct archive *a, int s
assertEqualString("file2", archive_entry_pathname(ae));
if (seeking) {
assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae));
+ assertEqualInt(4, archive_entry_size(ae));
+ assert(archive_entry_size_is_set(ae));
+ } else {
+ assertEqualInt(0, archive_entry_size_is_set(ae));
}
- assertEqualInt(4, archive_entry_size(ae));
- assert(archive_entry_size_is_set(ae));
if (content) {
assertEqualIntA(a, 4,
archive_read_data(a, filedata, sizeof(filedata)));
@@ -374,10 +377,13 @@ verify_contents(struct archive *a, int s
assertEqualInt(0, archive_entry_atime(ae));
assertEqualInt(0, archive_entry_ctime(ae));
assertEqualString("file_deflate", archive_entry_pathname(ae));
- if (seeking)
+ if (seeking) {
assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae));
- assertEqualInt(8, archive_entry_size(ae));
- assert(archive_entry_size_is_set(ae));
+ assertEqualInt(8, archive_entry_size(ae));
+ assert(archive_entry_size_is_set(ae));
+ } else {
+ assertEqualInt(0, archive_entry_size_is_set(ae));
+ }
if (content) {
assertEqualIntA(a, 8,
archive_read_data(a, filedata, sizeof(filedata)));
@@ -392,10 +398,13 @@ verify_contents(struct archive *a, int s
assertEqualInt(0, archive_entry_atime(ae));
assertEqualInt(0, archive_entry_ctime(ae));
assertEqualString("file2_deflate", archive_entry_pathname(ae));
- if (seeking)
+ if (seeking) {
assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae));
- assertEqualInt(4, archive_entry_size(ae));
- assert(archive_entry_size_is_set(ae));
+ assertEqualInt(4, archive_entry_size(ae));
+ assert(archive_entry_size_is_set(ae));
+ } else {
+ assertEqualInt(0, archive_entry_size_is_set(ae));
+ }
if (content) {
assertEqualIntA(a, 4,
archive_read_data(a, filedata, sizeof(filedata)));
@@ -410,6 +419,7 @@ verify_contents(struct archive *a, int s
assertEqualInt(0, archive_entry_ctime(ae));
assertEqualString("file3_deflate", archive_entry_pathname(ae));
if (seeking) {
+ assert(archive_entry_size_is_set(ae));
assertEqualInt(5, archive_entry_size(ae));
assertEqualInt(AE_IFREG | 0621, archive_entry_mode(ae));
} else {
@@ -460,10 +470,13 @@ verify_contents(struct archive *a, int s
assertEqualInt(0, archive_entry_atime(ae));
assertEqualInt(0, archive_entry_ctime(ae));
assertEqualString("file_stored", archive_entry_pathname(ae));
- if (seeking)
+ if (seeking) {
assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae));
- assert(archive_entry_size_is_set(ae));
- assertEqualInt(8, archive_entry_size(ae));
+ assert(archive_entry_size_is_set(ae));
+ assertEqualInt(8, archive_entry_size(ae));
+ } else {
+ assertEqualInt(0, archive_entry_size_is_set(ae));
+ }
if (content) {
assertEqualIntA(a, 8,
archive_read_data(a, filedata, sizeof(filedata)));
@@ -478,10 +491,13 @@ verify_contents(struct archive *a, int s
assertEqualInt(0, archive_entry_atime(ae));
assertEqualInt(0, archive_entry_ctime(ae));
assertEqualString("file2_stored", archive_entry_pathname(ae));
- if (seeking)
+ if (seeking) {
assertEqualInt(AE_IFREG | 0755, archive_entry_mode(ae));
- assertEqualInt(4, archive_entry_size(ae));
- assert(archive_entry_size_is_set(ae));
+ assertEqualInt(4, archive_entry_size(ae));
+ assert(archive_entry_size_is_set(ae));
+ } else {
+ assertEqualInt(0, archive_entry_size_is_set(ae));
+ }
if (content) {
assertEqualIntA(a, 4,
archive_read_data(a, filedata, sizeof(filedata)));
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_empty.c Fri Apr 12 15:39:56 2024
@@ -28,7 +28,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip_empty.c 201247 2009-12-30 05:59:21Z kientzle $");
DEFINE_TEST(test_write_format_zip_empty)
{
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c Fri Apr 12 15:39:56 2024
@@ -29,7 +29,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Detailed byte-for-byte verification of the format of a zip archive
@@ -170,17 +169,17 @@ DEFINE_TEST(test_write_format_zip_file)
p = extension_start = central_header + 46 + strlen(file_name);
extension_end = extension_start + i2(central_header + 30);
+ assertEqualInt(i2(p), 0x7875); /* 'ux' extension header */
+ assertEqualInt(i2(p + 2), 11); /* 'ux' size */
+ /* TODO: verify 'ux' contents */
+ p += 4 + i2(p + 2);
+
assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */
assertEqualInt(i2(p + 2), 5); /* 'UT' size */
assertEqualInt(p[4], 1); /* 'UT' flags */
assertEqualInt(i4(p + 5), t); /* 'UT' mtime */
p += 4 + i2(p + 2);
- assertEqualInt(i2(p), 0x7875); /* 'ux' extension header */
- assertEqualInt(i2(p + 2), 11); /* 'ux' size */
- /* TODO: verify 'ux' contents */
- p += 4 + i2(p + 2);
-
/* Just in case: Report any extra extensions. */
while (p < extension_end) {
failure("Unexpected extension 0x%04X", i2(p));
@@ -189,36 +188,30 @@ DEFINE_TEST(test_write_format_zip_file)
}
/* Should have run exactly to end of extra data. */
- assert(p == extension_end);
+ assertEqualAddress(p, extension_end);
- assert(p == eocd);
+ assertEqualAddress(p, eocd);
/* Regular EOCD immediately follows central directory. */
- assert(p == eocd_record);
+ assertEqualAddress(p, eocd_record);
/* Verify local header of file entry. */
p = local_header = buff;
assertEqualMem(p, "PK\003\004", 4); /* Signature */
assertEqualInt(i2(p + 4), zip_version); /* Version needed to extract */
- assertEqualInt(i2(p + 6), 8); /* Flags */
+ assertEqualInt(i2(p + 6), 8); /* Flags: bit 3 = length-at-end */
assertEqualInt(i2(p + 8), zip_compression); /* Compression method */
assertEqualInt(i2(p + 10), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */
assertEqualInt(i2(p + 12), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */
- assertEqualInt(i4(p + 14), 0); /* CRC-32 */
- /* assertEqualInt(i4(p + 18), sizeof(file_data)); */ /* Compressed size */
- /* assertEqualInt(i4(p + 22), sizeof(file_data)); */ /* Uncompressed size not stored because we're using length-at-end. */
+ assertEqualInt(i4(p + 14), 0); /* CRC-32 stored as zero because we're using length-at-end */
+ assertEqualInt(i4(p + 18), 0); /* Compressed size stored as zero because we're using length-at-end. */
+ assertEqualInt(i4(p + 22), 0); /* Uncompressed size stored as zero because we're using length-at-end. */
assertEqualInt(i2(p + 26), strlen(file_name)); /* Pathname length */
assertEqualInt(i2(p + 28), 37); /* Extra field length */
assertEqualMem(p + 30, file_name, strlen(file_name)); /* Pathname */
p = extension_start = local_header + 30 + strlen(file_name);
extension_end = extension_start + i2(local_header + 28);
- assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */
- assertEqualInt(i2(p + 2), 5); /* size */
- assertEqualInt(p[4], 1); /* 'UT' flags */
- assertEqualInt(i4(p + 5), t); /* 'UT' mtime */
- p += 4 + i2(p + 2);
-
assertEqualInt(i2(p), 0x7875); /* 'ux' extension header */
assertEqualInt(i2(p + 2), 11); /* size */
assertEqualInt(p[4], 1); /* 'ux' version */
@@ -228,6 +221,12 @@ DEFINE_TEST(test_write_format_zip_file)
assertEqualInt(i4(p + 11), file_gid); /* 'Ux' GID */
p += 4 + i2(p + 2);
+ assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */
+ assertEqualInt(i2(p + 2), 5); /* size */
+ assertEqualInt(p[4], 1); /* 'UT' flags */
+ assertEqualInt(i4(p + 5), t); /* 'UT' mtime */
+ p += 4 + i2(p + 2);
+
assertEqualInt(i2(p), 0x6c78); /* 'xl' experimental extension block */
assertEqualInt(i2(p + 2), 9); /* size */
assertEqualInt(p[4], 7); /* bitmap of fields in this block */
@@ -244,18 +243,18 @@ DEFINE_TEST(test_write_format_zip_file)
}
/* Should have run exactly to end of extra data. */
- assert(p == extension_end);
+ assertEqualAddress(p, extension_end);
/* Data descriptor should follow compressed data. */
while (p < central_header && memcmp(p, "PK\007\010", 4) != 0)
++p;
assertEqualMem(p, "PK\007\010", 4);
assertEqualInt(i4(p + 4), crc); /* CRC-32 */
- /* assertEqualInt(i4(p + 8), ???); */ /* compressed size */
+ assertEqualInt(i4(p + 8), p - extension_end); /* compressed size */
assertEqualInt(i4(p + 12), sizeof(file_data)); /* uncompressed size */
/* Central directory should immediately follow the only entry. */
- assert(p + 16 == central_header);
+ assertEqualAddress(p + 16, central_header);
free(buff);
}
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c:1.3 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c Fri Apr 12 15:39:56 2024
@@ -29,7 +29,6 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* Detailed byte-for-byte verification of the format of a zip archive
@@ -173,17 +172,17 @@ DEFINE_TEST(test_write_format_zip_file_z
p = extension_start = central_header + 46 + strlen(file_name);
extension_end = extension_start + i2(central_header + 30);
+ assertEqualInt(i2(p), 0x7875); /* 'ux' extension header */
+ assertEqualInt(i2(p + 2), 11); /* 'ux' size */
+ /* TODO: verify 'ux' contents */
+ p += 4 + i2(p + 2);
+
assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */
assertEqualInt(i2(p + 2), 5); /* 'UT' size */
assertEqualInt(p[4], 1); /* 'UT' flags */
assertEqualInt(i4(p + 5), t); /* 'UT' mtime */
p += 4 + i2(p + 2);
- assertEqualInt(i2(p), 0x7875); /* 'ux' extension header */
- assertEqualInt(i2(p + 2), 11); /* 'ux' size */
- /* TODO: verify 'ux' contents */
- p += 4 + i2(p + 2);
-
/* Note: We don't expect to see zip64 extension in the central
* directory, since the writer knows the actual full size by
* the time it is ready to write the central directory and has
@@ -198,9 +197,9 @@ DEFINE_TEST(test_write_format_zip_file_z
}
/* Should have run exactly to end of extra data. */
- assert(p == extension_end);
+ assertEqualAddress(p, extension_end);
- assert(p == eocd);
+ assertEqualAddress(p, eocd);
/* After Central dir, we find Zip64 eocd and Zip64 eocd locator. */
assertEqualMem(p, "PK\006\006", 4); /* Zip64 eocd */
@@ -222,31 +221,25 @@ DEFINE_TEST(test_write_format_zip_file_z
p += 20;
/* Regular EOCD immediately follows Zip64 records. */
- assert(p == eocd_record);
+ assertEqualAddress(p, eocd_record);
/* Verify local header of file entry. */
p = local_header = buff;
assertEqualMem(p, "PK\003\004", 4); /* Signature */
assertEqualInt(i2(p + 4), zip_version); /* Version needed to extract */
- assertEqualInt(i2(p + 6), 8); /* Flags */
+ assertEqualInt(i2(p + 6), 8); /* Flags: bit 3 = length-at-end */
assertEqualInt(i2(p + 8), zip_compression); /* Compression method */
assertEqualInt(i2(p + 10), (tm->tm_hour * 2048) + (tm->tm_min * 32) + (tm->tm_sec / 2)); /* File time */
assertEqualInt(i2(p + 12), ((tm->tm_year - 80) * 512) + ((tm->tm_mon + 1) * 32) + tm->tm_mday); /* File date */
- assertEqualInt(i4(p + 14), 0); /* CRC-32 */
- /* assertEqualInt(i4(p + 18), sizeof(file_data)); */ /* Compressed size */
- /* assertEqualInt(i4(p + 22), sizeof(file_data)); */ /* Uncompressed size not stored because we're using length-at-end. */
+ assertEqualInt(i4(p + 14), 0); /* CRC-32 must be 0 because of length-at-end */
+ assertEqualInt(i4(p + 18), 0); /* Compressed size must be 0 because of length-at-end */
+ assertEqualInt(i4(p + 22), 0); /* Uncompressed size must be 0 because of length-at-end. */
assertEqualInt(i2(p + 26), strlen(file_name)); /* Pathname length */
- assertEqualInt(i2(p + 28), 57); /* Extra field length */
+ assertEqualInt(i2(p + 28), 37); /* Extra field length */
assertEqualMem(p + 30, file_name, strlen(file_name)); /* Pathname */
p = extension_start = local_header + 30 + strlen(file_name);
extension_end = extension_start + i2(local_header + 28);
- assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */
- assertEqualInt(i2(p + 2), 5); /* 'UT' size */
- assertEqualInt(p[4], 1); /* 'UT' flags */
- assertEqualInt(i4(p + 5), t); /* 'UT' mtime */
- p += 4 + i2(p + 2);
-
assertEqualInt(i2(p), 0x7875); /* 'ux' extension header */
assertEqualInt(i2(p + 2), 11); /* 'ux' size */
assertEqualInt(p[4], 1); /* 'ux' version */
@@ -256,10 +249,10 @@ DEFINE_TEST(test_write_format_zip_file_z
assertEqualInt(i4(p + 11), file_gid); /* 'Ux' GID */
p += 4 + i2(p + 2);
- assertEqualInt(i2(p), 0x0001); /* Zip64 extension header */
- assertEqualInt(i2(p + 2), 16); /* size */
- assertEqualInt(i8(p + 4), 8); /* uncompressed file size */
- /* compressed file size we can't verify here */
+ assertEqualInt(i2(p), 0x5455); /* 'UT' extension header */
+ assertEqualInt(i2(p + 2), 5); /* 'UT' size */
+ assertEqualInt(p[4], 1); /* 'UT' flags */
+ assertEqualInt(i4(p + 5), t); /* 'UT' mtime */
p += 4 + i2(p + 2);
assertEqualInt(i2(p), 0x6c78); /* 'xl' experimental extension header */
@@ -278,18 +271,18 @@ DEFINE_TEST(test_write_format_zip_file_z
}
/* Should have run exactly to end of extra data. */
- assert(p == extension_end);
+ assertEqualAddress(p, extension_end);
/* Data descriptor should follow compressed data. */
while (p < central_header && memcmp(p, "PK\007\010", 4) != 0)
++p;
assertEqualMem(p, "PK\007\010", 4);
assertEqualInt(i4(p + 4), crc); /* CRC-32 */
- /* assertEqualInt(i8(p + 8), ???); */ /* compressed size */
+ assertEqualInt(i8(p + 8), p - extension_end); /* compressed size */
assertEqualInt(i8(p + 16), sizeof(file_data)); /* uncompressed size */
/* Central directory should immediately follow the only entry. */
- assert(p + 24 == central_header);
+ assertEqualAddress(p + 24, central_header);
free(buff);
}
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_fuzz.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_fuzz.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/test/test_fuzz.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_fuzz.c:1.8 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_fuzz.c Fri Apr 12 15:39:54 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_fuzz.c 201247 2009-12-30 05:59:21Z kientzle $");
/*
* This was inspired by an ISO fuzz tester written by Michal Zalewski
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_mtree.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_mtree.c:1.8 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_mtree.c:1.9
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_mtree.c:1.8 Thu Jan 18 18:00:19 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_mtree.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_mtree.c 201247 2009-12-30 05:59:21Z kientzle $");
static void
test_read_format_mtree1(void)
Index: pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip.c:1.10 pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip.c:1.11
--- pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip.c:1.10 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/test/test_read_format_zip.c Fri Apr 12 15:39:55 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_zip.c 189482 2009-03-07 03:30:35Z kientzle $");
#define __LIBARCHIVE_BUILD
#include <archive_crc32.h>
@@ -157,7 +156,7 @@ verify_basic(struct archive *a, int seek
if (archive_zlib_version() != NULL) {
failure("file2 has a bad CRC, so read should fail and not change buff");
memset(buff, 'a', 19);
- assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19));
+ assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, 19));
assertEqualMem(buff, "aaaaaaaaaaaaaaaaaaa", 19);
} else {
assertEqualInt(ARCHIVE_FAILED, archive_read_data(a, buff, 19));
Index: pkgsrc/archivers/libarchive/files/libarchive_fe/err.c
diff -u pkgsrc/archivers/libarchive/files/libarchive_fe/err.c:1.3 pkgsrc/archivers/libarchive/files/libarchive_fe/err.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive_fe/err.c:1.3 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/libarchive_fe/err.c Fri Apr 12 15:39:57 2024
@@ -25,8 +25,6 @@
*/
#include "lafe_platform.h"
-__FBSDID("$FreeBSD$");
-
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
Index: pkgsrc/archivers/libarchive/files/libarchive_fe/line_reader.c
diff -u pkgsrc/archivers/libarchive/files/libarchive_fe/line_reader.c:1.3 pkgsrc/archivers/libarchive/files/libarchive_fe/line_reader.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive_fe/line_reader.c:1.3 Sun Sep 22 09:55:08 2019
+++ pkgsrc/archivers/libarchive/files/libarchive_fe/line_reader.c Fri Apr 12 15:39:57 2024
@@ -26,8 +26,6 @@
*/
#include "lafe_platform.h"
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
Index: pkgsrc/archivers/libarchive/files/libarchive_fe/err.h
diff -u pkgsrc/archivers/libarchive/files/libarchive_fe/err.h:1.4 pkgsrc/archivers/libarchive/files/libarchive_fe/err.h:1.5
--- pkgsrc/archivers/libarchive/files/libarchive_fe/err.h:1.4 Tue May 26 09:16:43 2020
+++ pkgsrc/archivers/libarchive/files/libarchive_fe/err.h Fri Apr 12 15:39:57 2024
@@ -27,10 +27,12 @@
#define LAFE_ERR_H
#if defined(__GNUC__) && (__GNUC__ > 2 || \
- (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
-#define __LA_DEAD __attribute__((__noreturn__))
+ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define __LA_NORETURN __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define __LA_NORETURN __declspec(noreturn)
#else
-#define __LA_DEAD
+#define __LA_NORETURN
#endif
#if defined(__GNUC__) && (__GNUC__ > 2 || \
@@ -46,8 +48,7 @@
#endif
void lafe_warnc(int code, const char *fmt, ...) __LA_PRINTFLIKE(2, 3);
-void lafe_errc(int eval, int code, const char *fmt, ...) __LA_DEAD
- __LA_PRINTFLIKE(3, 4);
+__LA_NORETURN void lafe_errc(int eval, int code, const char *fmt, ...) __LA_PRINTFLIKE(3, 4);
const char * lafe_getprogname(void);
void lafe_setprogname(const char *name, const char *defaultname);
Index: pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c
diff -u pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.6 pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.6 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c Fri Apr 12 15:39:57 2024
@@ -50,8 +50,6 @@
#include "lafe_platform.h"
-__FBSDID("$FreeBSD$");
-
#include <errno.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -331,7 +329,7 @@ lafe_readpassphrase(const char *prompt,
break;
default:
lafe_errc(1, errno, "Couldn't read passphrase");
- break;
+ /* NOTREACHED */
}
}
return (p);
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar.1
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar.1:1.12 pkgsrc/archivers/libarchive/files/tar/bsdtar.1:1.13
--- pkgsrc/archivers/libarchive/files/tar/bsdtar.1:1.12 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar.1 Fri Apr 12 15:39:57 2024
@@ -23,9 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
-.Dd December 1, 2022
+.Dd March 1, 2024
.Dt TAR 1
.Os
.Sh NAME
@@ -274,6 +272,15 @@ will be used instead.
On create, this sets the group name that will be stored
in the archive;
the name will not be verified against the system group database.
+.It Fl Fl group Ar name Ns Op : Ns Ar gid
+Use the provided group, if
+.Ar gid
+is not provided,
+.Ar name
+can be either a group name or numeric id.
+See the
+.Fl Fl gname
+option for details.
.It Fl H
(c and r modes only)
Symbolic links named on the command line will be followed; the
@@ -403,6 +410,8 @@ This is the reverse of
and the default behavior in c, r, and u modes or if
.Nm
is run in x mode as root.
+Currently supported only for pax formats
+(including "pax restricted", the default tar format for bsdtar.)
.It Fl n , Fl Fl norecurse , Fl Fl no-recursion
Do not operate recursively on the content of directories.
.It Fl Fl newer Ar date
@@ -646,16 +655,56 @@ use as many threads as there are CPU cor
.It Cm zstd:frame-per-file
Start a new compression frame at the beginning of each file in the
archive.
-.It Cm zstd:min-frame-size Ns = Ns Ar N
+.It Cm zstd:min-frame-in Ns = Ns Ar N
+In combination with
+.Cm zstd:frame-per-file ,
+do not start a new compression frame unless the uncompressed size of
+the current frame is at least
+.Ar N
+bytes.
+The number may be followed by
+.Li k / Li kB ,
+.Li M / Li MB ,
+or
+.Li G / Li GB
+to indicate kilobytes, megabytes or gigabytes respectively.
+.It Cm zstd:min-frame-out Ns = Ns Ar N , Cm zstd:min-frame-size Ns = Ns Ar N
In combination with
.Cm zstd:frame-per-file ,
-do not start a new compression frame unless the current frame is at least
+do not start a new compression frame unless the compressed size of the
+current frame is at least
.Ar N
bytes.
-.It Cm zstd:max-frame-size Ns = Ns Ar N
-Start a new compression frame as soon as the current frame exceeds
+The number may be followed by
+.Li k / Li kB ,
+.Li M / Li MB ,
+or
+.Li G / Li GB
+to indicate kilobytes, megabytes or gigabytes respectively.
+.It Cm zstd:max-frame-in Ns = Ns Ar N , Cm zstd:max-frame-size Ns = Ns Ar N
+Start a new compression frame as soon as possible after the
+uncompressed size of the current frame exceeds
+.Ar N
+bytes.
+The number may be followed by
+.Li k / Li kB ,
+.Li M / Li MB ,
+or
+.Li G / Li GB
+to indicate kilobytes, megabytes or gigabytes respectively.
+Values less than 1,024 will be rejected.
+.It Cm zstd:max-frame-out Ns = Ns Ar N
+Start a new compression frame as soon as possible after the compressed
+size of the current frame exceeds
.Ar N
bytes.
+The number may be followed by
+.Li k / Li kB ,
+.Li M / Li MB ,
+or
+.Li G / Li GB
+to indicate kilobytes, megabytes or gigabytes respectively.
+Values less than 1,024 will be rejected.
.It Cm lzop:compression-level
A decimal integer from 1 to 9 specifying the lzop compression level.
.It Cm xz:compression-level
@@ -774,7 +823,7 @@ This works similar to the conv=sparse op
Modify file or archive member names according to
.Pa pattern .
The pattern has the format
-.Ar /old/new/ Ns Op ghHprRsS
+.Ar /old/new/ Ns Op bghHprRsS
where
.Ar old
is a basic regular expression,
@@ -796,6 +845,9 @@ of symbolic links.
The optional trailing p specifies that after a successful substitution
the original path name and the new path name should be printed to
standard error.
+The optional trailing b specifies that the substitution should be
+matched from the beginning of the string rather than from right after the
+position at which the previous matching substitution ended.
Optional trailing H, R, or S characters suppress substitutions
for hardlink targets, regular filenames, or symlink targets,
respectively.
@@ -901,6 +953,15 @@ the name is not verified against the sys
Pipe the input (in x or t mode) or the output (in c mode) through
.Pa program
instead of using the builtin compression support.
+.It Fl Fl owner Ar name Ns Op : Ns Ar uid
+Use the provided user, if
+.Ar uid
+is not provided,
+.Ar name
+can be either an username or numeric id.
+See the
+.Fl Fl uname
+option for details.
.It Fl v , Fl Fl verbose
Produce verbose output.
In create and extract modes,
Index: pkgsrc/archivers/libarchive/files/tar/write.c
diff -u pkgsrc/archivers/libarchive/files/tar/write.c:1.12 pkgsrc/archivers/libarchive/files/tar/write.c:1.13
--- pkgsrc/archivers/libarchive/files/tar/write.c:1.12 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/tar/write.c Fri Apr 12 15:39:57 2024
@@ -25,7 +25,6 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.79 2008/11/27 05:49:52 kientzle Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar.c
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar.c:1.11 pkgsrc/archivers/libarchive/files/tar/bsdtar.c:1.12
--- pkgsrc/archivers/libarchive/files/tar/bsdtar.c:1.11 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar.c Fri Apr 12 15:39:57 2024
@@ -24,7 +24,6 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.93 2008/11/08 04:43:24 kientzle Exp $");
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
@@ -114,11 +113,11 @@ need_report(void)
}
#endif
-static void long_help(void) __LA_DEAD;
+static __LA_NORETURN void long_help(void);
static void only_mode(struct bsdtar *, const char *opt,
const char *valid);
static void set_mode(struct bsdtar *, char opt);
-static void version(void) __LA_DEAD;
+static __LA_NORETURN void version(void);
/* A basic set of security flags to request from libarchive. */
#define SECURITY \
@@ -155,7 +154,7 @@ main(int argc, char **argv)
char compression, compression2;
const char *compression_name, *compression2_name;
const char *compress_program;
- char *tptr;
+ char *tptr, *uptr;
char possible_help_request;
char buff[16];
@@ -382,6 +381,36 @@ main(int argc, char **argv)
case OPTION_GNAME: /* cpio */
bsdtar->gname = bsdtar->argument;
break;
+ case OPTION_GROUP: /* GNU tar */
+ errno = 0;
+ tptr = NULL;
+
+ uptr = strchr(bsdtar->argument, ':');
+ if(uptr != NULL) {
+ if(uptr[1] == 0) {
+ lafe_errc(1, 0, "Invalid argument to --group (missing id after :)");
+ }
+ uptr[0] = 0;
+ uptr++;
+ t = (int)strtol(uptr, &tptr, 10);
+ if (errno || t < 0 || *uptr == '\0' ||
+ tptr == NULL || *tptr != '\0') {
+ lafe_errc(1, 0, "Invalid argument to --group (%s is not a number)", uptr);
+ } else {
+ bsdtar->gid = t;
+ }
+ bsdtar->gname = bsdtar->argument;
+ } else {
+ t = (int)strtol(bsdtar->argument, &tptr, 10);
+ if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ tptr == NULL || *tptr != '\0') {
+ bsdtar->gname = bsdtar->argument;
+ } else {
+ bsdtar->gid = t;
+ bsdtar->gname = "";
+ }
+ }
+ break;
case OPTION_GRZIP:
if (compression != '\0')
lafe_errc(1, 0,
@@ -400,8 +429,7 @@ main(int argc, char **argv)
break;
case OPTION_HELP: /* GNU tar, others */
long_help();
- exit(0);
- break;
+ /* NOTREACHED*/
case OPTION_HFS_COMPRESSION: /* Mac OS X v10.6 or later */
bsdtar->extract_flags |=
ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED;
@@ -626,8 +654,43 @@ main(int argc, char **argv)
ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS;
break;
case OPTION_OPTIONS:
+ if (bsdtar->option_options != NULL) {
+ lafe_warnc(0,
+ "Ignoring previous option '%s', separate multiple options with commas",
+ bsdtar->option_options);
+ }
bsdtar->option_options = bsdtar->argument;
break;
+ case OPTION_OWNER: /* GNU tar */
+ errno = 0;
+ tptr = NULL;
+
+ uptr = strchr(bsdtar->argument, ':');
+ if(uptr != NULL) {
+ if(uptr[1] == 0) {
+ lafe_errc(1, 0, "Invalid argument to --owner (missing id after :)");
+ }
+ uptr[0] = 0;
+ uptr++;
+ t = (int)strtol(uptr, &tptr, 10);
+ if (errno || t < 0 || *uptr == '\0' ||
+ tptr == NULL || *tptr != '\0') {
+ lafe_errc(1, 0, "Invalid argument to --owner (%s is not a number)", uptr);
+ } else {
+ bsdtar->uid = t;
+ }
+ bsdtar->uname = bsdtar->argument;
+ } else {
+ t = (int)strtol(bsdtar->argument, &tptr, 10);
+ if (errno || t < 0 || *(bsdtar->argument) == '\0' ||
+ tptr == NULL || *tptr != '\0') {
+ bsdtar->uname = bsdtar->argument;
+ } else {
+ bsdtar->uid = t;
+ bsdtar->uname = "";
+ }
+ }
+ break;
#if 0
/*
* The common BSD -P option is not necessary, since
@@ -670,7 +733,7 @@ main(int argc, char **argv)
bsdtar->extract_flags |= ARCHIVE_EXTRACT_SPARSE;
break;
case 's': /* NetBSD pax-as-tar */
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
add_substitution(bsdtar, bsdtar->argument);
#else
lafe_warnc(0,
@@ -738,7 +801,7 @@ main(int argc, char **argv)
break;
case OPTION_VERSION: /* GNU convention */
version();
- break;
+ /* NOTREACHED */
#if 0
/*
* The -W longopt feature is handled inside of
@@ -804,7 +867,6 @@ main(int argc, char **argv)
/* If no "real" mode was specified, treat -h as --help. */
if ((bsdtar->mode == '\0') && possible_help_request) {
long_help();
- exit(0);
}
/* Otherwise, a mode is required. */
@@ -950,7 +1012,7 @@ main(int argc, char **argv)
}
archive_match_free(bsdtar->matching);
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
cleanup_substitution(bsdtar);
#endif
cset_free(bsdtar->cset);
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar.h
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar.h:1.11 pkgsrc/archivers/libarchive/files/tar/bsdtar.h:1.12
--- pkgsrc/archivers/libarchive/files/tar/bsdtar.h:1.11 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar.h Fri Apr 12 15:39:57 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.37 2008/12/06 07:37:14 kientzle Exp $
*/
#ifndef BSDTAR_H_INCLUDED
@@ -145,6 +143,7 @@ enum {
OPTION_FORMAT,
OPTION_GID,
OPTION_GNAME,
+ OPTION_GROUP,
OPTION_GRZIP,
OPTION_HELP,
OPTION_HFS_COMPRESSION,
@@ -179,6 +178,7 @@ enum {
OPTION_OLDER_MTIME_THAN,
OPTION_ONE_FILE_SYSTEM,
OPTION_OPTIONS,
+ OPTION_OWNER,
OPTION_PASSPHRASE,
OPTION_POSIX,
OPTION_READ_SPARSE,
@@ -208,10 +208,10 @@ void tar_mode_r(struct bsdtar *bsdtar);
void tar_mode_t(struct bsdtar *bsdtar);
void tar_mode_u(struct bsdtar *bsdtar);
void tar_mode_x(struct bsdtar *bsdtar);
-void usage(void) __LA_DEAD;
+__LA_NORETURN void usage(void);
int yes(const char *fmt, ...) __LA_PRINTF(1, 2);
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
void add_substitution(struct bsdtar *, const char *);
int apply_substitution(struct bsdtar *, const char *, char **, int, int);
void cleanup_substitution(struct bsdtar *);
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar_platform.h
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar_platform.h:1.5 pkgsrc/archivers/libarchive/files/tar/bsdtar_platform.h:1.6
--- pkgsrc/archivers/libarchive/files/tar/bsdtar_platform.h:1.5 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar_platform.h Fri Apr 12 15:39:57 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/usr.bin/tar/bsdtar_platform.h,v 1.26 2008/12/06 07:37:14 kientzle Exp $
*/
/*
@@ -46,16 +44,6 @@
#include "bsdtar_windows.h"
#endif
-/* Get a real definition for __FBSDID if we can */
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-/* If not, define it so as to avoid dangling semicolons. */
-#ifndef __FBSDID
-#define __FBSDID(a) struct _undefined_hack
-#endif
-
#ifdef HAVE_LIBARCHIVE
/* If we're using the platform libarchive, include system headers. */
#include <archive.h>
@@ -121,12 +109,14 @@
/* How to mark functions that don't return. */
/* This facilitates use of some newer static code analysis tools. */
-#undef __LA_DEAD
+#undef __LA_NORETURN
#if defined(__GNUC__) && (__GNUC__ > 2 || \
- (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
-#define __LA_DEAD __attribute__((__noreturn__))
-#else
-#define __LA_DEAD
+ (__GNUC__ == 2 && __GNUC_MINOR__ >= 5))
+#define __LA_NORETURN __attribute__((__noreturn__))
+#elif defined(_MSC_VER)
+#define __LA_NORETURN __declspec(noreturn)
+#else
+#define __LA_NORETURN
#endif
#endif /* !BSDTAR_PLATFORM_H_INCLUDED */
Index: pkgsrc/archivers/libarchive/files/tar/creation_set.c
diff -u pkgsrc/archivers/libarchive/files/tar/creation_set.c:1.5 pkgsrc/archivers/libarchive/files/tar/creation_set.c:1.6
--- pkgsrc/archivers/libarchive/files/tar/creation_set.c:1.5 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/creation_set.c Fri Apr 12 15:39:57 2024
@@ -24,7 +24,6 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.c
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.c:1.2 pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.c:1.2 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.c Fri Apr 12 15:39:57 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
Index: pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.h
diff -u pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.h:1.3 pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.h:1.4
--- pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.h:1.3 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/tar/bsdtar_windows.h Fri Apr 12 15:39:57 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef BSDTAR_WINDOWS_H
Index: pkgsrc/archivers/libarchive/files/tar/cmdline.c
diff -u pkgsrc/archivers/libarchive/files/tar/cmdline.c:1.8 pkgsrc/archivers/libarchive/files/tar/cmdline.c:1.9
--- pkgsrc/archivers/libarchive/files/tar/cmdline.c:1.8 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/cmdline.c Fri Apr 12 15:39:57 2024
@@ -28,7 +28,6 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -94,6 +93,7 @@ static const struct bsdtar_option {
{ "format", 1, OPTION_FORMAT },
{ "gid", 1, OPTION_GID },
{ "gname", 1, OPTION_GNAME },
+ { "group", 1, OPTION_GROUP },
{ "grzip", 0, OPTION_GRZIP },
{ "gunzip", 0, 'z' },
{ "gzip", 0, 'z' },
@@ -142,6 +142,7 @@ static const struct bsdtar_option {
{ "older-than", 1, OPTION_OLDER_CTIME_THAN },
{ "one-file-system", 0, OPTION_ONE_FILE_SYSTEM },
{ "options", 1, OPTION_OPTIONS },
+ { "owner", 1, OPTION_OWNER },
{ "passphrase", 1, OPTION_PASSPHRASE },
{ "posix", 0, OPTION_POSIX },
{ "preserve-permissions", 0, 'p' },
Index: pkgsrc/archivers/libarchive/files/tar/util.c
diff -u pkgsrc/archivers/libarchive/files/tar/util.c:1.8 pkgsrc/archivers/libarchive/files/tar/util.c:1.9
--- pkgsrc/archivers/libarchive/files/tar/util.c:1.8 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/util.c Fri Apr 12 15:39:57 2024
@@ -24,7 +24,6 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.23 2008/12/15 06:00:25 kientzle Exp $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -471,7 +470,7 @@ edit_pathname(struct bsdtar *bsdtar, str
const char *original_name = name;
const char *hardlinkname = archive_entry_hardlink(entry);
const char *original_hardlinkname = hardlinkname;
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
char *subst_name;
int r;
Index: pkgsrc/archivers/libarchive/files/tar/read.c
diff -u pkgsrc/archivers/libarchive/files/tar/read.c:1.7 pkgsrc/archivers/libarchive/files/tar/read.c:1.8
--- pkgsrc/archivers/libarchive/files/tar/read.c:1.7 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/read.c Fri Apr 12 15:39:57 2024
@@ -24,7 +24,6 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.40 2008/08/21 06:41:14 kientzle Exp $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -372,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char
if (r != ARCHIVE_OK) {
if (!bsdtar->verbose)
safe_fprintf(stderr, "%s", archive_entry_pathname(entry));
- fprintf(stderr, ": %s: ", archive_error_string(a));
- fprintf(stderr, "%s", strerror(errno));
+ safe_fprintf(stderr, ": %s: %s",
+ archive_error_string(a),
+ strerror(archive_errno(a)));
if (!bsdtar->verbose)
fprintf(stderr, "\n");
bsdtar->return_value = 1;
Index: pkgsrc/archivers/libarchive/files/tar/subst.c
diff -u pkgsrc/archivers/libarchive/files/tar/subst.c:1.7 pkgsrc/archivers/libarchive/files/tar/subst.c:1.8
--- pkgsrc/archivers/libarchive/files/tar/subst.c:1.7 Thu Jan 18 18:00:20 2024
+++ pkgsrc/archivers/libarchive/files/tar/subst.c Fri Apr 12 15:39:57 2024
@@ -24,14 +24,15 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/subst.c,v 1.4 2008/06/15 10:08:16 kientzle Exp $");
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
#include "bsdtar.h"
#include <errno.h>
-#ifdef HAVE_PCREPOSIX_H
+#if defined(HAVE_PCREPOSIX_H)
#include <pcreposix.h>
+#elif defined(HAVE_PCRE2POSIX_H)
+#include <pcre2posix.h>
#else
#include <regex.h>
#endif
@@ -48,7 +49,7 @@ struct subst_rule {
struct subst_rule *next;
regex_t re;
char *result;
- unsigned int global:1, print:1, regular:1, symlink:1, hardlink:1;
+ unsigned int global:1, print:1, regular:1, symlink:1, hardlink:1, from_begin:1;
};
struct substitution {
@@ -128,9 +129,14 @@ add_substitution(struct bsdtar *bsdtar,
rule->regular = 1; /* Rewrite regular filenames. */
rule->symlink = 1; /* Rewrite symlink targets. */
rule->hardlink = 1; /* Rewrite hardlink targets. */
+ rule->from_begin = 0; /* Don't match from start. */
while (*++end_pattern) {
switch (*end_pattern) {
+ case 'b':
+ case 'B':
+ rule->from_begin = 1;
+ break;
case 'g':
case 'G':
rule->global = 1;
@@ -159,6 +165,7 @@ add_substitution(struct bsdtar *bsdtar,
break;
default:
lafe_errc(1, 0, "Invalid replacement flag %c", *end_pattern);
+ /* NOTREACHED */
}
}
}
@@ -212,6 +219,7 @@ apply_substitution(struct bsdtar *bsdtar
{
const char *path = name;
regmatch_t matches[10];
+ char* buffer = NULL;
size_t i, j;
struct subst_rule *rule;
struct substitution *subst;
@@ -237,6 +245,13 @@ apply_substitution(struct bsdtar *bsdtar
continue;
}
+ if (rule->from_begin && *result) {
+ realloc_strcat(result, name);
+ realloc_strcat(&buffer, *result);
+ name = buffer;
+ (*result)[0] = 0;
+ }
+
while (1) {
if (regexec(&rule->re, name, 10, matches, 0))
break;
@@ -276,6 +291,7 @@ apply_substitution(struct bsdtar *bsdtar
case '9':
realloc_strncat(result, rule->result + j, i - j - 1);
if ((size_t)(c - '0') > (size_t)(rule->re.re_nsub)) {
+ free(buffer);
free(*result);
*result = NULL;
return -1;
@@ -302,6 +318,8 @@ apply_substitution(struct bsdtar *bsdtar
if (got_match)
realloc_strcat(result, name);
+ free(buffer);
+
if (print_match)
fprintf(stderr, "%s >> %s\n", path, *result);
@@ -325,4 +343,4 @@ cleanup_substitution(struct bsdtar *bsdt
}
free(subst);
}
-#endif /* defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) */
+#endif /* defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H) */
Index: pkgsrc/archivers/libarchive/files/tar/test/CMakeLists.txt
diff -u pkgsrc/archivers/libarchive/files/tar/test/CMakeLists.txt:1.9 pkgsrc/archivers/libarchive/files/tar/test/CMakeLists.txt:1.10
--- pkgsrc/archivers/libarchive/files/tar/test/CMakeLists.txt:1.9 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/tar/test/CMakeLists.txt Fri Apr 12 15:39:57 2024
@@ -43,6 +43,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
test_option_exclude_vcs.c
test_option_fflags.c
test_option_gid_gname.c
+ test_option_group.c
test_option_grzip.c
test_option_ignore_zeros.c
test_option_j.c
@@ -56,6 +57,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
test_option_newer_than.c
test_option_nodump.c
test_option_older_than.c
+ test_option_owner.c
test_option_passphrase.c
test_option_q.c
test_option_r.c
Index: pkgsrc/archivers/libarchive/files/tar/test/list.h
diff -u pkgsrc/archivers/libarchive/files/tar/test/list.h:1.8 pkgsrc/archivers/libarchive/files/tar/test/list.h:1.9
--- pkgsrc/archivers/libarchive/files/tar/test/list.h:1.8 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/tar/test/list.h Fri Apr 12 15:39:57 2024
@@ -2,33 +2,39 @@ DEFINE_TEST(test_0)
DEFINE_TEST(test_basic)
DEFINE_TEST(test_copy)
DEFINE_TEST(test_empty_mtree)
+DEFINE_TEST(test_extract_tar_Z)
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_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)
@@ -38,7 +44,6 @@ 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)
@@ -46,18 +51,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_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_copy.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_copy.c:1.8 pkgsrc/archivers/libarchive/files/tar/test/test_copy.c:1.9
--- pkgsrc/archivers/libarchive/files/tar/test/test_copy.c:1.8 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/tar/test/test_copy.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_copy.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
#if defined(__CYGWIN__)
# include <limits.h>
Index: pkgsrc/archivers/libarchive/files/tar/test/test.h
diff -u pkgsrc/archivers/libarchive/files/tar/test/test.h:1.7 pkgsrc/archivers/libarchive/files/tar/test/test.h:1.8
--- pkgsrc/archivers/libarchive/files/tar/test/test.h:1.7 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test.h Fri Apr 12 15:39:57 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
/* Every test program should #include "test.h" as the first thing. */
Index: pkgsrc/archivers/libarchive/files/tar/test/test_0.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_0.c:1.4 pkgsrc/archivers/libarchive/files/tar/test/test_0.c:1.5
--- pkgsrc/archivers/libarchive/files/tar/test/test_0.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_0.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_0.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
/*
* This first test does basic sanity checks on the environment. For
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_b.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_b.c:1.4 pkgsrc/archivers/libarchive/files/tar/test/test_option_b.c:1.5
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_b.c:1.4 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_b.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#define USTAR_OPT " --format=ustar"
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_n.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_n.c:1.4 pkgsrc/archivers/libarchive/files/tar/test/test_option_n.c:1.5
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_n.c:1.4 Tue May 26 09:16:43 2020
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_n.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
Index: pkgsrc/archivers/libarchive/files/tar/test/test_patterns.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_patterns.c:1.4 pkgsrc/archivers/libarchive/files/tar/test/test_patterns.c:1.5
--- pkgsrc/archivers/libarchive/files/tar/test/test_patterns.c:1.4 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_patterns.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_patterns.c,v 1.6 2008/08/21 22:28:00 kientzle Exp $");
DEFINE_TEST(test_patterns)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_symlink_dir.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_symlink_dir.c:1.4 pkgsrc/archivers/libarchive/files/tar/test/test_symlink_dir.c:1.5
--- pkgsrc/archivers/libarchive/files/tar/test/test_symlink_dir.c:1.4 Sun Sep 22 09:55:09 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_symlink_dir.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_symlink_dir.c,v 1.1 2008/09/14 02:16:04 kientzle Exp $");
/*
* tar -x -P should follow existing symlinks for dirs, but not other
Index: pkgsrc/archivers/libarchive/files/tar/test/test_basic.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_basic.c:1.6 pkgsrc/archivers/libarchive/files/tar/test/test_basic.c:1.7
--- pkgsrc/archivers/libarchive/files/tar/test/test_basic.c:1.6 Tue May 26 09:16:43 2020
+++ pkgsrc/archivers/libarchive/files/tar/test/test_basic.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_basic.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
static const char *
make_files(void)
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_Z.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_Z.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_Z.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_Z.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_Z.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_Z)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_bz2.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_bz2.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_bz2.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_bz2.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_bz2.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_bz2)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_grz.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_grz.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_grz.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_grz.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_grz.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_grz)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_gz.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_gz.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_gz.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_gz.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_gz.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_gz)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lrz.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lrz.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lrz.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lrz.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lrz.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_lrz)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lz.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lz.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lz.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lz.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lz.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_lz)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzma.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzma.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzma.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzma.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzma.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_lzma)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzo.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzo.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzo.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzo.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_lzo.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_lzo)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_xz.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_xz.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_xz.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_xz.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_xz.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_xz)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_zstd.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_zstd.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_zstd.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_zstd.c:1.1 Wed Apr 10 08:24:06 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_extract_tar_zstd.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_extract_tar_zstd)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_format_newc.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_format_newc.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_format_newc.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_format_newc.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_format_newc.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_format_newc)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_O_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_O_upper.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_O_upper.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_O_upper.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_O_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
static const char *test4out[] = {"file1", "file2", NULL};
static const char *test5err[] = {"file1", "file2", NULL};
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_exclude.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_exclude.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_exclude.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_exclude.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_exclude.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_exclude)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_k.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_k.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_k.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_k.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_k.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_k)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_keep_newer_files.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_keep_newer_files.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_keep_newer_files.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_keep_newer_files.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_keep_newer_files.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_keep_newer_files)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_newer_than.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_newer_than.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_newer_than.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_newer_than.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_newer_than.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_newer_than)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_older_than.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_older_than.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_older_than.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_older_than.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_older_than.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_older_than)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_zstd.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_zstd.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_option_zstd.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_zstd.c:1.1 Wed Apr 10 08:24:06 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_zstd.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_zstd)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_print_longpath.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_print_longpath.c:1.1 pkgsrc/archivers/libarchive/files/tar/test/test_print_longpath.c:1.2
--- pkgsrc/archivers/libarchive/files/tar/test/test_print_longpath.c:1.1 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_print_longpath.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_print_longpath)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_help.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_help.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_help.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_help.c:1.3 Sat Feb 20 03:54:11 2010
+++ pkgsrc/archivers/libarchive/files/tar/test/test_help.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_help.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
/*
* Test that "--help", "-h", and "-W help" options all work and
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_H_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_H_upper.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_option_H_upper.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_H_upper.c:1.3 Sun Sep 22 09:55:09 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_H_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_H_upper)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_L_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_L_upper.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_option_L_upper.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_L_upper.c:1.3 Sun Sep 22 09:55:09 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_L_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_L_upper)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_U_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_U_upper.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_option_U_upper.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_U_upper.c:1.3 Sun Sep 22 09:55:09 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_U_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_U_upper)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_lzma.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_lzma.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_option_lzma.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_lzma.c:1.3 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_lzma.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_lzma)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_r.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_r.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_option_r.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_r.c:1.3 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_r.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
/*
* Also see test_option_q for additional validation of -r support.
Index: pkgsrc/archivers/libarchive/files/tar/test/test_strip_components.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_strip_components.c:1.3 pkgsrc/archivers/libarchive/files/tar/test/test_strip_components.c:1.4
--- pkgsrc/archivers/libarchive/files/tar/test/test_strip_components.c:1.3 Sun Sep 22 09:55:09 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_strip_components.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_strip_components.c,v 1.2 2008/11/10 05:24:13 kientzle Exp $");
DEFINE_TEST(test_strip_components)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_C_mtree.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_C_mtree.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_C_mtree.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_C_mtree.c:1.2 Sun Sep 22 09:55:09 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_C_mtree.c Fri Apr 12 15:39:57 2024
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_C_mtree)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_C_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_C_upper.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_C_upper.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_C_upper.c:1.2 Tue May 26 09:16:43 2020
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_C_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_C_upper)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_T_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_T_upper.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_T_upper.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_T_upper.c:1.2 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_T_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_T.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
static int
tryMakeFile(const char *fn)
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_X_upper.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_X_upper.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_X_upper.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_X_upper.c:1.2 Mon Jun 20 17:24:58 2016
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_X_upper.c Fri Apr 12 15:39:57 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_X_upper)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_a.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_a.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_a.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_a.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_a.c Fri Apr 12 15:39:57 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_a)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_acls.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_acls.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_acls.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_acls.c:1.2 Wed Apr 10 08:24:06 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_acls.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#if ARCHIVE_ACL_FREEBSD || ARCHIVE_ACL_DARWIN || ARCHIVE_ACL_LIBACL
static const acl_perm_t acl_perms[] = {
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_b64encode.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_b64encode.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_b64encode.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_b64encode.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_b64encode.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_b64encode)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_fflags.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_fflags.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_fflags.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_fflags.c:1.2 Wed Apr 10 08:24:06 2019
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_fflags.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
#define chmod _chmod
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_gid_gname.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_gid_gname.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_gid_gname.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_gid_gname.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_gid_gname.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_gid_gname)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_grzip.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_grzip.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_grzip.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_grzip.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_grzip.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_grzip)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_j.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_j.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_j.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_j.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_j.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_j)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_lrzip.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_lrzip.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_lrzip.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_lrzip.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_lrzip.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_lrzip)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_lzop.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_lzop.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_lzop.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_lzop.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_lzop.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_lzop)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_nodump.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_nodump.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_nodump.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_nodump.c:1.2 Tue Aug 1 22:26:24 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_nodump.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_nodump)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_q.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_q.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_q.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_q.c:1.2 Sat Jan 17 12:44:51 2015
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_q.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_q.c,v 1.3 2008/08/22 01:35:08 kientzle Exp $");
DEFINE_TEST(test_option_q)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_uid_uname.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_uid_uname.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_uid_uname.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_uid_uname.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_uid_uname.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_uid_uname)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_uuencode.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_uuencode.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_uuencode.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_uuencode.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_uuencode.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_uuencode)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_xattrs.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_xattrs.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_xattrs.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_xattrs.c:1.2 Tue May 26 09:16:43 2020
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_xattrs.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_xattrs)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_xz.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_xz.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_xz.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_xz.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_xz.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_xz)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_z.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_z.c:1.2 pkgsrc/archivers/libarchive/files/tar/test/test_option_z.c:1.3
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_z.c:1.2 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_z.c Fri Apr 12 15:39:58 2024
@@ -24,7 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
DEFINE_TEST(test_option_z)
{
Index: pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c:1.5 pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c:1.6
--- pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c:1.5 Tue May 26 09:16:43 2020
+++ pkgsrc/archivers/libarchive/files/tar/test/test_option_s.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_T.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
DEFINE_TEST(test_option_s)
{
@@ -89,6 +88,17 @@ DEFINE_TEST(test_option_s)
assertFileContents("bar", 3, "test4/in/d1/baz");
/*
+ * Test 4b: Multiple substitutions behavior with option b).
+ */
+ assertMakeDir("test4b", 0755);
+ systemf("%s -cf test4b.tar in/d1/foo in/d1/bar",
+ testprog);
+ systemf("%s -xf test4b.tar -s /oo/ar/ -s }ar}az}b -C test4b",
+ testprog);
+ assertFileContents("foo", 3, "test4b/in/d1/faz");
+ assertFileContents("bar", 3, "test4b/in/d1/baz");
+
+ /*
* Test 5: Name-switching substitutions when extracting archive.
*/
assertMakeDir("test5", 0755);
Index: pkgsrc/archivers/libarchive/files/tar/test/test_stdio.c
diff -u pkgsrc/archivers/libarchive/files/tar/test/test_stdio.c:1.5 pkgsrc/archivers/libarchive/files/tar/test/test_stdio.c:1.6
--- pkgsrc/archivers/libarchive/files/tar/test/test_stdio.c:1.5 Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/tar/test/test_stdio.c Fri Apr 12 15:39:58 2024
@@ -23,7 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_stdio.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
DEFINE_TEST(test_stdio)
{
Index: pkgsrc/archivers/libarchive/files/test_utils/test_common.h
diff -u pkgsrc/archivers/libarchive/files/test_utils/test_common.h:1.9 pkgsrc/archivers/libarchive/files/test_utils/test_common.h:1.10
--- pkgsrc/archivers/libarchive/files/test_utils/test_common.h:1.9 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/test_utils/test_common.h Fri Apr 12 15:39:58 2024
@@ -21,8 +21,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
*/
#ifndef TEST_COMMON_H
@@ -134,16 +132,6 @@
#include <stdint.h>
#endif
-/* Get a real definition for __FBSDID if we can */
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
-/* If not, define it so as to avoid dangling semicolons. */
-#ifndef __FBSDID
-#define __FBSDID(a) struct _undefined_hack
-#endif
-
#ifndef O_BINARY
#define O_BINARY 0
#endif
@@ -178,6 +166,8 @@
/* Assert two integers are the same. Reports value of each one if not. */
#define assertEqualInt(v1,v2) \
assertion_equal_int(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL)
+#define assertEqualAddress(v1,v2) \
+ assertion_equal_address(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL)
/* Assert two strings are the same. Reports value of each one if not. */
#define assertEqualString(v1,v2) \
assertion_equal_string(__FILE__, __LINE__, (v1), #v1, (v2), #v2, NULL, 0)
@@ -291,6 +281,7 @@ int assertion_compare_fflags(const char
int assertion_empty_file(const char *, int, const char *);
int assertion_equal_file(const char *, int, const char *, const char *);
int assertion_equal_int(const char *, int, long long, const char *, long long, const char *, void *);
+int assertion_equal_address(const char *, int, const void *, const char *, const void *, const char *, void *);
int assertion_equal_mem(const char *, int, const void *, const char *, const void *, const char *, size_t, const char *, void *);
int assertion_memory_filled_with(const char *, int, const void *, const char *, size_t, const char *, char, const char *, void *);
int assertion_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, void *, int);
Index: pkgsrc/archivers/libarchive/files/test_utils/test_main.c
diff -u pkgsrc/archivers/libarchive/files/test_utils/test_main.c:1.5 pkgsrc/archivers/libarchive/files/test_utils/test_main.c:1.6
--- pkgsrc/archivers/libarchive/files/test_utils/test_main.c:1.5 Thu Jan 18 18:00:21 2024
+++ pkgsrc/archivers/libarchive/files/test_utils/test_main.c Fri Apr 12 15:39:58 2024
@@ -625,6 +625,21 @@ assertion_equal_int(const char *file, in
return (0);
}
+/* Verify two pointers are equal. */
+int
+assertion_equal_address(const char *file, int line,
+ const void *v1, const char *e1, const void *v2, const char *e2, void *extra)
+{
+ assertion_count(file, line);
+ if (v1 == v2)
+ return (1);
+ failure_start(file, line, "%s != %s", e1, e2);
+ logprintf(" %s=0x%llx\n", e1, (unsigned long long)(uintptr_t)v1);
+ logprintf(" %s=0x%llx\n", e2, (unsigned long long)(uintptr_t)v2);
+ failure_finish(extra);
+ return (0);
+}
+
/*
* Utility to convert a single UTF-8 sequence.
*/
@@ -1245,7 +1260,7 @@ assertion_file_contains_lines_any_order(
c = *p;
}
if (actual_count) {
- actual = calloc(sizeof(char *), actual_count);
+ actual = calloc(actual_count, sizeof(char *));
if (actual == NULL) {
failure_start(pathname, line, "Can't allocate memory");
failure_finish(NULL);
@@ -4175,7 +4190,6 @@ main(int argc, char **argv)
free(refdir_alloc);
free(testprogdir);
usage(progname);
- return (1);
}
for (i = 0; i < test_num; i++) {
tests_run++;
Index: pkgsrc/archivers/libarchive/files/unzip/bsdunzip.c
diff -u pkgsrc/archivers/libarchive/files/unzip/bsdunzip.c:1.3 pkgsrc/archivers/libarchive/files/unzip/bsdunzip.c:1.4
--- pkgsrc/archivers/libarchive/files/unzip/bsdunzip.c:1.3 Sun Mar 31 13:35:08 2024
+++ pkgsrc/archivers/libarchive/files/unzip/bsdunzip.c Fri Apr 12 15:39:58 2024
@@ -27,8 +27,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
- *
* This file would be much shorter if we didn't care about command-line
* compatibility with Info-ZIP's UnZip, which requires us to duplicate
* parts of libarchive in order to gain more detailed control of its
@@ -59,6 +57,9 @@
#ifdef HAVE_FNMATCH_H
#include <fnmatch.h>
#endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
@@ -78,6 +79,9 @@
#include <sys/time.h>
#endif
#endif
+#ifdef HAVE_GETOPT_OPTRESET
+#include <getopt.h>
+#endif
#include "bsdunzip.h"
#include "passphrase.h"
@@ -1209,6 +1213,11 @@ main(int argc, char *argv[])
lafe_setprogname(*argv, "bsdunzip");
+#if HAVE_SETLOCALE
+ if (setlocale(LC_ALL, "") == NULL)
+ lafe_warnc(0, "Failed to set default locale");
+#endif
+
if (isatty(STDOUT_FILENO))
tty = 1;
@@ -1229,10 +1238,8 @@ main(int argc, char *argv[])
*/
nopts = getopts(argc, argv);
- if (version_opt == 1) {
+ if (version_opt == 1)
version();
- exit(EXIT_SUCCESS);
- }
/*
* When more of the zipinfo mode options are implemented, this
Home |
Main Index |
Thread Index |
Old Index