Module Name: src
Committed By: christos
Date: Thu Oct 17 16:42:09 UTC 2024
Modified Files:
src/external/bsd/libarchive/dist/cat/test: test_0.c
src/external/bsd/libarchive/dist/cpio/test: test_basic.c
test_format_newc.c
src/external/bsd/libarchive/dist/libarchive: archive.h
archive_openssl_evp_private.h archive_openssl_hmac_private.h
archive_private.h archive_read.c
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_xar.c archive_util.c
archive_write_disk_posix.c archive_write_set_format_ar.c
archive_write_set_format_shar.c archive_write_set_format_ustar.c
src/external/bsd/libarchive/dist/libarchive/test:
test_read_format_7zip.c test_read_format_zip_nested.c
test_read_truncated_filter.c test_sparse_basic.c
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
src/external/bsd/libarchive/include: config_netbsd.h
Log Message:
merge conflicts (4 tests still fail)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/dist/cat/test/test_0.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/cpio/test/test_basic.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/cpio/test/test_format_newc.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/libarchive/dist/libarchive/archive.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h \
src/external/bsd/libarchive/dist/libarchive/archive_read_disk_posix.c
cvs rdiff -u -r1.5 -r1.6 \
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.3 -r1.4 \
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_xar.c \
src/external/bsd/libarchive/dist/libarchive/archive_util.c
cvs rdiff -u -r1.7 -r1.8 \
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.3 -r1.4 \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_7zip.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_format_zip_nested.c \
src/external/bsd/libarchive/dist/libarchive/test/test_read_truncated_filter.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/libarchive/dist/libarchive/test/test_sparse_basic.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libarchive/dist/tar/bsdtar.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/dist/tar/write.c
cvs rdiff -u -r1.3 -r1.4 \
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.4 -r1.5 \
src/external/bsd/libarchive/dist/tar/test/test_copy.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libarchive/dist/test_utils/test_common.h \
src/external/bsd/libarchive/dist/test_utils/test_main.c
cvs rdiff -u -r1.13 -r1.14 \
src/external/bsd/libarchive/include/config_netbsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
