Module Name: src
Committed By: christos
Date: Sun Jun 9 19:47:56 UTC 2024
Modified Files:
src/external/bsd/libarchive: prepare-import.sh
src/external/bsd/libarchive/dist/cpio/test: test_basic.c
test_format_newc.c
src/external/bsd/libarchive/dist/libarchive: archive.h
archive_check_magic.c archive_entry.3 archive_openssl_evp_private.h
archive_openssl_hmac_private.h archive_pack_dev.c
archive_pack_dev.h archive_private.h archive_read.3 archive_read.c
archive_read_disk.3 archive_read_disk_entry_from_file.c
archive_read_disk_posix.c archive_read_open_filename.c
archive_read_support_format_iso9660.c
archive_read_support_format_mtree.c
archive_read_support_format_warc.c
archive_read_support_format_xar.c archive_util.3 archive_util.c
archive_write.3 archive_write_disk.3 archive_write_disk_posix.c
archive_write_set_format_ar.c archive_write_set_format_shar.c
archive_write_set_format_ustar.c libarchive-formats.5 libarchive.3
libarchive_internals.3 tar.5
src/external/bsd/libarchive/dist/libarchive/test:
test_acl_platform_nfs4.c test_acl_platform_posix1e.c
test_archive_write_set_format_filter_by_ext.c test_compat_zip.c
test_fuzz.c test_read_disk_directory_traversals.c
test_read_extract.c test_read_format_7zip.c
test_read_format_gtar_sparse.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_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_with_invalid_traditional_eocd.c
test_read_format_zip_zip64.c test_read_pax_truncated.c
test_read_truncated_filter.c test_sparse_basic.c test_write_disk.c
test_write_disk_secure.c test_write_disk_secure744.c
test_write_disk_secure746.c test_write_format_cpio_empty.c
test_write_format_shar_empty.c test_write_format_tar.c
test_write_format_tar_sparse.c test_write_format_zip_file.c
test_write_format_zip_file_zip64.c
src/external/bsd/libarchive/dist/libarchive_fe: err.c err.h
src/external/bsd/libarchive/dist/tar: bsdtar.c write.c
src/external/bsd/libarchive/dist/tar/test: test_basic.c test_copy.c
test_option_C_upper.c test_option_U_upper.c test_option_s.c
test_symlink_dir.c
src/external/bsd/libarchive/dist/test_utils: test_common.h test_main.c
test_utils.c test_utils.h
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile shlib_version
Removed Files:
src/external/bsd/libarchive/dist: CONTRIBUTING.md
src/external/bsd/libarchive/dist/libarchive/test:
test_compat_pax_libarchive_2x.c
test_compat_pax_libarchive_2x.tar.Z.uu test_read_pax_schily_xattr.c
test_read_pax_schily_xattr.tar.uu
Log Message:
Merge conflicts from 3.4.0 to 3.7.4
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libarchive/prepare-import.sh
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libarchive/dist/CONTRIBUTING.md
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/cpio/test/test_basic.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/cpio/test/test_format_newc.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/libarchive/dist/libarchive/archive.h \
src/external/bsd/libarchive/dist/libarchive/archive_entry.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk.3 \
src/external/bsd/libarchive/dist/libarchive/archive_write_disk.3
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c \
src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h \
src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.c \
src/external/bsd/libarchive/dist/libarchive/archive_pack_dev.h \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c \
src/external/bsd/libarchive/dist/libarchive/archive_util.3 \
src/external/bsd/libarchive/dist/libarchive/libarchive-formats.5 \
src/external/bsd/libarchive/dist/libarchive/libarchive.3 \
src/external/bsd/libarchive/dist/libarchive/libarchive_internals.3 \
src/external/bsd/libarchive/dist/libarchive/tar.5
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/archive_openssl_hmac_private.h \
src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
\
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ar.c \
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_shar.c
\
src/external/bsd/libarchive/dist/libarchive/archive_write_set_format_ustar.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/archive_private.h \
src/external/bsd/libarchive/dist/libarchive/archive_read.c \
src/external/bsd/libarchive/dist/libarchive/archive_read_open_filename.c \
src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_mtree.c
\
src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_warc.c \
src/external/bsd/libarchive/dist/libarchive/archive_read_support_format_xar.c \
src/external/bsd/libarchive/dist/libarchive/archive_util.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/libarchive/dist/libarchive/archive_read.3 \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c
\
src/external/bsd/libarchive/dist/libarchive/archive_write_disk_posix.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/libarchive/dist/libarchive/archive_write.3
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_nfs4.c \
src/external/bsd/libarchive/dist/libarchive/test/test_acl_platform_posix1e.c \
src/external/bsd/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_compat_zip.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_extract.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_gtar_sparse.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_7075_utf8_paths.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_high_compression.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_jar.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_mac_metadata.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_malformed.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_nested.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_nofiletype.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_padded.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_sfx.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_zip64.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_pax_truncated.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_truncated_filter.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_disk.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure744.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure746.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_cpio_empty.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_shar_empty.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_tar.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_tar_sparse.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file.c \
src/external/bsd/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/libarchive/dist/libarchive/test/test_compat_pax_libarchive_2x.c
\
src/external/bsd/libarchive/dist/libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu
\
src/external/bsd/libarchive/dist/libarchive/test/test_read_pax_schily_xattr.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_pax_schily_xattr.tar.uu
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/test/test_fuzz.c \
src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/test/test_write_disk_secure.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/dist/libarchive_fe/err.c \
src/external/bsd/libarchive/dist/libarchive_fe/err.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/dist/tar/bsdtar.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/dist/tar/write.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/tar/test/test_basic.c \
src/external/bsd/libarchive/dist/tar/test/test_option_C_upper.c \
src/external/bsd/libarchive/dist/tar/test/test_option_U_upper.c \
src/external/bsd/libarchive/dist/tar/test/test_option_s.c \
src/external/bsd/libarchive/dist/tar/test/test_symlink_dir.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/tar/test/test_copy.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libarchive/dist/test_utils/test_common.h \
src/external/bsd/libarchive/dist/test_utils/test_main.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/libarchive/dist/test_utils/test_utils.c \
src/external/bsd/libarchive/dist/test_utils/test_utils.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.16 -r1.17 \
src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/lib/libarchive/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
