svn commit: r299425 - in vendor/libarchive/dist: . build build/autoconf build/cmake cat cat/test contrib contrib/android contrib/android/config contrib/android/include cpio cpio/test doc examples e...

Martin Matuska mm at FreeBSD.org
Wed May 11 10:19:46 UTC 2016 

Author: mm
Date: Wed May 11 10:19:44 2016
New Revision: 299425
URL: https://svnweb.freebsd.org/changeset/base/299425

Log:
  Update vendor/libarchive/dist to git commit 61c56e5 (post 3.2.0)

Added:
  vendor/libarchive/dist/.travis.yml
  vendor/libarchive/dist/CONTRIBUTING.md
  vendor/libarchive/dist/build/autoconf/ax_append_compile_flags.m4
  vendor/libarchive/dist/build/autoconf/ax_append_flag.m4
  vendor/libarchive/dist/build/autoconf/ax_check_compile_flag.m4
  vendor/libarchive/dist/build/autoconf/ax_require_defined.m4
  vendor/libarchive/dist/build/cmake/CreatePkgConfigFile.cmake
  vendor/libarchive/dist/build/cmake/LibarchiveCodeCoverage.cmake
  vendor/libarchive/dist/cat/
  vendor/libarchive/dist/cat/CMakeLists.txt   (contents, props changed)
  vendor/libarchive/dist/cat/bsdcat.1   (contents, props changed)
  vendor/libarchive/dist/cat/bsdcat.c   (contents, props changed)
  vendor/libarchive/dist/cat/bsdcat.h   (contents, props changed)
  vendor/libarchive/dist/cat/bsdcat_platform.h   (contents, props changed)
  vendor/libarchive/dist/cat/cmdline.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/
  vendor/libarchive/dist/cat/test/CMakeLists.txt   (contents, props changed)
  vendor/libarchive/dist/cat/test/main.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test.h   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_0.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_empty.gz.uu
  vendor/libarchive/dist/cat/test/test_empty.lz4.uu
  vendor/libarchive/dist/cat/test/test_empty.xz.uu
  vendor/libarchive/dist/cat/test/test_empty_gz.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_empty_lz4.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_empty_xz.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_error.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_error_mixed.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand.Z.uu
  vendor/libarchive/dist/cat/test/test_expand.bz2.uu
  vendor/libarchive/dist/cat/test/test_expand.gz.uu
  vendor/libarchive/dist/cat/test/test_expand.lz4.uu
  vendor/libarchive/dist/cat/test/test_expand.plain.uu
  vendor/libarchive/dist/cat/test/test_expand.xz.uu
  vendor/libarchive/dist/cat/test/test_expand_Z.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand_bz2.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand_gz.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand_lz4.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand_mixed.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand_plain.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_expand_xz.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_help.c   (contents, props changed)
  vendor/libarchive/dist/cat/test/test_version.c   (contents, props changed)
  vendor/libarchive/dist/contrib/android/
  vendor/libarchive/dist/contrib/android/Android.mk   (contents, props changed)
  vendor/libarchive/dist/contrib/android/config/
  vendor/libarchive/dist/contrib/android/config/android.h   (contents, props changed)
  vendor/libarchive/dist/contrib/android/config/linux_host.h   (contents, props changed)
  vendor/libarchive/dist/contrib/android/config/windows_host.h   (contents, props changed)
  vendor/libarchive/dist/contrib/android/include/
  vendor/libarchive/dist/contrib/android/include/Bcrypt.h   (contents, props changed)
  vendor/libarchive/dist/contrib/android/include/Windows.h   (contents, props changed)
  vendor/libarchive/dist/contrib/android/include/android_lf.h   (contents, props changed)
  vendor/libarchive/dist/cpio/test/test_extract.cpio.lz4.uu
  vendor/libarchive/dist/cpio/test/test_extract_cpio_lz4.c   (contents, props changed)
  vendor/libarchive/dist/cpio/test/test_option_lz4.c   (contents, props changed)
  vendor/libarchive/dist/cpio/test/test_option_passphrase.c   (contents, props changed)
  vendor/libarchive/dist/cpio/test/test_option_passphrase.zip.uu
  vendor/libarchive/dist/libarchive/archive_cryptor.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_cryptor_private.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_digest.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_digest_private.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_getdate.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_hmac.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_hmac_private.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_pack_dev.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_pack_dev.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_random.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_random_private.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_read_add_passphrase.3   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_read_add_passphrase.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_read_extract2.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_read_support_filter_lz4.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_read_support_format_warc.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_write_add_filter_lz4.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_write_set_format_filter_by_ext.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_write_set_format_raw.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_write_set_format_warc.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_write_set_passphrase.3   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_write_set_passphrase.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/archive_xxhash.h   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_archive_digest.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_archive_read_add_passphrase.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_archive_write_set_format_filter_by_ext.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_archive_write_set_passphrase.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_compat_lz4.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_1.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_2.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_3.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B4.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B4BD.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B4BDBX.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B5.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B5BD.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B6.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B6BD.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B7.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_lz4_B7BD.tar.lz4.uu
  vendor/libarchive/dist/libarchive/test/test_compat_uudecode_large.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_compat_uudecode_large.tar.Z.uu
  vendor/libarchive/dist/libarchive/test/test_read_filter_compress.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_encryption.7z.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_encryption_data.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_encryption_header.7z.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_encryption_header.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_encryption_partially.7z.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_encryption_partially.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_malformed.7z.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_malformed.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_7zip_malformed2.7z.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_le.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_cpio_bin_le.cpio.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_lha_bugfix_0.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_lha_bugfix_0.lzh.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_rar_encryption_data.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_rar_encryption_data.rar.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_rar_encryption_header.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_rar_encryption_header.rar.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_rar_encryption_partially.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_rar_encryption_partially.rar.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_tar_concatenated.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_tar_concatenated.tar.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_pax.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_warc.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_warc.warc.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_encryption_data.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_encryption_data.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_encryption_header.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_encryption_header.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_encryption_partially.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_encryption_partially.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_malformed.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_malformed1.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_msdos.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_msdos.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_nested.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_nested.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_nofiletype.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_nofiletype.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_padded.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_padded1.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_padded2.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_padded3.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_traditional_encryption_data.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_traditional_encryption_data.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_winzip_aes.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_winzip_aes128.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_winzip_aes256.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_winzip_aes256_large.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_winzip_aes256_stored.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_winzip_aes_large.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_zip64.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_zip64a.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_zip64b.zip.uu
  vendor/libarchive/dist/libarchive/test/test_read_too_many_filters.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_read_too_many_filters.gz.uu
  vendor/libarchive/dist/libarchive/test/test_warn_missing_hardlink_target.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_filter_lz4.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_raw.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_raw_b64.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_warc.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_warc_empty.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_compression_store.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_empty_zip64.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_file.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_file_zip64.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_large.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_zip64.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/test/test_write_read_format_zip.c   (contents, props changed)
  vendor/libarchive/dist/libarchive/xxhash.c   (contents, props changed)
  vendor/libarchive/dist/libarchive_fe/passphrase.c   (contents, props changed)
  vendor/libarchive/dist/libarchive_fe/passphrase.h   (contents, props changed)
  vendor/libarchive/dist/tar/test/test_extract.tar.lz4.uu
  vendor/libarchive/dist/tar/test/test_extract_tar_lz4.c   (contents, props changed)
  vendor/libarchive/dist/tar/test/test_leading_slash.c   (contents, props changed)
  vendor/libarchive/dist/tar/test/test_leading_slash.tar.uu
  vendor/libarchive/dist/tar/test/test_option_lz4.c   (contents, props changed)
  vendor/libarchive/dist/tar/test/test_option_passphrase.c   (contents, props changed)
  vendor/libarchive/dist/tar/test/test_option_passphrase.zip.uu
Deleted:
  vendor/libarchive/dist/build/cmake/LibarchiveCheckCSourceCompiles.cmake
  vendor/libarchive/dist/build/cmake/LibarchiveCheckCSourceRuns.cmake
  vendor/libarchive/dist/libarchive/archive_crypto.c
  vendor/libarchive/dist/libarchive/archive_crypto_private.h
  vendor/libarchive/dist/libarchive/test/test_archive_crypto.c
  vendor/libarchive/dist/libarchive/test/test_write_format_zip_no_compression.c
  vendor/libarchive/dist/libarchive/test/test_write_zip_set_compression_store.c
Modified:
  vendor/libarchive/dist/.gitignore
  vendor/libarchive/dist/CMakeLists.txt
  vendor/libarchive/dist/COPYING
  vendor/libarchive/dist/INSTALL
  vendor/libarchive/dist/Makefile.am
  vendor/libarchive/dist/NEWS
  vendor/libarchive/dist/README
  vendor/libarchive/dist/build/autoconf/iconv.m4
  vendor/libarchive/dist/build/autogen.sh
  vendor/libarchive/dist/build/clean.sh
  vendor/libarchive/dist/build/cmake/config.h.in
  vendor/libarchive/dist/build/version
  vendor/libarchive/dist/configure.ac
  vendor/libarchive/dist/contrib/libarchive.spec
  vendor/libarchive/dist/contrib/untar.c
  vendor/libarchive/dist/cpio/CMakeLists.txt
  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/cpio_platform.h
  vendor/libarchive/dist/cpio/cpio_windows.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_extract_cpio_lzo.c
  vendor/libarchive/dist/cpio/test/test_option_c.c
  vendor/libarchive/dist/cpio/test/test_option_version.c
  vendor/libarchive/dist/doc/mdoc2wiki.awk
  vendor/libarchive/dist/examples/minitar/Makefile
  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_endian.h
  vendor/libarchive/dist/libarchive/archive_entry.3
  vendor/libarchive/dist/libarchive/archive_entry.c
  vendor/libarchive/dist/libarchive/archive_entry.h
  vendor/libarchive/dist/libarchive/archive_entry_acl.3
  vendor/libarchive/dist/libarchive/archive_entry_copy_stat.c
  vendor/libarchive/dist/libarchive/archive_entry_paths.3
  vendor/libarchive/dist/libarchive/archive_entry_perms.3
  vendor/libarchive/dist/libarchive/archive_entry_private.h
  vendor/libarchive/dist/libarchive/archive_entry_sparse.c
  vendor/libarchive/dist/libarchive/archive_entry_stat.3
  vendor/libarchive/dist/libarchive/archive_entry_time.3
  vendor/libarchive/dist/libarchive/archive_entry_xattr.c
  vendor/libarchive/dist/libarchive/archive_getdate.c
  vendor/libarchive/dist/libarchive/archive_match.c
  vendor/libarchive/dist/libarchive/archive_options.c
  vendor/libarchive/dist/libarchive/archive_pathmatch.c
  vendor/libarchive/dist/libarchive/archive_platform.h
  vendor/libarchive/dist/libarchive/archive_private.h
  vendor/libarchive/dist/libarchive/archive_read.3
  vendor/libarchive/dist/libarchive/archive_read.c
  vendor/libarchive/dist/libarchive/archive_read_append_filter.c
  vendor/libarchive/dist/libarchive/archive_read_data.3
  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_private.h
  vendor/libarchive/dist/libarchive/archive_read_disk_set_standard_lookup.c
  vendor/libarchive/dist/libarchive/archive_read_disk_windows.c
  vendor/libarchive/dist/libarchive/archive_read_extract.c
  vendor/libarchive/dist/libarchive/archive_read_filter.3
  vendor/libarchive/dist/libarchive/archive_read_open.3
  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_open_memory.c
  vendor/libarchive/dist/libarchive/archive_read_private.h
  vendor/libarchive/dist/libarchive/archive_read_set_options.3
  vendor/libarchive/dist/libarchive/archive_read_set_options.c
  vendor/libarchive/dist/libarchive/archive_read_support_filter_all.c
  vendor/libarchive/dist/libarchive/archive_read_support_filter_compress.c
  vendor/libarchive/dist/libarchive/archive_read_support_filter_lzop.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_all.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.3
  vendor/libarchive/dist/libarchive/archive_write.c
  vendor/libarchive/dist/libarchive/archive_write_add_filter.c
  vendor/libarchive/dist/libarchive/archive_write_add_filter_by_name.c
  vendor/libarchive/dist/libarchive/archive_write_add_filter_bzip2.c
  vendor/libarchive/dist/libarchive/archive_write_add_filter_grzip.c
  vendor/libarchive/dist/libarchive/archive_write_add_filter_gzip.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_program.c
  vendor/libarchive/dist/libarchive/archive_write_add_filter_xz.c
  vendor/libarchive/dist/libarchive/archive_write_data.3
  vendor/libarchive/dist/libarchive/archive_write_disk.3
  vendor/libarchive/dist/libarchive/archive_write_disk_acl.c
  vendor/libarchive/dist/libarchive/archive_write_disk_posix.c
  vendor/libarchive/dist/libarchive/archive_write_disk_set_standard_lookup.c
  vendor/libarchive/dist/libarchive/archive_write_disk_windows.c
  vendor/libarchive/dist/libarchive/archive_write_filter.3
  vendor/libarchive/dist/libarchive/archive_write_finish_entry.3
  vendor/libarchive/dist/libarchive/archive_write_format.3
  vendor/libarchive/dist/libarchive/archive_write_open.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.c
  vendor/libarchive/dist/libarchive/archive_write_set_format_7zip.c
  vendor/libarchive/dist/libarchive/archive_write_set_format_by_name.c
  vendor/libarchive/dist/libarchive/archive_write_set_format_gnutar.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_shar.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.3
  vendor/libarchive/dist/libarchive/filter_fork_windows.c
  vendor/libarchive/dist/libarchive/libarchive-formats.5
  vendor/libarchive/dist/libarchive/libarchive.3
  vendor/libarchive/dist/libarchive/libarchive_internals.3
  vendor/libarchive/dist/libarchive/mtree.5
  vendor/libarchive/dist/libarchive/tar.5
  vendor/libarchive/dist/libarchive/test/CMakeLists.txt
  vendor/libarchive/dist/libarchive/test/README
  vendor/libarchive/dist/libarchive/test/main.c
  vendor/libarchive/dist/libarchive/test/read_open_memory.c
  vendor/libarchive/dist/libarchive/test/test.h
  vendor/libarchive/dist/libarchive/test/test_archive_getdate.c
  vendor/libarchive/dist/libarchive/test/test_archive_match_time.c
  vendor/libarchive/dist/libarchive/test/test_archive_pathmatch.c
  vendor/libarchive/dist/libarchive/test/test_archive_string.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_mac.c
  vendor/libarchive/dist/libarchive/test/test_compat_pax_libarchive_2x.c
  vendor/libarchive/dist/libarchive/test/test_compat_zip.c
  vendor/libarchive/dist/libarchive/test/test_fuzz.c
  vendor/libarchive/dist/libarchive/test/test_gnutar_filename_encoding.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_directory_traversals.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_filename.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_gtar_sparse.c
  vendor/libarchive/dist/libarchive/test/test_read_format_gtar_sparse_skip_entry.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_mtree.mtree.uu
  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_raw.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_tar_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_ustar_filename.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_comment_stored.c
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_filename.c
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_mac_metadata.c
  vendor/libarchive/dist/libarchive/test/test_read_format_zip_sfx.c
  vendor/libarchive/dist/libarchive/test/test_read_truncated.c
  vendor/libarchive/dist/libarchive/test/test_sparse_basic.c
  vendor/libarchive/dist/libarchive/test/test_ustar_filename_encoding.c
  vendor/libarchive/dist/libarchive/test/test_write_disk_appledouble.c
  vendor/libarchive/dist/libarchive/test/test_write_disk_hfs_compression.c
  vendor/libarchive/dist/libarchive/test/test_write_disk_mac_metadata.c
  vendor/libarchive/dist/libarchive/test/test_write_disk_no_hfs_compression.c
  vendor/libarchive/dist/libarchive/test/test_write_disk_perms.c
  vendor/libarchive/dist/libarchive/test/test_write_disk_secure.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_format_ar.c
  vendor/libarchive/dist/libarchive/test/test_write_format_cpio_newc.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_mtree.c
  vendor/libarchive/dist/libarchive/test/test_write_format_pax.c
  vendor/libarchive/dist/libarchive/test/test_write_format_tar.c
  vendor/libarchive/dist/libarchive/test/test_write_format_tar_sparse.c
  vendor/libarchive/dist/libarchive/test/test_write_format_zip.c
  vendor/libarchive/dist/libarchive/test/test_zip_filename_encoding.c
  vendor/libarchive/dist/libarchive_fe/err.c
  vendor/libarchive/dist/libarchive_fe/err.h
  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/bsdtar_platform.h
  vendor/libarchive/dist/tar/bsdtar_windows.h
  vendor/libarchive/dist/tar/cmdline.c
  vendor/libarchive/dist/tar/creation_set.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_option_X_upper.c
  vendor/libarchive/dist/tar/test/test_option_b.c
  vendor/libarchive/dist/tar/test/test_option_s.c
  vendor/libarchive/dist/tar/test/test_version.c
  vendor/libarchive/dist/tar/util.c
  vendor/libarchive/dist/tar/write.c

Modified: vendor/libarchive/dist/.gitignore
==============================================================================
--- vendor/libarchive/dist/.gitignore	Wed May 11 10:18:56 2016	(r299424)
+++ vendor/libarchive/dist/.gitignore	Wed May 11 10:19:44 2016	(r299425)
@@ -1,3 +1,4 @@
+*~
 *.o
 *.exe
 *.lo
@@ -7,6 +8,8 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache/
+bsdcat
+bsdcat_test
 bsdcpio
 bsdcpio_test
 bsdtar
@@ -24,9 +27,13 @@ build/autoconf/ltversion.m4
 build/autoconf/lt~obsolete.m4
 build/autoconf/missing
 build/pkgconfig/libarchive.pc
+cat/.deps/
+cat/.dirstamp
+cat/test/.deps/
+cat/test/.dirstamp
+cat/test/list.h
 config.h
 config.h.in
-config.h.in~
 config.log
 config.status
 configure
@@ -82,3 +89,17 @@ libarchive/libarchive.so
 libarchive/libarchive.so.*
 
 .DS_Store
+
+bsdcat_test.log
+bsdcat_test.trs
+bsdcpio_test.log
+bsdcpio_test.trs
+bsdtar_test.log
+bsdtar_test.trs
+build/autoconf/test-driver
+libarchive_test.log
+libarchive_test.trs
+test-suite.log
+
+.sw?
+.*.sw?

Added: vendor/libarchive/dist/.travis.yml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libarchive/dist/.travis.yml	Wed May 11 10:19:44 2016	(r299425)
@@ -0,0 +1,20 @@
+language: C
+sudo: true
+compiler:
+  - gcc
+  - clang
+before_install:
+  - sudo add-apt-repository ppa:kubuntu-ppa/backports -y
+  - sudo apt-get update -qq
+install:
+  - sudo apt-get install -y cmake=2.8.12.2-0ubuntu1~ubuntu12.04.1~ppa2
+  - sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev
+before_script:
+  - BUILD_DIR=`pwd`/BUILD
+  - mkdir -p ${BUILD_DIR}
+  - cd ${BUILD_DIR}
+  - cmake ..
+script:
+  - cd ${BUILD_DIR}
+  - make
+  - make test

Modified: vendor/libarchive/dist/CMakeLists.txt
==============================================================================
--- vendor/libarchive/dist/CMakeLists.txt	Wed May 11 10:18:56 2016	(r299424)
+++ vendor/libarchive/dist/CMakeLists.txt	Wed May 11 10:19:44 2016	(r299425)
@@ -1,5 +1,5 @@
 #
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
 #
 PROJECT(libarchive C)
 #
@@ -15,7 +15,7 @@ endif()
 #   RelWithDebInfo : Release build with Debug Info
 #   MinSizeRel     : Release Min Size build
 IF(NOT CMAKE_BUILD_TYPE)
-  SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build Type" FORCE)
+  SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Type" FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 # Set a value type to properly display CMAKE_BUILD_TYPE on GUI if the
 # value type is "UNINITIALIZED".
@@ -35,6 +35,9 @@ ENDIF(NOT "${CMAKE_BUILD_TYPE}"
 # On MacOS, prefer MacPorts libraries to system libraries.
 # I haven't come up with a compelling argument for this to be conditional.
 list(APPEND CMAKE_PREFIX_PATH /opt/local)
+# Enable @rpath in the install name.
+# detail in "cmake  --help-policy CMP0042"
+SET(CMAKE_MACOSX_RPATH ON)
 
 #
 # Version - read from 'version' file.
@@ -55,11 +58,12 @@ STRING(REGEX REPLACE "[0]*([^0]*[0-9])$"
 SET(VERSION                    "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}")
 SET(BSDCPIO_VERSION_STRING     "${VERSION}")
 SET(BSDTAR_VERSION_STRING      "${VERSION}")
+SET(BSDCAT_VERSION_STRING      "${VERSION}")
 SET(LIBARCHIVE_VERSION_NUMBER  "${_version_number}")
 SET(LIBARCHIVE_VERSION_STRING  "${VERSION}")
 
 # INTERFACE_VERSION increments with every release
-# libarchive 2.7 == interface version 9 = 2 + 7 
+# libarchive 2.7 == interface version 9 = 2 + 7
 # libarchive 2.8 == interface version 10 = 2 + 8
 # libarchive 2.9 == interface version 11 = 2 + 9
 # libarchive 3.0 == interface version 12
@@ -84,7 +88,7 @@ SET(CMAKE_REQUIRED_FLAGS)
 # Especially for early development, we want to be a little
 # aggressive about diagnosing build problems; this can get
 # relaxed somewhat in final shipping versions.
-IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
   SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
   #################################################################
   # Set compile flags for all build types.
@@ -92,11 +96,43 @@ IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$
   #################################################################
   # Set compile flags for debug build.
   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -Wextra -Wunused")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
+  SET(CMAKE_REQUIRED_FLAGS "-Wall -Wformat -Wformat-security")
+  #################################################################
+  # Set compile flags for all build types.
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security")
+  #################################################################
+  # Set compile flags for debug build.
+  # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wmissing-prototypes")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wcast-qual")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
+  SET(CMAKE_C_COMPILER "xlc_r")
+  SET(CMAKE_REQUIRED_FLAGS "-qflag=e:e -qformat=sec")
+  #################################################################
+  # Set compile flags for all build types.
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qflag=e:e -qformat=sec")
+  #################################################################
+  # Set compile flags for debug build.
+  # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qhalt=w")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w")
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
+ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
 IF (MSVC)
   #################################################################
   # Set compile flags for debug build.
@@ -143,17 +179,36 @@ include(CTest)
 
 OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
 OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+OPTION(ENABLE_LZMA "Enable the use of the system found LZMA library if found" ON)
+OPTION(ENABLE_ZLIB "Enable the use of the system found ZLIB library if found" ON)
+OPTION(ENABLE_BZip2 "Enable the use of the system found BZip2 library if found" ON)
+OPTION(ENABLE_LIBXML2 "Enable the use of the system found libxml2 library if found" ON)
+OPTION(ENABLE_EXPAT "Enable the use of the system found EXPAT library if found" ON)
+OPTION(ENABLE_PCREPOSIX "Enable the use of the system found PCREPOSIX library if found" ON)
+OPTION(ENABLE_LibGCC "Enable the use of the system found LibGCC library if found" ON)
+# CNG is used for encrypt/decrypt Zip archives on Windows.
+OPTION(ENABLE_CNG "Enable the use of CNG(Crypto Next Generation)" ON)
+
 OPTION(ENABLE_TAR "Enable tar building" ON)
 OPTION(ENABLE_TAR_SHARED "Enable dynamic build of tar" FALSE)
 OPTION(ENABLE_CPIO "Enable cpio building" ON)
 OPTION(ENABLE_CPIO_SHARED "Enable dynamic build of cpio" FALSE)
+OPTION(ENABLE_CAT "Enable cat building" ON)
+OPTION(ENABLE_CAT_SHARED "Enable dynamic build of cat" FALSE)
 OPTION(ENABLE_XATTR "Enable extended attribute support" ON)
 OPTION(ENABLE_ACL "Enable ACL support" ON)
 OPTION(ENABLE_ICONV "Enable iconv support" ON)
 OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
+OPTION(ENABLE_COVERAGE "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)" FALSE)
+OPTION(ENABLE_INSTALL "Enable installing of libraries" 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)")
+SET(WINDOWS_VERSION "WIN7" CACHE STRING "Set Windows version to use (Windows only)")
+
+IF(ENABLE_COVERAGE)
+	include(LibarchiveCodeCoverage)
+ENDIF(ENABLE_COVERAGE)
 
 IF(ENABLE_TEST)
 	ENABLE_TESTING()
@@ -161,22 +216,35 @@ ENDIF(ENABLE_TEST)
 
 IF(WIN32)
   IF(WINDOWS_VERSION STREQUAL "WIN8")
+    SET(NTDDI_VERSION 0x06020000)
+    SET(_WIN32_WINNT 0x0602)
     SET(WINVER 0x0602)
   ELSEIF(WINDOWS_VERSION STREQUAL "WIN7")
+    SET(NTDDI_VERSION 0x06010000)
+    SET(_WIN32_WINNT 0x0601)
     SET(WINVER 0x0601)
   ELSEIF(WINDOWS_VERSION STREQUAL "WS08")
+    SET(NTDDI_VERSION 0x06000100)
+    SET(_WIN32_WINNT 0x0600)
     SET(WINVER 0x0600)
   ELSEIF(WINDOWS_VERSION STREQUAL "VISTA")
+    SET(NTDDI_VERSION 0x06000000)
+    SET(_WIN32_WINNT 0x0600)
     SET(WINVER 0x0600)
   ELSEIF(WINDOWS_VERSION STREQUAL "WS03")
+    SET(NTDDI_VERSION 0x05020000)
+    SET(_WIN32_WINNT 0x0502)
     SET(WINVER 0x0502)
   ELSEIF(WINDOWS_VERSION STREQUAL "WINXP")
+    SET(NTDDI_VERSION 0x05010000)
+    SET(_WIN32_WINNT 0x0501)
     SET(WINVER 0x0501)
   ELSE(WINDOWS_VERSION STREQUAL "WIN8")
-    # The default is to use Windows 2000 API.
-    SET(WINVER 0x0500)
+    # Default to Windows Server 2003 API if we don't recognize the specifier
+    SET(NTDDI_VERSION 0x05020000)
+    SET(_WIN32_WINNT 0x0502)
+    SET(WINVER 0x0502)
   ENDIF(WINDOWS_VERSION STREQUAL "WIN8")
-  SET(_WIN32_WINNT ${WINVER})
 ENDIF(WIN32)
 
 IF(MSVC)
@@ -184,12 +252,12 @@ IF(MSVC)
     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")
+    SET(ENV{LDFLAGS} "$ENV{LDFLAGS} /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")
+    SET(ENV{LDFLAGS} "$ENV{LDFLAGS} /SAFESEH:NO")
   ENDIF(ENABLE_SAFESEH STREQUAL "YES")
 ENDIF(MSVC)
 
@@ -198,8 +266,8 @@ IF("${CMAKE_C_PLATFORM_ID}" MATCHES "^(H
 ENDIF()
 
 #
-INCLUDE(LibarchiveCheckCSourceCompiles)
-INCLUDE(LibarchiveCheckCSourceRuns)
+INCLUDE(CheckCSourceCompiles)
+INCLUDE(CheckCSourceRuns)
 INCLUDE(CheckFileOffsetBits)
 INCLUDE(CheckFuncs)
 INCLUDE(CheckHeaderDirent)
@@ -263,9 +331,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")
-        LIBARCHIVE_CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
+        CHECK_C_SOURCE_COMPILES("${SAMPLE_SOURCE}" ${VAR})
       ELSEIF("${TRY_TYPE}" MATCHES "RUNS")
-        LIBARCHIVE_CHECK_C_SOURCE_RUNS("${SAMPLE_SOURCE}" ${VAR})
+        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")
@@ -297,11 +365,11 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${
   #   e.g.
   #     cmake -DCMAKE_PREFIX_PATH=<your-GnuWin32-path> <path-to-source>
   #
-  # If compiling error occured in zconf.h, You may need patch to zconf.h.
+  # If compiling error occurred in zconf.h, You may need patch to zconf.h.
   #--- zconf.h.orig	2005-07-21 00:40:26.000000000
   #+++ zconf.h	2009-01-19 11:39:10.093750000
   #@@ -286,7 +286,7 @@
-  # 
+  #
   # #if 1           /* HAVE_UNISTD_H -- this line is updated by ./configure */
   # #  include <sys/types.h> /* for off_t */
   #-#  include <unistd.h>    /* for SEEK_* and off_t */
@@ -315,7 +383,11 @@ SET(ADDITIONAL_LIBS "")
 #
 # Find ZLIB
 #
-FIND_PACKAGE(ZLIB)
+IF(ENABLE_ZLIB)
+  FIND_PACKAGE(ZLIB)
+ELSE()
+  SET(ZLIB_FOUND FALSE) # Override cached value
+ENDIF()
 IF(ZLIB_FOUND)
   SET(HAVE_LIBZ 1)
   SET(HAVE_ZLIB_H 1)
@@ -350,7 +422,11 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
 #
 # Find BZip2
 #
-FIND_PACKAGE(BZip2)
+IF(ENABLE_BZip2)
+  FIND_PACKAGE(BZip2)
+ELSE()
+  SET(BZIP2_FOUND FALSE) # Override cached value
+ENDIF()
 IF(BZIP2_FOUND)
   SET(HAVE_LIBBZ2 1)
   SET(HAVE_BZLIB_H 1)
@@ -370,10 +446,18 @@ IF(BZIP2_FOUND)
 ENDIF(BZIP2_FOUND)
 MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
+
+
 #
 # Find LZMA
 #
-FIND_PACKAGE(LZMA)
+IF(ENABLE_LZMA)
+  FIND_PACKAGE(LZMA)
+ELSE()
+  SET(LZMA_FOUND FALSE) # Override cached value
+  SET(LZMADEC_FOUND FALSE) # Override cached value
+ENDIF()
+
 IF(LZMA_FOUND)
   SET(HAVE_LIBLZMA 1)
   SET(HAVE_LZMA_H 1)
@@ -393,6 +477,8 @@ ELSEIF(LZMADEC_FOUND)
   SET(HAVE_LZMADEC_H 1)
   INCLUDE_DIRECTORIES(${LZMADEC_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${LZMADEC_LIBRARIES})
+ELSE(LZMA_FOUND)
+# LZMA not found and will not be used.
 ENDIF(LZMA_FOUND)
 #
 # Find LZO2
@@ -418,6 +504,33 @@ IF(LZO2_FOUND)
 ENDIF(LZO2_FOUND)
 MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR)
 MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY)
+#
+# Find LZ4
+#
+IF (LZ4_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LZ4_FIND_QUIETLY TRUE)
+ENDIF (LZ4_INCLUDE_DIR)
+
+FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
+FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
+IF(LZ4_FOUND)
+  SET(HAVE_LIBLZ4 1)
+  SET(HAVE_LZ4_H 1)
+  CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
+  SET(CMAKE_REQUIRED_INCLUDES ${LZ4_INCLUDE_DIR})
+  CHECK_INCLUDE_FILES("lz4hc.h" HAVE_LZ4HC_H)
+  CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
+  INCLUDE_DIRECTORIES(${LZ4_INCLUDE_DIR})
+  LIST(APPEND ADDITIONAL_LIBS ${LZ4_LIBRARY})
+  #
+  # TODO: test for static library.
+  #
+ENDIF(LZ4_FOUND)
+MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR)
+MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY)
 
 #
 # Check headers
@@ -444,7 +557,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)
 
-LIBARCHIVE_CHECK_C_SOURCE_COMPILES("#include <sys/ioctl.h>
+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)
 
@@ -463,7 +576,9 @@ LA_CHECK_INCLUDE_FILE("memory.h" HAVE_ME
 LA_CHECK_INCLUDE_FILE("paths.h" HAVE_PATHS_H)
 LA_CHECK_INCLUDE_FILE("poll.h" HAVE_POLL_H)
 LA_CHECK_INCLUDE_FILE("process.h" HAVE_PROCESS_H)
+LA_CHECK_INCLUDE_FILE("pthread.h" HAVE_PTHREAD_H)
 LA_CHECK_INCLUDE_FILE("pwd.h" HAVE_PWD_H)
+LA_CHECK_INCLUDE_FILE("readpassphrase.h" HAVE_READPASSPHRASE_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)
@@ -494,6 +609,11 @@ LA_CHECK_INCLUDE_FILE("utime.h" HAVE_UTI
 LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H)
 LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H)
 LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H)
+IF(ENABLE_CNG)
+  LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H)
+ELSE(ENABLE_CNG)
+  UNSET(HAVE_BCRYPT_H CACHE)
+ENDIF(ENABLE_CNG)
 # Following files need windwos.h, so we should test it after windows.h test.
 LA_CHECK_INCLUDE_FILE("wincrypt.h" HAVE_WINCRYPT_H)
 LA_CHECK_INCLUDE_FILE("winioctl.h" HAVE_WINIOCTL_H)
@@ -507,7 +627,7 @@ FOREACH (it ${_HEADER})
    SET(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
 ENDFOREACH (it)
 
-LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
+CHECK_C_SOURCE_COMPILES(
   "#define __EXTENSIONS__ 1
    ${_INCLUDE_FILES}
    int main() { return 0;}"
@@ -520,11 +640,17 @@ IF(ENABLE_NETTLE)
   FIND_PACKAGE(Nettle)
   IF(NETTLE_FOUND)
     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})
+    INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR})
+
+    LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR})
+    LA_CHECK_INCLUDE_FILE("nettle/aes.h" HAVE_NETTLE_AES_H)
+    LA_CHECK_INCLUDE_FILE("nettle/hmac.h" HAVE_NETTLE_HMAC_H)
+    LA_CHECK_INCLUDE_FILE("nettle/md5.h" HAVE_NETTLE_MD5_H)
+    LA_CHECK_INCLUDE_FILE("nettle/pbkdf2.h" HAVE_NETTLE_PBKDF2_H)
+    LA_CHECK_INCLUDE_FILE("nettle/ripemd160.h" HAVE_NETTLE_RIPEMD160_H)
+    LA_CHECK_INCLUDE_FILE("nettle/sha.h" HAVE_NETTLE_SHA_H)
+
   ENDIF(NETTLE_FOUND)
   MARK_AS_ADVANCED(CLEAR NETTLE_INCLUDE_DIR)
   MARK_AS_ADVANCED(CLEAR NETTLE_LIBRARIES)
@@ -536,6 +662,11 @@ ENDIF(ENABLE_NETTLE)
 #
 IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
   FIND_PACKAGE(OpenSSL)
+  IF(OPENSSL_FOUND)
+    SET(HAVE_LIBCRYPTO 1)
+    INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
+    LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
+  ENDIF(OPENSSL_FOUND)
 ELSE()
   SET(OPENSSL_FOUND FALSE) # Override cached value
 ENDIF()
@@ -554,7 +685,7 @@ ENDIF(NOT OPENSSL_FOUND)
 
 #
 # How to prove that CRYPTO functions, which have several names on various
-# platforms, just see if archive_crypto.c can compile and link against
+# platforms, just see if archive_digest.c can compile and link against
 # required libraries.
 #
 MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION)
@@ -593,7 +724,7 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTA
       ${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"
+	FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_digest.c"
 	     ARCHIVE_CRYPTO_C)
 
 	SET(SOURCE "${CONFDEFS_H}
@@ -619,16 +750,10 @@ 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 ${CHECK_CRYPTO_ADD_LINKER_FLAGS}
+	  CMAKE_FLAGS
 	   "${TRY_CRYPTO_REQUIRED_LIBS}"
 	   "${TRY_CRYPTO_REQUIRED_INCLUDES}"
 	  OUTPUT_VARIABLE OUTPUT)
@@ -713,16 +838,10 @@ 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_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive" ${CHECK_CRYPTO_WIN_ADD_LINKER_FLAGS}
+	  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/libarchive"
 	  OUTPUT_VARIABLE OUTPUT)
 
 	IF (ARCHIVE_CRYPTO_${CRYPTO}_WIN)
@@ -755,20 +874,25 @@ ENDMACRO(CHECK_CRYPTO_WIN CRYPTO_LIST)
 MACRO(CHECK_ICONV LIB TRY_ICONV_CONST)
   IF(NOT HAVE_ICONV)
     CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-    IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+    IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+        CMAKE_C_COMPILER_ID MATCHES "^Clang$")
       #
       # During checking iconv proto type, we should use -Werror to avoid the
       # success of iconv detection with a warnig which success is a miss
       # detection. So this needs for all build mode(even it's a release mode).
       #
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Werror")
-    ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+    ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+           CMAKE_C_COMPILER_ID MATCHES "^Clang$")
+    IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
+      SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -qhalt=w -qflag=w:w")
+    ENDIF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
     IF (MSVC)
       # NOTE: /WX option is the same as gcc's -Werror option.
       SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} /WX")
     ENDIF (MSVC)
     #
-    LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
+    CHECK_C_SOURCE_COMPILES(
       "#include <stdlib.h>
        #include <iconv.h>
        int main() {
@@ -884,7 +1008,11 @@ ENDIF(ENABLE_ICONV)
 #
 # Find Libxml2
 #
-FIND_PACKAGE(LibXml2)
+IF(ENABLE_LIBXML2)
+  FIND_PACKAGE(LibXml2)
+ELSE()
+  SET(LIBXML2_FOUND FALSE)
+ENDIF()
 IF(LIBXML2_FOUND)
   CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
   INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
@@ -909,7 +1037,11 @@ ELSE(LIBXML2_FOUND)
   #
   # Find Expat
   #
-  FIND_PACKAGE(EXPAT)
+  IF(ENABLE_EXPAT)
+    FIND_PACKAGE(EXPAT)
+  ELSE()
+    SET(EXPAT_FOUND FALSE)
+  ENDIF()
   IF(EXPAT_FOUND)
     CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
     INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR})
@@ -979,8 +1111,16 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_R
   #
   # If requested, try finding library for PCREPOSIX
   #
-  FIND_PACKAGE(LibGCC)
-  FIND_PACKAGE(PCREPOSIX)
+  IF(ENABLE_LibGCC)
+    FIND_PACKAGE(LibGCC)
+  ELSE()
+    SET(LIBGCC_FOUND FALSE) # Override cached value
+  ENDIF()
+  IF(ENABLE_PCREPOSIX)
+    FIND_PACKAGE(PCREPOSIX)
+  ELSE()
+    SET(PCREPOSIX_FOUND FALSE) # Override cached value
+  ENDIF()
   IF(PCREPOSIX_FOUND)
     INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR})
     LIST(APPEND ADDITIONAL_LIBS ${PCREPOSIX_LIBRARIES})
@@ -1032,15 +1172,18 @@ ENDIF(NOT FOUND_POSIX_REGEX_LIB AND POSI
 # Check functions
 #
 CMAKE_PUSH_CHECK_STATE()	# Save the state of the variables
-IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+    CMAKE_C_COMPILER_ID MATCHES "^Clang$")
   #
   # During checking functions, we should use -fno-builtin to avoid the
   # failure of function detection which failure is an error "conflicting
   # types for built-in function" caused by using -Werror option.
   #
   SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-builtin")
-ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$" OR
+       CMAKE_C_COMPILER_ID MATCHES "^Clang$")
 CHECK_SYMBOL_EXISTS(_CrtSetReportMode "crtdbg.h" HAVE__CrtSetReportMode)
+CHECK_FUNCTION_EXISTS_GLIBC(arc4random_buf HAVE_ARC4RANDOM_BUF)
 CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
 CHECK_FUNCTION_EXISTS_GLIBC(chroot HAVE_CHROOT)
@@ -1088,6 +1231,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(pipe HAVE_PI
 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(readpassphrase HAVE_READPASSPHRASE)
 CHECK_FUNCTION_EXISTS_GLIBC(select HAVE_SELECT)
 CHECK_FUNCTION_EXISTS_GLIBC(setenv HAVE_SETENV)
 CHECK_FUNCTION_EXISTS_GLIBC(setlocale HAVE_SETLOCALE)
@@ -1126,19 +1270,20 @@ CHECK_FUNCTION_EXISTS(strftime HAVE_STRF
 CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
+CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
 
 CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 
 # Make sure we have the POSIX version of readdir_r, not the
 # older 2-argument version.
-LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
+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.
-LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
+CHECK_C_SOURCE_COMPILES(
   "#include <fcntl.h>\n#include <unistd.h>\nint main() {char buf[10]; return readlinkat(AT_FDCWD, \"\", buf, 0);}"
   HAVE_READLINKAT)
 
@@ -1147,10 +1292,10 @@ LIBARCHIVE_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.
-LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
+CHECK_C_SOURCE_COMPILES(
   "#include <sys/mkdev.h>\nint main() { return major(256); }"
   MAJOR_IN_MKDEV)
-LIBARCHIVE_CHECK_C_SOURCE_COMPILES(
+CHECK_C_SOURCE_COMPILES(
   "#include <sys/sysmacros.h>\nint main() { return major(256); }"
   MAJOR_IN_SYSMACROS)
 
@@ -1171,10 +1316,15 @@ ENDIF(HAVE_INTTYPES_H)
 CHECK_SYMBOL_EXISTS(EFTYPE           "errno.h"    HAVE_EFTYPE)
 CHECK_SYMBOL_EXISTS(EILSEQ           "errno.h"    HAVE_EILSEQ)
 CHECK_SYMBOL_EXISTS(D_MD_ORDER       "langinfo.h" HAVE_D_MD_ORDER)
+CHECK_SYMBOL_EXISTS(INT32_MAX        "${headers}" HAVE_DECL_INT32_MAX)
+CHECK_SYMBOL_EXISTS(INT32_MIN        "${headers}" HAVE_DECL_INT32_MIN)
 CHECK_SYMBOL_EXISTS(INT64_MAX        "${headers}" HAVE_DECL_INT64_MAX)
 CHECK_SYMBOL_EXISTS(INT64_MIN        "${headers}" HAVE_DECL_INT64_MIN)
+CHECK_SYMBOL_EXISTS(INTMAX_MAX       "${headers}" HAVE_DECL_INTMAX_MAX)
+CHECK_SYMBOL_EXISTS(INTMAX_MIN       "${headers}" HAVE_DECL_INTMAX_MIN)
 CHECK_SYMBOL_EXISTS(UINT32_MAX       "${headers}" HAVE_DECL_UINT32_MAX)
 CHECK_SYMBOL_EXISTS(UINT64_MAX       "${headers}" HAVE_DECL_UINT64_MAX)
+CHECK_SYMBOL_EXISTS(UINTMAX_MAX      "${headers}" HAVE_DECL_UINTMAX_MAX)
 CHECK_SYMBOL_EXISTS(SIZE_MAX         "${headers}" HAVE_DECL_SIZE_MAX)
 CHECK_SYMBOL_EXISTS(SSIZE_MAX        "limits.h"   HAVE_DECL_SSIZE_MAX)
 
@@ -1242,13 +1392,13 @@ CHECK_TYPE_SIZE("unsigned long long" SIZ
 CHECK_TYPE_SIZE("__int64" __INT64)
 CHECK_TYPE_SIZE("unsigned __int64" UNSIGNED___INT64)
 
-CHECK_TYPE_SIZE(int16_t INT16_T) 
+CHECK_TYPE_SIZE(int16_t INT16_T)
 CHECK_TYPE_SIZE(int32_t INT32_T)
 CHECK_TYPE_SIZE(int64_t INT64_T)
 CHECK_TYPE_SIZE(intmax_t INTMAX_T)
-CHECK_TYPE_SIZE(uint8_t UINT8_T) 
-CHECK_TYPE_SIZE(uint16_t UINT16_T) 
-CHECK_TYPE_SIZE(uint32_t UINT32_T) 
+CHECK_TYPE_SIZE(uint8_t UINT8_T)
+CHECK_TYPE_SIZE(uint16_t UINT16_T)
+CHECK_TYPE_SIZE(uint32_t UINT32_T)
 CHECK_TYPE_SIZE(uint64_t UINT64_T)
 CHECK_TYPE_SIZE(uintmax_t UINTMAX_T)
 
@@ -1491,6 +1641,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
 INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
+# Handle generation of the libarchive.pc file for pkg-config
+INCLUDE(CreatePkgConfigFile)
+
 #
 # Register installation of PDF documents.
 #
@@ -1521,5 +1674,6 @@ IF(ENABLE_TEST)
 ENDIF(ENABLE_TEST)
 
 add_subdirectory(libarchive)
+add_subdirectory(cat)
 add_subdirectory(tar)
 add_subdirectory(cpio)

Added: vendor/libarchive/dist/CONTRIBUTING.md
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libarchive/dist/CONTRIBUTING.md	Wed May 11 10:19:44 2016	(r299425)
@@ -0,0 +1,98 @@
+Thank you for helping us improve libarchive.
+The following guidelines will help ensure your contribution gets prompt attention.
+
+# Bugs and other Issues
+
+If you encounter any problems with libarchive,
+[please file an issue on our issue tracker](https://github.com/libarchive/libarchive/issues).
+
+All bug reports should include the following information.  You can copy the text below directly into the issue tracker to get started:
+
+```
+Basic Information
+  Version of libarchive:
+  How you obtained it:  (build from source, pre-packaged binary, etc)
+  Operating system and version:
+  What compiler and/or IDE you are using (include version):
+
+If you are using a pre-packaged binary
+  Exact package name and version:
+  Repository you obtained it from:
+
+Description of the problem you are seeing:
+  What did you do?
+  What did you expect to happen?
+  What actually happened?
+  What log files or error messages were produced?
+
+How the libarchive developers can reproduce your problem:
+  What other software was involved?
+  What other files were involved?
+  How can we obtain any of the above?
+```
+
+Depending on the specific type of issue, other information will be helpful:
+
+## Test Failures
+
+If you see any test failures, please include the information above and also:
+
+* Names of the tests that failed.
+
+* Look for the .log files in the /tmp/libarchive_test_*date-and-time* directories.  (On Mac OS, look in $TMPDIR which is different than /tmp.)
+
+Please paste the .log files you will find there directly into your report.
+
+
+## Problems using libarchive in a program
+
+If you are trying to write a program using libarchive, please include the information above and also:
+
+* It will help us if we can actually run the program.  This is easiest if you can provide source to a short program that illustrates your problem.
+
+* If you have a sufficiently short program that shows the problem, you can either paste it into the report or [put it into a gist](https://gist.github.com).
+
+
+## Libarchive produced incorrect output
+
+Please tell us what program you ran, any command-line arguments you provided, and details of the input files (`ls -l` output is helpful here).  If the problem involved a command-line program, please copy the full terminal text into the report, including the command line and any error messages.
+
+Please try to make the output file available to us.  Unless it is very large, you can upload it into a fresh github repository and provide a link in your issue report.
+
+
+## Libarchive could not read a particular input file
+
+Note: If you can provide a **very small** input file that reproduces the problem, we can add that to our test suite.  This will ensure that the bug does not reappear in the future.
+
+A link to the relevant file is usually sufficient.
+
+If you cannot provide the input file or a link to the file, please let us know if there is some other way to obtain it.
+
+
+## Documentation improvements
+
+We are always interested in improving the libarchive documentation.  Please tell us about any errors you find, including:
+
+* Typos or errors in the manpages provided with libarchive source.
+
+* Mistakes in the [libarchive Wiki](https://github.com/libarchive/libarchive/wiki)
+
+* Problems with the PDF or Wiki files that are automatically generated from the manpages.
+
+
+# Code Submissions
+
+We welcome all code submissions.  But of course, some code submissions are easier for us to respond to than others. The best code submissions:
+
+* Address a single issue.  There have been many cases where a simple fix to an obvious problem did not get handled for months because the patch that was provided also included an unrelated change affecting an especially complex area of the code.
+
+* Follow existing libarchive code style and conventions.  Libarchive generally follows [BSD KNF](https://www.freebsd.org/cgi/man.cgi?query=style&sektion=9) for formatting code.
+
+* Do not make unnecessary changes to existing whitespace, capitalization, or spelling.
+
+* Include detailed instructions for reproducing the problem you're fixing.  We do try to verify that a submission actually fixes a real problem.  If we can't reproduce the problem, it will take us longer to evaluate the fix.  For this reason, we encourage you to file an issue report first with details on reproducing the problem, then refer to that issue in your pull request.
+
+* Includes a test case.  The libarchive Wiki has [detailed documentation for adding new test cases](https://github.com/libarchive/libarchive/wiki/LibarchiveAddingTest).
+
+* Are provided via Github pull requests.  We welcome patches in almost any format, but github's pull request management makes it significantly easier for us to evaluate and test changes.
+

Modified: vendor/libarchive/dist/COPYING
==============================================================================
--- vendor/libarchive/dist/COPYING	Wed May 11 10:18:56 2016	(r299424)
+++ vendor/libarchive/dist/COPYING	Wed May 11 10:19:44 2016	(r299425)
@@ -17,12 +17,11 @@ the actual statements in the files are c
   files for details:
    libarchive/archive_entry.c
    libarchive/archive_read_support_filter_compress.c
-   libarchive/archive_write_set_filter_compress.c
+   libarchive/archive_write_add_filter_compress.c
    libarchive/mtree.5
-   tar/matching.c
 
 * The following source files are in the public domain:
-   tar/getdate.c
+   libarchive/archive_getdate.c
 
 * The build files---including Makefiles, configure scripts,
   and auxiliary scripts used as part of the compile process---have

Modified: vendor/libarchive/dist/INSTALL
==============================================================================
--- vendor/libarchive/dist/INSTALL	Wed May 11 10:18:56 2016	(r299424)
+++ vendor/libarchive/dist/INSTALL	Wed May 11 10:19:44 2016	(r299425)
@@ -1,5 +1,5 @@
 More complete build documentation is available on the libarchive
-Wiki:  http://libarchive.googlecode.com/
+Wiki:  https://github.com/libarchive/libarchive/wiki
 
 On most Unix-like systems, you should be able to install libarchive,
 bsdtar, and bsdcpio using the following common steps:

Modified: vendor/libarchive/dist/Makefile.am
==============================================================================
--- vendor/libarchive/dist/Makefile.am	Wed May 11 10:18:56 2016	(r299424)
+++ vendor/libarchive/dist/Makefile.am	Wed May 11 10:19:44 2016	(r299425)
@@ -8,24 +8,23 @@ ACLOCAL_AMFLAGS = -I build/autoconf
 #
 lib_LTLIBRARIES=	libarchive.la
 noinst_LTLIBRARIES=	libarchive_fe.la
-bin_PROGRAMS=	$(bsdtar_programs) $(bsdcpio_programs)
-man_MANS= $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
-BUILT_SOURCES= libarchive/test/list.h tar/test/list.h cpio/test/list.h
+bin_PROGRAMS=	$(bsdtar_programs) $(bsdcpio_programs) $(bsdcat_programs)
+man_MANS= $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS) $(bsdcat_man_MANS)
+BUILT_SOURCES= libarchive/test/list.h tar/test/list.h cpio/test/list.h cat/test/list.h
 
 #
 # What to test: We always test libarchive, test bsdtar and bsdcpio only
 # if we built them.
 #
-check_PROGRAMS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs)
-TESTS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs)
-TESTS_ENVIRONMENT= $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
+check_PROGRAMS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs) $(bsdcat_test_programs)
+TESTS= libarchive_test $(bsdtar_test_programs) $(bsdcpio_test_programs) $(bsdcat_test_programs)
+TESTS_ENVIRONMENT= $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT) $(bsdcat_TESTS_ENVIRONMENT)
 # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
 DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio
-COMMON_CFLAGS=-Wall -Wformat -Wformat-security
 # The next line is commented out by default in shipping libarchive releases.
 # It is uncommented by default in trunk.
-# DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual
-AM_CFLAGS=$(COMMON_CFLAGS) $(DEV_CFLAGS)
+DEV_CFLAGS=-Werror -Wextra -Wunused -Wshadow -Wmissing-prototypes -Wcast-qual -g
+AM_CFLAGS=$(DEV_CFLAGS)
 PLATFORMCPPFLAGS = @PLATFORMCPPFLAGS@
 AM_CPPFLAGS=$(PLATFORMCPPFLAGS)
 
@@ -33,21 +32,23 @@ AM_CPPFLAGS=$(PLATFORMCPPFLAGS)
 # What to include in the distribution
 #
 EXTRA_DIST= \
-	CMakeLists.txt			\
-	build/autogen.sh		\
-	build/bump-version.sh		\
-	build/clean.sh			\
-	build/cmake			\
-	build/version			\
-	contrib				\
-	doc				\
-	examples			\
-	$(libarchive_EXTRA_DIST)	\
-	$(libarchive_test_EXTRA_DIST)	\
-	$(bsdtar_EXTRA_DIST)		\
-	$(bsdtar_test_EXTRA_DIST)	\
-	$(bsdcpio_EXTRA_DIST)		\
-	$(bsdcpio_test_EXTRA_DIST)
+	CMakeLists.txt \
+	build/autogen.sh \
+	build/bump-version.sh \
+	build/clean.sh \
+	build/cmake \
+	build/version \
+	contrib \
+	doc \
+	examples \
+	$(libarchive_EXTRA_DIST) \
+	$(libarchive_test_EXTRA_DIST) \
+	$(bsdtar_EXTRA_DIST) \
+	$(bsdtar_test_EXTRA_DIST) \
+	$(bsdcpio_EXTRA_DIST) \
+	$(bsdcpio_test_EXTRA_DIST) \
+	$(bsdcat_EXTRA_DIST) \
+	$(bsdcat_test_EXTRA_DIST)
 
 # a) Clean out some unneeded files and directories
 # b) Collect all documentation and format it for distribution.
@@ -63,10 +64,11 @@ dist-hook:
 #
 # Extra rules for cleanup
 #
-DISTCLEANFILES=					\
-	libarchive/test/list.h			\
-	tar/test/list.h				\
-	cpio/test/list.h
+DISTCLEANFILES= \
+	libarchive/test/list.h \
+	tar/test/list.h \
+	cpio/test/list.h \
+	cat/test/list.h
 
 distclean-local:
 	-rm -rf .ref
@@ -78,6 +80,8 @@ distclean-local:
 	-[ -f tar/test/Makefile ] && cd tar/test && make clean
 	-[ -f cpio/Makefile ] && cd cpio && make clean
 	-[ -f cpio/test/Makefile ] && cd cpio/test && make clean
+	-[ -f cat/Makefile ] && cd cat && make clean
+	-[ -f cpio/test/Makefile ] && cd cat/test && make clean
 
 #
 # Libarchive headers, source, etc.
@@ -86,137 +90,157 @@ distclean-local:
 
 include_HEADERS= libarchive/archive.h libarchive/archive_entry.h
 
-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			\
-	libarchive/archive_endian.h				\
-	libarchive/archive_entry.c				\
-	libarchive/archive_entry.h				\
-	libarchive/archive_entry_copy_stat.c			\
-	libarchive/archive_entry_link_resolver.c		\
-	libarchive/archive_entry_locale.h			\
-	libarchive/archive_entry_private.h			\
-	libarchive/archive_entry_sparse.c			\
-	libarchive/archive_entry_stat.c				\
-	libarchive/archive_entry_strmode.c			\
-	libarchive/archive_entry_xattr.c			\
-	libarchive/archive_getdate.c				\
-	libarchive/archive_match.c				\
-	libarchive/archive_options.c				\
-	libarchive/archive_options_private.h			\
-	libarchive/archive_pathmatch.c				\
-	libarchive/archive_pathmatch.h				\
-	libarchive/archive_platform.h				\
-	libarchive/archive_ppmd_private.h			\
-	libarchive/archive_ppmd7.c				\
-	libarchive/archive_ppmd7_private.h			\
-	libarchive/archive_private.h				\
-	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			\
-	libarchive/archive_read_disk_private.h			\
-	libarchive/archive_read_disk_set_standard_lookup.c	\
-	libarchive/archive_read_extract.c			\
-	libarchive/archive_read_open_fd.c			\
-	libarchive/archive_read_open_file.c			\
-	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		\
-	libarchive/archive_read_support_filter_uu.c		\
-	libarchive/archive_read_support_filter_xz.c		\
-	libarchive/archive_read_support_format_7zip.c		\
-	libarchive/archive_read_support_format_all.c		\
-	libarchive/archive_read_support_format_ar.c		\
-	libarchive/archive_read_support_format_by_code.c	\
-	libarchive/archive_read_support_format_cab.c		\

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-all mailing list