Date: Sat, 25 Feb 2012 10:58:03 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r232153 - in head: . contrib/libarchive contrib/libarchive/cpio contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/libarchi... Message-ID: <201202251058.q1PAw30N014517@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Sat Feb 25 10:58:02 2012 New Revision: 232153 URL: http://svn.freebsd.org/changeset/base/232153 Log: Update libarchive to 3.0.3 Some of new features: - New readers: RAR, LHA/LZH, CAB reader, 7-Zip - New writers: ISO9660, XAR - Improvements to many formats, especially including ISO9660 and Zip - Stackable write filters to write, e.g., tar.gz.uu in a single pass - Exploit seekable input; new "seekable" Zip reader can exploit the Zip Central Directory when it's available; the old "streamable" Zip reader is still fully supported for cases where seeking is not possible. Full release notes available at: https://github.com/libarchive/libarchive/wiki/ReleaseNotes Added: head/contrib/libarchive/cpio/test/test_option_0.c - copied unchanged from r231200, vendor/libarchive/dist/cpio/test/test_option_0.c head/contrib/libarchive/libarchive/archive_acl.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_acl.c head/contrib/libarchive/libarchive/archive_acl_private.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_acl_private.h head/contrib/libarchive/libarchive/archive_crypto.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_crypto.c head/contrib/libarchive/libarchive/archive_crypto_private.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_crypto_private.h head/contrib/libarchive/libarchive/archive_entry_acl.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_acl.3 head/contrib/libarchive/libarchive/archive_entry_linkify.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_linkify.3 head/contrib/libarchive/libarchive/archive_entry_locale.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_locale.h head/contrib/libarchive/libarchive/archive_entry_paths.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_paths.3 head/contrib/libarchive/libarchive/archive_entry_perms.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_perms.3 head/contrib/libarchive/libarchive/archive_entry_sparse.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_sparse.c head/contrib/libarchive/libarchive/archive_entry_stat.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_stat.3 head/contrib/libarchive/libarchive/archive_entry_time.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_entry_time.3 head/contrib/libarchive/libarchive/archive_options.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_options.c head/contrib/libarchive/libarchive/archive_options_private.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_options_private.h head/contrib/libarchive/libarchive/archive_ppmd7.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_ppmd7.c head/contrib/libarchive/libarchive/archive_ppmd7_private.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_ppmd7_private.h head/contrib/libarchive/libarchive/archive_ppmd_private.h - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_ppmd_private.h head/contrib/libarchive/libarchive/archive_rb.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_rb.c head/contrib/libarchive/libarchive/archive_rb.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_rb.h head/contrib/libarchive/libarchive/archive_read_data.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_data.3 head/contrib/libarchive/libarchive/archive_read_disk_posix.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_read_disk_posix.c head/contrib/libarchive/libarchive/archive_read_extract.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_extract.3 head/contrib/libarchive/libarchive/archive_read_filter.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_filter.3 head/contrib/libarchive/libarchive/archive_read_format.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_format.3 head/contrib/libarchive/libarchive/archive_read_free.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_free.3 head/contrib/libarchive/libarchive/archive_read_header.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_header.3 head/contrib/libarchive/libarchive/archive_read_new.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_new.3 head/contrib/libarchive/libarchive/archive_read_open.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_open.3 head/contrib/libarchive/libarchive/archive_read_set_options.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_set_options.3 head/contrib/libarchive/libarchive/archive_read_set_options.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_read_set_options.c head/contrib/libarchive/libarchive/archive_read_support_filter_all.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_all.c head/contrib/libarchive/libarchive/archive_read_support_filter_bzip2.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_bzip2.c head/contrib/libarchive/libarchive/archive_read_support_filter_compress.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_compress.c head/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_gzip.c head/contrib/libarchive/libarchive/archive_read_support_filter_none.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_none.c head/contrib/libarchive/libarchive/archive_read_support_filter_program.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_program.c head/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_rpm.c head/contrib/libarchive/libarchive/archive_read_support_filter_uu.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_uu.c head/contrib/libarchive/libarchive/archive_read_support_filter_xz.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_filter_xz.c head/contrib/libarchive/libarchive/archive_read_support_format_7zip.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_read_support_format_7zip.c head/contrib/libarchive/libarchive/archive_read_support_format_by_code.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_read_support_format_by_code.c head/contrib/libarchive/libarchive/archive_read_support_format_cab.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_read_support_format_cab.c head/contrib/libarchive/libarchive/archive_read_support_format_lha.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_read_support_format_lha.c head/contrib/libarchive/libarchive/archive_read_support_format_rar.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_read_support_format_rar.c head/contrib/libarchive/libarchive/archive_string_composition.h - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_string_composition.h head/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_add_filter_bzip2.c head/contrib/libarchive/libarchive/archive_write_add_filter_compress.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_add_filter_compress.c head/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_add_filter_gzip.c head/contrib/libarchive/libarchive/archive_write_add_filter_none.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_add_filter_none.c head/contrib/libarchive/libarchive/archive_write_add_filter_program.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_add_filter_program.c head/contrib/libarchive/libarchive/archive_write_add_filter_xz.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_add_filter_xz.c head/contrib/libarchive/libarchive/archive_write_blocksize.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_blocksize.3 head/contrib/libarchive/libarchive/archive_write_data.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_data.3 head/contrib/libarchive/libarchive/archive_write_disk_posix.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_disk_posix.c head/contrib/libarchive/libarchive/archive_write_filter.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_filter.3 head/contrib/libarchive/libarchive/archive_write_finish_entry.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_finish_entry.3 head/contrib/libarchive/libarchive/archive_write_format.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_format.3 head/contrib/libarchive/libarchive/archive_write_free.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_free.3 head/contrib/libarchive/libarchive/archive_write_header.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_header.3 head/contrib/libarchive/libarchive/archive_write_new.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_new.3 head/contrib/libarchive/libarchive/archive_write_open.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_open.3 head/contrib/libarchive/libarchive/archive_write_set_format_7zip.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_set_format_7zip.c head/contrib/libarchive/libarchive/archive_write_set_format_gnutar.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_set_format_gnutar.c head/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_set_format_iso9660.c head/contrib/libarchive/libarchive/archive_write_set_format_xar.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_set_format_xar.c head/contrib/libarchive/libarchive/archive_write_set_options.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/archive_write_set_options.3 head/contrib/libarchive/libarchive/archive_write_set_options.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/archive_write_set_options.c head/contrib/libarchive/libarchive/libarchive_changes.3 - copied unchanged from r231200, vendor/libarchive/dist/libarchive/libarchive_changes.3 head/contrib/libarchive/libarchive/test/test_acl_nfs4.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_acl_nfs4.c head/contrib/libarchive/libarchive/test/test_acl_pax.tar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_acl_pax.tar.uu head/contrib/libarchive/libarchive/test/test_acl_posix1e.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_acl_posix1e.c head/contrib/libarchive/libarchive/test/test_archive_clear_error.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_clear_error.c head/contrib/libarchive/libarchive/test/test_archive_crypto.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_crypto.c head/contrib/libarchive/libarchive/test/test_archive_read_close_twice.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_close_twice.c head/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_fd.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_close_twice_open_fd.c head/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_close_twice_open_filename.c head/contrib/libarchive/libarchive/test/test_archive_read_next_header_empty.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_next_header_empty.c head/contrib/libarchive/libarchive/test/test_archive_read_next_header_raw.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_next_header_raw.c head/contrib/libarchive/libarchive/test/test_archive_read_open2.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_open2.c head/contrib/libarchive/libarchive/test/test_archive_read_set_filter_option.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_set_filter_option.c head/contrib/libarchive/libarchive/test/test_archive_read_set_format_option.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_set_format_option.c head/contrib/libarchive/libarchive/test/test_archive_read_set_option.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_set_option.c head/contrib/libarchive/libarchive/test/test_archive_read_set_options.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_set_options.c head/contrib/libarchive/libarchive/test/test_archive_read_support.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_read_support.c head/contrib/libarchive/libarchive/test/test_archive_set_error.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_set_error.c head/contrib/libarchive/libarchive/test/test_archive_string.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_string.c head/contrib/libarchive/libarchive/test/test_archive_string_conversion.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_string_conversion.c head/contrib/libarchive/libarchive/test/test_archive_string_conversion.txt.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_string_conversion.txt.Z.uu head/contrib/libarchive/libarchive/test/test_archive_write_set_filter_option.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_write_set_filter_option.c head/contrib/libarchive/libarchive/test/test_archive_write_set_format_option.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_write_set_format_option.c head/contrib/libarchive/libarchive/test/test_archive_write_set_option.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_archive_write_set_option.c head/contrib/libarchive/libarchive/test/test_archive_write_set_options.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_archive_write_set_options.c head/contrib/libarchive/libarchive/test/test_compat_lzip.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_lzip.c head/contrib/libarchive/libarchive/test/test_compat_lzip_1.tlz.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_lzip_1.tlz.uu head/contrib/libarchive/libarchive/test/test_compat_lzip_2.tlz.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_lzip_2.tlz.uu head/contrib/libarchive/libarchive/test/test_compat_mac-1.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_mac-1.tar.Z.uu head/contrib/libarchive/libarchive/test/test_compat_mac-2.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_mac-2.tar.Z.uu head/contrib/libarchive/libarchive/test/test_compat_mac.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_compat_mac.c head/contrib/libarchive/libarchive/test/test_compat_pax_libarchive_2x.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_pax_libarchive_2x.c head/contrib/libarchive/libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu head/contrib/libarchive/libarchive/test/test_compat_solaris_pax_sparse.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_solaris_pax_sparse.c head/contrib/libarchive/libarchive/test/test_compat_solaris_pax_sparse_1.pax.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_solaris_pax_sparse_1.pax.Z.uu head/contrib/libarchive/libarchive/test/test_compat_solaris_pax_sparse_2.pax.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_solaris_pax_sparse_2.pax.Z.uu head/contrib/libarchive/libarchive/test/test_compat_zip_3.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_zip_3.zip.uu head/contrib/libarchive/libarchive/test/test_compat_zip_4.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_zip_4.zip.uu head/contrib/libarchive/libarchive/test/test_compat_zip_5.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_zip_5.zip.uu head/contrib/libarchive/libarchive/test/test_compat_zip_6.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_zip_6.zip.uu head/contrib/libarchive/libarchive/test/test_compat_zip_7.xps.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_compat_zip_7.xps.uu head/contrib/libarchive/libarchive/test/test_filter_count.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_filter_count.c head/contrib/libarchive/libarchive/test/test_fuzz.cab.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_fuzz.cab.uu head/contrib/libarchive/libarchive/test/test_fuzz.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_fuzz.lzh.uu head/contrib/libarchive/libarchive/test/test_gnutar_filename_encoding.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_gnutar_filename_encoding.c head/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_disk_directory_traversals.c head/contrib/libarchive/libarchive/test/test_read_format_7zip.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip.c head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_bzip2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_bzip2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_copy_1.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_copy_1.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_copy_2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_copy_2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_copy_lzma.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_copy_lzma.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_deflate.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_deflate.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_lzma1_1.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_lzma1_1.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_lzma1_2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_lzma1_2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_lzma2_1.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_lzma2_1.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj2_lzma2_2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj2_lzma2_2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj_bzip2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj_bzip2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj_copy.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj_copy.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj_deflate.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj_deflate.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj_lzma1.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj_lzma1.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bcj_lzma2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bcj_lzma2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_bzip2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_bzip2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_copy.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_copy.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_copy_2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_copy_2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_deflate.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_deflate.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_delta_lzma1.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_delta_lzma1.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_delta_lzma2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_delta_lzma2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_empty_archive.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_empty_archive.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_empty_file.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_empty_file.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma1.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_lzma1.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma1_2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_lzma1_2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_lzma2.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_lzma2.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_ppmd.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_ppmd.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_7zip_symbolic_name.7z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_7zip_symbolic_name.7z.uu head/contrib/libarchive/libarchive/test/test_read_format_cab.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cab.c head/contrib/libarchive/libarchive/test/test_read_format_cab_1.cab.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cab_1.cab.uu head/contrib/libarchive/libarchive/test/test_read_format_cab_2.cab.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cab_2.cab.uu head/contrib/libarchive/libarchive/test/test_read_format_cab_3.cab.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cab_3.cab.uu head/contrib/libarchive/libarchive/test/test_read_format_cab_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cab_filename.c head/contrib/libarchive/libarchive/test/test_read_format_cab_filename_cp932.cab.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cab_filename_cp932.cab.uu head/contrib/libarchive/libarchive/test/test_read_format_cpio_afio.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_afio.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzip.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_lzip.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu head/contrib/libarchive/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu head/contrib/libarchive/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu head/contrib/libarchive/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu head/contrib/libarchive/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu head/contrib/libarchive/libarchive/test/test_read_format_gtar_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_gtar_filename.c head/contrib/libarchive/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_by_nero.iso.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_iso_joliet_by_nero.iso.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_iso_xorriso.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_iso_xorriso.c head/contrib/libarchive/libarchive/test/test_read_format_iso_xorriso.iso.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_iso_xorriso.iso.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_isojoliet_versioned.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_versioned.c head/contrib/libarchive/libarchive/test/test_read_format_lha.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha.c head/contrib/libarchive/libarchive/test/test_read_format_lha_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_filename.c head/contrib/libarchive/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_header0.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_header0.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_header1.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_header1.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_header2.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_header2.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_header3.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_header3.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_lh0.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_lh0.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_lh6.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_lh6.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_lh7.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_lh7.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_lha_withjunk.lzh.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_lha_withjunk.lzh.uu head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic.mtree.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_mtree_nomagic.mtree.uu head/contrib/libarchive/libarchive/test/test_read_format_rar.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar.c head/contrib/libarchive/libarchive/test/test_read_format_rar.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_binary_data.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_binary_data.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_compress_best.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_compress_best.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_compress_normal.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_compress_normal.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_noeof.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_noeof.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_sfx.exe.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_sfx.exe.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_subblock.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_subblock.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_unicode.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_unicode.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_rar_windows.rar.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_rar_windows.rar.uu head/contrib/libarchive/libarchive/test/test_read_format_tar_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_tar_filename.c head/contrib/libarchive/libarchive/test/test_read_format_tar_filename_koi8r.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_tar_filename_koi8r.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_ustar_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_ustar_filename.c head/contrib/libarchive/libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_filename.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename.c head/contrib/libarchive/libarchive/test/test_read_format_zip_filename_cp866.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename_cp866.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_filename_cp932.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename_cp932.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_length_at_end.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_length_at_end.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_symlink.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_symlink.zip.uu head/contrib/libarchive/libarchive/test/test_read_format_zip_ux.zip.uu - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_format_zip_ux.zip.uu head/contrib/libarchive/libarchive/test/test_read_truncated_filter.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_read_truncated_filter.c head/contrib/libarchive/libarchive/test/test_sparse_basic.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_sparse_basic.c head/contrib/libarchive/libarchive/test/test_ustar_filename_encoding.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_ustar_filename_encoding.c head/contrib/libarchive/libarchive/test/test_write_compress_lzip.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_compress_lzip.c head/contrib/libarchive/libarchive/test/test_write_disk_lookup.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_write_disk_lookup.c head/contrib/libarchive/libarchive/test/test_write_format_7zip.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_7zip.c head/contrib/libarchive/libarchive/test/test_write_format_gnutar.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_gnutar.c head/contrib/libarchive/libarchive/test/test_write_format_iso9660.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_iso9660.c head/contrib/libarchive/libarchive/test/test_write_format_iso9660_boot.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_boot.c head/contrib/libarchive/libarchive/test/test_write_format_iso9660_empty.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_empty.c head/contrib/libarchive/libarchive/test/test_write_format_iso9660_filename.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_filename.c head/contrib/libarchive/libarchive/test/test_write_format_iso9660_zisofs.c - copied, changed from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_zisofs.c head/contrib/libarchive/libarchive/test/test_write_format_mtree_fflags.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_mtree_fflags.c head/contrib/libarchive/libarchive/test/test_write_format_tar_sparse.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_tar_sparse.c head/contrib/libarchive/libarchive/test/test_write_format_xar.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_xar.c head/contrib/libarchive/libarchive/test/test_write_format_xar_empty.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_write_format_xar_empty.c head/contrib/libarchive/libarchive/test/test_zip_filename_encoding.c - copied unchanged from r231200, vendor/libarchive/dist/libarchive/test/test_zip_filename_encoding.c head/contrib/libarchive/tar/test/test_option_C_upper.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_C_upper.c head/contrib/libarchive/tar/test/test_option_H_upper.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_H_upper.c head/contrib/libarchive/tar/test/test_option_L_upper.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_L_upper.c head/contrib/libarchive/tar/test/test_option_O_upper.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_O_upper.c head/contrib/libarchive/tar/test/test_option_U_upper.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_U_upper.c head/contrib/libarchive/tar/test/test_option_X_upper.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_X_upper.c head/contrib/libarchive/tar/test/test_option_b.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_b.c head/contrib/libarchive/tar/test/test_option_exclude.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_exclude.c head/contrib/libarchive/tar/test/test_option_gid_gname.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_gid_gname.c head/contrib/libarchive/tar/test/test_option_k.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_k.c head/contrib/libarchive/tar/test/test_option_keep_newer_files.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_keep_newer_files.c head/contrib/libarchive/tar/test/test_option_keep_newer_files.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_keep_newer_files.tar.Z.uu head/contrib/libarchive/tar/test/test_option_n.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_n.c head/contrib/libarchive/tar/test/test_option_newer_than.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_newer_than.c head/contrib/libarchive/tar/test/test_option_s.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_s.tar.Z.uu head/contrib/libarchive/tar/test/test_option_uid_uname.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_option_uid_uname.c head/contrib/libarchive/tar/test/test_print_longpath.c - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_print_longpath.c head/contrib/libarchive/tar/test/test_print_longpath.tar.Z.uu - copied unchanged from r231200, vendor/libarchive/dist/tar/test/test_print_longpath.tar.Z.uu Deleted: head/contrib/libarchive/libarchive/archive_hash.h head/contrib/libarchive/libarchive/archive_read_disk.c head/contrib/libarchive/libarchive/archive_read_support_compression_all.c head/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c head/contrib/libarchive/libarchive/archive_read_support_compression_compress.c head/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c head/contrib/libarchive/libarchive/archive_read_support_compression_none.c head/contrib/libarchive/libarchive/archive_read_support_compression_program.c head/contrib/libarchive/libarchive/archive_read_support_compression_rpm.c head/contrib/libarchive/libarchive/archive_read_support_compression_uu.c head/contrib/libarchive/libarchive/archive_read_support_compression_xz.c head/contrib/libarchive/libarchive/archive_write_disk.c head/contrib/libarchive/libarchive/archive_write_set_compression_bzip2.c head/contrib/libarchive/libarchive/archive_write_set_compression_compress.c head/contrib/libarchive/libarchive/archive_write_set_compression_gzip.c head/contrib/libarchive/libarchive/archive_write_set_compression_none.c head/contrib/libarchive/libarchive/archive_write_set_compression_program.c head/contrib/libarchive/libarchive/archive_write_set_compression_xz.c head/contrib/libarchive/libarchive/test/test_acl_basic.c head/usr.bin/cpio/config_freebsd.h head/usr.bin/tar/config_freebsd.h Modified: head/ObsoleteFiles.inc head/contrib/libarchive/COPYING head/contrib/libarchive/FREEBSD-Xlist head/contrib/libarchive/NEWS head/contrib/libarchive/README head/contrib/libarchive/cpio/bsdcpio.1 head/contrib/libarchive/cpio/cmdline.c head/contrib/libarchive/cpio/cpio.c head/contrib/libarchive/cpio/cpio.h head/contrib/libarchive/cpio/test/main.c head/contrib/libarchive/cpio/test/test.h head/contrib/libarchive/cpio/test/test_0.c head/contrib/libarchive/cpio/test/test_basic.c head/contrib/libarchive/cpio/test/test_format_newc.c head/contrib/libarchive/cpio/test/test_option_c.c head/contrib/libarchive/cpio/test/test_option_t.c head/contrib/libarchive/cpio/test/test_option_u.c head/contrib/libarchive/cpio/test/test_owner_parse.c head/contrib/libarchive/libarchive/archive.h head/contrib/libarchive/libarchive/archive_check_magic.c head/contrib/libarchive/libarchive/archive_crc32.h head/contrib/libarchive/libarchive/archive_entry.3 head/contrib/libarchive/libarchive/archive_entry.c head/contrib/libarchive/libarchive/archive_entry.h head/contrib/libarchive/libarchive/archive_entry_copy_stat.c head/contrib/libarchive/libarchive/archive_entry_link_resolver.c head/contrib/libarchive/libarchive/archive_entry_private.h head/contrib/libarchive/libarchive/archive_entry_stat.c head/contrib/libarchive/libarchive/archive_private.h head/contrib/libarchive/libarchive/archive_read.3 head/contrib/libarchive/libarchive/archive_read.c head/contrib/libarchive/libarchive/archive_read_data_into_fd.c head/contrib/libarchive/libarchive/archive_read_disk.3 head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c head/contrib/libarchive/libarchive/archive_read_disk_private.h head/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c head/contrib/libarchive/libarchive/archive_read_extract.c head/contrib/libarchive/libarchive/archive_read_open_fd.c head/contrib/libarchive/libarchive/archive_read_open_file.c head/contrib/libarchive/libarchive/archive_read_open_filename.c head/contrib/libarchive/libarchive/archive_read_open_memory.c head/contrib/libarchive/libarchive/archive_read_private.h head/contrib/libarchive/libarchive/archive_read_support_format_all.c head/contrib/libarchive/libarchive/archive_read_support_format_ar.c head/contrib/libarchive/libarchive/archive_read_support_format_cpio.c head/contrib/libarchive/libarchive/archive_read_support_format_empty.c head/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c head/contrib/libarchive/libarchive/archive_read_support_format_raw.c head/contrib/libarchive/libarchive/archive_read_support_format_tar.c head/contrib/libarchive/libarchive/archive_read_support_format_xar.c head/contrib/libarchive/libarchive/archive_read_support_format_zip.c head/contrib/libarchive/libarchive/archive_string.c head/contrib/libarchive/libarchive/archive_string.h head/contrib/libarchive/libarchive/archive_string_sprintf.c head/contrib/libarchive/libarchive/archive_util.3 head/contrib/libarchive/libarchive/archive_util.c head/contrib/libarchive/libarchive/archive_virtual.c head/contrib/libarchive/libarchive/archive_write.3 head/contrib/libarchive/libarchive/archive_write.c head/contrib/libarchive/libarchive/archive_write_disk.3 head/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c head/contrib/libarchive/libarchive/archive_write_open_filename.c head/contrib/libarchive/libarchive/archive_write_open_memory.c head/contrib/libarchive/libarchive/archive_write_private.h head/contrib/libarchive/libarchive/archive_write_set_format.c head/contrib/libarchive/libarchive/archive_write_set_format_ar.c head/contrib/libarchive/libarchive/archive_write_set_format_by_name.c head/contrib/libarchive/libarchive/archive_write_set_format_cpio.c head/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c head/contrib/libarchive/libarchive/archive_write_set_format_mtree.c head/contrib/libarchive/libarchive/archive_write_set_format_pax.c head/contrib/libarchive/libarchive/archive_write_set_format_shar.c head/contrib/libarchive/libarchive/archive_write_set_format_ustar.c head/contrib/libarchive/libarchive/archive_write_set_format_zip.c head/contrib/libarchive/libarchive/libarchive-formats.5 head/contrib/libarchive/libarchive/libarchive.3 head/contrib/libarchive/libarchive/libarchive_internals.3 head/contrib/libarchive/libarchive/tar.5 head/contrib/libarchive/libarchive/test/main.c head/contrib/libarchive/libarchive/test/read_open_memory.c head/contrib/libarchive/libarchive/test/test.h head/contrib/libarchive/libarchive/test/test_acl_freebsd.c head/contrib/libarchive/libarchive/test/test_acl_pax.c head/contrib/libarchive/libarchive/test/test_archive_api_feature.c head/contrib/libarchive/libarchive/test/test_bad_fd.c head/contrib/libarchive/libarchive/test/test_compat_bzip2.c head/contrib/libarchive/libarchive/test/test_compat_cpio.c head/contrib/libarchive/libarchive/test/test_compat_gtar.c head/contrib/libarchive/libarchive/test/test_compat_gzip.c head/contrib/libarchive/libarchive/test/test_compat_lzma.c head/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c head/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c head/contrib/libarchive/libarchive/test/test_compat_xz.c head/contrib/libarchive/libarchive/test/test_compat_zip.c head/contrib/libarchive/libarchive/test/test_compat_zip_2.zip.uu head/contrib/libarchive/libarchive/test/test_empty_write.c head/contrib/libarchive/libarchive/test/test_entry.c head/contrib/libarchive/libarchive/test/test_extattr_freebsd.c head/contrib/libarchive/libarchive/test/test_fuzz.c head/contrib/libarchive/libarchive/test/test_open_failure.c head/contrib/libarchive/libarchive/test/test_open_fd.c head/contrib/libarchive/libarchive/test/test_open_file.c head/contrib/libarchive/libarchive/test/test_open_filename.c head/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c head/contrib/libarchive/libarchive/test/test_read_compress_program.c head/contrib/libarchive/libarchive/test/test_read_data_large.c head/contrib/libarchive/libarchive/test/test_read_disk.c head/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c head/contrib/libarchive/libarchive/test/test_read_extract.c head/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c head/contrib/libarchive/libarchive/test/test_read_format_ar.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c head/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c head/contrib/libarchive/libarchive/test/test_read_format_empty.c head/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c head/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c head/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c head/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c head/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c head/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c head/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c head/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c head/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c head/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c head/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c head/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c head/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c head/contrib/libarchive/libarchive/test/test_read_format_mtree.c head/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu head/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c head/contrib/libarchive/libarchive/test/test_read_format_raw.c head/contrib/libarchive/libarchive/test/test_read_format_tar.c head/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c head/contrib/libarchive/libarchive/test/test_read_format_tbz.c head/contrib/libarchive/libarchive/test/test_read_format_tgz.c head/contrib/libarchive/libarchive/test/test_read_format_tlz.c head/contrib/libarchive/libarchive/test/test_read_format_txz.c head/contrib/libarchive/libarchive/test/test_read_format_tz.c head/contrib/libarchive/libarchive/test/test_read_format_xar.c head/contrib/libarchive/libarchive/test/test_read_format_zip.c head/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu head/contrib/libarchive/libarchive/test/test_read_large.c head/contrib/libarchive/libarchive/test/test_read_pax_truncated.c head/contrib/libarchive/libarchive/test/test_read_position.c head/contrib/libarchive/libarchive/test/test_read_truncated.c head/contrib/libarchive/libarchive/test/test_read_uu.c head/contrib/libarchive/libarchive/test/test_tar_filenames.c head/contrib/libarchive/libarchive/test/test_tar_large.c head/contrib/libarchive/libarchive/test/test_ustar_filenames.c head/contrib/libarchive/libarchive/test/test_write_compress.c head/contrib/libarchive/libarchive/test/test_write_compress_bzip2.c head/contrib/libarchive/libarchive/test/test_write_compress_gzip.c head/contrib/libarchive/libarchive/test/test_write_compress_lzma.c head/contrib/libarchive/libarchive/test/test_write_compress_program.c head/contrib/libarchive/libarchive/test/test_write_compress_xz.c head/contrib/libarchive/libarchive/test/test_write_disk.c head/contrib/libarchive/libarchive/test/test_write_disk_failures.c head/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c head/contrib/libarchive/libarchive/test/test_write_disk_perms.c head/contrib/libarchive/libarchive/test/test_write_disk_secure.c head/contrib/libarchive/libarchive/test/test_write_disk_sparse.c head/contrib/libarchive/libarchive/test/test_write_disk_symlink.c head/contrib/libarchive/libarchive/test/test_write_disk_times.c head/contrib/libarchive/libarchive/test/test_write_format_ar.c head/contrib/libarchive/libarchive/test/test_write_format_cpio.c head/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c head/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c head/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c head/contrib/libarchive/libarchive/test/test_write_format_mtree.c head/contrib/libarchive/libarchive/test/test_write_format_pax.c head/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c head/contrib/libarchive/libarchive/test/test_write_format_tar.c head/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c head/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c head/contrib/libarchive/libarchive/test/test_write_format_zip.c head/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c head/contrib/libarchive/libarchive/test/test_write_format_zip_no_compression.c head/contrib/libarchive/libarchive/test/test_write_open_memory.c head/contrib/libarchive/libarchive_fe/line_reader.c head/contrib/libarchive/libarchive_fe/matching.c head/contrib/libarchive/libarchive_fe/pathmatch.c head/contrib/libarchive/tar/bsdtar.1 head/contrib/libarchive/tar/bsdtar.c head/contrib/libarchive/tar/bsdtar.h head/contrib/libarchive/tar/bsdtar_platform.h head/contrib/libarchive/tar/cmdline.c head/contrib/libarchive/tar/getdate.c head/contrib/libarchive/tar/read.c head/contrib/libarchive/tar/subst.c head/contrib/libarchive/tar/test/main.c head/contrib/libarchive/tar/test/test.h head/contrib/libarchive/tar/test/test_0.c head/contrib/libarchive/tar/test/test_basic.c head/contrib/libarchive/tar/test/test_option_T_upper.c head/contrib/libarchive/tar/test/test_option_q.c head/contrib/libarchive/tar/test/test_option_r.c head/contrib/libarchive/tar/test/test_option_s.c head/contrib/libarchive/tar/test/test_patterns.c head/contrib/libarchive/tar/test/test_strip_components.c head/contrib/libarchive/tar/test/test_symlink_dir.c head/contrib/libarchive/tar/tree.c head/contrib/libarchive/tar/util.c head/contrib/libarchive/tar/write.c head/lib/libarchive/Makefile head/lib/libarchive/config_freebsd.h head/lib/libarchive/test/Makefile head/usr.bin/ar/ar.c head/usr.bin/cpio/Makefile head/usr.bin/cpio/test/Makefile head/usr.bin/tar/Makefile head/usr.bin/tar/test/Makefile Directory Properties: head/contrib/libarchive/ (props changed) head/contrib/libarchive/cpio/ (props changed) head/contrib/libarchive/libarchive/ (props changed) head/contrib/libarchive/libarchive_fe/ (props changed) head/contrib/libarchive/tar/ (props changed) Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Feb 25 10:15:41 2012 (r232152) +++ head/ObsoleteFiles.inc Sat Feb 25 10:58:02 2012 (r232153) @@ -38,6 +38,24 @@ # xargs -n1 | sort | uniq -d; # done +# 20120225: libarchive 3.0.3 +OLD_FILES+=man/man3/archive_read_data_into_buffer.3.gz \ + man/man3/archive_read_support_compression_all.3.gz \ + man/man3/archive_read_support_compression_bzip2.3.gz \ + man/man3/archive_read_support_compression_compress.3.gz \ + man/man3/archive_read_support_compression_gzip.3.gz \ + man/man3/archive_read_support_compression_lzma.3.gz \ + man/man3/archive_read_support_compression_none.3.gz \ + man/man3/archive_read_support_compression_program.3.gz \ + man/man3/archive_read_support_compression_program_signature.3.gz \ + man/man3/archive_read_support_compression_xz.3.gz \ + man/man3/archive_write_set_callbacks.3.gz \ + man/man3/archive_write_set_compression_bzip2.3.gz \ + man/man3/archive_write_set_compression_compress.3.gz \ + man/man3/archive_write_set_compression_gzip.3.gz \ + man/man3/archive_write_set_compression_none.3.gz \ + man/man3/archive_write_set_compression_program.3.gz +OLD_LIBS+=usr/lib/libarchive.so.5 # 20120113: removal of wtmpcvt(1) OLD_FILES+=usr/bin/wtmpcvt OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz Modified: head/contrib/libarchive/COPYING ============================================================================== --- head/contrib/libarchive/COPYING Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/COPYING Sat Feb 25 10:58:02 2012 (r232153) @@ -16,8 +16,8 @@ the actual statements in the files are c a 3-clause UC Regents copyright; please read the individual source files for details: libarchive/archive_entry.c - libarchive/archive_read_support_compression_compress.c - libarchive/archive_write_set_compression_compress.c + libarchive/archive_read_support_filter_compress.c + libarchive/archive_write_set_filter_compress.c libarchive/mtree.5 tar/matching.c Modified: head/contrib/libarchive/FREEBSD-Xlist ============================================================================== --- head/contrib/libarchive/FREEBSD-Xlist Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/FREEBSD-Xlist Sat Feb 25 10:58:02 2012 (r232153) @@ -15,8 +15,10 @@ doc examples libarchive/CMakeLists.txt libarchive/archive_entry_copy_bhfi.c +libarchive/archive_read_disk_windows.c libarchive/archive_windows.c libarchive/archive_windows.h +libarchive/archive_write_disk_windows.c libarchive/config_freebsd.h libarchive/filter_fork_windows.c libarchive/mtree.5 Modified: head/contrib/libarchive/NEWS ============================================================================== --- head/contrib/libarchive/NEWS Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/NEWS Sat Feb 25 10:58:02 2012 (r232153) @@ -1,27 +1,80 @@ -Feb 05, 2011: Fix issue 134: Improve handling of open failures -Dec 06, 2010: Fix issue 119: Relax ISO verification -Dec 06, 2010: Fix issue 121: mtree parsing -Dec 05, 2010: Fix extraction of GNU tar 'D' directory entries -Dec 05, 2010: Be less demanding in LZMA/XZ compression tests -Jun 30, 2010: libarchive 2.8.4 released -Jun 30, 2010: Improved reliability of hash function detection -Jun 30, 2010: Fix issues on ancient FreeBSD, QNX, ancient NetBSD and Minix - -Mar 14, 2010: libarchive 2.8.3 released -Mar 14, 2010: Symlink dereference fix for Linux broke the build there; corrected. - -Mar 14, 2010: libarchive 2.8.2 released -Mar 12, 2010: Fix NULL deference for short self-extracting zip archives. +Jan 10, 2012: Issue 223: Skip atime tests if atime not supported +Jan 09, 2012: Issue 222: Errors saving sparse files to pax archives +Jan 09, 2012: Issue 221: allow archive_*_free(NULL) +Dec 31, 2011: Issue 212: configure script on Solaris +Dec 30, 2011: Issue 218: empty contents extracting Zip files with bsdcpio +Dec 30, 2011: Issue 217: fix compile warning +Dec 30, 2011: Issue 216: truncated filenames in listings +Dec 28, 2011: Issue 210: memory leak on Windows +Dec 28, 2011: Issue 206: fix hardlink tests on Windows 2000 +Dec 27, 2011: Issue 208: Don't hang when using external compression + program on Windows + +Dec 24, 2011: libarchive 3.0.2 released +Dec 23, 2011: Various fixes merged from FreeBSD +Dec 23, 2011: Symlink support in Zip reader and writer +Dec 23, 2011: Robustness fixes to 7Zip reader + +Nov 27, 2011: libarchive 3.0.1b released + +Nov 26, 2011: 7Zip reader +Nov 26, 2011: Small fixes to ISO and Zip to improve robustness with corrupted input +Nov 24, 2011: Improve streaming Zip reader's support for uncompressed entries +Nov 20, 2011: New seeking Zip reader supports SFX Zip archives +Nov 20, 2011: Build fixes on Windows + +Nov 13, 2011: libarchive 3.0.0a released + +Nov 06, 2011: Update shared-library version calculations for libarchive 3.x +Sep 04, 2011: Fix tar -s; follow GNU tar for controlling hardlink/symlink substitutions +Aug 18, 2011: Fix reading ISO images built by NetBSD's mkisofs +Aug 15, 2011: Old archive_read_support_compression_XXX functions are deprecated and + will disappear in libarchive 4.0. +Jun 26, 2011: RAR reader +Jun 16, 2011: Add tar:compat-2x option to emulate broken libarchive 2.x + handling of pax UTF-8 headers +Apr 25, 2011: Refactor read_open() into a collection of single-item setters; + support the old interfaces as wrappers +Apr 12, 2011: Split disk writer into separate POSIX and Windows implementations +Apr 10, 2011: Improvements to character translations on Windows. +Mar 30, 2011: More work to return errors instead of calling abort() +Mar 23, 2011: Add charset option to many writers to control MBCS filenames +Mar 17, 2011: Overhauled support for per-format extension options +Mar 17, 2011: Track character set used for mbcs strings, support + translating to/from user-specified locale +Mar 09, 2011: Recognize mtree files without requiring a signature +Mar 06, 2011: Use iconv to convert to/from Unicode instead of making bad + assumptions about the C90 character set translation functions +Feb 17, 2011: Fixes for AIX, TRU64, and other platforms +Dec 22, 2010: CAB reader +Dec 20, 2010: LHA/LZH reader +Jul 03, 2010: minitar example demonstrates archive_read_disk directory traversal +Jun 29, 2010: Many improvements to ISO reader compatibility +Jun 26, 2010: Use larger buffers when copy files into an archive +Jun 18, 2010: Reimplement Mac OS extensions in libarchive +Jun 09, 2010: archive_read_disk now supports traversals +May 28, 2010: XAR writer +May 16, 2010: Fix ^T handling; don't exit on interrupted reads and writes +May 09, 2010: Improved detection of platform-specific crypto support +May 04, 2010: lzip read and write filters +May 01, 2010: New options: tar --gid --gname --uid --uname +Apr 28, 2010: Use Red-black tree for ISO reader/writer to improve performance +Apr 17, 2010: Minimal writer for legacy GNU tar format Mar 12, 2010: Don't dereference symlinks on Linux when reading ACLs. -Mar 07, 2010: Better detection of SHA2 support for old OpenSSL versions. -Mar 07, 2010: Fix parsing of input files for bsdtar -T. -Mar 07, 2010: Do not leak setup_xattr into the global namespace. - -Mar 06, 2010: libarchive 2.8.1 released Mar 06, 2010: Fix build when an older libarchive is already installed -Mar 03, 2010: Use O_BINARY opening files in bsdtar -Mar 02, 2010: Include missing archive_crc32.h -Mar 01, 2010: Correctly include iconv.h required by libxml2. +Feb 28, 2010: Relax handling of state failures; misuse by clients now generally + results in a sticky ARCHIVE_FATAL rather than a visit to abort() +Feb 25, 2010: ISO writer +Feb 21, 2010: Split many man pages into smaller chunks. +Feb 21, 2010: Performance: Cheat on block sizes when reading archives from disk. +Feb 21, 2010: Use int64_t instead of off_t, dev_t, ino_t, uid_t, and gid_t +Feb 20, 2010: Document new ACL functions. +Feb 19, 2010: Support multiple write filters +Feb 07, 2010: Remove some legacy libarchive 1.x APIs +Feb 04, 2010: Read afio headers +Feb 02, 2010: Archive sparse files compatibly with GNU tar +Feb 01, 2010: Integrate Apple extensions for Mac OS extended attributes into bsdtar +Jan 31, 2010: Support cpio -V Feb 04, 2010: libarchive 2.8.0 released Jan 17, 2010: Fix error handling for 'echo nonexistent | cpio -o' Modified: head/contrib/libarchive/README ============================================================================== --- head/contrib/libarchive/README Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/README Sat Feb 25 10:58:02 2012 (r232153) @@ -13,8 +13,6 @@ This distribution bundle includes the fo essentially the same functionality * examples: Some small example programs that you may find useful. * examples/minitar: a compact sample demonstrating use of libarchive. - I use this for testing link pollution; it should produce a very - small executable file on most systems. * contrib: Various items sent to me by third parties; please contact the authors with any questions. @@ -51,16 +49,11 @@ The manual pages above are provided in t a number of different formats. You should also read the copious comments in "archive.h" and the -source code for the sample programs for more details. Please let me +source code for the sample programs for more details. Please let us know about any errors or omissions you find. -Currently, the library automatically detects and reads the following: - * gzip compression - * bzip2 compression - * compress/LZW compression - * lzma and xz compression - * GNU tar format (including GNU long filenames, long link names, and - sparse files) +Currently, the library automatically detects and reads the following fomats: + * GNU tar format (including GNU long filenames, long link names, and sparse files) * Solaris 9 extended tar format (including ACLs) * Old V7 tar archives * POSIX ustar @@ -73,22 +66,40 @@ Currently, the library automatically det * ZIP archives (with uncompressed or "deflate" compressed entries) * GNU and BSD 'ar' archives * 'mtree' format - -The library can write: + * Microsoft CAB format + * LHA and LZH archives + * RAR archives + * XAR archives + +The library also detects and handles any of the following before evaluating the archive: + * uuencoded files + * files with RPM wrapper * gzip compression * bzip2 compression * compress/LZW compression - * lzma and xz compression + * lzma, lzip, and xz compression + +The library can create archives in any of the following formats: * POSIX ustar * POSIX pax interchange format * "restricted" pax format, which will create ustar archives except for entries that require pax extensions (for long filenames, ACLs, etc). + * Old GNU tar format * POSIX octet-oriented cpio * SVR4 "newc" cpio * shar archives * ZIP archives (with uncompressed or "deflate" compressed entries) * GNU and BSD 'ar' archives * 'mtree' format + * ISO9660 format + * XAR archives + +When creating archives, the result can be filtered with any of the following: + * uuencode + * gzip compression + * bzip2 compression + * compress/LZW compression + * lzma, lzip, and xz compression Notes about the library architecture: Modified: head/contrib/libarchive/cpio/bsdcpio.1 ============================================================================== --- head/contrib/libarchive/cpio/bsdcpio.1 Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/cpio/bsdcpio.1 Sat Feb 25 10:58:02 2012 (r232153) @@ -24,8 +24,8 @@ .\" .\" $FreeBSD$ .\" -.Dd September 5, 2010 -.Dt BSDCPIO 1 +.Dd December 21, 2007 +.Dt CPIO 1 .Os .Sh NAME .Nm cpio @@ -59,7 +59,7 @@ is a mode indicator from the following l .Bl -tag -compact -width indent .It Fl i Input. -Read an archive from standard input (unless overriden) and extract the +Read an archive from standard input (unless overridden) and extract the contents to disk or (if the .Fl t option is specified) @@ -69,7 +69,7 @@ one of the patterns will be extracted. .It Fl o Output. Read a list of filenames from standard input and produce a new archive -on standard output (unless overriden) containing the specified items. +on standard output (unless overridden) containing the specified items. .It Fl p Pass-through. Read a list of filenames from standard input and copy the files to the @@ -80,7 +80,7 @@ specified directory. Unless specifically stated otherwise, options are applicable in all operating modes. .Bl -tag -width indent -.It Fl 0 +.It Fl 0 , Fl Fl null Read filenames separated by NUL characters instead of newlines. This is necessary if any of the filenames being read might contain newlines. .It Fl A @@ -102,8 +102,8 @@ bytes. (o mode only) Use the old POSIX portable character format. Equivalent to -.Fl -format Ar odc . -.It Fl d +.Fl Fl format Ar odc . +.It Fl d , Fl Fl make-directories (i and p modes) Create directories as necessary. .It Fl E Ar file @@ -111,14 +111,14 @@ Create directories as necessary. Read list of file name patterns from .Ar file to list and extract. -.It Fl F Ar file +.It Fl F Ar file , Fl Fl file Ar file Read archive from or write archive to .Ar file . .It Fl f Ar pattern (i mode only) Ignore files that match .Ar pattern . -.It Fl -format Ar format +.It Fl H Ar format , Fl Fl format Ar format (o mode only) Produce the output archive in the specified format. Supported formats include: @@ -145,24 +145,21 @@ for more complete information about the formats currently supported by the underlying .Xr libarchive 3 library. -.It Fl H Ar format -Synonym for -.Fl -format . -.It Fl h , Fl -help +.It Fl h , Fl Fl help Print usage information. .It Fl I Ar file Read archive from .Ar file . -.It Fl i +.It Fl i , Fl Fl extract Input mode. See above for description. -.It Fl -insecure +.It Fl Fl insecure (i and p mode only) Disable security checks during extraction or copying. This allows extraction via symbolic links and path names containing .Sq .. in the name. -.It Fl J +.It Fl J , Fl Fl xz (o mode only) Compress the file with xz-compatible compression before writing it. In input mode, this option is ignored; xz compression is recognized @@ -175,20 +172,20 @@ Synonym for All symbolic links will be followed. Normally, symbolic links are archived and copied as symbolic links. With this option, the target of the link will be archived or copied instead. -.It Fl l +.It Fl l , Fl Fl link (p mode only) Create links from the target directory to the original files, instead of copying. -.It Fl lzma +.It Fl Fl lzma (o mode only) Compress the file with lzma-compatible compression before writing it. In input mode, this option is ignored; lzma compression is recognized automatically on input. -.It Fl m +.It Fl m , Fl Fl preserve-modification-time (i and p modes) Set file modification time on created files to match those in the source. -.It Fl n +.It Fl n , Fl Fl numeric-uid-gid (i mode, only with .Fl t ) Display numeric uid and gid. @@ -197,26 +194,26 @@ By default, displays the user and group names when they are provided in the archive, or looks up the user and group names in the system password database. -.It Fl no-preserve-owner +.It Fl Fl no-preserve-owner (i mode only) Do not attempt to restore file ownership. This is the default when run by non-root users. .It Fl O Ar file Write archive to .Ar file . -.It Fl o +.It Fl o , Fl Fl create Output mode. See above for description. -.It Fl p +.It Fl p , Fl Fl pass-through Pass-through mode. See above for description. -.It Fl preserve-owner +.It Fl Fl preserve-owner (i mode only) Restore file ownership. This is the default when run by the root user. -.It Fl -quiet +.It Fl Fl quiet Suppress unnecessary messages. -.It Fl R Oo user Oc Ns Oo : Oc Ns Oo group Oc +.It Fl R Oo user Oc Ns Oo : Oc Ns Oo group Oc , Fl Fl owner Oo user Oc Ns Oo : Oc Ns Oo group Oc Set the owner and/or group on files in the output. If group is specified with no user (for example, @@ -244,20 +241,24 @@ containing the name of the file and a li If the line read is blank, the file is skipped. If the line contains a single period, the file is processed normally. Otherwise, the line is taken to be the new name of the file. -.It Fl t +.It Fl t , Fl Fl list (i mode only) List the contents of the archive to stdout; do not restore the contents to disk. -.It Fl u +.It Fl u , Fl Fl unconditional (i and p modes) Unconditionally overwrite existing files. Ordinarily, an older file will not overwrite a newer file on disk. -.It Fl v +.It Fl V , Fl Fl dot +Print a dot to stderr for each file as it is processed. +Superseded by +.Fl v . +.It Fl v , Fl Fl verbose Print the name of each file to stderr as it is processed. With .Fl t , provide a detailed listing of each file. -.It Fl -version +.It Fl Fl version Print the program version information and exit. .It Fl y (o mode only) @@ -275,6 +276,8 @@ Compress the archive with gzip-compatibl In input mode, this option is ignored; gzip compression is recognized automatically on input. .El +.Sh EXIT STATUS +.Ex -std .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -290,8 +293,6 @@ See .Xr environ 7 for more information. .El -.Sh EXIT STATUS -.Ex -std .Sh EXAMPLES The .Nm Modified: head/contrib/libarchive/cpio/cmdline.c ============================================================================== --- head/contrib/libarchive/cpio/cmdline.c Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/cpio/cmdline.c Sat Feb 25 10:58:02 2012 (r232153) @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); /* * Short options for cpio. Please keep this sorted. */ -static const char *short_options = "0AaBC:cdE:F:f:H:hI:iJjLlmnO:opR:rtuvW:yZz"; +static const char *short_options = "0AaBC:cdE:F:f:H:hI:iJjLlmnO:opR:rtuVvW:yZz"; /* * Long options for cpio. Please keep this sorted. @@ -62,6 +62,7 @@ static const struct option { int equivalent; /* Equivalent short option. */ } cpio_longopts[] = { { "create", 0, 'o' }, + { "dot", 0, 'V' }, { "extract", 0, 'i' }, { "file", 1, 'F' }, { "format", 1, 'H' }, @@ -109,7 +110,7 @@ cpio_getopt(struct cpio *cpio) int opt = '?'; int required = 0; - cpio->optarg = NULL; + cpio->argument = NULL; /* First time through, initialize everything. */ if (state == state_start) { @@ -188,7 +189,7 @@ cpio_getopt(struct cpio *cpio) long_prefix = "-W "; /* For clearer errors. */ } else { state = state_next_word; - cpio->optarg = opt_word; + cpio->argument = opt_word; } } } @@ -202,7 +203,7 @@ cpio_getopt(struct cpio *cpio) p = strchr(opt_word, '='); if (p != NULL) { optlength = (size_t)(p - opt_word); - cpio->optarg = (char *)(uintptr_t)(p + 1); + cpio->argument = (char *)(uintptr_t)(p + 1); } else { optlength = strlen(opt_word); } @@ -241,9 +242,9 @@ cpio_getopt(struct cpio *cpio) /* We've found a unique match; does it need an argument? */ if (match->required) { /* Argument required: get next word if necessary. */ - if (cpio->optarg == NULL) { - cpio->optarg = *cpio->argv; - if (cpio->optarg == NULL) { + if (cpio->argument == NULL) { + cpio->argument = *cpio->argv; + if (cpio->argument == NULL) { lafe_warnc(0, "Option %s%s requires an argument", long_prefix, match->name); @@ -254,7 +255,7 @@ cpio_getopt(struct cpio *cpio) } } else { /* Argument forbidden: fail if there is one. */ - if (cpio->optarg != NULL) { + if (cpio->argument != NULL) { lafe_warnc(0, "Option %s%s does not allow an argument", long_prefix, match->name); @@ -340,7 +341,7 @@ owner_parse(const char *spec, int *uid, } else { char *end; errno = 0; - *uid = strtoul(user, &end, 10); + *uid = (int)strtoul(user, &end, 10); if (errno || *end != '\0') { snprintf(errbuff, sizeof(errbuff), "Couldn't lookup user ``%s''", user); @@ -358,7 +359,7 @@ owner_parse(const char *spec, int *uid, } else { char *end; errno = 0; - *gid = strtoul(g, &end, 10); + *gid = (int)strtoul(g, &end, 10); if (errno || *end != '\0') { snprintf(errbuff, sizeof(errbuff), "Couldn't lookup group ``%s''", g); Modified: head/contrib/libarchive/cpio/cpio.c ============================================================================== --- head/contrib/libarchive/cpio/cpio.c Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/cpio/cpio.c Sat Feb 25 10:58:02 2012 (r232153) @@ -50,9 +50,15 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_GRP_H #include <grp.h> #endif +#ifdef HAVE_LOCALE_H +#include <locale.h> +#endif #ifdef HAVE_PWD_H #include <pwd.h> #endif +#ifdef HAVE_SIGNAL_H +#include <signal.h> +#endif #ifdef HAVE_STDARG_H #include <stdarg.h> #endif @@ -69,9 +75,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif #ifdef HAVE_TIME_H #include <time.h> #endif @@ -116,6 +119,7 @@ static void mode_in(struct cpio *); static 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); @@ -136,20 +140,34 @@ main(int argc, char *argv[]) cpio->buff = buff; cpio->buff_size = sizeof(buff); +#if defined(HAVE_SIGACTION) && defined(SIGPIPE) + { /* Ignore SIGPIPE signals. */ + struct sigaction sa; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sa.sa_handler = SIG_IGN; + sigaction(SIGPIPE, &sa, NULL); + } +#endif + /* Need lafe_progname before calling lafe_warnc. */ if (*argv == NULL) lafe_progname = "bsdcpio"; else { #if defined(_WIN32) && !defined(__CYGWIN__) lafe_progname = strrchr(*argv, '\\'); -#else - lafe_progname = strrchr(*argv, '/'); + if (strrchr(*argv, '/') > lafe_progname) #endif + lafe_progname = strrchr(*argv, '/'); if (lafe_progname != NULL) lafe_progname++; else lafe_progname = *argv; } +#if HAVE_SETLOCALE + if (setlocale(LC_ALL, "") == NULL) + lafe_warnc(0, "Failed to set default locale"); +#endif cpio->uid_override = -1; cpio->gid_override = -1; @@ -187,9 +205,9 @@ main(int argc, char *argv[]) cpio->bytes_per_block = 5120; break; case 'C': /* NetBSD/OpenBSD */ - cpio->bytes_per_block = atoi(cpio->optarg); + cpio->bytes_per_block = atoi(cpio->argument); if (cpio->bytes_per_block <= 0) - lafe_errc(1, 0, "Invalid blocksize %s", cpio->optarg); + lafe_errc(1, 0, "Invalid blocksize %s", cpio->argument); break; case 'c': /* POSIX 1997 */ cpio->format = "odc"; @@ -199,22 +217,22 @@ main(int argc, char *argv[]) break; case 'E': /* NetBSD/OpenBSD */ lafe_include_from_file(&cpio->matching, - cpio->optarg, cpio->option_null); + cpio->argument, cpio->option_null); break; case 'F': /* NetBSD/OpenBSD/GNU cpio */ - cpio->filename = cpio->optarg; + cpio->filename = cpio->argument; break; case 'f': /* POSIX 1997 */ - lafe_exclude(&cpio->matching, cpio->optarg); + lafe_exclude(&cpio->matching, cpio->argument); break; case 'H': /* GNU cpio (also --format) */ - cpio->format = cpio->optarg; + cpio->format = cpio->argument; break; case 'h': long_help(); break; case 'I': /* NetBSD/OpenBSD */ - cpio->filename = cpio->optarg; + cpio->filename = cpio->argument; break; case 'i': /* POSIX 1997 */ if (cpio->mode != '\0') @@ -251,7 +269,7 @@ main(int argc, char *argv[]) cpio->extract_flags &= ~ARCHIVE_EXTRACT_OWNER; break; case 'O': /* GNU cpio */ - cpio->filename = cpio->optarg; + cpio->filename = cpio->argument; break; case 'o': /* POSIX 1997 */ if (cpio->mode != '\0') @@ -275,7 +293,7 @@ main(int argc, char *argv[]) case 'R': /* GNU cpio, also --owner */ /* TODO: owner_parse should return uname/gname * also; use that to set [ug]name_override. */ - errmsg = owner_parse(cpio->optarg, &uid, &gid); + errmsg = owner_parse(cpio->argument, &uid, &gid); if (errmsg) { lafe_warnc(-1, "%s", errmsg); usage(); @@ -302,6 +320,9 @@ main(int argc, char *argv[]) case 'v': /* POSIX 1997 */ cpio->verbose++; break; + case 'V': /* GNU cpio */ + cpio->dot++; + break; case OPTION_VERSION: /* GNU convention */ version(); break; @@ -345,6 +366,12 @@ main(int argc, char *argv[]) /* -l requires -p */ if (cpio->option_link && cpio->mode != 'p') lafe_errc(1, 0, "Option -l requires -p"); + /* -v overrides -V */ + if (cpio->dot && cpio->verbose) + cpio->dot = 0; + /* -v overrides -V */ + if (cpio->dot && cpio->verbose) + cpio->dot = 0; /* TODO: Flag other nonsensical combinations. */ switch (cpio->mode) { @@ -402,7 +429,7 @@ static const char *long_help_msg = "First option must be a mode specifier:\n" " -i Input -o Output -p Pass\n" "Common Options:\n" - " -v Verbose\n" + " -v Verbose filenames -V one dot per file\n" "Create: %p -o [options] < [list of files] > [archive]\n" " -J,-y,-z,--lzma Compress archive with xz/bzip2/gzip/lzma\n" " --format {odc|newc|ustar} Select archive format\n" @@ -451,7 +478,7 @@ version(void) { fprintf(stdout,"bsdcpio %s -- %s\n", BSDCPIO_VERSION_STRING, - archive_version()); + archive_version_string()); exit(0); } @@ -533,6 +560,8 @@ mode_out(struct cpio *cpio) } r = archive_write_close(cpio->archive); + if (cpio->dot) + fprintf(stderr, "\n"); if (r != ARCHIVE_OK) lafe_errc(1, 0, "%s", archive_error_string(cpio->archive)); @@ -543,7 +572,50 @@ mode_out(struct cpio *cpio) fprintf(stderr, "%lu %s\n", (unsigned long)blocks, blocks == 1 ? "block" : "blocks"); } - archive_write_finish(cpio->archive); + archive_write_free(cpio->archive); +} + +static const char * +remove_leading_slash(const char *p) +{ + const char *rp; + + /* Remove leading "//./" or "//?/" or "//?/UNC/" + * (absolute path prefixes used by Windows API) */ + if ((p[0] == '/' || p[0] == '\\') && + (p[1] == '/' || p[1] == '\\') && + (p[2] == '.' || p[2] == '?') && + (p[3] == '/' || p[3] == '\\')) + { + if (p[2] == '?' && + (p[4] == 'U' || p[4] == 'u') && + (p[5] == 'N' || p[5] == 'n') && + (p[6] == 'C' || p[6] == 'c') && + (p[7] == '/' || p[7] == '\\')) + p += 8; + else + p += 4; + } + do { + rp = p; + /* Remove leading drive letter from archives created + * on Windows. */ + if (((p[0] >= 'a' && p[0] <= 'z') || + (p[0] >= 'A' && p[0] <= 'Z')) && + p[1] == ':') { + p += 2; + } + /* Remove leading "/../", "//", etc. */ + while (p[0] == '/' || p[0] == '\\') { + if (p[1] == '.' && p[2] == '.' && + (p[3] == '/' || p[3] == '\\')) { + p += 3; /* Remove "/..", leave "/" + * for next pass. */ + } else + p += 1; /* Remove "/". */ + } + } while (rp != p); + return (p); } /* @@ -557,7 +629,6 @@ file_to_archive(struct cpio *cpio, const const char *destpath; struct archive_entry *entry, *spare; size_t len; - const char *p; int r; /* @@ -611,10 +682,7 @@ file_to_archive(struct cpio *cpio, const "Can't allocate path buffer"); } strcpy(cpio->pass_destpath, cpio->destdir); - p = srcpath; - while (p[0] == '/') - ++p; - strcat(cpio->pass_destpath, p); + strcat(cpio->pass_destpath, remove_leading_slash(srcpath)); destpath = cpio->pass_destpath; } if (cpio->option_rename) @@ -656,6 +724,8 @@ entry_to_archive(struct cpio *cpio, stru /* Print out the destination name to the user. */ if (cpio->verbose) fprintf(stderr,"%s", destpath); + if (cpio->dot) + fprintf(stderr, "."); /* * Option_link only makes sense in pass mode and for @@ -725,7 +795,7 @@ entry_to_archive(struct cpio *cpio, stru if (r == ARCHIVE_FATAL) exit(1); - if (r >= ARCHIVE_WARN && fd >= 0) { + if (r >= ARCHIVE_WARN && archive_entry_size(entry) > 0 && fd >= 0) { bytes_read = read(fd, cpio->buff, cpio->buff_size); while (bytes_read > 0) { r = archive_write_data(cpio->archive, @@ -825,7 +895,7 @@ mode_in(struct cpio *cpio) a = archive_read_new(); if (a == NULL) lafe_errc(1, 0, "Couldn't allocate archive object"); - archive_read_support_compression_all(a); + archive_read_support_filter_all(a); archive_read_support_format_all(a); if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block)) @@ -849,7 +919,9 @@ mode_in(struct cpio *cpio) if (destpath == NULL) continue; if (cpio->verbose) - fprintf(stdout, "%s\n", destpath); + fprintf(stderr, "%s\n", destpath); + if (cpio->dot) + fprintf(stderr, "."); if (cpio->uid_override >= 0) archive_entry_set_uid(entry, cpio->uid_override); if (cpio->gid_override >= 0) @@ -859,13 +931,16 @@ mode_in(struct cpio *cpio) fprintf(stderr, "%s: %s\n", archive_entry_pathname(entry), archive_error_string(ext)); - } else if (archive_entry_size(entry) > 0) { + } else if (!archive_entry_size_is_set(entry) + || archive_entry_size(entry) > 0) { r = extract_data(a, ext); if (r != ARCHIVE_OK) cpio->return_value = 1; } } r = archive_read_close(a); + if (cpio->dot) + fprintf(stderr, "\n"); if (r != ARCHIVE_OK) lafe_errc(1, 0, "%s", archive_error_string(a)); r = archive_write_close(ext); @@ -877,8 +952,8 @@ mode_in(struct cpio *cpio) fprintf(stderr, "%lu %s\n", (unsigned long)blocks, blocks == 1 ? "block" : "blocks"); } - archive_read_finish(a); - archive_write_finish(ext); + archive_read_free(a); + archive_write_free(ext); exit(cpio->return_value); } @@ -892,7 +967,7 @@ extract_data(struct archive *ar, struct int r; size_t size; const void *block; - off_t offset; + int64_t offset; for (;;) { r = archive_read_data_block(ar, &block, &size, &offset); @@ -922,7 +997,7 @@ mode_list(struct cpio *cpio) a = archive_read_new(); if (a == NULL) lafe_errc(1, 0, "Couldn't allocate archive object"); - archive_read_support_compression_all(a); + archive_read_support_filter_all(a); archive_read_support_format_all(a); if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block)) @@ -952,7 +1027,7 @@ mode_list(struct cpio *cpio) fprintf(stderr, "%lu %s\n", (unsigned long)blocks, blocks == 1 ? "block" : "blocks"); } - archive_read_finish(a); + archive_read_free(a); exit(0); } @@ -989,11 +1064,11 @@ list_item_verbose(struct cpio *cpio, str /* Use uname if it's present, else lookup name from uid. */ uname = archive_entry_uname(entry); if (uname == NULL) - uname = lookup_uname(cpio, archive_entry_uid(entry)); + uname = lookup_uname(cpio, (uid_t)archive_entry_uid(entry)); /* Use gname if it's present, else lookup name from gid. */ gname = archive_entry_gname(entry); if (gname == NULL) - gname = lookup_gname(cpio, archive_entry_gid(entry)); + gname = lookup_gname(cpio, (uid_t)archive_entry_gid(entry)); } /* Print device number or file size. */ @@ -1075,6 +1150,8 @@ mode_pass(struct cpio *cpio, const char archive_entry_linkresolver_free(cpio->linkresolver); r = archive_write_close(cpio->archive); + if (cpio->dot) + fprintf(stderr, "\n"); if (r != ARCHIVE_OK) lafe_errc(1, 0, "%s", archive_error_string(cpio->archive)); @@ -1086,7 +1163,7 @@ mode_pass(struct cpio *cpio, const char blocks == 1 ? "block" : "blocks"); } - archive_write_finish(cpio->archive); + archive_write_free(cpio->archive); } /* @@ -1102,12 +1179,24 @@ cpio_rename(const char *name) static char buff[1024]; FILE *t; char *p, *ret; +#if defined(_WIN32) && !defined(__CYGWIN__) + FILE *to; + t = fopen("CONIN$", "r"); + if (t == NULL) + return (name); + to = fopen("CONOUT$", "w"); + if (to == NULL) + return (name); + fprintf(to, "%s (Enter/./(new name))? ", name); + fclose(to); +#else t = fopen("/dev/tty", "r+"); if (t == NULL) return (name); fprintf(t, "%s (Enter/./(new name))? ", name); fflush(t); +#endif p = fgets(buff, sizeof(buff), t); fclose(t); @@ -1260,8 +1349,9 @@ lookup_gname_helper(struct cpio *cpio, c const char * cpio_i64toa(int64_t n0) { - // 2^64 =~ 1.8 * 10^19, so 20 decimal digits suffice. - // We also need 1 byte for '-' and 1 for '\0'. + /* 2^64 =~ 1.8 * 10^19, so 20 decimal digits suffice. + * We also need 1 byte for '-' and 1 for '\0'. + */ static char buff[22]; int64_t n = n0 < 0 ? -n0 : n0; char *p = buff + sizeof(buff); Modified: head/contrib/libarchive/cpio/cpio.h ============================================================================== --- head/contrib/libarchive/cpio/cpio.h Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/cpio/cpio.h Sat Feb 25 10:58:02 2012 (r232153) @@ -43,18 +43,18 @@ */ struct cpio { /* Option parsing */ - const char *optarg; + const char *argument; /* Options */ const char *filename; - char mode; /* -i -o -p */ - char compress; /* -j, -y, or -z */ + int mode; /* -i -o -p */ + int compress; /* -j, -y, or -z */ const char *format; /* -H format */ int bytes_per_block; /* -b block_size */ int verbose; /* -v */ + int dot; /* -V */ int quiet; /* --quiet */ int extract_flags; /* Flags for extract operation */ - char symlink_mode; /* H or L, per BSD conventions */ const char *compress_program; int option_append; /* -A, only relevant for -o */ int option_atime_restore; /* -a */ Modified: head/contrib/libarchive/cpio/test/main.c ============================================================================== --- head/contrib/libarchive/cpio/test/main.c Sat Feb 25 10:15:41 2012 (r232152) +++ head/contrib/libarchive/cpio/test/main.c Sat Feb 25 10:58:02 2012 (r232153) @@ -24,8 +24,18 @@ */ #include "test.h" +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif #include <errno.h> +#ifdef HAVE_ICONV_H +#include <iconv.h> +#endif +#include <limits.h> #include <locale.h> +#ifdef HAVE_SIGNAL_H +#include <signal.h> +#endif #include <stdarg.h> #include <time.h> @@ -40,8 +50,10 @@ __FBSDID("$FreeBSD$"); #define KNOWNREF "test_option_f.cpio.uu" #define ENVBASE "BSDCPIO" /* Prefix for environment variables. */ #define PROGRAM "bsdcpio" /* Name of program being tested. */ -#undef LIBRARY /* Not testing a library. */ -#undef EXTRA_DUMP /* How to dump extra data */ +#define PROGRAM_ALIAS "cpio" /* Generic alias for program */ +#undef LIBRARY /* Not testing a library. */ +#undef EXTRA_DUMP /* How to dump extra data */ +#undef EXTRA_ERRNO /* How to dump errno */ /* How to generate extra version info. */ #define EXTRA_VERSION (systemf("%s --version", testprog) ? "" : "") @@ -78,6 +90,7 @@ __FBSDID("$FreeBSD$"); #endif #if !defined(__BORLANDC__) #define access _access *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202251058.q1PAw30N014517>