svn commit: r248616 - in head: contrib/libarchive contrib/libarchive/cpio contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/tar contri...
Martin Matuska
mm at FreeBSD.org
Fri Mar 22 13:36:08 UTC 2013
Author: mm
Date: Fri Mar 22 13:36:03 2013
New Revision: 248616
URL: http://svnweb.freebsd.org/changeset/base/248616
Log:
MFV r248590,248594:
Update libarchive to 3.1.2
Some of new features:
- support for lrzip and grzip compression
- support for writing tar v7 format
- b64encode and uuencode filters
- support for __MACOSX directory in Zip archives
- support for lzop compresion (external utility)
Added:
head/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.Z.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.bz2.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.grz.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.gz.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lrz.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lz.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lzma.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lzo.uu
head/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.xz.uu
head/contrib/libarchive/cpio/test/test_extract_cpio_Z.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_Z.c
head/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_bz2.c
head/contrib/libarchive/cpio/test/test_extract_cpio_grz.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_grz.c
head/contrib/libarchive/cpio/test/test_extract_cpio_gz.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_gz.c
head/contrib/libarchive/cpio/test/test_extract_cpio_lrz.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_lrz.c
head/contrib/libarchive/cpio/test/test_extract_cpio_lz.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_lz.c
head/contrib/libarchive/cpio/test/test_extract_cpio_lzma.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_lzma.c
head/contrib/libarchive/cpio/test/test_extract_cpio_lzo.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_lzo.c
head/contrib/libarchive/cpio/test/test_extract_cpio_xz.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_xz.c
head/contrib/libarchive/cpio/test/test_option_b64encode.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_option_b64encode.c
head/contrib/libarchive/cpio/test/test_option_grzip.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_option_grzip.c
head/contrib/libarchive/cpio/test/test_option_lrzip.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_option_lrzip.c
head/contrib/libarchive/cpio/test/test_option_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_option_lzop.c
head/contrib/libarchive/cpio/test/test_option_uuencode.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_option_uuencode.c
head/contrib/libarchive/cpio/test/test_option_xz.c
- copied unchanged from r248590, vendor/libarchive/dist/cpio/test/test_option_xz.c
head/contrib/libarchive/libarchive/archive_cmdline.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_cmdline.c
head/contrib/libarchive/libarchive/archive_cmdline_private.h
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_cmdline_private.h
head/contrib/libarchive/libarchive/archive_read_append_filter.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_read_append_filter.c
head/contrib/libarchive/libarchive/archive_read_set_format.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_read_set_format.c
head/contrib/libarchive/libarchive/archive_read_support_filter_grzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_read_support_filter_grzip.c
head/contrib/libarchive/libarchive/archive_read_support_filter_lrzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_read_support_filter_lrzip.c
head/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_read_support_filter_lzop.c
head/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_add_filter_b64encode.c
head/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_add_filter_by_name.c
head/contrib/libarchive/libarchive/archive_write_add_filter_grzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_add_filter_grzip.c
head/contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_add_filter_lrzip.c
head/contrib/libarchive/libarchive/archive_write_add_filter_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_add_filter_lzop.c
head/contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_add_filter_uuencode.c
head/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/archive_write_set_format_v7tar.c
head/contrib/libarchive/libarchive/filter_fork_posix.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/filter_fork_posix.c
head/contrib/libarchive/libarchive/test/test_archive_cmdline.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_archive_cmdline.c
head/contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_archive_read_multiple_data_objects.c
head/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_archive_write_add_filter_by_name.c
head/contrib/libarchive/libarchive/test/test_archive_write_set_format_by_name.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_archive_write_set_format_by_name.c
head/contrib/libarchive/libarchive/test/test_compat_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_compat_lzop.c
head/contrib/libarchive/libarchive/test/test_compat_lzop_1.tar.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_compat_lzop_1.tar.lzo.uu
head/contrib/libarchive/libarchive/test/test_compat_lzop_2.tar.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_compat_lzop_2.tar.lzo.uu
head/contrib/libarchive/libarchive/test/test_compat_lzop_3.tar.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_compat_lzop_3.tar.lzo.uu
head/contrib/libarchive/libarchive/test/test_compat_uudecode.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_compat_uudecode.c
head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
head/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
head/contrib/libarchive/libarchive/test/test_read_filter_grzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_grzip.c
head/contrib/libarchive/libarchive/test/test_read_filter_grzip.tar.grz.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_grzip.tar.grz.uu
head/contrib/libarchive/libarchive/test/test_read_filter_lrzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_lrzip.c
head/contrib/libarchive/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
head/contrib/libarchive/libarchive/test/test_read_filter_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_lzop.c
head/contrib/libarchive/libarchive/test/test_read_filter_lzop.tar.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_lzop.tar.lzo.uu
head/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_lzop_multiple_parts.c
head/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu
head/contrib/libarchive/libarchive/test/test_read_filter_program.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_program.c
head/contrib/libarchive/libarchive/test/test_read_filter_program_signature.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_program_signature.c
head/contrib/libarchive/libarchive/test/test_read_filter_uudecode.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_filter_uudecode.c
head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu
head/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu
head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
head/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored.c
head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu
head/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu
head/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_mac_metadata.c
head/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.zip.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_mac_metadata.zip.uu
head/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_sfx.c
head/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_format_zip_sfx.uu
head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_aa.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_aa.uu
head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ab.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ab.uu
head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ac.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ac.uu
head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ad.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ad.uu
head/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ae.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ae.uu
head/contrib/libarchive/libarchive/test/test_read_set_format.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_set_format.c
head/contrib/libarchive/libarchive/test/test_read_splitted_rar_aa.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_aa.uu
head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ab.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_ab.uu
head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ac.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_ac.uu
head/contrib/libarchive/libarchive/test/test_read_splitted_rar_ad.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_ad.uu
head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_aa.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_splitted_rar_seek_support_aa.uu
head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ab.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_splitted_rar_seek_support_ab.uu
head/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ac.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_splitted_rar_seek_support_ac.uu
head/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_appledouble.c
head/contrib/libarchive/libarchive/test/test_write_disk_appledouble.cpio.gz.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_appledouble.cpio.gz.uu
head/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_hfs_compression.c
head/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.tgz.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_hfs_compression.tgz.uu
head/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_mac_metadata.c
head/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu
head/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_no_hfs_compression.c
head/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu
head/contrib/libarchive/libarchive/test/test_write_filter_b64encode.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_b64encode.c
head/contrib/libarchive/libarchive/test/test_write_filter_bzip2.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_bzip2.c
head/contrib/libarchive/libarchive/test/test_write_filter_compress.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_compress.c
head/contrib/libarchive/libarchive/test/test_write_filter_gzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_gzip.c
head/contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_gzip_timestamp.c
head/contrib/libarchive/libarchive/test/test_write_filter_lrzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_lrzip.c
head/contrib/libarchive/libarchive/test/test_write_filter_lzip.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_lzip.c
head/contrib/libarchive/libarchive/test/test_write_filter_lzma.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_lzma.c
head/contrib/libarchive/libarchive/test/test_write_filter_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_lzop.c
head/contrib/libarchive/libarchive/test/test_write_filter_program.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_program.c
head/contrib/libarchive/libarchive/test/test_write_filter_uuencode.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_uuencode.c
head/contrib/libarchive/libarchive/test/test_write_filter_xz.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_filter_xz.c
head/contrib/libarchive/libarchive/test/test_write_format_7zip_empty.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_7zip_empty.c
head/contrib/libarchive/libarchive/test/test_write_format_7zip_large.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_7zip_large.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree_absolute_path.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_mtree_absolute_path.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree_classic.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_mtree_classic.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree_classic_indent.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_mtree_classic_indent.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree_no_separator.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_mtree_no_separator.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree_quoted_filename.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_mtree_quoted_filename.c
head/contrib/libarchive/libarchive/test/test_write_format_tar_v7tar.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_format_tar_v7tar.c
head/contrib/libarchive/libarchive/test/test_write_zip_set_compression_store.c
- copied unchanged from r248590, vendor/libarchive/dist/libarchive/test/test_write_zip_set_compression_store.c
head/contrib/libarchive/tar/creation_set.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/creation_set.c
head/contrib/libarchive/tar/test/test_extract.tar.Z.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.Z.uu
head/contrib/libarchive/tar/test/test_extract.tar.bz2.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.bz2.uu
head/contrib/libarchive/tar/test/test_extract.tar.grz.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.grz.uu
head/contrib/libarchive/tar/test/test_extract.tar.gz.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.gz.uu
head/contrib/libarchive/tar/test/test_extract.tar.lrz.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.lrz.uu
head/contrib/libarchive/tar/test/test_extract.tar.lz.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.lz.uu
head/contrib/libarchive/tar/test/test_extract.tar.lzma.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.lzma.uu
head/contrib/libarchive/tar/test/test_extract.tar.lzo.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.lzo.uu
head/contrib/libarchive/tar/test/test_extract.tar.xz.uu
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract.tar.xz.uu
head/contrib/libarchive/tar/test/test_extract_tar_Z.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_Z.c
head/contrib/libarchive/tar/test/test_extract_tar_bz2.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_bz2.c
head/contrib/libarchive/tar/test/test_extract_tar_grz.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_grz.c
head/contrib/libarchive/tar/test/test_extract_tar_gz.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_gz.c
head/contrib/libarchive/tar/test/test_extract_tar_lrz.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_lrz.c
head/contrib/libarchive/tar/test/test_extract_tar_lz.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_lz.c
head/contrib/libarchive/tar/test/test_extract_tar_lzma.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_lzma.c
head/contrib/libarchive/tar/test/test_extract_tar_lzo.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_lzo.c
head/contrib/libarchive/tar/test/test_extract_tar_xz.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_extract_tar_xz.c
head/contrib/libarchive/tar/test/test_option_a.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_a.c
head/contrib/libarchive/tar/test/test_option_b64encode.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_b64encode.c
head/contrib/libarchive/tar/test/test_option_grzip.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_grzip.c
head/contrib/libarchive/tar/test/test_option_j.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_j.c
head/contrib/libarchive/tar/test/test_option_lrzip.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_lrzip.c
head/contrib/libarchive/tar/test/test_option_lzma.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_lzma.c
head/contrib/libarchive/tar/test/test_option_lzop.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_lzop.c
head/contrib/libarchive/tar/test/test_option_older_than.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_older_than.c
head/contrib/libarchive/tar/test/test_option_uuencode.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_uuencode.c
head/contrib/libarchive/tar/test/test_option_xz.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_xz.c
head/contrib/libarchive/tar/test/test_option_z.c
- copied unchanged from r248590, vendor/libarchive/dist/tar/test/test_option_z.c
head/contrib/libarchive/test_utils/
- copied from r248590, vendor/libarchive/dist/test_utils/
Deleted:
head/contrib/libarchive/libarchive/filter_fork.c
head/contrib/libarchive/libarchive/test/test_acl_freebsd.c
head/contrib/libarchive/libarchive/test/test_read_compress_program.c
head/contrib/libarchive/libarchive/test/test_read_uu.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_lzip.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
Modified:
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_basic.c
head/contrib/libarchive/cpio/test/test_format_newc.c
head/contrib/libarchive/cpio/test/test_option_y.c
head/contrib/libarchive/cpio/test/test_option_z.c
head/contrib/libarchive/libarchive/archive.h
head/contrib/libarchive/libarchive/archive_crypto.c
head/contrib/libarchive/libarchive/archive_entry.c
head/contrib/libarchive/libarchive/archive_entry.h
head/contrib/libarchive/libarchive/archive_entry_link_resolver.c
head/contrib/libarchive/libarchive/archive_match.c
head/contrib/libarchive/libarchive/archive_options.c
head/contrib/libarchive/libarchive/archive_ppmd7.c
head/contrib/libarchive/libarchive/archive_private.h
head/contrib/libarchive/libarchive/archive_rb.c
head/contrib/libarchive/libarchive/archive_read.c
head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
head/contrib/libarchive/libarchive/archive_read_disk_posix.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_private.h
head/contrib/libarchive/libarchive/archive_read_support_filter_all.c
head/contrib/libarchive/libarchive/archive_read_support_filter_bzip2.c
head/contrib/libarchive/libarchive/archive_read_support_filter_compress.c
head/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c
head/contrib/libarchive/libarchive/archive_read_support_filter_program.c
head/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c
head/contrib/libarchive/libarchive/archive_read_support_filter_uu.c
head/contrib/libarchive/libarchive/archive_read_support_filter_xz.c
head/contrib/libarchive/libarchive/archive_read_support_format_7zip.c
head/contrib/libarchive/libarchive/archive_read_support_format_ar.c
head/contrib/libarchive/libarchive/archive_read_support_format_cab.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_lha.c
head/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
head/contrib/libarchive/libarchive/archive_read_support_format_rar.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_util.c
head/contrib/libarchive/libarchive/archive_virtual.c
head/contrib/libarchive/libarchive/archive_write.c
head/contrib/libarchive/libarchive/archive_write_add_filter.c
head/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c
head/contrib/libarchive/libarchive/archive_write_add_filter_compress.c
head/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c
head/contrib/libarchive/libarchive/archive_write_add_filter_program.c
head/contrib/libarchive/libarchive/archive_write_add_filter_xz.c
head/contrib/libarchive/libarchive/archive_write_disk_acl.c
head/contrib/libarchive/libarchive/archive_write_disk_posix.c
head/contrib/libarchive/libarchive/archive_write_free.3
head/contrib/libarchive/libarchive/archive_write_open_filename.c
head/contrib/libarchive/libarchive/archive_write_private.h
head/contrib/libarchive/libarchive/archive_write_set_format_7zip.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_iso9660.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_xar.c
head/contrib/libarchive/libarchive/archive_write_set_format_zip.c
head/contrib/libarchive/libarchive/archive_write_set_options.c
head/contrib/libarchive/libarchive/filter_fork.h
head/contrib/libarchive/libarchive/libarchive-formats.5
head/contrib/libarchive/libarchive/test/main.c
head/contrib/libarchive/libarchive/test/test.h
head/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c
head/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
head/contrib/libarchive/libarchive/test/test_acl_nfs4.c
head/contrib/libarchive/libarchive/test/test_acl_pax.c
head/contrib/libarchive/libarchive/test/test_acl_posix1e.c
head/contrib/libarchive/libarchive/test/test_archive_clear_error.c
head/contrib/libarchive/libarchive/test/test_archive_read_close_twice.c
head/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_fd.c
head/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c
head/contrib/libarchive/libarchive/test/test_archive_read_set_filter_option.c
head/contrib/libarchive/libarchive/test/test_archive_read_set_format_option.c
head/contrib/libarchive/libarchive/test/test_archive_read_set_option.c
head/contrib/libarchive/libarchive/test/test_archive_read_set_options.c
head/contrib/libarchive/libarchive/test/test_archive_set_error.c
head/contrib/libarchive/libarchive/test/test_archive_write_set_filter_option.c
head/contrib/libarchive/libarchive/test/test_archive_write_set_format_option.c
head/contrib/libarchive/libarchive/test/test_archive_write_set_option.c
head/contrib/libarchive/libarchive/test/test_archive_write_set_options.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_lzip.c
head/contrib/libarchive/libarchive/test/test_compat_lzma.c
head/contrib/libarchive/libarchive/test/test_compat_mac.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_empty_write.c
head/contrib/libarchive/libarchive/test/test_entry.c
head/contrib/libarchive/libarchive/test/test_filter_count.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_data_large.c
head/contrib/libarchive/libarchive/test/test_read_disk.c
head/contrib/libarchive/libarchive/test/test_read_extract.c
head/contrib/libarchive/libarchive/test/test_read_format_7zip.c
head/contrib/libarchive/libarchive/test/test_read_format_ar.c
head/contrib/libarchive/libarchive/test/test_read_format_cab.c
head/contrib/libarchive/libarchive/test/test_read_format_cab_filename.c
head/contrib/libarchive/libarchive/test/test_read_format_cpio_afio.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_lzip.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_filename.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_iso_Z.c
head/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c
head/contrib/libarchive/libarchive/test/test_read_format_iso_xorriso.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_isojoliet_versioned.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_lha.c
head/contrib/libarchive/libarchive/test/test_read_format_lha_filename.c
head/contrib/libarchive/libarchive/test/test_read_format_mtree.c
head/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c
head/contrib/libarchive/libarchive/test/test_read_format_rar.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_filename.c
head/contrib/libarchive/libarchive/test/test_read_pax_truncated.c
head/contrib/libarchive/libarchive/test/test_read_truncated.c
head/contrib/libarchive/libarchive/test/test_read_truncated_filter.c
head/contrib/libarchive/libarchive/test/test_sparse_basic.c
head/contrib/libarchive/libarchive/test/test_tar_filenames.c
head/contrib/libarchive/libarchive/test/test_ustar_filenames.c
head/contrib/libarchive/libarchive/test/test_write_disk_sparse.c
head/contrib/libarchive/libarchive/test/test_write_format_7zip.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_gnutar.c
head/contrib/libarchive/libarchive/test/test_write_format_iso9660.c
head/contrib/libarchive/libarchive/test/test_write_format_iso9660_boot.c
head/contrib/libarchive/libarchive/test/test_write_format_iso9660_empty.c
head/contrib/libarchive/libarchive/test/test_write_format_iso9660_filename.c
head/contrib/libarchive/libarchive/test/test_write_format_iso9660_zisofs.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree.c
head/contrib/libarchive/libarchive/test/test_write_format_mtree_fflags.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_sparse.c
head/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c
head/contrib/libarchive/libarchive/test/test_write_format_xar.c
head/contrib/libarchive/libarchive/test/test_write_format_xar_empty.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/tar/bsdtar.1
head/contrib/libarchive/tar/bsdtar.c
head/contrib/libarchive/tar/bsdtar.h
head/contrib/libarchive/tar/cmdline.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_copy.c
head/contrib/libarchive/tar/test/test_option_newer_than.c
head/contrib/libarchive/tar/test/test_option_r.c
head/contrib/libarchive/tar/test/test_stdio.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/Makefile
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/tar/ (props changed)
Modified: head/contrib/libarchive/NEWS
==============================================================================
--- head/contrib/libarchive/NEWS Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/NEWS Fri Mar 22 13:36:03 2013 (r248616)
@@ -1,3 +1,30 @@
+Feb 09, 2013: libarchive 3.1.2 released
+
+Jan 28, 2013: libarchive's new website moved to http://www.libarchive.org.
+
+Jan 13, 2013: libarchive 3.1.1 released
+
+Jan 13, 2013: libarchive 3.1.0 released
+
+Dec 07, 2012: Implement functions to manually set the format and filters used.
+
+Nov 11, 2012: Add support for __MACOSX directory in Zip archives, which resource
+ forks are stored in.
+
+Oct 20, 2012: Add support for writing v7 tar format.
+
+Oct 09, 2012: Add support for grzip compression.
+
+Oct 07, 2012: Introduce b64encode filter.
+Oct 07, 2012: Introduce uuencode filter.
+
+Oct 06, 2012: Add support for lzop.
+
+Sep 27, 2012: Implement function used to seek within data blocks.
+ (Currently only supported for uncompressed RAR archives).
+
+Apr 22, 2012: Add basic archive read and write filter support for lrzip.
+
Mar 27, 2012: libarchive 3.0.4 released
Feb 05, 2012: libarchive development now hosted at GitHub.
Modified: head/contrib/libarchive/README
==============================================================================
--- head/contrib/libarchive/README Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/README Fri Mar 22 13:36:03 2013 (r248616)
@@ -1,7 +1,7 @@
README for libarchive bundle.
Questions? Issues?
- * http://libarchive.github.com/ is the home for ongoing
+ * http://www.libarchive.org is the home for ongoing
libarchive development, including documentation, and
links to the libarchive mailing lists.
* To report an issue, use the issue tracker at
Modified: head/contrib/libarchive/cpio/bsdcpio.1
==============================================================================
--- head/contrib/libarchive/cpio/bsdcpio.1 Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/bsdcpio.1 Fri Mar 22 13:36:03 2013 (r248616)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd December 24, 2011
+.Dd October 7, 2012
.Dt CPIO 1
.Os
.Sh NAME
@@ -176,11 +176,21 @@ With this option, the target of the link
(p mode only)
Create links from the target directory to the original files,
instead of copying.
+.It Fl Fl lrzip
+(o mode only)
+Compress the resulting archive with
+.Xr lrzip 1 .
+In input mode, this option is ignored.
.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 Fl lzop
+(o mode only)
+Compress the resulting archive with
+.Xr lzop 1 .
+In input mode, this option is ignored.
.It Fl m , Fl Fl preserve-modification-time
(i and p modes)
Set file modification time on created files to match
Modified: head/contrib/libarchive/cpio/cmdline.c
==============================================================================
--- head/contrib/libarchive/cpio/cmdline.c Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/cmdline.c Fri Mar 22 13:36:03 2013 (r248616)
@@ -61,16 +61,20 @@ static const struct option {
int required; /* 1 if this option requires an argument */
int equivalent; /* Equivalent short option. */
} cpio_longopts[] = {
+ { "b64encode", 0, OPTION_B64ENCODE },
{ "create", 0, 'o' },
{ "dot", 0, 'V' },
{ "extract", 0, 'i' },
{ "file", 1, 'F' },
{ "format", 1, 'H' },
+ { "grzip", 0, OPTION_GRZIP },
{ "help", 0, 'h' },
{ "insecure", 0, OPTION_INSECURE },
{ "link", 0, 'l' },
{ "list", 0, 't' },
+ { "lrzip", 0, OPTION_LRZIP },
{ "lzma", 0, OPTION_LZMA },
+ { "lzop", 0, OPTION_LZOP },
{ "make-directories", 0, 'd' },
{ "no-preserve-owner", 0, OPTION_NO_PRESERVE_OWNER },
{ "null", 0, '0' },
@@ -81,6 +85,7 @@ static const struct option {
{ "preserve-owner", 0, OPTION_PRESERVE_OWNER },
{ "quiet", 0, OPTION_QUIET },
{ "unconditional", 0, 'u' },
+ { "uuencode", 0, OPTION_UUENCODE },
{ "verbose", 0, 'v' },
{ "version", 0, OPTION_VERSION },
{ "xz", 0, 'J' },
Modified: head/contrib/libarchive/cpio/cpio.c
==============================================================================
--- head/contrib/libarchive/cpio/cpio.c Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/cpio.c Fri Mar 22 13:36:03 2013 (r248616)
@@ -207,6 +207,9 @@ main(int argc, char *argv[])
case 'B': /* POSIX 1997 */
cpio->bytes_per_block = 5120;
break;
+ case OPTION_B64ENCODE:
+ cpio->add_filter = opt;
+ break;
case 'C': /* NetBSD/OpenBSD */
cpio->bytes_per_block = atoi(cpio->argument);
if (cpio->bytes_per_block <= 0)
@@ -234,6 +237,9 @@ main(int argc, char *argv[])
lafe_errc(1, 0, "Error : %s",
archive_error_string(cpio->matching));
break;
+ case OPTION_GRZIP:
+ cpio->compress = opt;
+ break;
case 'H': /* GNU cpio (also --format) */
cpio->format = cpio->argument;
break;
@@ -265,7 +271,9 @@ main(int argc, char *argv[])
case 'l': /* POSIX 1997 */
cpio->option_link = 1;
break;
+ case OPTION_LRZIP:
case OPTION_LZMA: /* GNU tar, others */
+ case OPTION_LZOP: /* GNU tar, others */
cpio->compress = opt;
break;
case 'm': /* POSIX 1997 */
@@ -326,6 +334,9 @@ main(int argc, char *argv[])
cpio->extract_flags
&= ~ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
break;
+ case OPTION_UUENCODE:
+ cpio->add_filter = opt;
+ break;
case 'v': /* POSIX 1997 */
cpio->verbose++;
break;
@@ -417,6 +428,7 @@ main(int argc, char *argv[])
archive_match_free(cpio->matching);
free_cache(cpio->gname_cache);
free_cache(cpio->uname_cache);
+ free(cpio->destdir);
return (cpio->return_value);
}
@@ -516,27 +528,49 @@ mode_out(struct cpio *cpio)
if (cpio->archive == NULL)
lafe_errc(1, 0, "Failed to allocate archive object");
switch (cpio->compress) {
+ case OPTION_GRZIP:
+ r = archive_write_add_filter_grzip(cpio->archive);
+ break;
case 'J':
- r = archive_write_set_compression_xz(cpio->archive);
+ r = archive_write_add_filter_xz(cpio->archive);
+ break;
+ case OPTION_LRZIP:
+ r = archive_write_add_filter_lrzip(cpio->archive);
break;
case OPTION_LZMA:
- r = archive_write_set_compression_lzma(cpio->archive);
+ r = archive_write_add_filter_lzma(cpio->archive);
+ break;
+ case OPTION_LZOP:
+ r = archive_write_add_filter_lzop(cpio->archive);
break;
case 'j': case 'y':
- r = archive_write_set_compression_bzip2(cpio->archive);
+ r = archive_write_add_filter_bzip2(cpio->archive);
break;
case 'z':
- r = archive_write_set_compression_gzip(cpio->archive);
+ r = archive_write_add_filter_gzip(cpio->archive);
break;
case 'Z':
- r = archive_write_set_compression_compress(cpio->archive);
+ r = archive_write_add_filter_compress(cpio->archive);
break;
default:
- r = archive_write_set_compression_none(cpio->archive);
+ r = archive_write_add_filter_none(cpio->archive);
break;
}
if (r < ARCHIVE_WARN)
lafe_errc(1, 0, "Requested compression not available");
+ switch (cpio->add_filter) {
+ case 0:
+ r = ARCHIVE_OK;
+ break;
+ case OPTION_B64ENCODE:
+ r = archive_write_add_filter_b64encode(cpio->archive);
+ break;
+ case OPTION_UUENCODE:
+ r = archive_write_add_filter_uuencode(cpio->archive);
+ break;
+ }
+ if (r < ARCHIVE_WARN)
+ lafe_errc(1, 0, "Requested filter not available");
r = archive_write_set_format_by_name(cpio->archive, cpio->format);
if (r != ARCHIVE_OK)
lafe_errc(1, 0, "%s", archive_error_string(cpio->archive));
@@ -548,7 +582,7 @@ mode_out(struct cpio *cpio)
/*
* The main loop: Copy each file into the output archive.
*/
- r = archive_write_open_file(cpio->archive, cpio->filename);
+ r = archive_write_open_filename(cpio->archive, cpio->filename);
if (r != ARCHIVE_OK)
lafe_errc(1, 0, "%s", archive_error_string(cpio->archive));
lr = lafe_line_reader("-", cpio->option_null);
@@ -577,7 +611,7 @@ mode_out(struct cpio *cpio)
if (!cpio->quiet) {
int64_t blocks =
- (archive_position_uncompressed(cpio->archive) + 511)
+ (archive_filter_bytes(cpio->archive, 0) + 511)
/ 512;
fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
blocks == 1 ? "block" : "blocks");
@@ -806,18 +840,21 @@ entry_to_archive(struct cpio *cpio, stru
exit(1);
if (r >= ARCHIVE_WARN && archive_entry_size(entry) > 0 && fd >= 0) {
- bytes_read = read(fd, cpio->buff, cpio->buff_size);
+ bytes_read = read(fd, cpio->buff, (unsigned)cpio->buff_size);
while (bytes_read > 0) {
- r = archive_write_data(cpio->archive,
+ ssize_t bytes_write;
+ bytes_write = archive_write_data(cpio->archive,
cpio->buff, bytes_read);
- if (r < 0)
+ if (bytes_write < 0)
lafe_errc(1, archive_errno(cpio->archive),
"%s", archive_error_string(cpio->archive));
- if (r < bytes_read) {
+ if (bytes_write < bytes_read) {
lafe_warnc(0,
- "Truncated write; file may have grown while being archived.");
+ "Truncated write; file may have "
+ "grown while being archived.");
}
- bytes_read = read(fd, cpio->buff, cpio->buff_size);
+ bytes_read = read(fd, cpio->buff,
+ (unsigned)cpio->buff_size);
}
}
@@ -908,7 +945,8 @@ mode_in(struct cpio *cpio)
archive_read_support_filter_all(a);
archive_read_support_format_all(a);
- if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block))
+ if (archive_read_open_filename(a, cpio->filename,
+ cpio->bytes_per_block))
lafe_errc(1, archive_errno(a),
"%s", archive_error_string(a));
for (;;) {
@@ -957,7 +995,7 @@ mode_in(struct cpio *cpio)
if (r != ARCHIVE_OK)
lafe_errc(1, 0, "%s", archive_error_string(ext));
if (!cpio->quiet) {
- int64_t blocks = (archive_position_uncompressed(a) + 511)
+ int64_t blocks = (archive_filter_bytes(a, 0) + 511)
/ 512;
fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
blocks == 1 ? "block" : "blocks");
@@ -988,7 +1026,7 @@ extract_data(struct archive *ar, struct
"%s", archive_error_string(ar));
exit(1);
}
- r = archive_write_data_block(aw, block, size, offset);
+ r = (int)archive_write_data_block(aw, block, size, offset);
if (r != ARCHIVE_OK) {
lafe_warnc(archive_errno(aw),
"%s", archive_error_string(aw));
@@ -1010,7 +1048,8 @@ mode_list(struct cpio *cpio)
archive_read_support_filter_all(a);
archive_read_support_format_all(a);
- if (archive_read_open_file(a, cpio->filename, cpio->bytes_per_block))
+ if (archive_read_open_filename(a, cpio->filename,
+ cpio->bytes_per_block))
lafe_errc(1, archive_errno(a),
"%s", archive_error_string(a));
for (;;) {
@@ -1032,7 +1071,7 @@ mode_list(struct cpio *cpio)
if (r != ARCHIVE_OK)
lafe_errc(1, 0, "%s", archive_error_string(a));
if (!cpio->quiet) {
- int64_t blocks = (archive_position_uncompressed(a) + 511)
+ int64_t blocks = (archive_filter_bytes(a, 0) + 511)
/ 512;
fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
blocks == 1 ? "block" : "blocks");
@@ -1167,7 +1206,7 @@ mode_pass(struct cpio *cpio, const char
if (!cpio->quiet) {
int64_t blocks =
- (archive_position_uncompressed(cpio->archive) + 511)
+ (archive_filter_bytes(cpio->archive, 0) + 511)
/ 512;
fprintf(stderr, "%lu %s\n", (unsigned long)blocks,
blocks == 1 ? "block" : "blocks");
Modified: head/contrib/libarchive/cpio/cpio.h
==============================================================================
--- head/contrib/libarchive/cpio/cpio.h Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/cpio.h Fri Mar 22 13:36:03 2013 (r248616)
@@ -44,6 +44,7 @@ struct cpio {
const char *argument;
/* Options */
+ int add_filter; /* --uuencode */
const char *filename;
int mode; /* -i -o -p */
int compress; /* -j, -y, or -z */
@@ -96,11 +97,16 @@ const char *owner_parse(const char *, in
/* Fake short equivalents for long options that otherwise lack them. */
enum {
- OPTION_INSECURE = 1,
+ OPTION_B64ENCODE = 1,
+ OPTION_GRZIP,
+ OPTION_INSECURE,
+ OPTION_LRZIP,
OPTION_LZMA,
+ OPTION_LZOP,
OPTION_NO_PRESERVE_OWNER,
OPTION_PRESERVE_OWNER,
OPTION_QUIET,
+ OPTION_UUENCODE,
OPTION_VERSION
};
Modified: head/contrib/libarchive/cpio/test/main.c
==============================================================================
--- head/contrib/libarchive/cpio/test/main.c Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/test/main.c Fri Mar 22 13:36:03 2013 (r248616)
@@ -24,6 +24,7 @@
*/
#include "test.h"
+#include "test_utils.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
@@ -91,6 +92,7 @@ __FBSDID("$FreeBSD$");
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
#include <io.h>
+#include <direct.h>
#include <windows.h>
#ifndef F_OK
#define F_OK (0)
@@ -389,7 +391,6 @@ failure_finish(void *extra)
fprintf(stderr,
" *** forcing core dump so failure can be debugged ***\n");
abort();
- exit(1);
}
}
@@ -622,8 +623,8 @@ assertion_equal_string(const char *file,
if (v1 == v2 || (v1 != NULL && v2 != NULL && strcmp(v1, v2) == 0))
return (1);
failure_start(file, line, "%s != %s", e1, e2);
- l1 = strlen(e1);
- l2 = strlen(e2);
+ l1 = (int)strlen(e1);
+ l2 = (int)strlen(e2);
if (l1 < l2)
l1 = l2;
strdump(e1, v1, l1, utf8);
@@ -746,6 +747,8 @@ assertion_equal_mem(const char *file, in
assertion_count(file, line);
if (v1 == v2 || (v1 != NULL && v2 != NULL && memcmp(v1, v2, l) == 0))
return (1);
+ if (v1 == NULL || v2 == NULL)
+ return (0);
failure_start(file, line, "%s != %s", e1, e2);
logprintf(" size %s = %d\n", ld, (int)l);
@@ -839,9 +842,14 @@ assertion_equal_file(const char *filenam
f1 = fopen(fn1, "rb");
f2 = fopen(fn2, "rb");
+ if (f1 == NULL || f2 == NULL) {
+ if (f1) fclose(f1);
+ if (f2) fclose(f2);
+ return (0);
+ }
for (;;) {
- n1 = fread(buff1, 1, sizeof(buff1), f1);
- n2 = fread(buff2, 1, sizeof(buff2), f2);
+ n1 = (int)fread(buff1, 1, sizeof(buff1), f1);
+ n2 = (int)fread(buff2, 1, sizeof(buff2), f2);
if (n1 != n2)
break;
if (n1 == 0 && n2 == 0) {
@@ -915,7 +923,7 @@ assertion_file_contents(const char *file
return (0);
}
contents = malloc(s * 2);
- n = fread(contents, 1, s * 2, f);
+ n = (int)fread(contents, 1, s * 2, f);
fclose(f);
if (n == s && memcmp(buff, contents, s) == 0) {
free(contents);
@@ -951,9 +959,9 @@ assertion_text_file_contents(const char
failure_finish(NULL);
return (0);
}
- s = strlen(buff);
+ s = (int)strlen(buff);
contents = malloc(s * 2 + 128);
- n = fread(contents, 1, s * 2 + 128 - 1, f);
+ n = (int)fread(contents, 1, s * 2 + 128 - 1, f);
if (n >= 0)
contents[n] = '\0';
fclose(f);
@@ -1004,8 +1012,8 @@ assertion_file_contains_lines_any_order(
char *buff;
size_t buff_size;
size_t expected_count, actual_count, i, j;
- char **expected;
- char *p, **actual;
+ char **expected = NULL;
+ char *p, **actual = NULL;
char c;
int expected_failure = 0, actual_failure = 0;
@@ -1018,14 +1026,21 @@ assertion_file_contains_lines_any_order(
return (0);
}
- /* Make a copy of the provided lines and count up the expected file size. */
- expected_count = 0;
+ /* Make a copy of the provided lines and count up the expected
+ * file size. */
for (i = 0; lines[i] != NULL; ++i) {
}
expected_count = i;
- expected = malloc(sizeof(char *) * expected_count);
- for (i = 0; lines[i] != NULL; ++i) {
- expected[i] = strdup(lines[i]);
+ if (expected_count) {
+ expected = malloc(sizeof(char *) * expected_count);
+ if (expected == NULL) {
+ failure_start(pathname, line, "Can't allocate memory");
+ failure_finish(NULL);
+ return (0);
+ }
+ for (i = 0; lines[i] != NULL; ++i) {
+ expected[i] = strdup(lines[i]);
+ }
}
/* Break the file into lines */
@@ -1037,11 +1052,19 @@ assertion_file_contains_lines_any_order(
++actual_count;
c = *p;
}
- actual = malloc(sizeof(char *) * actual_count);
- for (j = 0, p = buff; p < buff + buff_size; p += 1 + strlen(p)) {
- if (*p != '\0') {
- actual[j] = p;
- ++j;
+ if (actual_count) {
+ actual = calloc(sizeof(char *), actual_count);
+ if (actual == NULL) {
+ failure_start(pathname, line, "Can't allocate memory");
+ failure_finish(NULL);
+ free(expected);
+ return (0);
+ }
+ for (j = 0, p = buff; p < buff + buff_size; p += 1 + strlen(p)) {
+ if (*p != '\0') {
+ actual[j] = p;
+ ++j;
+ }
}
}
@@ -1176,11 +1199,11 @@ assertion_file_time(const char *file, in
#if defined(_WIN32) && !defined(__CYGWIN__)
#define EPOC_TIME (116444736000000000ULL)
- FILETIME ftime, fbirthtime, fatime, fmtime;
+ FILETIME fxtime, fbirthtime, fatime, fmtime;
ULARGE_INTEGER wintm;
HANDLE h;
- ftime.dwLowDateTime = 0;
- ftime.dwHighDateTime = 0;
+ fxtime.dwLowDateTime = 0;
+ fxtime.dwHighDateTime = 0;
assertion_count(file, line);
/* Note: FILE_FLAG_BACKUP_SEMANTICS applies to open
@@ -1195,9 +1218,9 @@ assertion_file_time(const char *file, in
}
r = GetFileTime(h, &fbirthtime, &fatime, &fmtime);
switch (type) {
- case 'a': ftime = fatime; break;
- case 'b': ftime = fbirthtime; break;
- case 'm': ftime = fmtime; break;
+ case 'a': fxtime = fatime; break;
+ case 'b': fxtime = fbirthtime; break;
+ case 'm': fxtime = fmtime; break;
}
CloseHandle(h);
if (r == 0) {
@@ -1205,8 +1228,8 @@ assertion_file_time(const char *file, in
failure_finish(NULL);
return (0);
}
- wintm.LowPart = ftime.dwLowDateTime;
- wintm.HighPart = ftime.dwHighDateTime;
+ wintm.LowPart = fxtime.dwLowDateTime;
+ wintm.HighPart = fxtime.dwHighDateTime;
filet = (wintm.QuadPart - EPOC_TIME) / 10000000;
filet_nsec = ((wintm.QuadPart - EPOC_TIME) % 10000000) * 100;
nsec = (nsec / 100) * 100; /* Round the request */
@@ -1834,15 +1857,45 @@ canSymlink(void)
return (value);
}
-/*
- * Can this platform run the gzip program?
- */
/* Platform-dependent options for hiding the output of a subcommand. */
#if defined(_WIN32) && !defined(__CYGWIN__)
static const char *redirectArgs = ">NUL 2>NUL"; /* Win32 cmd.exe */
#else
static const char *redirectArgs = ">/dev/null 2>/dev/null"; /* POSIX 'sh' */
#endif
+/*
+ * Can this platform run the bzip2 program?
+ */
+int
+canBzip2(void)
+{
+ static int tested = 0, value = 0;
+ if (!tested) {
+ tested = 1;
+ if (systemf("bzip2 -d -V %s", redirectArgs) == 0)
+ value = 1;
+ }
+ return (value);
+}
+
+/*
+ * Can this platform run the grzip program?
+ */
+int
+canGrzip(void)
+{
+ static int tested = 0, value = 0;
+ if (!tested) {
+ tested = 1;
+ if (systemf("grzip -V %s", redirectArgs) == 0)
+ value = 1;
+ }
+ return (value);
+}
+
+/*
+ * Can this platform run the gzip program?
+ */
int
canGzip(void)
{
@@ -1856,15 +1909,75 @@ canGzip(void)
}
/*
- * Can this platform run the gunzip program?
+ * Can this platform run the lrzip program?
*/
int
-canGunzip(void)
+canLrzip(void)
{
static int tested = 0, value = 0;
if (!tested) {
tested = 1;
- if (systemf("gunzip -V %s", redirectArgs) == 0)
+ if (systemf("lrzip -V %s", redirectArgs) == 0)
+ value = 1;
+ }
+ return (value);
+}
+
+/*
+ * Can this platform run the lzip program?
+ */
+int
+canLzip(void)
+{
+ static int tested = 0, value = 0;
+ if (!tested) {
+ tested = 1;
+ if (systemf("lzip -V %s", redirectArgs) == 0)
+ value = 1;
+ }
+ return (value);
+}
+
+/*
+ * Can this platform run the lzma program?
+ */
+int
+canLzma(void)
+{
+ static int tested = 0, value = 0;
+ if (!tested) {
+ tested = 1;
+ if (systemf("lzma -V %s", redirectArgs) == 0)
+ value = 1;
+ }
+ return (value);
+}
+
+/*
+ * Can this platform run the lzop program?
+ */
+int
+canLzop(void)
+{
+ static int tested = 0, value = 0;
+ if (!tested) {
+ tested = 1;
+ if (systemf("lzop -V %s", redirectArgs) == 0)
+ value = 1;
+ }
+ return (value);
+}
+
+/*
+ * Can this platform run the xz program?
+ */
+int
+canXz(void)
+{
+ static int tested = 0, value = 0;
+ if (!tested) {
+ tested = 1;
+ if (systemf("xz -V %s", redirectArgs) == 0)
value = 1;
}
return (value);
@@ -2124,7 +2237,7 @@ is_LargeInode(const char *file)
/* Use "list.h" to create a list of all tests (functions and names). */
#undef DEFINE_TEST
#define DEFINE_TEST(n) { n, #n, 0 },
-struct { void (*func)(void); const char *name; int failures; } tests[] = {
+struct test_list_t tests[] = {
#include "list.h"
};
@@ -2377,65 +2490,6 @@ success:
return strdup(buff);
}
-static int
-get_test_set(int *test_set, int limit, const char *test)
-{
- int start, end;
- int idx = 0;
-
- if (test == NULL) {
- /* Default: Run all tests. */
- for (;idx < limit; idx++)
- test_set[idx] = idx;
- return (limit);
- }
- if (*test >= '0' && *test <= '9') {
- const char *vp = test;
- start = 0;
- while (*vp >= '0' && *vp <= '9') {
- start *= 10;
- start += *vp - '0';
- ++vp;
- }
- if (*vp == '\0') {
- end = start;
- } else if (*vp == '-') {
- ++vp;
- if (*vp == '\0') {
- end = limit - 1;
- } else {
- end = 0;
- while (*vp >= '0' && *vp <= '9') {
- end *= 10;
- end += *vp - '0';
- ++vp;
- }
- }
- } else
- return (-1);
- if (start < 0 || end >= limit || start > end)
- return (-1);
- while (start <= end)
- test_set[idx++] = start++;
- } else {
- size_t len = strlen(test);
- for (start = 0; start < limit; ++start) {
- const char *name = tests[start].name;
- const char *p;
-
- while ((p = strchr(name, test[0])) != NULL) {
- if (strncmp(p, test, len) == 0) {
- test_set[idx++] = start;
- break;
- } else
- name = p + 1;
- }
-
- }
- }
- return ((idx == 0)?-1:idx);
-}
-
int
main(int argc, char **argv)
{
@@ -2720,10 +2774,11 @@ main(int argc, char **argv)
do {
int test_num;
- test_num = get_test_set(test_set, limit, *argv);
+ test_num = get_test_set(test_set, limit, *argv, tests);
if (test_num < 0) {
printf("*** INVALID Test %s\n", *argv);
free(refdir_alloc);
+ free(testprogdir);
usage(progname);
return (1);
}
Modified: head/contrib/libarchive/cpio/test/test.h
==============================================================================
--- head/contrib/libarchive/cpio/test/test.h Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/test/test.h Fri Mar 22 13:36:03 2013 (r248616)
@@ -266,11 +266,29 @@ void sleepUntilAfter(time_t);
/* Return true if this platform can create symlinks. */
int canSymlink(void);
+/* Return true if this platform can run the "bzip2" program. */
+int canBzip2(void);
+
+/* Return true if this platform can run the "grzip" program. */
+int canGrzip(void);
+
/* Return true if this platform can run the "gzip" program. */
int canGzip(void);
-/* Return true if this platform can run the "gunzip" program. */
-int canGunzip(void);
+/* Return true if this platform can run the "lrzip" program. */
+int canLrzip(void);
+
+/* Return true if this platform can run the "lzip" program. */
+int canLzip(void);
+
+/* Return true if this platform can run the "lzma" program. */
+int canLzma(void);
+
+/* Return true if this platform can run the "lzop" program. */
+int canLzop(void);
+
+/* Return true if this platform can run the "xz" program. */
+int canXz(void);
/* Return true if this filesystem can handle nodump flags. */
int canNodump(void);
Modified: head/contrib/libarchive/cpio/test/test_basic.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_basic.c Fri Mar 22 13:34:22 2013 (r248615)
+++ head/contrib/libarchive/cpio/test/test_basic.c Fri Mar 22 13:36:03 2013 (r248616)
@@ -148,7 +148,7 @@ DEFINE_TEST(test_basic)
strncat(result,
"bsdcpio: file: large inode number truncated: "
"Numerical result out of range\n",
- sizeof(result) - strlen(result));
+ sizeof(result) - strlen(result) -1);
/* hardlink to above file. */
assertMakeHardlink("linkfile", "file");
@@ -157,7 +157,7 @@ DEFINE_TEST(test_basic)
strncat(result,
"bsdcpio: linkfile: large inode number truncated: "
"Numerical result out of range\n",
- sizeof(result) - strlen(result));
+ sizeof(result) - strlen(result) -1);
/* Symlink to above file. */
if (canSymlink()) {
@@ -167,7 +167,7 @@ DEFINE_TEST(test_basic)
strncat(result,
"bsdcpio: symlink: large inode number truncated: "
"Numerical result out of range\n",
- sizeof(result) - strlen(result));
+ sizeof(result) - strlen(result) -1);
}
/* Another file with different permissions. */
@@ -177,7 +177,7 @@ DEFINE_TEST(test_basic)
strncat(result,
"bsdcpio: file2: large inode number truncated: "
"Numerical result out of range\n",
- sizeof(result) - strlen(result));
+ sizeof(result) - strlen(result) -1);
/* Directory. */
assertMakeDir("dir", 0775);
@@ -186,8 +186,8 @@ DEFINE_TEST(test_basic)
strncat(result,
"bsdcpio: dir: large inode number truncated: "
"Numerical result out of range\n",
- sizeof(result) - strlen(result));
- strncat(result, "2 blocks\n", sizeof(result) - strlen(result));
+ sizeof(result) - strlen(result) -1);
+ strncat(result, "2 blocks\n", sizeof(result) - strlen(result) -1);
/* All done. */
fclose(filelist);
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.Z.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.Z.uu)
@@ -0,0 +1,7 @@
+begin 664 test_extract.cpio.Z
+M'YV0,&X$'`B#!@P8,0XJC)$0A at T;!A'>J+%PHL*%%P_&D`%CAHP;!F7,B*C0
+M1L:+(LVD85,F!H`Q;]S0*2-S#H at W9D"H9!G#A8*!`@46U)A11L.'$6-8U+CT
+M8D.G'#V"A"&#!L6+)D\>3+FRC(R7,6?6O)ESIU>?0`EJ7<N6[=.V:V/,@$M%
+A2I`D3(I("<$7 at -^_@`,+'DRXL.'#B!,K7LRXL>/'D!4#
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.bz2.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.bz2.uu)
@@ -0,0 +1,7 @@
+begin 664 test_extract.cpio.bz2
+M0EIH.3%!629365?=.4@``#G_ at G*0(`#@`7^`(B04``LEC```!"``E`E(>I,H
+M::'J&@_4C3:@E$AD#0&@&@%"E;V/1!XIP>#C9T[41`4PQ1A`@S*4F&BD at B0T
+MBA$$-:\/@BQGNKU1G@%#`G+N0R%$JTHG(XBRB%1$V8F4#F_IWT=S4+ERVL(?
+40V!'@1L4+AO_B[DBG"A(*^Z<I```
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.grz.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.grz.uu)
@@ -0,0 +1,7 @@
+begin 644 test_extract.cpio.grz
+M1U)::7!)20`"!#HI``(``*P-```&`0``"````&X````B%2.02C`PK`#__..F
+MI;8=99?N!6`:IQJ:XU/T"`W`B"?N/D9-0K6VN/D\.2>0,#J&)3G"\^YE?X_'
+M_K._F':0[`DL%IQ=<,Z-JH>V$S,?.[`&42C7]J^XQ at 9OY!Z$!$^JLQPKZU[:
+/!M,+.$MY:Y(HS<<]U`&`
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.gz.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.gz.uu)
@@ -0,0 +1,7 @@
+begin 664 test_extract.cpio.gz
+M'XL("`5X<E```W1E<W1?97AT<F%C="YC<&EO`#,P-P!!`Q,#`T,#$#`$4F9F
+M(*ZYJ0&,-(#)&A@:&1@;F9L8&!F;@/EF!C!@9)R6F9-JR)"<GU>2FE=2K)"?
+MI@`6T>,R0+?$B$A+3$RQ6F*$88D1PA*"P!"[J#$2)R3(T=/'-4A149%AF`,`
+(305ZBP`"````
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lrz.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lrz.uu)
@@ -0,0 +1,8 @@
+begin 664 test_extract.cpio.lrz
+M3%):20`&``(``````````%T````!`0```@$`$`,`````#@`#`````"\``QH`
+M&@````!W``$G`&4``#,``2(``0``#0$````U<-`Y!F$`MP$````8#=\$8#<1
+MR/BL39$D4M>["H7&@4%L/4*_(*VGB*YU>?RX.9]HL86'.A)H at Y;Z\^$?M^8_
+M!/-;62G.*7*A&A!_ENZ8$7]O-M7_.FTRC%BCGC95:6'9ZH3)QSCR4RX42P!`
+/-E>/7"L[:OY"/A924S4$
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lz.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lz.uu)
@@ -0,0 +1,6 @@
+begin 664 test_extract.cpio.lz
+M3%I)4`$,`!@-WP1 at -Q'(^*Q-D212U[L*A<:!06P]0K\@K:>(KG5Y_+ at YGVBQ
+MA8<Z$FB#EOKSX1^WYC\$\UM9*<XI<J$:$'^B>;_>8N3MLP="$0SJ#QKYB?@8
+G]@'$$7\&W^T*+9?6B=?__M$G@$T%>HL``@```````($`````````
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lzma.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lzma.uu)
@@ -0,0 +1,6 @@
+begin 664 test_extract.cpio.lzma
+M70``@`#__________P`8#=\$8#<1R/BL39$D4M>["H7&@4%L/4*_(*VGB*YU
+M>?RX.9]HL86'.A)H at Y;Z\^$?M^8_!/-;62G.*7*A&A!_HGF_WF+D[;.+!OW3
+:T_2I)V(;K[FNL#'W%T+L;ATS`A*3__[1Z```
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lzo.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.lzo.uu)
@@ -0,0 +1,9 @@
+begin 664 test_extract.cpio.lzo
+MB4Q:3P`-"AH*$#`@8`E``04#```!``"!M%!R>-T`````$71E<W1?97AT<F%C
+M="YC<&EOOH$+9````@````"DIR,^[`HP-S`W,#<P,#0P,#$P8``#,3$P,#8V
+M>`$#-S4P,#`QE`!@`7`#"C`P,3(P,S(W-#`R,S2!`C:4`'````(R,V9I;&4Q
+M`&-O;G1E;G1S(&]F((8"+ at HOD0$R(`:1`31J$#`P+I$!,B^1`3(HD`%L$3L,
+M`+P<+HH`,3,I1``(5%)!24Q%4B$A(0`@JP````$`````````````````````
+*````$0``````````
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu (from r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.xz.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract.cpio.xz.uu)
@@ -0,0 +1,7 @@
+begin 664 test_extract.cpio.xz
+M_3=Z6%H```3FUK1&`@`A`18```!T+^6CX`'_`&%=`!@-WP1 at -Q'(^*Q-D212
+MU[L*A<:!06P]0K\@K:>(KG5Y_+ at YGVBQA8<Z$FB#EOKSX1^WYC\$\UM9*<XI
+M<J$:$'^B>;_>8N3MLXL&_=/3]*DG8ANON:ZP,?<70NQN'3"CP@``````J9FA
+=#1$]4L<``7V`!`````?M;4JQQ&?[`@`````$65H`
+`
+end
Copied: head/contrib/libarchive/cpio/test/test_extract_cpio_Z.c (from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_Z.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract_cpio_Z.c Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_Z.c)
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+DEFINE_TEST(test_extract_cpio_Z)
+{
+ const char *reffile = "test_extract.cpio.Z";
+
+ extract_reference_file(reffile);
+ assertEqualInt(0, systemf("%s -i < %s >test.out 2>test.err",
+ testprog, reffile));
+
+ assertFileExists("file1");
+ assertTextFileContents("contents of file1.\n", "file1");
+ assertFileExists("file2");
+ assertTextFileContents("contents of file2.\n", "file2");
+ assertEmptyFile("test.out");
+ assertTextFileContents("1 block\n", "test.err");
+}
Copied: head/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c (from r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_bz2.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c Fri Mar 22 13:36:03 2013 (r248616, copy of r248590, vendor/libarchive/dist/cpio/test/test_extract_cpio_bz2.c)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+DEFINE_TEST(test_extract_cpio_bz2)
+{
+ const char *reffile = "test_extract.cpio.bz2";
+ int f;
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list