svn commit: r248590 - in vendor/libarchive/dist: . build build/cmake cpio cpio/test doc examples examples/minitar libarchive libarchive/test tar tar/test test_utils
Martin Matuska
mm at FreeBSD.org
Thu Mar 21 18:59:03 UTC 2013
Author: mm
Date: Thu Mar 21 18:59:02 2013
New Revision: 248590
URL: http://svnweb.freebsd.org/changeset/base/248590
Log:
Update libarchive's vendor dist to version 3.1.2 from release branch.
Git branch: release
Git commit: 19f23e191f9d3e1dd2a518735046100419965804
Obtained from: https://github.com/libarchive/libarchive.git
Added:
vendor/libarchive/dist/build/README.txt
vendor/libarchive/dist/build/cmake/FindLibGCC.cmake
vendor/libarchive/dist/build/cmake/FindNettle.cmake
vendor/libarchive/dist/build/cmake/FindPCREPOSIX.cmake
vendor/libarchive/dist/build/cmake/LibarchiveCheckCSourceCompiles.cmake
vendor/libarchive/dist/build/cmake/LibarchiveCheckCSourceRuns.cmake
vendor/libarchive/dist/cpio/test/test_extract.cpio.Z.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.bz2.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.grz.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.gz.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.lrz.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.lz.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.lzma.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.lzo.uu
vendor/libarchive/dist/cpio/test/test_extract.cpio.xz.uu
vendor/libarchive/dist/cpio/test/test_extract_cpio_Z.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_bz2.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_grz.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_gz.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_lrz.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_lz.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_lzma.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_lzo.c
vendor/libarchive/dist/cpio/test/test_extract_cpio_xz.c
vendor/libarchive/dist/cpio/test/test_option_b64encode.c
vendor/libarchive/dist/cpio/test/test_option_grzip.c
vendor/libarchive/dist/cpio/test/test_option_lrzip.c
vendor/libarchive/dist/cpio/test/test_option_lzop.c
vendor/libarchive/dist/cpio/test/test_option_uuencode.c
vendor/libarchive/dist/cpio/test/test_option_xz.c
vendor/libarchive/dist/libarchive/archive_cmdline.c
vendor/libarchive/dist/libarchive/archive_cmdline_private.h
vendor/libarchive/dist/libarchive/archive_read_append_filter.c
vendor/libarchive/dist/libarchive/archive_read_set_format.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_grzip.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_lrzip.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_lzop.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_b64encode.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_by_name.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_grzip.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_lrzip.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_lzop.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_uuencode.c
vendor/libarchive/dist/libarchive/archive_write_disk_acl.c
vendor/libarchive/dist/libarchive/archive_write_set_format_v7tar.c
vendor/libarchive/dist/libarchive/filter_fork_posix.c
vendor/libarchive/dist/libarchive/test/test_acl_freebsd_nfs4.c
vendor/libarchive/dist/libarchive/test/test_acl_freebsd_posix1e.c
vendor/libarchive/dist/libarchive/test/test_archive_cmdline.c
vendor/libarchive/dist/libarchive/test/test_archive_read_multiple_data_objects.c
vendor/libarchive/dist/libarchive/test/test_archive_write_add_filter_by_name.c
vendor/libarchive/dist/libarchive/test/test_archive_write_set_format_by_name.c
vendor/libarchive/dist/libarchive/test/test_compat_lzop.c
vendor/libarchive/dist/libarchive/test/test_compat_lzop_1.tar.lzo.uu
vendor/libarchive/dist/libarchive/test/test_compat_lzop_2.tar.lzo.uu
vendor/libarchive/dist/libarchive/test/test_compat_lzop_3.tar.lzo.uu
vendor/libarchive/dist/libarchive/test/test_compat_uudecode.c
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
vendor/libarchive/dist/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
vendor/libarchive/dist/libarchive/test/test_read_filter_grzip.c
vendor/libarchive/dist/libarchive/test/test_read_filter_grzip.tar.grz.uu
vendor/libarchive/dist/libarchive/test/test_read_filter_lrzip.c
vendor/libarchive/dist/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
vendor/libarchive/dist/libarchive/test/test_read_filter_lzop.c
vendor/libarchive/dist/libarchive/test/test_read_filter_lzop.tar.lzo.uu
vendor/libarchive/dist/libarchive/test/test_read_filter_lzop_multiple_parts.c
vendor/libarchive/dist/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu
vendor/libarchive/dist/libarchive/test/test_read_filter_program.c
vendor/libarchive/dist/libarchive/test/test_read_filter_program_signature.c
vendor/libarchive/dist/libarchive/test/test_read_filter_uudecode.c
vendor/libarchive/dist/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu
vendor/libarchive/dist/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu
vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
vendor/libarchive/dist/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
vendor/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu
vendor/libarchive/dist/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu
vendor/libarchive/dist/libarchive/test/test_read_format_zip_mac_metadata.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip_mac_metadata.zip.uu
vendor/libarchive/dist/libarchive/test/test_read_format_zip_sfx.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip_sfx.uu
vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_aa.uu
vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ab.uu
vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ac.uu
vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ad.uu
vendor/libarchive/dist/libarchive/test/test_read_large_splitted_rar_ae.uu
vendor/libarchive/dist/libarchive/test/test_read_set_format.c
vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_aa.uu
vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_ab.uu
vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_ac.uu
vendor/libarchive/dist/libarchive/test/test_read_splitted_rar_ad.uu
vendor/libarchive/dist/libarchive/test/test_splitted_rar_seek_support_aa.uu
vendor/libarchive/dist/libarchive/test/test_splitted_rar_seek_support_ab.uu
vendor/libarchive/dist/libarchive/test/test_splitted_rar_seek_support_ac.uu
vendor/libarchive/dist/libarchive/test/test_write_disk_appledouble.c
vendor/libarchive/dist/libarchive/test/test_write_disk_appledouble.cpio.gz.uu
vendor/libarchive/dist/libarchive/test/test_write_disk_hfs_compression.c
vendor/libarchive/dist/libarchive/test/test_write_disk_hfs_compression.tgz.uu
vendor/libarchive/dist/libarchive/test/test_write_disk_mac_metadata.c
vendor/libarchive/dist/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu
vendor/libarchive/dist/libarchive/test/test_write_disk_no_hfs_compression.c
vendor/libarchive/dist/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu
vendor/libarchive/dist/libarchive/test/test_write_filter_b64encode.c
vendor/libarchive/dist/libarchive/test/test_write_filter_bzip2.c
vendor/libarchive/dist/libarchive/test/test_write_filter_compress.c
vendor/libarchive/dist/libarchive/test/test_write_filter_gzip.c
vendor/libarchive/dist/libarchive/test/test_write_filter_gzip_timestamp.c
vendor/libarchive/dist/libarchive/test/test_write_filter_lrzip.c
vendor/libarchive/dist/libarchive/test/test_write_filter_lzip.c
vendor/libarchive/dist/libarchive/test/test_write_filter_lzma.c
vendor/libarchive/dist/libarchive/test/test_write_filter_lzop.c
vendor/libarchive/dist/libarchive/test/test_write_filter_program.c
vendor/libarchive/dist/libarchive/test/test_write_filter_uuencode.c
vendor/libarchive/dist/libarchive/test/test_write_filter_xz.c
vendor/libarchive/dist/libarchive/test/test_write_format_7zip_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_7zip_large.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree_absolute_path.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree_classic.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree_classic_indent.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree_no_separator.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree_quoted_filename.c
vendor/libarchive/dist/libarchive/test/test_write_format_tar_v7tar.c
vendor/libarchive/dist/libarchive/test/test_write_zip_set_compression_store.c
vendor/libarchive/dist/tar/creation_set.c
vendor/libarchive/dist/tar/test/test_extract.tar.Z.uu
vendor/libarchive/dist/tar/test/test_extract.tar.bz2.uu
vendor/libarchive/dist/tar/test/test_extract.tar.grz.uu
vendor/libarchive/dist/tar/test/test_extract.tar.gz.uu
vendor/libarchive/dist/tar/test/test_extract.tar.lrz.uu
vendor/libarchive/dist/tar/test/test_extract.tar.lz.uu
vendor/libarchive/dist/tar/test/test_extract.tar.lzma.uu
vendor/libarchive/dist/tar/test/test_extract.tar.lzo.uu
vendor/libarchive/dist/tar/test/test_extract.tar.xz.uu
vendor/libarchive/dist/tar/test/test_extract_tar_Z.c
vendor/libarchive/dist/tar/test/test_extract_tar_bz2.c
vendor/libarchive/dist/tar/test/test_extract_tar_grz.c
vendor/libarchive/dist/tar/test/test_extract_tar_gz.c
vendor/libarchive/dist/tar/test/test_extract_tar_lrz.c
vendor/libarchive/dist/tar/test/test_extract_tar_lz.c
vendor/libarchive/dist/tar/test/test_extract_tar_lzma.c
vendor/libarchive/dist/tar/test/test_extract_tar_lzo.c
vendor/libarchive/dist/tar/test/test_extract_tar_xz.c
vendor/libarchive/dist/tar/test/test_option_a.c
vendor/libarchive/dist/tar/test/test_option_b64encode.c
vendor/libarchive/dist/tar/test/test_option_grzip.c
vendor/libarchive/dist/tar/test/test_option_j.c
vendor/libarchive/dist/tar/test/test_option_lrzip.c
vendor/libarchive/dist/tar/test/test_option_lzma.c
vendor/libarchive/dist/tar/test/test_option_lzop.c
vendor/libarchive/dist/tar/test/test_option_older_than.c
vendor/libarchive/dist/tar/test/test_option_uuencode.c
vendor/libarchive/dist/tar/test/test_option_xz.c
vendor/libarchive/dist/tar/test/test_option_z.c
vendor/libarchive/dist/test_utils/
vendor/libarchive/dist/test_utils/test_utils.c
vendor/libarchive/dist/test_utils/test_utils.h
Modified:
vendor/libarchive/dist/CMakeLists.txt
vendor/libarchive/dist/Makefile.am
vendor/libarchive/dist/NEWS
vendor/libarchive/dist/README
vendor/libarchive/dist/build/autogen.sh
vendor/libarchive/dist/build/bump-version.sh
vendor/libarchive/dist/build/cmake/config.h.in
vendor/libarchive/dist/build/makerelease.sh
vendor/libarchive/dist/build/version
vendor/libarchive/dist/configure.ac
vendor/libarchive/dist/cpio/bsdcpio.1
vendor/libarchive/dist/cpio/cmdline.c
vendor/libarchive/dist/cpio/cpio.c
vendor/libarchive/dist/cpio/cpio.h
vendor/libarchive/dist/cpio/test/CMakeLists.txt
vendor/libarchive/dist/cpio/test/main.c
vendor/libarchive/dist/cpio/test/test.h
vendor/libarchive/dist/cpio/test/test_basic.c
vendor/libarchive/dist/cpio/test/test_format_newc.c
vendor/libarchive/dist/cpio/test/test_option_y.c
vendor/libarchive/dist/cpio/test/test_option_z.c
vendor/libarchive/dist/doc/update.sh
vendor/libarchive/dist/examples/minitar/minitar.c
vendor/libarchive/dist/examples/untar.c
vendor/libarchive/dist/libarchive/CMakeLists.txt
vendor/libarchive/dist/libarchive/archive.h
vendor/libarchive/dist/libarchive/archive_crypto.c
vendor/libarchive/dist/libarchive/archive_entry.c
vendor/libarchive/dist/libarchive/archive_entry.h
vendor/libarchive/dist/libarchive/archive_entry_link_resolver.c
vendor/libarchive/dist/libarchive/archive_match.c
vendor/libarchive/dist/libarchive/archive_options.c
vendor/libarchive/dist/libarchive/archive_ppmd7.c
vendor/libarchive/dist/libarchive/archive_private.h
vendor/libarchive/dist/libarchive/archive_rb.c
vendor/libarchive/dist/libarchive/archive_read.c
vendor/libarchive/dist/libarchive/archive_read_disk_entry_from_file.c
vendor/libarchive/dist/libarchive/archive_read_disk_posix.c
vendor/libarchive/dist/libarchive/archive_read_disk_windows.c
vendor/libarchive/dist/libarchive/archive_read_extract.c
vendor/libarchive/dist/libarchive/archive_read_open_fd.c
vendor/libarchive/dist/libarchive/archive_read_open_file.c
vendor/libarchive/dist/libarchive/archive_read_open_filename.c
vendor/libarchive/dist/libarchive/archive_read_private.h
vendor/libarchive/dist/libarchive/archive_read_support_filter_all.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_bzip2.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_compress.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_gzip.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_program.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_rpm.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_uu.c
vendor/libarchive/dist/libarchive/archive_read_support_filter_xz.c
vendor/libarchive/dist/libarchive/archive_read_support_format_7zip.c
vendor/libarchive/dist/libarchive/archive_read_support_format_ar.c
vendor/libarchive/dist/libarchive/archive_read_support_format_cab.c
vendor/libarchive/dist/libarchive/archive_read_support_format_cpio.c
vendor/libarchive/dist/libarchive/archive_read_support_format_empty.c
vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
vendor/libarchive/dist/libarchive/archive_read_support_format_lha.c
vendor/libarchive/dist/libarchive/archive_read_support_format_mtree.c
vendor/libarchive/dist/libarchive/archive_read_support_format_rar.c
vendor/libarchive/dist/libarchive/archive_read_support_format_raw.c
vendor/libarchive/dist/libarchive/archive_read_support_format_tar.c
vendor/libarchive/dist/libarchive/archive_read_support_format_xar.c
vendor/libarchive/dist/libarchive/archive_read_support_format_zip.c
vendor/libarchive/dist/libarchive/archive_string.c
vendor/libarchive/dist/libarchive/archive_util.c
vendor/libarchive/dist/libarchive/archive_virtual.c
vendor/libarchive/dist/libarchive/archive_windows.c
vendor/libarchive/dist/libarchive/archive_windows.h
vendor/libarchive/dist/libarchive/archive_write.c
vendor/libarchive/dist/libarchive/archive_write_add_filter.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_bzip2.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_compress.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_gzip.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_program.c
vendor/libarchive/dist/libarchive/archive_write_add_filter_xz.c
vendor/libarchive/dist/libarchive/archive_write_disk_posix.c
vendor/libarchive/dist/libarchive/archive_write_disk_private.h
vendor/libarchive/dist/libarchive/archive_write_disk_windows.c
vendor/libarchive/dist/libarchive/archive_write_free.3
vendor/libarchive/dist/libarchive/archive_write_open_filename.c
vendor/libarchive/dist/libarchive/archive_write_private.h
vendor/libarchive/dist/libarchive/archive_write_set_format_7zip.c
vendor/libarchive/dist/libarchive/archive_write_set_format_ar.c
vendor/libarchive/dist/libarchive/archive_write_set_format_by_name.c
vendor/libarchive/dist/libarchive/archive_write_set_format_iso9660.c
vendor/libarchive/dist/libarchive/archive_write_set_format_mtree.c
vendor/libarchive/dist/libarchive/archive_write_set_format_pax.c
vendor/libarchive/dist/libarchive/archive_write_set_format_xar.c
vendor/libarchive/dist/libarchive/archive_write_set_format_zip.c
vendor/libarchive/dist/libarchive/archive_write_set_options.c
vendor/libarchive/dist/libarchive/filter_fork.h
vendor/libarchive/dist/libarchive/filter_fork_windows.c
vendor/libarchive/dist/libarchive/libarchive-formats.5
vendor/libarchive/dist/libarchive/test/CMakeLists.txt
vendor/libarchive/dist/libarchive/test/main.c
vendor/libarchive/dist/libarchive/test/test.h
vendor/libarchive/dist/libarchive/test/test_acl_nfs4.c
vendor/libarchive/dist/libarchive/test/test_acl_pax.c
vendor/libarchive/dist/libarchive/test/test_acl_posix1e.c
vendor/libarchive/dist/libarchive/test/test_archive_clear_error.c
vendor/libarchive/dist/libarchive/test/test_archive_read_close_twice.c
vendor/libarchive/dist/libarchive/test/test_archive_read_close_twice_open_fd.c
vendor/libarchive/dist/libarchive/test/test_archive_read_close_twice_open_filename.c
vendor/libarchive/dist/libarchive/test/test_archive_read_set_filter_option.c
vendor/libarchive/dist/libarchive/test/test_archive_read_set_format_option.c
vendor/libarchive/dist/libarchive/test/test_archive_read_set_option.c
vendor/libarchive/dist/libarchive/test/test_archive_read_set_options.c
vendor/libarchive/dist/libarchive/test/test_archive_set_error.c
vendor/libarchive/dist/libarchive/test/test_archive_write_set_filter_option.c
vendor/libarchive/dist/libarchive/test/test_archive_write_set_format_option.c
vendor/libarchive/dist/libarchive/test/test_archive_write_set_option.c
vendor/libarchive/dist/libarchive/test/test_archive_write_set_options.c
vendor/libarchive/dist/libarchive/test/test_compat_bzip2.c
vendor/libarchive/dist/libarchive/test/test_compat_cpio.c
vendor/libarchive/dist/libarchive/test/test_compat_gtar.c
vendor/libarchive/dist/libarchive/test/test_compat_gzip.c
vendor/libarchive/dist/libarchive/test/test_compat_lzip.c
vendor/libarchive/dist/libarchive/test/test_compat_lzma.c
vendor/libarchive/dist/libarchive/test/test_compat_mac.c
vendor/libarchive/dist/libarchive/test/test_compat_tar_hardlink.c
vendor/libarchive/dist/libarchive/test/test_compat_xz.c
vendor/libarchive/dist/libarchive/test/test_compat_zip.c
vendor/libarchive/dist/libarchive/test/test_empty_write.c
vendor/libarchive/dist/libarchive/test/test_entry.c
vendor/libarchive/dist/libarchive/test/test_filter_count.c
vendor/libarchive/dist/libarchive/test/test_fuzz.c
vendor/libarchive/dist/libarchive/test/test_open_failure.c
vendor/libarchive/dist/libarchive/test/test_open_fd.c
vendor/libarchive/dist/libarchive/test/test_open_file.c
vendor/libarchive/dist/libarchive/test/test_open_filename.c
vendor/libarchive/dist/libarchive/test/test_pax_filename_encoding.c
vendor/libarchive/dist/libarchive/test/test_read_data_large.c
vendor/libarchive/dist/libarchive/test/test_read_disk.c
vendor/libarchive/dist/libarchive/test/test_read_extract.c
vendor/libarchive/dist/libarchive/test/test_read_format_7zip.c
vendor/libarchive/dist/libarchive/test/test_read_format_ar.c
vendor/libarchive/dist/libarchive/test/test_read_format_cab.c
vendor/libarchive/dist/libarchive/test/test_read_format_cab_filename.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_afio.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_Z.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_be.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_bz2.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_gz.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_lzip.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_lzma.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_xz.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_filename.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_odc.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
vendor/libarchive/dist/libarchive/test/test_read_format_cpio_svr4c_Z.c
vendor/libarchive/dist/libarchive/test/test_read_format_empty.c
vendor/libarchive/dist/libarchive/test/test_read_format_gtar_gz.c
vendor/libarchive/dist/libarchive/test/test_read_format_gtar_lzma.c
vendor/libarchive/dist/libarchive/test/test_read_format_iso_Z.c
vendor/libarchive/dist/libarchive/test/test_read_format_iso_multi_extent.c
vendor/libarchive/dist/libarchive/test/test_read_format_iso_xorriso.c
vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_bz2.c
vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_long.c
vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_rr.c
vendor/libarchive/dist/libarchive/test/test_read_format_isojoliet_versioned.c
vendor/libarchive/dist/libarchive/test/test_read_format_isorr_bz2.c
vendor/libarchive/dist/libarchive/test/test_read_format_isorr_ce.c
vendor/libarchive/dist/libarchive/test/test_read_format_isorr_new_bz2.c
vendor/libarchive/dist/libarchive/test/test_read_format_isorr_rr_moved.c
vendor/libarchive/dist/libarchive/test/test_read_format_isozisofs_bz2.c
vendor/libarchive/dist/libarchive/test/test_read_format_lha.c
vendor/libarchive/dist/libarchive/test/test_read_format_lha_filename.c
vendor/libarchive/dist/libarchive/test/test_read_format_mtree.c
vendor/libarchive/dist/libarchive/test/test_read_format_pax_bz2.c
vendor/libarchive/dist/libarchive/test/test_read_format_rar.c
vendor/libarchive/dist/libarchive/test/test_read_format_tar.c
vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_filename.c
vendor/libarchive/dist/libarchive/test/test_read_format_tbz.c
vendor/libarchive/dist/libarchive/test/test_read_format_tgz.c
vendor/libarchive/dist/libarchive/test/test_read_format_tlz.c
vendor/libarchive/dist/libarchive/test/test_read_format_txz.c
vendor/libarchive/dist/libarchive/test/test_read_format_tz.c
vendor/libarchive/dist/libarchive/test/test_read_format_xar.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip.c
vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename.c
vendor/libarchive/dist/libarchive/test/test_read_pax_truncated.c
vendor/libarchive/dist/libarchive/test/test_read_truncated.c
vendor/libarchive/dist/libarchive/test/test_read_truncated_filter.c
vendor/libarchive/dist/libarchive/test/test_sparse_basic.c
vendor/libarchive/dist/libarchive/test/test_tar_filenames.c
vendor/libarchive/dist/libarchive/test/test_ustar_filenames.c
vendor/libarchive/dist/libarchive/test/test_write_disk_sparse.c
vendor/libarchive/dist/libarchive/test/test_write_format_7zip.c
vendor/libarchive/dist/libarchive/test/test_write_format_ar.c
vendor/libarchive/dist/libarchive/test/test_write_format_cpio.c
vendor/libarchive/dist/libarchive/test/test_write_format_cpio_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_cpio_newc.c
vendor/libarchive/dist/libarchive/test/test_write_format_cpio_odc.c
vendor/libarchive/dist/libarchive/test/test_write_format_gnutar.c
vendor/libarchive/dist/libarchive/test/test_write_format_iso9660.c
vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_boot.c
vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_filename.c
vendor/libarchive/dist/libarchive/test/test_write_format_iso9660_zisofs.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree.c
vendor/libarchive/dist/libarchive/test/test_write_format_mtree_fflags.c
vendor/libarchive/dist/libarchive/test/test_write_format_pax.c
vendor/libarchive/dist/libarchive/test/test_write_format_shar_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_tar.c
vendor/libarchive/dist/libarchive/test/test_write_format_tar_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_tar_sparse.c
vendor/libarchive/dist/libarchive/test/test_write_format_tar_ustar.c
vendor/libarchive/dist/libarchive/test/test_write_format_xar.c
vendor/libarchive/dist/libarchive/test/test_write_format_xar_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_zip.c
vendor/libarchive/dist/libarchive/test/test_write_format_zip_empty.c
vendor/libarchive/dist/libarchive/test/test_write_format_zip_no_compression.c
vendor/libarchive/dist/libarchive/test/test_write_open_memory.c
vendor/libarchive/dist/tar/CMakeLists.txt
vendor/libarchive/dist/tar/bsdtar.1
vendor/libarchive/dist/tar/bsdtar.c
vendor/libarchive/dist/tar/bsdtar.h
vendor/libarchive/dist/tar/cmdline.c
vendor/libarchive/dist/tar/read.c
vendor/libarchive/dist/tar/subst.c
vendor/libarchive/dist/tar/test/CMakeLists.txt
vendor/libarchive/dist/tar/test/main.c
vendor/libarchive/dist/tar/test/test.h
vendor/libarchive/dist/tar/test/test_basic.c
vendor/libarchive/dist/tar/test/test_copy.c
vendor/libarchive/dist/tar/test/test_option_newer_than.c
vendor/libarchive/dist/tar/test/test_option_r.c
vendor/libarchive/dist/tar/test/test_stdio.c
vendor/libarchive/dist/tar/test/test_windows.c
vendor/libarchive/dist/tar/util.c
vendor/libarchive/dist/tar/write.c
Modified: vendor/libarchive/dist/CMakeLists.txt
==============================================================================
--- vendor/libarchive/dist/CMakeLists.txt Thu Mar 21 16:29:08 2013 (r248589)
+++ vendor/libarchive/dist/CMakeLists.txt Thu Mar 21 18:59:02 2013 (r248590)
@@ -63,8 +63,8 @@ SET(LIBARCHIVE_VERSION_STRING "${VERSIO
# libarchive 2.8 == interface version 10 = 2 + 8
# libarchive 2.9 == interface version 11 = 2 + 9
# libarchive 3.0 == interface version 12
-# libarchive 3.x == interface version 12 + x
-math(EXPR INTERFACE_VERSION "12 + ${_minor}")
+# libarchive 3.1 == interface version 13
+math(EXPR INTERFACE_VERSION "13 + ${_minor}")
# Set SOVERSION == Interface version
# ?? Should there be more here ??
@@ -151,27 +151,55 @@ OPTION(ENABLE_XATTR "Enable extended att
OPTION(ENABLE_ACL "Enable ACL support" ON)
OPTION(ENABLE_ICONV "Enable iconv support" ON)
OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
+SET(POSIX_REGEX_LIB "AUTO" CACHE STRING "Choose what library should provide POSIX regular expression support")
+SET(ENABLE_SAFESEH "AUTO" CACHE STRING "Enable use of /SAFESEH linker flag (MSVC only)")
+SET(WINDOWS_VERSION "" CACHE STRING "Set Windows version to use (Windows only)")
IF(ENABLE_TEST)
ENABLE_TESTING()
ENDIF(ENABLE_TEST)
IF(WIN32)
- IF(MSVC60)
- SET(WINVER 0x0400)
- ELSE()
+ IF(WINDOWS_VERSION STREQUAL "WIN8")
+ SET(WINVER 0x0602)
+ ELSEIF(WINDOWS_VERSION STREQUAL "WIN7")
+ SET(WINVER 0x0601)
+ ELSEIF(WINDOWS_VERSION STREQUAL "WS08")
+ SET(WINVER 0x0600)
+ ELSEIF(WINDOWS_VERSION STREQUAL "VISTA")
+ SET(WINVER 0x0600)
+ ELSEIF(WINDOWS_VERSION STREQUAL "WS03")
+ SET(WINVER 0x0502)
+ ELSEIF(WINDOWS_VERSION STREQUAL "WINXP")
+ SET(WINVER 0x0501)
+ ELSE(WINDOWS_VERSION STREQUAL "WIN8")
+ # The default is to use Windows 2000 API.
SET(WINVER 0x0500)
- ENDIF()
+ ENDIF(WINDOWS_VERSION STREQUAL "WIN8")
SET(_WIN32_WINNT ${WINVER})
ENDIF(WIN32)
+IF(MSVC)
+ IF(ENABLE_SAFESEH STREQUAL "YES")
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH")
+ SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH")
+ SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH")
+ ELSEIF(ENABLE_SAFESEH STREQUAL "NO")
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
+ SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
+ SET(CMAKE_REQUIRED_LINKER_FLAGS "/SAFESEH:NO")
+ ENDIF(ENABLE_SAFESEH STREQUAL "YES")
+ENDIF(MSVC)
+
IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(HP-UX)$")
ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t
ENDIF()
#
-INCLUDE(CheckCSourceCompiles)
-INCLUDE(CheckCSourceRuns)
+INCLUDE(LibarchiveCheckCSourceCompiles)
+INCLUDE(LibarchiveCheckCSourceRuns)
INCLUDE(CheckFileOffsetBits)
INCLUDE(CheckFuncs)
INCLUDE(CheckHeaderDirent)
@@ -235,9 +263,9 @@ MACRO (TRY_MACRO_FOR_LIBRARY INCLUDES LI
ENDIF(NOT "${PREV_VAR_WITH_LIB}" STREQUAL "${LIBRARIES}")
# Check if the library can be used with the macro.
IF("${TRY_TYPE}" MATCHES "COMPILES")
- CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
+ LIBARCHIVE_CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
ELSEIF("${TRY_TYPE}" MATCHES "RUNS")
- CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
+ LIBARCHIVE_CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
ELSE("${TRY_TYPE}" MATCHES "COMPILES")
MESSAGE(FATAL_ERROR "UNKNOWN KEYWORD \"${TRY_TYPE}\" FOR TRY_TYPE")
ENDIF("${TRY_TYPE}" MATCHES "COMPILES")
@@ -366,6 +394,30 @@ ELSEIF(LZMADEC_FOUND)
INCLUDE_DIRECTORIES(${LZMADEC_INCLUDE_DIR})
LIST(APPEND ADDITIONAL_LIBS ${LZMADEC_LIBRARIES})
ENDIF(LZMA_FOUND)
+#
+# Find LZO2
+#
+IF (LZO2_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(LZO2_FIND_QUIETLY TRUE)
+ENDIF (LZO2_INCLUDE_DIR)
+
+FIND_PATH(LZO2_INCLUDE_DIR lzo/lzoconf.h)
+FIND_LIBRARY(LZO2_LIBRARY NAMES lzo2 liblzo2)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO2 DEFAULT_MSG LZO2_LIBRARY LZO2_INCLUDE_DIR)
+IF(LZO2_FOUND)
+ SET(HAVE_LIBLZO2 1)
+ SET(HAVE_LZO_LZOCONF_H 1)
+ SET(HAVE_LZO_LZO1X_H 1)
+ INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR})
+ LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY})
+ #
+ # TODO: test for static library.
+ #
+ENDIF(LZO2_FOUND)
+MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR)
+MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY)
#
# Check headers
@@ -392,7 +444,7 @@ LA_CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLF
LA_CHECK_INCLUDE_FILE("errno.h" HAVE_ERRNO_H)
LA_CHECK_INCLUDE_FILE("ext2fs/ext2_fs.h" HAVE_EXT2FS_EXT2_FS_H)
-CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
#include <ext2fs/ext2_fs.h>
int main(void) { return EXT2_IOC_GETFLAGS; }" HAVE_WORKING_EXT2_IOC_GETFLAGS)
@@ -414,6 +466,7 @@ LA_CHECK_INCLUDE_FILE("process.h" HAVE_P
LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H)
LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H)
LA_CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
+LA_CHECK_INCLUDE_FILE("spawn.h" HAVE_SPAWN_H)
LA_CHECK_INCLUDE_FILE("stdarg.h" HAVE_STDARG_H)
LA_CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
LA_CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
@@ -454,7 +507,7 @@ FOREACH (it ${_HEADER})
SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
ENDFOREACH (it)
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
"#define __EXTENSIONS__ 1
${_INCLUDE_FILES}
int main() { return 0;}"
@@ -464,16 +517,17 @@ CHECK_C_SOURCE_COMPILES(
# Find Nettle
#
IF(ENABLE_NETTLE)
- CHECK_LIBRARY_EXISTS(nettle "nettle_sha1_digest" "" NETTLE_FOUND)
+ FIND_PACKAGE(Nettle)
IF(NETTLE_FOUND)
- CMAKE_PUSH_CHECK_STATE() # Save the state of the variables
- SET(CMAKE_REQUIRED_LIBRARIES "nettle")
- FIND_LIBRARY(NETTLE_LIBRARY NAMES nettle)
- LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARY})
- CMAKE_POP_CHECK_STATE() # Restore the state of the variables
- ELSE(NETTLE_FOUND)
- SET(ENABLE_NETTLE OFF)
+ SET(HAVE_LIBNETTLE 1)
+ SET(HAVE_NETTLE_MD5_H 1)
+ SET(HAVE_NETTLE_RIPEMD160_H 1)
+ SET(HAVE_NETTLE_SHA_H 1)
+ INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR})
+ LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES})
ENDIF(NETTLE_FOUND)
+ MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR)
+ MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES)
ENDIF(ENABLE_NETTLE)
#
@@ -487,14 +541,16 @@ ELSE()
ENDIF()
# FreeBSD libmd
-CHECK_LIBRARY_EXISTS(md "MD5Init" "" LIBMD_FOUND)
-IF(LIBMD_FOUND)
- CMAKE_PUSH_CHECK_STATE() # Save the state of the variables
- SET(CMAKE_REQUIRED_LIBRARIES "md")
- FIND_LIBRARY(LIBMD_LIBRARY NAMES md)
- LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY})
- CMAKE_POP_CHECK_STATE() # Restore the state of the variables
-ENDIF(LIBMD_FOUND)
+IF(NOT OPENSSL_FOUND)
+ CHECK_LIBRARY_EXISTS(md "MD5Init" "" LIBMD_FOUND)
+ IF(LIBMD_FOUND)
+ CMAKE_PUSH_CHECK_STATE() # Save the state of the variables
+ SET(CMAKE_REQUIRED_LIBRARIES "md")
+ FIND_LIBRARY(LIBMD_LIBRARY NAMES md)
+ LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY})
+ CMAKE_POP_CHECK_STATE() # Restore the state of the variables
+ ENDIF(LIBMD_FOUND)
+ENDIF(NOT OPENSSL_FOUND)
#
# How to prove that CRYPTO functions, which have several names on various
@@ -502,13 +558,8 @@ ENDIF(LIBMD_FOUND)
# required libraries.
#
MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
- IF(HAVE_SYS_TYPES_H)
- SET(CRYPTO_HEADER_CONFIG "#define HAVE_SYS_TYPES_H 1\n")
- ELSE(HAVE_SYS_TYPES_H)
- SET(CRYPTO_HEADER_CONFIG "")
- ENDIF(HAVE_SYS_TYPES_H)
-
FOREACH(ALGORITHM ${ALGORITHMS})
+ IF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
STRING(TOLOWER "${ALGORITHM}" lower_algorithm)
STRING(TOUPPER "${ALGORITHM}" algorithm)
IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND)
@@ -521,7 +572,7 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTA
# Probe the local implementation for whether this
# crypto implementation is available on this platform.
SET(TRY_CRYPTO_REQUIRED_INCLUDES
- "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive;${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp")
+ "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive;${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp")
SET(TRY_CRYPTO_REQUIRED_LIBS)
IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
SET(TRY_CRYPTO_REQUIRED_INCLUDES
@@ -529,6 +580,8 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTA
SET(TRY_CRYPTO_REQUIRED_LIBS
"-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}")
ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NETTLE_FOUND)
+ SET(TRY_CRYPTO_REQUIRED_INCLUDES
+ "${TRY_CRYPTO_REQUIRED_INCLUDES};${NETTLE_INCLUDE_DIR}")
SET(TRY_CRYPTO_REQUIRED_LIBS
"-DLINK_LIBRARIES:STRING=${NETTLE_LIBRARY}")
ELSEIF("${IMPLEMENTATION}" MATCHES "^LIBMD$" AND LIBMD_FOUND)
@@ -536,10 +589,15 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTA
"-DLINK_LIBRARIES:STRING=${LIBMD_LIBRARY}")
ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
+ FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
+ CONFDEFS_H)
FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_crypto.c"
ARCHIVE_CRYPTO_C)
- SET(SOURCE "
+ SET(SOURCE "${CONFDEFS_H}
+
#define ARCHIVE_${algorithm}_COMPILE_TEST
#define ARCHIVE_CRYPTO_${algorithm}_${IMPLEMENTATION}
#define PLATFORM_CONFIG_H \"check_crypto_md.h\"
@@ -561,10 +619,16 @@ main(int argc, char **argv)
FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c" "${SOURCE}")
MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}")
+ IF(CMAKE_REQUIRED_LINKER_FLAGS)
+ SET(CHECK_CRYPTO_ADD_LINKER_FLAGS
+ "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS}")
+ ELSE(CMAKE_REQUIRED_LINKER_FLAGS)
+ SET(CHECK_CRYPTO_ADD_LINKER_FLAGS)
+ ENDIF(CMAKE_REQUIRED_LINKER_FLAGS)
TRY_COMPILE(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/check_crypto_md.c
- CMAKE_FLAGS
+ CMAKE_FLAGS ${CHECK_CRYPTO_ADD_LINKER_FLAGS}
"${TRY_CRYPTO_REQUIRED_LIBS}"
"${TRY_CRYPTO_REQUIRED_INCLUDES}"
OUTPUT_VARIABLE OUTPUT)
@@ -572,6 +636,7 @@ main(int argc, char **argv)
# Inform user whether or not we found it; if not, log why we didn't.
IF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} -- found")
+ SET(ARCHIVE_CRYPTO_${ALGORITHM} 1)
ELSE (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} -- not found")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
@@ -590,6 +655,7 @@ main(int argc, char **argv)
LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
+ ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
ENDFOREACH(ALGORITHM ${ALGORITHMS})
ENDMACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
@@ -605,6 +671,7 @@ ENDMACRO(CHECK_CRYPTO ALGORITHMS IMPLEME
MACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
IF(WIN32 AND NOT CYGWIN)
FOREACH(CRYPTO ${CRYPTO_LIST})
+ IF(NOT ARCHIVE_CRYPTO_${CRYPTO})
IF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN)
STRING(TOUPPER "${CRYPTO}" crypto)
SET(ALGID "")
@@ -624,9 +691,14 @@ MACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
SET(ALGID "CALG_SHA_512")
ENDIF ("${CRYPTO}" MATCHES "^SHA512$")
- SET(SOURCE "#define ${crypto}_COMPILE_TEST
-#define _WIN32_WINNT ${_WIN32_WINNT}
-#define WINVER ${WINVER}
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h)
+ FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h"
+ CONFDEFS_H)
+
+ SET(SOURCE "${CONFDEFS_H}
+
+#define ${crypto}_COMPILE_TEST
#include <windows.h>
#include <wincrypt.h>
@@ -641,15 +713,22 @@ main(int argc, char **argv)
FILE(WRITE "${SOURCE_FILE}" "${SOURCE}")
MESSAGE(STATUS "Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN")
+ IF(CMAKE_REQUIRED_LINKER_FLAGS)
+ SET(CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS
+ "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS} -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_REQUIRED_LINKER_FLAGS}")
+ ELSE(CMAKE_REQUIRED_LINKER_FLAGS)
+ SET(CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS)
+ ENDIF(CMAKE_REQUIRED_LINKER_FLAGS)
TRY_COMPILE(ARCHIVE_CRYPTO_${CRYPTO}_WIN
${CMAKE_BINARY_DIR}
${SOURCE_FILE}
- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive" ${CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS}
OUTPUT_VARIABLE OUTPUT)
IF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
MESSAGE(STATUS
"Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- found")
+ SET(ARCHIVE_CRYPTO_${CRYPTO} 1)
ELSE (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
MESSAGE(STATUS
"Checking support for ARCHIVE_CRYPTO_${CRYPTO}_WIN -- not found")
@@ -661,6 +740,7 @@ main(int argc, char **argv)
ENDIF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
ENDIF(NOT DEFINED ARCHIVE_CRYPTO_${CRYPTO}_WIN)
+ ENDIF(NOT ARCHIVE_CRYPTO_${CRYPTO})
ENDFOREACH(CRYPTO)
ENDIF(WIN32 AND NOT CYGWIN)
ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
@@ -688,7 +768,7 @@ MACRO(CHECK_ICONV LIB TRY_ICONV_CONST)
SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /WX")
ENDIF (MSVC)
#
- CHECK_C_SOURCE_COMPILES(
+ LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
"#include <stdlib.h>
#include <iconv.h>
int main() {
@@ -841,49 +921,112 @@ ELSE(LIBXML2_FOUND)
ENDIF(LIBXML2_FOUND)
MARK_AS_ADVANCED(CLEAR LIBXML2_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR LIBXML2_LIBRARIES)
+
#
-# Find Libregex
+# POSIX Regular Expression support
#
-FIND_PATH(REGEX_INCLUDE_DIR regex.h)
-IF(REGEX_INCLUDE_DIR)
- CHECK_FUNCTION_EXISTS_GLIBC(regcomp HAVE_REGCOMP_LIBC)
+IF(POSIX_REGEX_LIB MATCHES "^(AUTO|LIBC|LIBREGEX)$")
#
- # If libc does not provide regex, find libregex.
+ # If PCREPOSIX is not found or not requested, try using regex
+ # from libc or libregex
#
- IF(NOT HAVE_REGCOMP_LIBC)
- CMAKE_PUSH_CHECK_STATE() # Save the state of the variables
- FIND_LIBRARY(REGEX_LIBRARY regex)
- IF(REGEX_LIBRARY)
- SET(CMAKE_REQUIRED_LIBRARIES ${REGEX_LIBRARY})
- CHECK_FUNCTION_EXISTS_GLIBC(regcomp HAVE_REGCOMP_LIBREGEX)
- IF(HAVE_REGCOMP_LIBREGEX)
- LIST(APPEND ADDITIONAL_LIBS ${REGEX_LIBRARY})
- #
- # If regex.h is not found, retry looking for regex.h at
- # REGEX_INCLUDE_DIR
- #
- IF(NOT HAVE_REGEX_H)
- UNSET(HAVE_REGEX_H CACHE)
- INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR})
- SET(CMAKE_REQUIRED_INCLUDES ${REGEX_INCLUDE_DIR})
- LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H)
- ENDIF(NOT HAVE_REGEX_H)
- # Test if a macro is needed for the library.
- TRY_MACRO_FOR_LIBRARY(
- "${REGEX_INCLUDE_DIR}" "${REGEX_LIBRARY}"
- COMPILES
- "#include <stddef.h>\n#include <regex.h>\nint main() {regex_t r;return regcomp(&r, \"\", 0);}"
- "USE_REGEX_DLL;USE_REGEX_STATIC")
- IF(USE_REGEX_DLL)
- ADD_DEFINITIONS(-DUSE_REGEX_DLL)
- ELSEIF(USE_REGEX_STATIC)
- ADD_DEFINITIONS(-DUSE_REGEX_STATIC)
- ENDIF(USE_REGEX_DLL)
- ENDIF(HAVE_REGCOMP_LIBREGEX)
- ENDIF(REGEX_LIBRARY)
- CMAKE_POP_CHECK_STATE() # Restore the state of the variables
- ENDIF(NOT HAVE_REGCOMP_LIBC)
-ENDIF(REGEX_INCLUDE_DIR)
+ FIND_PATH(REGEX_INCLUDE_DIR regex.h)
+ IF(REGEX_INCLUDE_DIR)
+ CHECK_FUNCTION_EXISTS_GLIBC(regcomp HAVE_REGCOMP_LIBC)
+ #
+ # If libc does not provide regex, find libregex.
+ #
+ IF(NOT HAVE_REGCOMP_LIBC)
+ CMAKE_PUSH_CHECK_STATE() # Save the state of the variables
+ FIND_LIBRARY(REGEX_LIBRARY regex)
+ IF(REGEX_LIBRARY)
+ SET(CMAKE_REQUIRED_LIBRARIES ${REGEX_LIBRARY})
+ CHECK_FUNCTION_EXISTS_GLIBC(regcomp HAVE_REGCOMP_LIBREGEX)
+ IF(HAVE_REGCOMP_LIBREGEX)
+ LIST(APPEND ADDITIONAL_LIBS ${REGEX_LIBRARY})
+ #
+ # If regex.h is not found, retry looking for regex.h at
+ # REGEX_INCLUDE_DIR
+ #
+ IF(NOT HAVE_REGEX_H)
+ UNSET(HAVE_REGEX_H CACHE)
+ INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR})
+ SET(CMAKE_REQUIRED_INCLUDES ${REGEX_INCLUDE_DIR})
+ LA_CHECK_INCLUDE_FILE("regex.h" HAVE_REGEX_H)
+ ENDIF(NOT HAVE_REGEX_H)
+ # Test if a macro is needed for the library.
+ TRY_MACRO_FOR_LIBRARY(
+ "${REGEX_INCLUDE_DIR}" "${REGEX_LIBRARY}"
+ COMPILES
+ "#include <stddef.h>\n#include <regex.h>\nint main() {regex_t r;return regcomp(&r, \"\", 0);}"
+ "USE_REGEX_DLL;USE_REGEX_STATIC")
+ IF(USE_REGEX_DLL)
+ ADD_DEFINITIONS(-DUSE_REGEX_DLL)
+ ELSEIF(USE_REGEX_STATIC)
+ ADD_DEFINITIONS(-DUSE_REGEX_STATIC)
+ ENDIF(USE_REGEX_DLL)
+ ENDIF(HAVE_REGCOMP_LIBREGEX)
+ ENDIF(REGEX_LIBRARY)
+ CMAKE_POP_CHECK_STATE() # Restore the state of the variables
+ ENDIF(NOT HAVE_REGCOMP_LIBC)
+ ENDIF(REGEX_INCLUDE_DIR)
+ IF(HAVE_REGCOMP_LIBC OR HAVE_REGCOMP_LIBREGEX)
+ SET(FOUND_POSIX_REGEX_LIB 1)
+ ENDIF(HAVE_REGCOMP_LIBC OR HAVE_REGCOMP_LIBREGEX)
+ENDIF(POSIX_REGEX_LIB MATCHES "^(AUTO|LIBC|LIBREGEX)$")
+
+IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$")
+ #
+ # If requested, try finding library for PCREPOSIX
+ #
+ FIND_PACKAGE(LibGCC)
+ FIND_PACKAGE(PCREPOSIX)
+ IF(PCREPOSIX_FOUND)
+ INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR})
+ LIST(APPEND ADDITIONAL_LIBS ${PCREPOSIX_LIBRARIES})
+ # Test if a macro is needed for the library.
+ TRY_MACRO_FOR_LIBRARY(
+ "${PCRE_INCLUDE_DIR}" "${PCREPOSIX_LIBRARIES}"
+ COMPILES
+ "#include <pcreposix.h>\nint main() {regex_t r;return regcomp(&r, \"\", 0);}"
+ "WITHOUT_PCRE_STATIC;PCRE_STATIC")
+ IF(NOT WITHOUT_PCRE_STATIC AND PCRE_STATIC)
+ ADD_DEFINITIONS(-DPCRE_STATIC)
+ ELSEIF(NOT WITHOUT_PCRE_STATIC AND NOT PCRE_STATIC AND PCRE_FOUND)
+ # Determine if pcre static libraries are to be used.
+ LIST(APPEND ADDITIONAL_LIBS ${PCRE_LIBRARIES})
+ SET(TMP_LIBRARIES ${PCREPOSIX_LIBRARIES} ${PCRE_LIBRARIES})
+ MESSAGE(STATUS "trying again with -lpcre included")
+ TRY_MACRO_FOR_LIBRARY(
+ "${PCRE_INCLUDE_DIR}" "${TMP_LIBRARIES}"
+ COMPILES
+ "#include <pcreposix.h>\nint main() {regex_t r;return regcomp(&r, \"\", 0);}"
+ "WITHOUT_PCRE_STATIC;PCRE_STATIC")
+ IF(NOT WITHOUT_PCRE_STATIC AND PCRE_STATIC)
+ ADD_DEFINITIONS(-DPCRE_STATIC)
+ ELSEIF(NOT WITHOUT_PCRE_STATIC AND NOT PCRE_STATIC AND MSVC AND LIBGCC_FOUND)
+ # When doing a Visual Studio build using pcre static libraries
+ # built using the mingw toolchain, -lgcc is needed to resolve
+ # ___chkstk_ms.
+ MESSAGE(STATUS "Visual Studio build detected, trying again with -lgcc included")
+ LIST(APPEND ADDITIONAL_LIBS ${LIBGCC_LIBRARIES})
+ SET(TMP_LIBRARIES ${PCREPOSIX_LIBRARIES} ${PCRE_LIBRARIES} ${LIBGCC_LIBRARIES})
+ TRY_MACRO_FOR_LIBRARY(
+ "${PCRE_INCLUDE_DIR}" "${TMP_LIBRARIES}"
+ COMPILES
+ "#include <pcreposix.h>\nint main() {regex_t r;return regcomp(&r, \"\", 0);}"
+ "WITHOUT_PCRE_STATIC;PCRE_STATIC")
+ IF(NOT WITHOUT_PCRE_STATIC AND PCRE_STATIC)
+ ADD_DEFINITIONS(-DPCRE_STATIC)
+ ENDIF(NOT WITHOUT_PCRE_STATIC AND PCRE_STATIC)
+ ENDIF(NOT WITHOUT_PCRE_STATIC AND PCRE_STATIC)
+ ENDIF(NOT WITHOUT_PCRE_STATIC AND PCRE_STATIC)
+ ENDIF(PCREPOSIX_FOUND)
+ MARK_AS_ADVANCED(CLEAR PCRE_INCLUDE_DIR)
+ MARK_AS_ADVANCED(CLEAR PCREPOSIX_LIBRARIES)
+ MARK_AS_ADVANCED(CLEAR PCRE_LIBRARIES)
+ MARK_AS_ADVANCED(CLEAR LIBGCC_LIBRARIES)
+ENDIF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$")
#
# Check functions
@@ -902,6 +1045,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE
CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT)
CHECK_FUNCTION_EXISTS_GLIBC(ctime_r HAVE_CTIME_R)
+CHECK_FUNCTION_EXISTS_GLIBC(dirfd HAVE_DIRFD)
CHECK_FUNCTION_EXISTS_GLIBC(fchdir HAVE_FCHDIR)
CHECK_FUNCTION_EXISTS_GLIBC(fchflags HAVE_FCHFLAGS)
CHECK_FUNCTION_EXISTS_GLIBC(fchmod HAVE_FCHMOD)
@@ -942,6 +1086,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(nl_langinfo
CHECK_FUNCTION_EXISTS_GLIBC(openat HAVE_OPENAT)
CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PIPE)
CHECK_FUNCTION_EXISTS_GLIBC(poll HAVE_POLL)
+CHECK_FUNCTION_EXISTS_GLIBC(posix_spawnp HAVE_POSIX_SPAWNP)
CHECK_FUNCTION_EXISTS_GLIBC(readlink HAVE_READLINK)
CHECK_FUNCTION_EXISTS_GLIBC(select HAVE_SELECT)
CHECK_FUNCTION_EXISTS_GLIBC(setenv HAVE_SETENV)
@@ -986,14 +1131,14 @@ CMAKE_POP_CHECK_STATE() # Restore the st
# Make sure we have the POSIX version of readdir_r, not the
# older 2-argument version.
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
"#include <dirent.h>\nint main() {DIR *d = opendir(\".\"); struct dirent e,*r; return readdir_r(d,&e,&r);}"
HAVE_READDIR_R)
# Only detect readlinkat() if we also have AT_FDCWD in unistd.h.
# NOTE: linux requires fcntl.h for AT_FDCWD.
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
"#include <fcntl.h>\n#include <unistd.h>\nint main() {char buf[10]; return readlinkat(AT_FDCWD, \"\", buf, 0);}"
HAVE_READLINKAT)
@@ -1002,10 +1147,10 @@ CHECK_C_SOURCE_COMPILES(
# of interest and verify that the result can be linked.
# CHECK_FUNCTION_EXISTS doesn't accept a header argument,
# CHECK_SYMBOL_EXISTS doesn't test linkage.
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
"#include <sys/mkdev.h>\nint main() { return major(256); }"
MAJOR_IN_MKDEV)
-CHECK_C_SOURCE_COMPILES(
+LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
"#include <sys/sysmacros.h>\nint main() { return major(256); }"
MAJOR_IN_SYSMACROS)
@@ -1301,6 +1446,8 @@ IF(ENABLE_ACL)
CHECK_FUNCTION_EXISTS(acl_get_perm_np HAVE_ACL_GET_PERM_NP)
CHECK_FUNCTION_EXISTS(acl_get_link HAVE_ACL_GET_LINK)
CHECK_FUNCTION_EXISTS(acl_get_link_np HAVE_ACL_GET_LINK_NP)
+ CHECK_FUNCTION_EXISTS(acl_is_trivial_np HAVE_ACL_IS_TRIVIAL_NP)
+ CHECK_FUNCTION_EXISTS(acl_set_link_np HAVE_ACL_SET_LINK_NP)
# MacOS has an acl.h that isn't POSIX. It can be detected by
# checking for ACL_USER
Modified: vendor/libarchive/dist/Makefile.am
==============================================================================
--- vendor/libarchive/dist/Makefile.am Thu Mar 21 16:29:08 2013 (r248589)
+++ vendor/libarchive/dist/Makefile.am Thu Mar 21 18:59:02 2013 (r248590)
@@ -90,6 +90,8 @@ libarchive_la_SOURCES= \
libarchive/archive_acl.c \
libarchive/archive_acl_private.h \
libarchive/archive_check_magic.c \
+ libarchive/archive_cmdline.c \
+ libarchive/archive_cmdline_private.h \
libarchive/archive_crc32.h \
libarchive/archive_crypto.c \
libarchive/archive_crypto_private.h \
@@ -118,6 +120,7 @@ libarchive_la_SOURCES= \
libarchive/archive_rb.c \
libarchive/archive_rb.h \
libarchive/archive_read.c \
+ libarchive/archive_read_append_filter.c \
libarchive/archive_read_data_into_fd.c \
libarchive/archive_read_disk_entry_from_file.c \
libarchive/archive_read_disk_posix.c \
@@ -129,11 +132,15 @@ libarchive_la_SOURCES= \
libarchive/archive_read_open_filename.c \
libarchive/archive_read_open_memory.c \
libarchive/archive_read_private.h \
+ libarchive/archive_read_set_format.c \
libarchive/archive_read_set_options.c \
libarchive/archive_read_support_filter_all.c \
libarchive/archive_read_support_filter_bzip2.c \
libarchive/archive_read_support_filter_compress.c \
+ libarchive/archive_read_support_filter_grzip.c \
libarchive/archive_read_support_filter_gzip.c \
+ libarchive/archive_read_support_filter_lrzip.c \
+ libarchive/archive_read_support_filter_lzop.c \
libarchive/archive_read_support_filter_none.c \
libarchive/archive_read_support_filter_program.c \
libarchive/archive_read_support_filter_rpm.c \
@@ -161,6 +168,7 @@ libarchive_la_SOURCES= \
libarchive/archive_util.c \
libarchive/archive_virtual.c \
libarchive/archive_write.c \
+ libarchive/archive_write_disk_acl.c \
libarchive/archive_write_disk_posix.c \
libarchive/archive_write_disk_private.h \
libarchive/archive_write_disk_set_standard_lookup.c \
@@ -170,11 +178,17 @@ libarchive_la_SOURCES= \
libarchive/archive_write_open_memory.c \
libarchive/archive_write_private.h \
libarchive/archive_write_add_filter.c \
- libarchive/archive_write_add_filter_bzip2.c \
- libarchive/archive_write_add_filter_compress.c \
+ libarchive/archive_write_add_filter_b64encode.c \
+ libarchive/archive_write_add_filter_by_name.c \
+ libarchive/archive_write_add_filter_bzip2.c \
+ libarchive/archive_write_add_filter_compress.c \
+ libarchive/archive_write_add_filter_grzip.c \
libarchive/archive_write_add_filter_gzip.c \
+ libarchive/archive_write_add_filter_lrzip.c \
+ libarchive/archive_write_add_filter_lzop.c \
libarchive/archive_write_add_filter_none.c \
- libarchive/archive_write_add_filter_program.c \
+ libarchive/archive_write_add_filter_program.c \
+ libarchive/archive_write_add_filter_uuencode.c \
libarchive/archive_write_add_filter_xz.c \
libarchive/archive_write_set_format.c \
libarchive/archive_write_set_format_7zip.c \
@@ -187,12 +201,13 @@ libarchive_la_SOURCES= \
libarchive/archive_write_set_format_pax.c \
libarchive/archive_write_set_format_shar.c \
libarchive/archive_write_set_format_ustar.c \
+ libarchive/archive_write_set_format_v7tar.c \
libarchive/archive_write_set_format_gnutar.c \
libarchive/archive_write_set_format_xar.c \
libarchive/archive_write_set_format_zip.c \
libarchive/archive_write_set_options.c \
libarchive/config_freebsd.h \
- libarchive/filter_fork.c \
+ libarchive/filter_fork_posix.c \
libarchive/filter_fork.h
if INC_WINDOWS_FILES
@@ -220,14 +235,32 @@ libarchive_man_MANS= \
libarchive/archive_entry_stat.3 \
libarchive/archive_entry_time.3 \
libarchive/archive_read.3 \
+ libarchive/archive_read_data.3 \
libarchive/archive_read_disk.3 \
+ libarchive/archive_read_extract.3 \
+ libarchive/archive_read_filter.3 \
+ libarchive/archive_read_format.3 \
+ libarchive/archive_read_free.3 \
+ libarchive/archive_read_header.3 \
+ libarchive/archive_read_new.3 \
+ libarchive/archive_read_open.3 \
libarchive/archive_read_set_options.3 \
libarchive/archive_util.3 \
libarchive/archive_write.3 \
+ libarchive/archive_write_blocksize.3 \
+ libarchive/archive_write_data.3 \
libarchive/archive_write_disk.3 \
+ libarchive/archive_write_filter.3 \
+ libarchive/archive_write_finish_entry.3 \
+ libarchive/archive_write_format.3 \
+ libarchive/archive_write_free.3 \
+ libarchive/archive_write_header.3 \
+ libarchive/archive_write_new.3 \
+ libarchive/archive_write_open.3 \
libarchive/archive_write_set_options.3 \
libarchive/cpio.5 \
libarchive/libarchive.3 \
+ libarchive/libarchive_changes.3 \
libarchive/libarchive_internals.3 \
libarchive/libarchive-formats.5 \
libarchive/mtree.5 \
@@ -245,6 +278,11 @@ libarchive_EXTRA_DIST= \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = build/pkgconfig/libarchive.pc
+# Sources needed by all test programs
+test_utils_SOURCES= \
+ test_utils/test_utils.c \
+ test_utils/test_utils.h
+
#
#
# libarchive_test program
@@ -252,15 +290,18 @@ pkgconfig_DATA = build/pkgconfig/libarch
#
libarchive_test_SOURCES= \
$(libarchive_la_SOURCES) \
+ $(test_utils_SOURCES) \
libarchive/test/main.c \
libarchive/test/read_open_memory.c \
libarchive/test/test.h \
- libarchive/test/test_acl_freebsd.c \
+ libarchive/test/test_acl_freebsd_posix1e.c \
+ libarchive/test/test_acl_freebsd_nfs4.c \
libarchive/test/test_acl_nfs4.c \
libarchive/test/test_acl_pax.c \
libarchive/test/test_acl_posix1e.c \
libarchive/test/test_archive_api_feature.c \
libarchive/test/test_archive_clear_error.c \
+ libarchive/test/test_archive_cmdline.c \
libarchive/test/test_archive_crypto.c \
libarchive/test/test_archive_getdate.c \
libarchive/test/test_archive_match_owner.c \
@@ -270,6 +311,7 @@ libarchive_test_SOURCES= \
libarchive/test/test_archive_read_close_twice.c \
libarchive/test/test_archive_read_close_twice_open_fd.c \
libarchive/test/test_archive_read_close_twice_open_filename.c \
+ libarchive/test/test_archive_read_multiple_data_objects.c \
libarchive/test/test_archive_read_next_header_empty.c \
libarchive/test/test_archive_read_next_header_raw.c \
libarchive/test/test_archive_read_open2.c \
@@ -281,7 +323,9 @@ libarchive_test_SOURCES= \
libarchive/test/test_archive_set_error.c \
libarchive/test/test_archive_string.c \
libarchive/test/test_archive_string_conversion.c \
+ libarchive/test/test_archive_write_add_filter_by_name.c \
libarchive/test/test_archive_write_set_filter_option.c \
+ libarchive/test/test_archive_write_set_format_by_name.c \
libarchive/test/test_archive_write_set_format_option.c \
libarchive/test/test_archive_write_set_option.c \
libarchive/test/test_archive_write_set_options.c \
@@ -292,11 +336,13 @@ libarchive_test_SOURCES= \
libarchive/test/test_compat_gzip.c \
libarchive/test/test_compat_lzip.c \
libarchive/test/test_compat_lzma.c \
+ libarchive/test/test_compat_lzop.c \
libarchive/test/test_compat_mac.c \
libarchive/test/test_compat_pax_libarchive_2x.c \
libarchive/test/test_compat_solaris_tar_acl.c \
libarchive/test/test_compat_solaris_pax_sparse.c \
libarchive/test/test_compat_tar_hardlink.c \
+ libarchive/test/test_compat_uudecode.c \
libarchive/test/test_compat_xz.c \
libarchive/test/test_compat_zip.c \
libarchive/test/test_empty_write.c \
@@ -312,13 +358,19 @@ libarchive_test_SOURCES= \
libarchive/test/test_open_file.c \
libarchive/test/test_open_filename.c \
libarchive/test/test_pax_filename_encoding.c \
- libarchive/test/test_read_compress_program.c \
libarchive/test/test_read_data_large.c \
libarchive/test/test_read_disk.c \
libarchive/test/test_read_disk_directory_traversals.c \
libarchive/test/test_read_disk_entry_from_file.c \
libarchive/test/test_read_extract.c \
libarchive/test/test_read_file_nonexistent.c \
+ libarchive/test/test_read_filter_grzip.c \
+ libarchive/test/test_read_filter_lrzip.c \
+ libarchive/test/test_read_filter_lzop.c \
+ libarchive/test/test_read_filter_lzop_multiple_parts.c \
+ libarchive/test/test_read_filter_program.c \
+ libarchive/test/test_read_filter_program_signature.c \
+ libarchive/test/test_read_filter_uudecode.c \
libarchive/test/test_read_format_7zip.c \
libarchive/test/test_read_format_ar.c \
libarchive/test/test_read_format_cab.c \
@@ -372,35 +424,49 @@ libarchive_test_SOURCES= \
libarchive/test/test_read_format_ustar_filename.c \
libarchive/test/test_read_format_xar.c \
libarchive/test/test_read_format_zip.c \
+ libarchive/test/test_read_format_zip_comment_stored.c \
libarchive/test/test_read_format_zip_filename.c \
+ libarchive/test/test_read_format_zip_mac_metadata.c \
+ libarchive/test/test_read_format_zip_sfx.c \
libarchive/test/test_read_large.c \
libarchive/test/test_read_pax_truncated.c \
libarchive/test/test_read_position.c \
+ libarchive/test/test_read_set_format.c \
libarchive/test/test_read_truncated.c \
libarchive/test/test_read_truncated_filter.c \
- libarchive/test/test_read_uu.c \
libarchive/test/test_sparse_basic.c \
libarchive/test/test_tar_filenames.c \
libarchive/test/test_tar_large.c \
libarchive/test/test_ustar_filenames.c \
libarchive/test/test_ustar_filename_encoding.c \
- libarchive/test/test_write_compress.c \
- libarchive/test/test_write_compress_bzip2.c \
- libarchive/test/test_write_compress_gzip.c \
- libarchive/test/test_write_compress_lzip.c \
- libarchive/test/test_write_compress_lzma.c \
- libarchive/test/test_write_compress_program.c \
- libarchive/test/test_write_compress_xz.c \
libarchive/test/test_write_disk.c \
+ libarchive/test/test_write_disk_appledouble.c \
libarchive/test/test_write_disk_failures.c \
libarchive/test/test_write_disk_hardlink.c \
+ libarchive/test/test_write_disk_hfs_compression.c \
libarchive/test/test_write_disk_lookup.c \
+ libarchive/test/test_write_disk_mac_metadata.c \
+ libarchive/test/test_write_disk_no_hfs_compression.c \
libarchive/test/test_write_disk_perms.c \
libarchive/test/test_write_disk_secure.c \
libarchive/test/test_write_disk_sparse.c \
libarchive/test/test_write_disk_symlink.c \
libarchive/test/test_write_disk_times.c \
+ libarchive/test/test_write_filter_b64encode.c \
+ libarchive/test/test_write_filter_bzip2.c \
+ libarchive/test/test_write_filter_compress.c \
+ libarchive/test/test_write_filter_gzip.c \
+ libarchive/test/test_write_filter_gzip_timestamp.c \
+ libarchive/test/test_write_filter_lrzip.c \
+ libarchive/test/test_write_filter_lzip.c \
+ libarchive/test/test_write_filter_lzma.c \
+ libarchive/test/test_write_filter_lzop.c \
+ libarchive/test/test_write_filter_program.c \
+ libarchive/test/test_write_filter_uuencode.c \
+ libarchive/test/test_write_filter_xz.c \
libarchive/test/test_write_format_7zip.c \
+ libarchive/test/test_write_format_7zip_empty.c \
+ libarchive/test/test_write_format_7zip_large.c \
libarchive/test/test_write_format_ar.c \
libarchive/test/test_write_format_cpio.c \
libarchive/test/test_write_format_cpio_empty.c \
@@ -413,22 +479,29 @@ libarchive_test_SOURCES= \
libarchive/test/test_write_format_iso9660_filename.c \
libarchive/test/test_write_format_iso9660_zisofs.c \
libarchive/test/test_write_format_mtree.c \
+ libarchive/test/test_write_format_mtree_absolute_path.c \
+ libarchive/test/test_write_format_mtree_classic.c \
+ libarchive/test/test_write_format_mtree_classic_indent.c\
libarchive/test/test_write_format_mtree_fflags.c \
+ libarchive/test/test_write_format_mtree_no_separator.c \
+ libarchive/test/test_write_format_mtree_quoted_filename.c\
libarchive/test/test_write_format_pax.c \
libarchive/test/test_write_format_shar_empty.c \
libarchive/test/test_write_format_tar.c \
libarchive/test/test_write_format_tar_empty.c \
libarchive/test/test_write_format_tar_sparse.c \
libarchive/test/test_write_format_tar_ustar.c \
+ libarchive/test/test_write_format_tar_v7tar.c \
libarchive/test/test_write_format_xar.c \
libarchive/test/test_write_format_xar_empty.c \
libarchive/test/test_write_format_zip.c \
libarchive/test/test_write_format_zip_empty.c \
libarchive/test/test_write_format_zip_no_compression.c \
libarchive/test/test_write_open_memory.c \
+ libarchive/test/test_write_zip_set_compression_store.c \
libarchive/test/test_zip_filename_encoding.c
-libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS)
+libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/test_utils -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC $(PLATFORMCPPFLAGS)
libarchive_test_LDADD= $(LTLIBICONV)
# The "list.h" file just lists all of the tests defined in all of the sources.
@@ -437,7 +510,7 @@ libarchive_test_LDADD= $(LTLIBICONV)
libarchive/test/list.h: Makefile
cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h
-libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test
+libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
libarchive_test_EXTRA_DIST=\
libarchive/test/list.h \
@@ -454,6 +527,9 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_compat_lzma_1.tlz.uu \
libarchive/test/test_compat_lzma_2.tlz.uu \
libarchive/test/test_compat_lzma_3.tlz.uu \
+ libarchive/test/test_compat_lzop_1.tar.lzo.uu \
+ libarchive/test/test_compat_lzop_2.tar.lzo.uu \
+ libarchive/test/test_compat_lzop_3.tar.lzo.uu \
libarchive/test/test_compat_mac-1.tar.Z.uu \
libarchive/test/test_compat_mac-2.tar.Z.uu \
libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu \
@@ -473,6 +549,29 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_fuzz.cab.uu \
libarchive/test/test_fuzz.lzh.uu \
libarchive/test/test_pax_filename_encoding.tar.uu \
+ libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu \
+ libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu \
+ libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu \
+ libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu \
+ libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu \
+ libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu \
+ libarchive/test/test_rar_multivolume_single_file.part1.rar.uu \
+ libarchive/test/test_rar_multivolume_single_file.part2.rar.uu \
+ libarchive/test/test_rar_multivolume_single_file.part3.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu \
+ libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu \
+ libarchive/test/test_read_filter_grzip.tar.grz.uu \
+ libarchive/test/test_read_filter_lrzip.tar.lrz.uu \
+ libarchive/test/test_read_filter_lzop.tar.lzo.uu \
+ libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu \
libarchive/test/test_read_format_7zip_bcj_bzip2.7z.uu \
libarchive/test/test_read_format_7zip_bcj_copy.7z.uu \
libarchive/test/test_read_format_7zip_bcj_deflate.7z.uu \
@@ -547,11 +646,17 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_read_format_lha_withjunk.lzh.uu \
libarchive/test/test_read_format_mtree.mtree.uu \
libarchive/test/test_read_format_mtree_nomagic.mtree.uu \
+ libarchive/test/test_read_format_mtree_nomagic2.mtree.uu \
+ libarchive/test/test_read_format_mtree_nomagic3.mtree.uu \
libarchive/test/test_read_format_rar.rar.uu \
libarchive/test/test_read_format_rar_binary_data.rar.uu \
libarchive/test/test_read_format_rar_compress_best.rar.uu \
libarchive/test/test_read_format_rar_compress_normal.rar.uu \
libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu \
+ libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu\
+ libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu\
+ libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu\
+ libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu\
libarchive/test/test_read_format_rar_noeof.rar.uu \
libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu\
libarchive/test/test_read_format_rar_sfx.exe.uu \
@@ -566,6 +671,8 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_read_format_ustar_filename_eucjp.tar.Z.uu \
libarchive/test/test_read_format_ustar_filename_koi8r.tar.Z.uu \
libarchive/test/test_read_format_zip.zip.uu \
+ libarchive/test/test_read_format_zip_comment_stored_1.zip.uu \
+ libarchive/test/test_read_format_zip_comment_stored_2.zip.uu \
libarchive/test/test_read_format_zip_filename_cp866.zip.uu \
libarchive/test/test_read_format_zip_filename_cp932.zip.uu \
libarchive/test/test_read_format_zip_filename_koi8r.zip.uu \
@@ -573,8 +680,26 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu \
libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu \
libarchive/test/test_read_format_zip_length_at_end.zip.uu \
+ libarchive/test/test_read_format_zip_mac_metadata.zip.uu \
+ libarchive/test/test_read_format_zip_sfx.uu \
libarchive/test/test_read_format_zip_symlink.zip.uu \
libarchive/test/test_read_format_zip_ux.zip.uu \
+ libarchive/test/test_read_large_splitted_rar_aa.uu \
+ libarchive/test/test_read_large_splitted_rar_ab.uu \
+ libarchive/test/test_read_large_splitted_rar_ac.uu \
+ libarchive/test/test_read_large_splitted_rar_ad.uu \
+ libarchive/test/test_read_large_splitted_rar_ae.uu \
+ libarchive/test/test_read_splitted_rar_aa.uu \
+ libarchive/test/test_read_splitted_rar_ab.uu \
+ libarchive/test/test_read_splitted_rar_ac.uu \
+ libarchive/test/test_read_splitted_rar_ad.uu \
+ libarchive/test/test_splitted_rar_seek_support_aa.uu \
+ libarchive/test/test_splitted_rar_seek_support_ab.uu \
+ libarchive/test/test_splitted_rar_seek_support_ac.uu \
+ libarchive/test/test_write_disk_appledouble.cpio.gz.uu \
+ libarchive/test/test_write_disk_hfs_compression.tgz.uu \
+ libarchive/test/test_write_disk_mac_metadata.tar.gz.uu \
+ libarchive/test/test_write_disk_no_hfs_compression.tgz.uu \
libarchive/test/CMakeLists.txt \
libarchive/test/README
@@ -600,6 +725,7 @@ bsdtar_SOURCES= \
tar/bsdtar.h \
tar/bsdtar_platform.h \
tar/cmdline.c \
+ tar/creation_set.c \
tar/read.c \
tar/subst.c \
tar/util.c \
@@ -646,12 +772,22 @@ endif
#
bsdtar_test_SOURCES= \
+ $(test_utils_SOURCES) \
tar/test/main.c \
tar/test/test.h \
tar/test/test_0.c \
tar/test/test_basic.c \
tar/test/test_copy.c \
tar/test/test_empty_mtree.c \
+ tar/test/test_extract_tar_Z.c \
+ tar/test/test_extract_tar_bz2.c \
+ tar/test/test_extract_tar_grz.c \
+ tar/test/test_extract_tar_gz.c \
+ tar/test/test_extract_tar_lrz.c \
+ tar/test/test_extract_tar_lz.c \
+ tar/test/test_extract_tar_lzma.c \
+ tar/test/test_extract_tar_lzo.c \
+ tar/test/test_extract_tar_xz.c \
tar/test/test_format_newc.c \
tar/test/test_help.c \
tar/test/test_option_C_upper.c \
@@ -661,18 +797,29 @@ bsdtar_test_SOURCES= \
tar/test/test_option_T_upper.c \
tar/test/test_option_U_upper.c \
tar/test/test_option_X_upper.c \
+ tar/test/test_option_a.c \
tar/test/test_option_b.c \
+ tar/test/test_option_b64encode.c \
tar/test/test_option_exclude.c \
tar/test/test_option_gid_gname.c \
+ tar/test/test_option_grzip.c \
+ tar/test/test_option_j.c \
tar/test/test_option_k.c \
tar/test/test_option_keep_newer_files.c \
+ tar/test/test_option_lrzip.c \
+ tar/test/test_option_lzma.c \
+ tar/test/test_option_lzop.c \
tar/test/test_option_n.c \
tar/test/test_option_newer_than.c \
tar/test/test_option_nodump.c \
+ tar/test/test_option_older_than.c \
tar/test/test_option_q.c \
tar/test/test_option_r.c \
tar/test/test_option_s.c \
tar/test/test_option_uid_uname.c \
+ tar/test/test_option_uuencode.c \
+ tar/test/test_option_xz.c \
+ tar/test/test_option_z.c \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list