[Midnightbsd-cvs] src [9171] trunk/contrib/libarchive: sync patchset on top of libarchive 3.2.1 with freebsd 11 (security patches)
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 15 09:39:32 EDT 2016
Revision: 9171
http://svnweb.midnightbsd.org/src/?rev=9171
Author: laffer1
Date: 2016-10-15 09:39:32 -0400 (Sat, 15 Oct 2016)
Log Message:
-----------
sync patchset on top of libarchive 3.2.1 with freebsd 11 (security patches)
Modified Paths:
--------------
trunk/contrib/libarchive/cat/bsdcat.1
trunk/contrib/libarchive/cat/bsdcat.c
trunk/contrib/libarchive/cat/bsdcat_platform.h
trunk/contrib/libarchive/cat/cmdline.c
trunk/contrib/libarchive/cat/test/main.c
trunk/contrib/libarchive/cat/test/test.h
trunk/contrib/libarchive/cat/test/test_version.c
trunk/contrib/libarchive/cpio/bsdcpio.1
trunk/contrib/libarchive/cpio/cmdline.c
trunk/contrib/libarchive/cpio/cpio.c
trunk/contrib/libarchive/cpio/cpio.h
trunk/contrib/libarchive/cpio/cpio_platform.h
trunk/contrib/libarchive/cpio/test/main.c
trunk/contrib/libarchive/cpio/test/test.h
trunk/contrib/libarchive/cpio/test/test_0.c
trunk/contrib/libarchive/cpio/test/test_basic.c
trunk/contrib/libarchive/cpio/test/test_cmdline.c
trunk/contrib/libarchive/cpio/test/test_extract_cpio_lz4.c
trunk/contrib/libarchive/cpio/test/test_format_newc.c
trunk/contrib/libarchive/cpio/test/test_gcpio_compat.c
trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu
trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu
trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu
trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu
trunk/contrib/libarchive/cpio/test/test_missing_file.c
trunk/contrib/libarchive/cpio/test/test_option_B_upper.c
trunk/contrib/libarchive/cpio/test/test_option_C_upper.c
trunk/contrib/libarchive/cpio/test/test_option_J_upper.c
trunk/contrib/libarchive/cpio/test/test_option_L_upper.c
trunk/contrib/libarchive/cpio/test/test_option_Z_upper.c
trunk/contrib/libarchive/cpio/test/test_option_a.c
trunk/contrib/libarchive/cpio/test/test_option_c.c
trunk/contrib/libarchive/cpio/test/test_option_d.c
trunk/contrib/libarchive/cpio/test/test_option_f.c
trunk/contrib/libarchive/cpio/test/test_option_f.cpio.uu
trunk/contrib/libarchive/cpio/test/test_option_help.c
trunk/contrib/libarchive/cpio/test/test_option_l.c
trunk/contrib/libarchive/cpio/test/test_option_lz4.c
trunk/contrib/libarchive/cpio/test/test_option_lzma.c
trunk/contrib/libarchive/cpio/test/test_option_m.c
trunk/contrib/libarchive/cpio/test/test_option_m.cpio.uu
trunk/contrib/libarchive/cpio/test/test_option_passphrase.c
trunk/contrib/libarchive/cpio/test/test_option_t.c
trunk/contrib/libarchive/cpio/test/test_option_t.cpio.uu
trunk/contrib/libarchive/cpio/test/test_option_t.stdout.uu
trunk/contrib/libarchive/cpio/test/test_option_tv.stdout.uu
trunk/contrib/libarchive/cpio/test/test_option_u.c
trunk/contrib/libarchive/cpio/test/test_option_version.c
trunk/contrib/libarchive/cpio/test/test_option_y.c
trunk/contrib/libarchive/cpio/test/test_option_z.c
trunk/contrib/libarchive/cpio/test/test_owner_parse.c
trunk/contrib/libarchive/cpio/test/test_passthrough_dotdot.c
trunk/contrib/libarchive/cpio/test/test_passthrough_reverse.c
trunk/contrib/libarchive/libarchive/archive.h
trunk/contrib/libarchive/libarchive/archive_acl.c
trunk/contrib/libarchive/libarchive/archive_check_magic.c
trunk/contrib/libarchive/libarchive/archive_crc32.h
trunk/contrib/libarchive/libarchive/archive_endian.h
trunk/contrib/libarchive/libarchive/archive_entry.3
trunk/contrib/libarchive/libarchive/archive_entry.c
trunk/contrib/libarchive/libarchive/archive_entry.h
trunk/contrib/libarchive/libarchive/archive_entry_copy_stat.c
trunk/contrib/libarchive/libarchive/archive_entry_link_resolver.c
trunk/contrib/libarchive/libarchive/archive_entry_private.h
trunk/contrib/libarchive/libarchive/archive_entry_stat.c
trunk/contrib/libarchive/libarchive/archive_entry_strmode.c
trunk/contrib/libarchive/libarchive/archive_entry_xattr.c
trunk/contrib/libarchive/libarchive/archive_getdate.h
trunk/contrib/libarchive/libarchive/archive_match.c
trunk/contrib/libarchive/libarchive/archive_platform.h
trunk/contrib/libarchive/libarchive/archive_ppmd7_private.h
trunk/contrib/libarchive/libarchive/archive_private.h
trunk/contrib/libarchive/libarchive/archive_random.c
trunk/contrib/libarchive/libarchive/archive_read.3
trunk/contrib/libarchive/libarchive/archive_read.c
trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.3
trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.c
trunk/contrib/libarchive/libarchive/archive_read_data_into_fd.c
trunk/contrib/libarchive/libarchive/archive_read_disk.3
trunk/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
trunk/contrib/libarchive/libarchive/archive_read_disk_posix.c
trunk/contrib/libarchive/libarchive/archive_read_disk_private.h
trunk/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
trunk/contrib/libarchive/libarchive/archive_read_extract.c
trunk/contrib/libarchive/libarchive/archive_read_extract2.c
trunk/contrib/libarchive/libarchive/archive_read_open_fd.c
trunk/contrib/libarchive/libarchive/archive_read_open_file.c
trunk/contrib/libarchive/libarchive/archive_read_open_filename.c
trunk/contrib/libarchive/libarchive/archive_read_open_memory.c
trunk/contrib/libarchive/libarchive/archive_read_private.h
trunk/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_7zip.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_all.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_ar.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_cpio.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_empty.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_lha.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_raw.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_warc.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_xar.c
trunk/contrib/libarchive/libarchive/archive_read_support_format_zip.c
trunk/contrib/libarchive/libarchive/archive_string.c
trunk/contrib/libarchive/libarchive/archive_string.h
trunk/contrib/libarchive/libarchive/archive_string_sprintf.c
trunk/contrib/libarchive/libarchive/archive_util.3
trunk/contrib/libarchive/libarchive/archive_util.c
trunk/contrib/libarchive/libarchive/archive_virtual.c
trunk/contrib/libarchive/libarchive/archive_write.3
trunk/contrib/libarchive/libarchive/archive_write.c
trunk/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c
trunk/contrib/libarchive/libarchive/archive_write_disk.3
trunk/contrib/libarchive/libarchive/archive_write_disk_acl.c
trunk/contrib/libarchive/libarchive/archive_write_disk_posix.c
trunk/contrib/libarchive/libarchive/archive_write_disk_private.h
trunk/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c
trunk/contrib/libarchive/libarchive/archive_write_open_fd.c
trunk/contrib/libarchive/libarchive/archive_write_open_file.c
trunk/contrib/libarchive/libarchive/archive_write_open_filename.c
trunk/contrib/libarchive/libarchive/archive_write_open_memory.c
trunk/contrib/libarchive/libarchive/archive_write_private.h
trunk/contrib/libarchive/libarchive/archive_write_set_format.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_ar.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_by_name.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_mtree.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_pax.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_shar.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_ustar.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_warc.c
trunk/contrib/libarchive/libarchive/archive_write_set_format_zip.c
trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.3
trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.c
trunk/contrib/libarchive/libarchive/cpio.5
trunk/contrib/libarchive/libarchive/filter_fork.h
trunk/contrib/libarchive/libarchive/libarchive-formats.5
trunk/contrib/libarchive/libarchive/libarchive.3
trunk/contrib/libarchive/libarchive/libarchive_internals.3
trunk/contrib/libarchive/libarchive/tar.5
trunk/contrib/libarchive/libarchive/test/README
trunk/contrib/libarchive/libarchive/test/main.c
trunk/contrib/libarchive/libarchive/test/read_open_memory.c
trunk/contrib/libarchive/libarchive/test/test.h
trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c
trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
trunk/contrib/libarchive/libarchive/test/test_acl_pax.c
trunk/contrib/libarchive/libarchive/test/test_archive_api_feature.c
trunk/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c
trunk/contrib/libarchive/libarchive/test/test_archive_string_conversion.c
trunk/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c
trunk/contrib/libarchive/libarchive/test/test_archive_write_set_passphrase.c
trunk/contrib/libarchive/libarchive/test/test_bad_fd.c
trunk/contrib/libarchive/libarchive/test/test_compat_bzip2.c
trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_cpio.c
trunk/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu
trunk/contrib/libarchive/libarchive/test/test_compat_gtar.c
trunk/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu
trunk/contrib/libarchive/libarchive/test/test_compat_gzip.c
trunk/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_lz4.c
trunk/contrib/libarchive/libarchive/test/test_compat_lzma.c
trunk/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c
trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu
trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c
trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu
trunk/contrib/libarchive/libarchive/test/test_compat_uudecode_large.c
trunk/contrib/libarchive/libarchive/test/test_compat_xz.c
trunk/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu
trunk/contrib/libarchive/libarchive/test/test_compat_zip.c
trunk/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu
trunk/contrib/libarchive/libarchive/test/test_empty_write.c
trunk/contrib/libarchive/libarchive/test/test_entry.c
trunk/contrib/libarchive/libarchive/test/test_entry_strmode.c
trunk/contrib/libarchive/libarchive/test/test_extattr_freebsd.c
trunk/contrib/libarchive/libarchive/test/test_fuzz.c
trunk/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_link_resolver.c
trunk/contrib/libarchive/libarchive/test/test_open_failure.c
trunk/contrib/libarchive/libarchive/test/test_open_fd.c
trunk/contrib/libarchive/libarchive/test/test_open_file.c
trunk/contrib/libarchive/libarchive/test/test_open_filename.c
trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c
trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_data_large.c
trunk/contrib/libarchive/libarchive/test/test_read_disk.c
trunk/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c
trunk/contrib/libarchive/libarchive/test/test_read_extract.c
trunk/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c
trunk/contrib/libarchive/libarchive/test/test_read_format_7zip_malformed.c
trunk/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_ar.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_le.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c
trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c
trunk/contrib/libarchive/libarchive/test/test_read_format_empty.c
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
trunk/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c
trunk/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c
trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.c
trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c
trunk/contrib/libarchive/libarchive/test/test_read_format_rar.c
trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_data.c
trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_header.c
trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_partially.c
trunk/contrib/libarchive/libarchive/test/test_read_format_rar_invalid1.c
trunk/contrib/libarchive/libarchive/test/test_read_format_raw.c
trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_tar.c
trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c
trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_pax.c
trunk/contrib/libarchive/libarchive/test/test_read_format_tbz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_tgz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_tlz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_txz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_tz.c
trunk/contrib/libarchive/libarchive/test/test_read_format_warc.c
trunk/contrib/libarchive/libarchive/test/test_read_format_xar.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_data.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_header.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_partially.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nofiletype.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c
trunk/contrib/libarchive/libarchive/test/test_read_format_zip_zip64.c
trunk/contrib/libarchive/libarchive/test/test_read_large.c
trunk/contrib/libarchive/libarchive/test/test_read_pax_truncated.c
trunk/contrib/libarchive/libarchive/test/test_read_position.c
trunk/contrib/libarchive/libarchive/test/test_read_set_format.c
trunk/contrib/libarchive/libarchive/test/test_read_truncated.c
trunk/contrib/libarchive/libarchive/test/test_tar_filenames.c
trunk/contrib/libarchive/libarchive/test/test_tar_large.c
trunk/contrib/libarchive/libarchive/test/test_ustar_filenames.c
trunk/contrib/libarchive/libarchive/test/test_write_disk.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_failures.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_perms.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_secure.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_sparse.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_symlink.c
trunk/contrib/libarchive/libarchive/test/test_write_disk_times.c
trunk/contrib/libarchive/libarchive/test/test_write_filter_lz4.c
trunk/contrib/libarchive/libarchive/test/test_write_format_ar.c
trunk/contrib/libarchive/libarchive/test/test_write_format_cpio.c
trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c
trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c
trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c
trunk/contrib/libarchive/libarchive/test/test_write_format_gnutar_filenames.c
trunk/contrib/libarchive/libarchive/test/test_write_format_mtree.c
trunk/contrib/libarchive/libarchive/test/test_write_format_pax.c
trunk/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c
trunk/contrib/libarchive/libarchive/test/test_write_format_tar.c
trunk/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c
trunk/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c
trunk/contrib/libarchive/libarchive/test/test_write_format_warc.c
trunk/contrib/libarchive/libarchive/test/test_write_format_warc_empty.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty_zip64.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_large.c
trunk/contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c
trunk/contrib/libarchive/libarchive/test/test_write_open_memory.c
trunk/contrib/libarchive/libarchive/test/test_write_read_format_zip.c
trunk/contrib/libarchive/libarchive_fe/err.c
trunk/contrib/libarchive/libarchive_fe/err.h
trunk/contrib/libarchive/libarchive_fe/lafe_platform.h
trunk/contrib/libarchive/libarchive_fe/line_reader.c
trunk/contrib/libarchive/libarchive_fe/line_reader.h
trunk/contrib/libarchive/libarchive_fe/passphrase.c
trunk/contrib/libarchive/tar/bsdtar.1
trunk/contrib/libarchive/tar/bsdtar.c
trunk/contrib/libarchive/tar/bsdtar.h
trunk/contrib/libarchive/tar/bsdtar_platform.h
trunk/contrib/libarchive/tar/cmdline.c
trunk/contrib/libarchive/tar/read.c
trunk/contrib/libarchive/tar/subst.c
trunk/contrib/libarchive/tar/test/main.c
trunk/contrib/libarchive/tar/test/test.h
trunk/contrib/libarchive/tar/test/test_0.c
trunk/contrib/libarchive/tar/test/test_basic.c
trunk/contrib/libarchive/tar/test/test_copy.c
trunk/contrib/libarchive/tar/test/test_empty_mtree.c
trunk/contrib/libarchive/tar/test/test_extract_tar_lz4.c
trunk/contrib/libarchive/tar/test/test_help.c
trunk/contrib/libarchive/tar/test/test_leading_slash.c
trunk/contrib/libarchive/tar/test/test_missing_file.c
trunk/contrib/libarchive/tar/test/test_option_H_upper.c
trunk/contrib/libarchive/tar/test/test_option_L_upper.c
trunk/contrib/libarchive/tar/test/test_option_T_upper.c
trunk/contrib/libarchive/tar/test/test_option_U_upper.c
trunk/contrib/libarchive/tar/test/test_option_lz4.c
trunk/contrib/libarchive/tar/test/test_option_n.c
trunk/contrib/libarchive/tar/test/test_option_passphrase.c
trunk/contrib/libarchive/tar/test/test_option_q.c
trunk/contrib/libarchive/tar/test/test_option_r.c
trunk/contrib/libarchive/tar/test/test_option_s.c
trunk/contrib/libarchive/tar/test/test_patterns.c
trunk/contrib/libarchive/tar/test/test_stdio.c
trunk/contrib/libarchive/tar/test/test_strip_components.c
trunk/contrib/libarchive/tar/test/test_symlink_dir.c
trunk/contrib/libarchive/tar/test/test_version.c
trunk/contrib/libarchive/tar/util.c
trunk/contrib/libarchive/tar/write.c
Modified: trunk/contrib/libarchive/cat/bsdcat.1
===================================================================
--- trunk/contrib/libarchive/cat/bsdcat.1 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/bsdcat.1 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/cat/bsdcat.1 299425 2016-05-11 10:19:44Z mm $
.\"
.Dd March 1, 2014
.Dt BSDCAT 1
Modified: trunk/contrib/libarchive/cat/bsdcat.c
===================================================================
--- trunk/contrib/libarchive/cat/bsdcat.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/bsdcat.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "bsdcat_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cat/bsdcat.c 299529 2016-05-12 10:16:16Z mm $");
#include <stdio.h>
#ifdef HAVE_STDLIB_H
Modified: trunk/contrib/libarchive/cat/bsdcat_platform.h
===================================================================
--- trunk/contrib/libarchive/cat/bsdcat_platform.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/bsdcat_platform.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/tar/bsdtar_platform.h,v 1.26 2008/12/06 07:37:14 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/cat/bsdcat_platform.h 299425 2016-05-11 10:19:44Z mm $
*/
/*
Modified: trunk/contrib/libarchive/cat/cmdline.c
===================================================================
--- trunk/contrib/libarchive/cat/cmdline.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/cmdline.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
*/
#include "bsdcat_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cat/cmdline.c 299425 2016-05-11 10:19:44Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/cat/test/main.c
===================================================================
--- trunk/contrib/libarchive/cat/test/main.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/test/main.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1360,6 +1360,31 @@
return assertion_file_time(file, line, pathname, 0, 0, 'b', 1);
}
+/* Verify mode of 'pathname'. */
+int
+assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
+{
+ int mode;
+ int r;
+
+ assertion_count(file, line);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ failure_start(file, line, "assertFileMode not yet implemented for Windows");
+#else
+ {
+ struct stat st;
+ r = lstat(pathname, &st);
+ mode = (int)(st.st_mode & 0777);
+ }
+ if (r == 0 && mode == expected_mode)
+ return (1);
+ failure_start(file, line, "File %s has mode %o, expected %o",
+ pathname, mode, expected_mode);
+#endif
+ failure_finish(NULL);
+ return (0);
+}
+
/* Verify mtime of 'pathname'. */
int
assertion_file_mtime(const char *file, int line,
@@ -1578,8 +1603,12 @@
if (0 == _mkdir(dirname))
return (1);
#else
- if (0 == mkdir(dirname, mode))
- return (1);
+ if (0 == mkdir(dirname, mode)) {
+ if (0 == chmod(dirname, mode)) {
+ assertion_file_mode(file, line, dirname, mode);
+ return (1);
+ }
+ }
#endif
failure_start(file, line, "Could not create directory %s", dirname);
failure_finish(NULL);
@@ -1628,6 +1657,11 @@
failure_finish(NULL);
return (0);
}
+ if (0 != chmod(path, mode)) {
+ failure_start(file, line, "Could not chmod %s", path);
+ failure_finish(NULL);
+ return (0);
+ }
if (contents != NULL) {
ssize_t wsize;
@@ -1644,6 +1678,7 @@
}
}
close(fd);
+ assertion_file_mode(file, line, path, mode);
return (1);
#endif
}
Modified: trunk/contrib/libarchive/cat/test/test.h
===================================================================
--- trunk/contrib/libarchive/cat/test/test.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/test/test.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/tar/test/test.h,v 1.4 2008/08/21 07:04:57 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/cat/test/test.h 307138 2016-10-12 10:28:22Z mm $
*/
/* Every test program should #include "test.h" as the first thing. */
@@ -241,6 +241,7 @@
int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
int assertion_file_contents(const char *, int, const void *, int, const char *);
int assertion_file_exists(const char *, int, const char *);
+int assertion_file_mode(const char *, int, const char *, int);
int assertion_file_mtime(const char *, int, const char *, long, long);
int assertion_file_mtime_recent(const char *, int, const char *);
int assertion_file_nlinks(const char *, int, const char *, int);
Modified: trunk/contrib/libarchive/cat/test/test_version.c
===================================================================
--- trunk/contrib/libarchive/cat/test/test_version.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cat/test/test_version.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -83,7 +83,7 @@
if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
++q;
/* Skip arbitrary third-party version numbers. */
- while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
+ while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
++q;
--s;
}
Modified: trunk/contrib/libarchive/cpio/bsdcpio.1
===================================================================
--- trunk/contrib/libarchive/cpio/bsdcpio.1 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/bsdcpio.1 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/cpio/bsdcpio.1 299896 2016-05-16 05:01:44Z mm $
.\"
.Dd September 16, 2014
.Dt CPIO 1
Modified: trunk/contrib/libarchive/cpio/cmdline.c
===================================================================
--- trunk/contrib/libarchive/cpio/cmdline.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/cmdline.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
#include "cpio_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.5 2008/12/06 07:30:40 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/cmdline.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -63,6 +63,7 @@
} cpio_longopts[] = {
{ "b64encode", 0, OPTION_B64ENCODE },
{ "create", 0, 'o' },
+ { "dereference", 0, 'L' },
{ "dot", 0, 'V' },
{ "extract", 0, 'i' },
{ "file", 1, 'F' },
Modified: trunk/contrib/libarchive/cpio/cpio.c
===================================================================
--- trunk/contrib/libarchive/cpio/cpio.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/cpio.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
#include "cpio_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/cpio.c 302075 2016-06-22 07:49:59Z mm $");
#include <sys/types.h>
#include <archive.h>
@@ -498,7 +498,7 @@
static void
version(void)
{
- fprintf(stdout,"bsdcpio %s -- %s\n",
+ fprintf(stdout,"bsdcpio %s - %s\n",
BSDCPIO_VERSION_STRING,
archive_version_details());
exit(0);
Modified: trunk/contrib/libarchive/cpio/cpio.h
===================================================================
--- trunk/contrib/libarchive/cpio/cpio.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/cpio.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.7 2008/12/06 07:30:40 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/cpio/cpio.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef CPIO_H_INCLUDED
Modified: trunk/contrib/libarchive/cpio/cpio_platform.h
===================================================================
--- trunk/contrib/libarchive/cpio/cpio_platform.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/cpio_platform.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/cpio/cpio_platform.h,v 1.2 2008/12/06 07:15:42 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/cpio/cpio_platform.h 299529 2016-05-12 10:16:16Z mm $
*/
/*
Modified: trunk/contrib/libarchive/cpio/test/main.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/main.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/main.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -60,7 +60,7 @@
* TODO: Move this into a separate configuration header, have all test
* suites share one copy of this file.
*/
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/main.c,v 1.3 2008/08/24 04:58:22 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/main.c 307138 2016-10-12 10:28:22Z mm $");
#define KNOWNREF "test_option_f.cpio.uu"
#define ENVBASE "BSDCPIO" /* Prefix for environment variables. */
#define PROGRAM "bsdcpio" /* Name of program being tested. */
@@ -1361,6 +1361,31 @@
return assertion_file_time(file, line, pathname, 0, 0, 'b', 1);
}
+/* Verify mode of 'pathname'. */
+int
+assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
+{
+ int mode;
+ int r;
+
+ assertion_count(file, line);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ failure_start(file, line, "assertFileMode not yet implemented for Windows");
+#else
+ {
+ struct stat st;
+ r = lstat(pathname, &st);
+ mode = (int)(st.st_mode & 0777);
+ }
+ if (r == 0 && mode == expected_mode)
+ return (1);
+ failure_start(file, line, "File %s has mode %o, expected %o",
+ pathname, mode, expected_mode);
+#endif
+ failure_finish(NULL);
+ return (0);
+}
+
/* Verify mtime of 'pathname'. */
int
assertion_file_mtime(const char *file, int line,
@@ -1579,8 +1604,12 @@
if (0 == _mkdir(dirname))
return (1);
#else
- if (0 == mkdir(dirname, mode))
- return (1);
+ if (0 == mkdir(dirname, mode)) {
+ if (0 == chmod(dirname, mode)) {
+ assertion_file_mode(file, line, dirname, mode);
+ return (1);
+ }
+ }
#endif
failure_start(file, line, "Could not create directory %s", dirname);
failure_finish(NULL);
@@ -1629,6 +1658,11 @@
failure_finish(NULL);
return (0);
}
+ if (0 != chmod(path, mode)) {
+ failure_start(file, line, "Could not chmod %s", path);
+ failure_finish(NULL);
+ return (0);
+ }
if (contents != NULL) {
ssize_t wsize;
@@ -1645,6 +1679,7 @@
}
}
close(fd);
+ assertion_file_mode(file, line, path, mode);
return (1);
#endif
}
Modified: trunk/contrib/libarchive/cpio/test/test.h
===================================================================
--- trunk/contrib/libarchive/cpio/test/test.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/cpio/test/test.h,v 1.2 2008/06/21 02:17:18 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/cpio/test/test.h 307138 2016-10-12 10:28:22Z mm $
*/
/* Every test program should #include "test.h" as the first thing. */
@@ -241,6 +241,7 @@
int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
int assertion_file_contents(const char *, int, const void *, int, const char *);
int assertion_file_exists(const char *, int, const char *);
+int assertion_file_mode(const char *, int, const char *, int);
int assertion_file_mtime(const char *, int, const char *, long, long);
int assertion_file_mtime_recent(const char *, int, const char *);
int assertion_file_nlinks(const char *, int, const char *, int);
Modified: trunk/contrib/libarchive/cpio/test/test_0.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_0.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_0.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_0.c 232153 2012-02-25 10:58:02Z mm $");
/*
* This first test does basic sanity checks on the environment. For
Modified: trunk/contrib/libarchive/cpio/test/test_basic.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_basic.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_basic.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_basic.c,v 1.4 2008/08/25 06:39:29 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_basic.c 299529 2016-05-12 10:16:16Z mm $");
static void
verify_files(const char *msg)
Modified: trunk/contrib/libarchive/cpio/test/test_cmdline.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_cmdline.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_cmdline.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_cmdline.c 228763 2011-12-21 11:13:29Z mm $");
/*
* Test the command-line parsing.
Modified: trunk/contrib/libarchive/cpio/test/test_extract_cpio_lz4.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_extract_cpio_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_extract_cpio_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_extract_cpio_lz4.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_extract_cpio_lz4)
{
Modified: trunk/contrib/libarchive/cpio/test/test_format_newc.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_format_newc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_format_newc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_format_newc.c,v 1.2 2008/08/22 02:09:10 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_format_newc.c 248616 2013-03-22 13:36:03Z mm $");
/* Number of bytes needed to pad 'n' to multiple of 'block', assuming
* that 'block' is a power of two. This trick can be more easily
Modified: trunk/contrib/libarchive/cpio/test/test_gcpio_compat.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_gcpio_compat.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_gcpio_compat.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_gcpio_compat.c,v 1.2 2008/08/22 02:27:06 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_gcpio_compat.c 228763 2011-12-21 11:13:29Z mm $");
static void
unpack_test(const char *from, const char *options, const char *se)
Modified: trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_gcpio_compat_ref.bin
MQW%9`*IWI('H`^@#`@````U'=YD%````"@!F:6QE```Q,C,T-38W.#D*QW%9
M`*IWI('H`^@#`@````U'=YD)````"@!L:6YK9FEL90``,3(S-#4V-S at Y"L=Q
Modified: trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_gcpio_compat_ref.crc
M,#<P-S`R,#`S,S<W86$P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93 at P,#`P,#`P
M,C0W,&0Y.3<W,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4Y,#`P,#`P,#`P,#`P
Modified: trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_gcpio_compat_ref.newc
M,#<P-S`Q,#`S,S<W86$P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93 at P,#`P,#`P
M,C0W,&0Y.3<W,#`P,#`P,#`P,#`P,#`P,#`P,#`P,#4Y,#`P,#`P,#`P,#`P
Modified: trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_gcpio_compat_ref.ustar
M9FEL90``````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/cpio/test/test_missing_file.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_missing_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_missing_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_missing_file.c 302075 2016-06-22 07:49:59Z mm $");
DEFINE_TEST(test_missing_file)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_B_upper.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_B_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_B_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_B_upper.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_B_upper)
Modified: trunk/contrib/libarchive/cpio/test/test_option_C_upper.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_C_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_C_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_C_upper.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_C_upper)
Modified: trunk/contrib/libarchive/cpio/test/test_option_J_upper.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_J_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_J_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_J_upper.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_J_upper)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_L_upper.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_L_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_L_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_L.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_L_upper.c 228763 2011-12-21 11:13:29Z mm $");
/* This is a little pointless, as Windows doesn't support symlinks
* (except for the seriously crippled CreateSymbolicLink API) so these
Modified: trunk/contrib/libarchive/cpio/test/test_option_Z_upper.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_Z_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_Z_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_Z_upper.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_Z_upper)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_a.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_a.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_a.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
#elif defined(HAVE_SYS_UTIME_H)
#include <sys/utime.h>
#endif
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_a.c,v 1.3 2008/08/24 06:21:00 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_a.c 228763 2011-12-21 11:13:29Z mm $");
static struct {
const char *name;
Modified: trunk/contrib/libarchive/cpio/test/test_option_c.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_c.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_c.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_c.c 299529 2016-05-12 10:16:16Z mm $");
static int
is_octal(const char *p, size_t l)
Modified: trunk/contrib/libarchive/cpio/test/test_option_d.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_d.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_d.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_d.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_d)
Modified: trunk/contrib/libarchive/cpio/test/test_option_f.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_f.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_f.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_f.c 228763 2011-12-21 11:13:29Z mm $");
/*
* Unpack the archive in a new dir.
Modified: trunk/contrib/libarchive/cpio/test/test_option_f.cpio.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_f.cpio.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_f.cpio.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_f.cpio.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_option_f.cpio
M,#<P-S`W,#`P,3,Q-C(Q-38Q,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P
M,#`P,3`W,S4Q,3(U,C8P,#`P,#4P,#`P,#`P,#`P,&$Q,C,`,#<P-S`W,#`P
Modified: trunk/contrib/libarchive/cpio/test/test_option_help.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_help.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_help.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_help.c 228763 2011-12-21 11:13:29Z mm $");
/*
* Test that "--help", "-h", and "-W help" options all work and
Modified: trunk/contrib/libarchive/cpio/test/test_option_l.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_l.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_l.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_l.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_l)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_lz4.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_lz4.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_option_lz4)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_lzma.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_lzma.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_lzma.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_lzma.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_lzma)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_m.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_m.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_m.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_m.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_option_m)
Modified: trunk/contrib/libarchive/cpio/test/test_option_m.cpio.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_m.cpio.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_m.cpio.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_m.cpio.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_option_m.cpio
M,#<P-S`W,#`P,3,Q-#4P,#8T,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P
M,#`P,#`P,#`P,#`P,#$P,#`P,#4P,#`P,#`P,#`P,&9I;&4`,#<P-S`W,#`P
Modified: trunk/contrib/libarchive/cpio/test/test_option_passphrase.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_passphrase.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_option_passphrase)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_t.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_t.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_t.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_t.c 232153 2012-02-25 10:58:02Z mm $");
#ifdef HAVE_LOCALE_H
#include <locale.h>
Modified: trunk/contrib/libarchive/cpio/test/test_option_t.cpio.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_t.cpio.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_t.cpio.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_t.cpio.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_option_t.cpio
M,#<P-S`W,#`P,3,Q-#4P,#8T,3`P-C0T,#`Q-S4P,#`Q-S4P,#`P,#`Q,#`P
M,#`P,#`P,#`P,#`P,#$P,#`P,#4P,#`P,#`P,#`P,&9I;&4`,#<P-S`W,#`P
Modified: trunk/contrib/libarchive/cpio/test/test_option_t.stdout.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_t.stdout.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_t.stdout.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_t.stdout.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_option_t.stdout
%9FEL90H`
`
Modified: trunk/contrib/libarchive/cpio/test/test_option_tv.stdout.uu
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_tv.stdout.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_tv.stdout.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: src/usr.bin/cpio/test/test_option_tv.stdout.uu,v 1.2 2008/11/29 20:22:02 kientzle Exp $
+$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_tv.stdout.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_option_tv.stdout
M+7)W+7(M+7(M+2`@(#$@=&EM("`@("`@=&EM("`@("`@("`@("`@(#`@1&5C
/(#,Q("`Q.38Y(&9I;&4*
Modified: trunk/contrib/libarchive/cpio/test/test_option_u.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_u.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_u.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
#elif defined(HAVE_SYS_UTIME_H)
#include <sys/utime.h>
#endif
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_u.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_option_u)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_version.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_version.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_version.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_version.c 305188 2016-09-01 07:53:59Z mm $");
/*
* Test that --version option works and generates reasonable output.
@@ -59,8 +59,8 @@
++q; --s;
/* Separator. */
failure("Version: %s", p);
- assertEqualMem(q, "-- ", 3);
- q += 3; s -= 3;
+ assertEqualMem(q, "- ", 2);
+ q += 2; s -= 2;
/* libarchive name and version number */
assert(s > 11);
failure("Version: %s", p);
@@ -75,7 +75,7 @@
if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
++q;
/* Skip arbitrary third-party version numbers. */
- while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
+ while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
++q;
--s;
}
Modified: trunk/contrib/libarchive/cpio/test/test_option_y.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_y.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_y.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_option_y.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_y.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_option_y)
{
Modified: trunk/contrib/libarchive/cpio/test/test_option_z.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_option_z.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_option_z.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_option_z.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_option_z)
{
Modified: trunk/contrib/libarchive/cpio/test/test_owner_parse.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_owner_parse.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_owner_parse.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_owner_parse.c 232153 2012-02-25 10:58:02Z mm $");
#include "../cpio.h"
#include "err.h"
Modified: trunk/contrib/libarchive/cpio/test/test_passthrough_dotdot.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_passthrough_dotdot.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_passthrough_dotdot.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_passthrough_dotdot.c,v 1.4 2008/08/24 06:21:00 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_passthrough_dotdot.c 228763 2011-12-21 11:13:29Z mm $");
/*
* Verify that "cpio -p .." works.
Modified: trunk/contrib/libarchive/cpio/test/test_passthrough_reverse.c
===================================================================
--- trunk/contrib/libarchive/cpio/test/test_passthrough_reverse.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/cpio/test/test_passthrough_reverse.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/test/test_passthrough_reverse.c,v 1.2 2008/08/24 06:21:00 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/cpio/test/test_passthrough_reverse.c 228763 2011-12-21 11:13:29Z mm $");
/*
* As reported by Bernd Walter: Some people are in the habit of
Modified: trunk/contrib/libarchive/libarchive/archive.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.50 2008/05/26 17:00:22 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive.h 302075 2016-06-22 07:49:59Z mm $
*/
#ifndef ARCHIVE_H_INCLUDED
Modified: trunk/contrib/libarchive/libarchive/archive_acl.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_acl.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_acl.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -707,10 +707,11 @@
if (r != 0)
return (-1);
*p++ = separator;
- if (flags & ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID)
+ if (name == NULL || (flags & ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID)) {
id = ap->id;
- else
+ } else {
id = -1;
+ }
append_entry(&p, NULL, ap->tag, name,
ap->permset, id);
count++;
Modified: trunk/contrib/libarchive/libarchive/archive_check_magic.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_check_magic.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_check_magic.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_check_magic.c 201089 2009-12-28 02:20:23Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_check_magic.c 238856 2012-07-28 06:38:44Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_crc32.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_crc32.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_crc32.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_crc32.h 201102 2009-12-28 03:11:36Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_crc32.h 232153 2012-02-25 10:58:02Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_endian.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_endian.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_endian.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_endian.h 201085 2009-12-28 02:17:15Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_endian.h 299529 2016-05-12 10:16:16Z mm $
*
* Borrowed from FreeBSD's <sys/endian.h>
*/
Modified: trunk/contrib/libarchive/libarchive/archive_entry.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd Feburary 2, 2012
.Dt ARCHIVE_ENTRY 3
Modified: trunk/contrib/libarchive/libarchive/archive_entry.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry.c 201096 2009-12-28 02:41:27Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_entry.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_entry.h 201096 2009-12-28 02:41:27Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry.h 302075 2016-06-22 07:49:59Z mm $
*/
#ifndef ARCHIVE_ENTRY_H_INCLUDED
Modified: trunk/contrib/libarchive/libarchive/archive_entry_copy_stat.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry_copy_stat.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry_copy_stat.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_copy_stat.c 189466 2009-03-07 00:52:02Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry_copy_stat.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_entry_link_resolver.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry_link_resolver.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry_link_resolver.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_link_resolver.c 201100 2009-12-28 03:05:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry_link_resolver.c 248616 2013-03-22 13:36:03Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_entry_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_entry_private.h 201096 2009-12-28 02:41:27Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry_private.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_entry_stat.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry_stat.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry_stat.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_stat.c 201100 2009-12-28 03:05:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry_stat.c 238856 2012-07-28 06:38:44Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_entry_strmode.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry_strmode.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry_strmode.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_strmode.c,v 1.4 2008/06/15 05:14:01 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry_strmode.c 228763 2011-12-21 11:13:29Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_entry_xattr.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_entry_xattr.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_entry_xattr.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_entry_xattr.c 201096 2009-12-28 02:41:27Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_entry_xattr.c 302075 2016-06-22 07:49:59Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_getdate.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_getdate.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_getdate.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_getdate.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_match.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_match.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_match.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -655,7 +655,7 @@
}
}
- /* If something error happend, report it immediately. */
+ /* If an error occurred, report it immediately. */
if (r < ARCHIVE_OK) {
archive_copy_error(&(a->archive), ar);
archive_read_free(ar);
Modified: trunk/contrib/libarchive/libarchive/archive_platform.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_platform.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_platform.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_platform.h 201090 2009-12-28 02:22:04Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_platform.h 306321 2016-09-25 22:02:27Z mm $
*/
/* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */
@@ -159,6 +159,15 @@
#define CAN_RESTORE_METADATA_FD
#endif
+/*
+ * glibc 2.24 deprecates readdir_r
+ */
+#if defined(HAVE_READDIR_R) && (!defined(__GLIBC__) || !defined(__GLIBC_MINOR__) || __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24))
+#define USE_READDIR_R 1
+#else
+#undef USE_READDIR_R
+#endif
+
/* Set up defaults for internal error codes. */
#ifndef ARCHIVE_ERRNO_FILE_FORMAT
#if HAVE_EFTYPE
Modified: trunk/contrib/libarchive/libarchive/archive_ppmd7_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_ppmd7_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_ppmd7_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -19,7 +19,7 @@
#define PPMD7_MAX_ORDER 64
#define PPMD7_MIN_MEM_SIZE (1 << 11)
-#define PPMD7_MAX_MEM_SIZE (0xFFFFFFFF - 12 * 3)
+#define PPMD7_MAX_MEM_SIZE (0xFFFFFFFFu - 12 * 3)
struct CPpmd7_Context_;
Modified: trunk/contrib/libarchive/libarchive/archive_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_private.h 201098 2009-12-28 02:58:14Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_private.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_random.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_random.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_random.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_random.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ 3
Modified: trunk/contrib/libarchive/libarchive/archive_read.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -32,7 +32,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read.c 201157 2009-12-29 05:30:23Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_add_passphrase.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd September 14, 2014
.Dt ARCHIVE_READ_ADD_PASSPHRASE 3
Modified: trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_add_passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_add_passphrase.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -125,7 +125,7 @@
__archive_read_reset_passphrase(struct archive_read *a)
{
- a->passphrases.candiate = -1;
+ a->passphrases.candidate = -1;
}
/*
@@ -137,24 +137,24 @@
struct archive_read_passphrase *p;
const char *passphrase;
- if (a->passphrases.candiate < 0) {
+ if (a->passphrases.candidate < 0) {
/* Count out how many passphrases we have. */
int cnt = 0;
for (p = a->passphrases.first; p != NULL; p = p->next)
cnt++;
- a->passphrases.candiate = cnt;
+ a->passphrases.candidate = cnt;
p = a->passphrases.first;
- } else if (a->passphrases.candiate > 1) {
+ } else if (a->passphrases.candidate > 1) {
/* Rotate a passphrase list. */
- a->passphrases.candiate--;
+ a->passphrases.candidate--;
p = remove_passphrases_from_head(a);
add_passphrase_to_tail(a, p);
- /* Pick a new passphrase candiate up. */
+ /* Pick a new passphrase candidate up. */
p = a->passphrases.first;
- } else if (a->passphrases.candiate == 1) {
- /* This case is that all cadiates failed to decryption. */
- a->passphrases.candiate = 0;
+ } else if (a->passphrases.candidate == 1) {
+ /* This case is that all candidates failed to decrypt. */
+ a->passphrases.candidate = 0;
if (a->passphrases.first->next != NULL) {
/* Rotate a passphrase list. */
p = remove_passphrases_from_head(a);
@@ -161,7 +161,7 @@
add_passphrase_to_tail(a, p);
}
p = NULL;
- } else /* There is no passphrase candaite. */
+ } else /* There is no passphrase candidate. */
p = NULL;
if (p != NULL)
@@ -177,7 +177,7 @@
if (p == NULL)
return (NULL);
insert_passphrase_to_head(a, p);
- a->passphrases.candiate = 1;
+ a->passphrases.candidate = 1;
}
} else
passphrase = NULL;
Modified: trunk/contrib/libarchive/libarchive/archive_read_data_into_fd.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_data_into_fd.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_data_into_fd.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.16 2008/05/23 05:01:29 cperciva Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_data_into_fd.c 232153 2012-02-25 10:58:02Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_disk.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_disk.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_disk.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_disk.3 238856 2012-07-28 06:38:44Z mm $
.\"
.Dd February 2, 2012
.Dt ARCHIVE_READ_DISK 3
Modified: trunk/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_entry_from_file.c 201084 2009-12-28 02:14:09Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c 306321 2016-09-25 22:02:27Z mm $");
/* This is the tree-walking code for POSIX systems. */
#if !defined(_WIN32) || defined(__CYGWIN__)
@@ -411,20 +411,38 @@
{
const char *accpath;
acl_t acl;
-#if HAVE_ACL_IS_TRIVIAL_NP
int r;
-#endif
accpath = archive_entry_sourcepath(entry);
if (accpath == NULL)
accpath = archive_entry_pathname(entry);
+ if (*fd < 0 && a->tree != NULL) {
+ if (a->follow_symlinks ||
+ archive_entry_filetype(entry) != AE_IFLNK)
+ *fd = a->open_on_current_dir(a->tree,
+ accpath, O_RDONLY | O_NONBLOCK);
+ if (*fd < 0) {
+ if (a->tree_enter_working_dir(a->tree) != 0) {
+ archive_set_error(&a->archive, errno,
+ "Couldn't access %s", accpath);
+ return (ARCHIVE_FAILED);
+ }
+ }
+ }
+
archive_entry_acl_clear(entry);
+ acl = NULL;
+
#ifdef ACL_TYPE_NFS4
/* Try NFS4 ACL first. */
if (*fd >= 0)
+#if HAVE_ACL_GET_FD_NP
+ acl = acl_get_fd_np(*fd, ACL_TYPE_NFS4);
+#else
acl = acl_get_fd(*fd);
+#endif
#if HAVE_ACL_GET_LINK_NP
else if (!a->follow_symlinks)
acl = acl_get_link_np(accpath, ACL_TYPE_NFS4);
@@ -437,20 +455,31 @@
#endif
else
acl = acl_get_file(accpath, ACL_TYPE_NFS4);
+
#if HAVE_ACL_IS_TRIVIAL_NP
- /* Ignore "trivial" ACLs that just mirror the file mode. */
- acl_is_trivial_np(acl, &r);
- if (r) {
- acl_free(acl);
- acl = NULL;
+ if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) {
+ /* Ignore "trivial" ACLs that just mirror the file mode. */
+ if (r) {
+ acl_free(acl);
+ acl = NULL;
+ /*
+ * Simultaneous NFSv4 and POSIX.1e ACLs for the same
+ * entry are not allowed, so we should return here
+ */
+ return (ARCHIVE_OK);
+ }
}
#endif
if (acl != NULL) {
- translate_acl(a, entry, acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4);
+ r = translate_acl(a, entry, acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4);
acl_free(acl);
- return (ARCHIVE_OK);
+ if (r != ARCHIVE_OK) {
+ archive_set_error(&a->archive, errno,
+ "Couldn't translate NFSv4 ACLs: %s", accpath);
+ }
+ return (r);
}
-#endif
+#endif /* ACL_TYPE_NFS4 */
/* Retrieve access ACL from file. */
if (*fd >= 0)
@@ -467,10 +496,27 @@
#endif
else
acl = acl_get_file(accpath, ACL_TYPE_ACCESS);
+
+#if HAVE_ACL_IS_TRIVIAL_NP
+ /* Ignore "trivial" ACLs that just mirror the file mode. */
+ if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) {
+ if (r) {
+ acl_free(acl);
+ acl = NULL;
+ }
+ }
+#endif
+
if (acl != NULL) {
- translate_acl(a, entry, acl,
+ r = translate_acl(a, entry, acl,
ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
acl_free(acl);
+ acl = NULL;
+ if (r != ARCHIVE_OK) {
+ archive_set_error(&a->archive, errno,
+ "Couldn't translate access ACLs: %s", accpath);
+ return (r);
+ }
}
/* Only directories can have default ACLs. */
@@ -477,9 +523,15 @@
if (S_ISDIR(archive_entry_mode(entry))) {
acl = acl_get_file(accpath, ACL_TYPE_DEFAULT);
if (acl != NULL) {
- translate_acl(a, entry, acl,
+ r = translate_acl(a, entry, acl,
ARCHIVE_ENTRY_ACL_TYPE_DEFAULT);
acl_free(acl);
+ if (r != ARCHIVE_OK) {
+ archive_set_error(&a->archive, errno,
+ "Couldn't translate default ACLs: %s",
+ accpath);
+ return (r);
+ }
}
}
return (ARCHIVE_OK);
@@ -535,20 +587,23 @@
#ifdef ACL_TYPE_NFS4
acl_entry_type_t acl_type;
acl_flagset_t acl_flagset;
- int brand, r;
+ int brand;
#endif
acl_entry_t acl_entry;
acl_permset_t acl_permset;
int i, entry_acl_type;
- int s, ae_id, ae_tag, ae_perm;
+ int r, s, ae_id, ae_tag, ae_perm;
const char *ae_name;
-
#ifdef ACL_TYPE_NFS4
// FreeBSD "brands" ACLs as POSIX.1e or NFSv4
// Make sure the "brand" on this ACL is consistent
// with the default_entry_acl_type bits provided.
- acl_get_brand_np(acl, &brand);
+ if (acl_get_brand_np(acl, &brand) != 0) {
+ archive_set_error(&a->archive, errno,
+ "Failed to read ACL brand");
+ return (ARCHIVE_WARN);
+ }
switch (brand) {
case ACL_BRAND_POSIX:
switch (default_entry_acl_type) {
@@ -556,19 +611,22 @@
case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT:
break;
default:
- // XXX set warning message?
- return ARCHIVE_FAILED;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Invalid ACL entry type for POSIX.1e ACL");
+ return (ARCHIVE_WARN);
}
break;
case ACL_BRAND_NFS4:
if (default_entry_acl_type & ~ARCHIVE_ENTRY_ACL_TYPE_NFS4) {
- // XXX set warning message?
- return ARCHIVE_FAILED;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Invalid ACL entry type for NFSv4 ACL");
+ return (ARCHIVE_WARN);
}
break;
default:
- // XXX set warning message?
- return ARCHIVE_FAILED;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Unknown ACL brand");
+ return (ARCHIVE_WARN);
break;
}
#endif
@@ -575,12 +633,21 @@
s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry);
+ if (s == -1) {
+ archive_set_error(&a->archive, errno,
+ "Failed to get first ACL entry");
+ return (ARCHIVE_WARN);
+ }
while (s == 1) {
ae_id = -1;
ae_name = NULL;
ae_perm = 0;
- acl_get_tag_type(acl_entry, &acl_tag);
+ if (acl_get_tag_type(acl_entry, &acl_tag) != 0) {
+ archive_set_error(&a->archive, errno,
+ "Failed to get ACL tag type");
+ return (ARCHIVE_WARN);
+ }
switch (acl_tag) {
case ACL_USER:
ae_id = (int)*(uid_t *)acl_get_qualifier(acl_entry);
@@ -615,13 +682,18 @@
continue;
}
- // XXX acl type maps to allow/deny/audit/YYYY bits
- // XXX acl_get_entry_type_np on FreeBSD returns EINVAL for
- // non-NFSv4 ACLs
+ // XXX acl_type maps to allow/deny/audit/YYYY bits
entry_acl_type = default_entry_acl_type;
#ifdef ACL_TYPE_NFS4
- r = acl_get_entry_type_np(acl_entry, &acl_type);
- if (r == 0) {
+ if (default_entry_acl_type & ARCHIVE_ENTRY_ACL_TYPE_NFS4) {
+ /*
+ * acl_get_entry_type_np() falis with non-NFSv4 ACLs
+ */
+ if (acl_get_entry_type_np(acl_entry, &acl_type) != 0) {
+ archive_set_error(&a->archive, errno, "Failed "
+ "to get ACL type from a NFSv4 ACL entry");
+ return (ARCHIVE_WARN);
+ }
switch (acl_type) {
case ACL_ENTRY_TYPE_ALLOW:
entry_acl_type = ARCHIVE_ENTRY_ACL_TYPE_ALLOW;
@@ -635,29 +707,53 @@
case ACL_ENTRY_TYPE_ALARM:
entry_acl_type = ARCHIVE_ENTRY_ACL_TYPE_ALARM;
break;
+ default:
+ archive_set_error(&a->archive, errno,
+ "Invalid NFSv4 ACL entry type");
+ return (ARCHIVE_WARN);
}
+
+ /*
+ * Libarchive stores "flag" (NFSv4 inheritance bits)
+ * in the ae_perm bitmap.
+ *
+ * acl_get_flagset_np() fails with non-NFSv4 ACLs
+ */
+ if (acl_get_flagset_np(acl_entry, &acl_flagset) != 0) {
+ archive_set_error(&a->archive, errno,
+ "Failed to get flagset from a NFSv4 ACL entry");
+ return (ARCHIVE_WARN);
+ }
+ for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) {
+ r = acl_get_flag_np(acl_flagset,
+ acl_inherit_map[i].platform_inherit);
+ if (r == -1) {
+ archive_set_error(&a->archive, errno,
+ "Failed to check flag in a NFSv4 "
+ "ACL flagset");
+ return (ARCHIVE_WARN);
+ } else if (r)
+ ae_perm |= acl_inherit_map[i].archive_inherit;
+ }
}
-
- /*
- * Libarchive stores "flag" (NFSv4 inheritance bits)
- * in the ae_perm bitmap.
- */
- acl_get_flagset_np(acl_entry, &acl_flagset);
- for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) {
- if (acl_get_flag_np(acl_flagset,
- acl_inherit_map[i].platform_inherit))
- ae_perm |= acl_inherit_map[i].archive_inherit;
-
- }
#endif
- acl_get_permset(acl_entry, &acl_permset);
+ if (acl_get_permset(acl_entry, &acl_permset) != 0) {
+ archive_set_error(&a->archive, errno,
+ "Failed to get ACL permission set");
+ return (ARCHIVE_WARN);
+ }
for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) {
/*
* acl_get_perm() is spelled differently on different
* platforms; see above.
*/
- if (ACL_GET_PERM(acl_permset, acl_perm_map[i].platform_perm))
+ r = ACL_GET_PERM(acl_permset, acl_perm_map[i].platform_perm);
+ if (r == -1) {
+ archive_set_error(&a->archive, errno,
+ "Failed to check permission in an ACL permission set");
+ return (ARCHIVE_WARN);
+ } else if (r)
ae_perm |= acl_perm_map[i].archive_perm;
}
@@ -666,6 +762,11 @@
ae_id, ae_name);
s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
+ if (s == -1) {
+ archive_set_error(&a->archive, errno,
+ "Failed to get next ACL entry");
+ return (ARCHIVE_WARN);
+ }
}
return (ARCHIVE_OK);
}
Modified: trunk/contrib/libarchive/libarchive/archive_read_disk_posix.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_disk_posix.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_disk_posix.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -165,7 +165,7 @@
int synthetic;
int remote;
int noatime;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
size_t name_max;
#endif
long incr_xfer_size;
@@ -200,7 +200,7 @@
DIR *d;
#define INVALID_DIR_HANDLE NULL
struct dirent *de;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
struct dirent *dirent;
size_t dirent_allocated;
#endif
@@ -938,7 +938,7 @@
r = archive_match_path_excluded(a->matching, entry);
if (r < 0) {
archive_set_error(&(a->archive), errno,
- "Faild : %s", archive_error_string(a->matching));
+ "Failed : %s", archive_error_string(a->matching));
return (r);
}
if (r) {
@@ -1041,7 +1041,7 @@
r = archive_match_time_excluded(a->matching, entry);
if (r < 0) {
archive_set_error(&(a->archive), errno,
- "Faild : %s", archive_error_string(a->matching));
+ "Failed : %s", archive_error_string(a->matching));
return (r);
}
if (r) {
@@ -1067,7 +1067,7 @@
r = archive_match_owner_excluded(a->matching, entry);
if (r < 0) {
archive_set_error(&(a->archive), errno,
- "Faild : %s", archive_error_string(a->matching));
+ "Failed : %s", archive_error_string(a->matching));
return (r);
}
if (r) {
@@ -1504,7 +1504,20 @@
struct tree *t = a->tree;
struct statfs sfs;
#if defined(HAVE_GETVFSBYNAME) && defined(VFCF_SYNTHETIC)
+/* TODO: configure should set GETVFSBYNAME_ARG_TYPE to make
+ * this accurate; some platforms have both and we need the one that's
+ * used by getvfsbyname()
+ *
+ * Then the following would become:
+ * #if defined(GETVFSBYNAME_ARG_TYPE)
+ * GETVFSBYNAME_ARG_TYPE vfc;
+ * #endif
+ */
+# if defined(HAVE_STRUCT_XVFSCONF)
struct xvfsconf vfc;
+# else
+ struct vfsconf vfc;
+# endif
#endif
int r, xr = 0;
#if !defined(HAVE_STRUCT_STATFS_F_NAMEMAX)
@@ -1579,7 +1592,7 @@
#endif
t->current_filesystem->noatime = 0;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
/* Set maximum filename length. */
#if defined(HAVE_STRUCT_STATFS_F_NAMEMAX)
t->current_filesystem->name_max = sfs.f_namemax;
@@ -1602,7 +1615,7 @@
else
t->current_filesystem->name_max = nm;
#endif
-#endif /* HAVE_READDIR_R */
+#endif /* USE_READDIR_R */
return (ARCHIVE_OK);
}
@@ -1804,7 +1817,7 @@
#endif
t->current_filesystem->noatime = 0;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
/* Set maximum filename length. */
t->current_filesystem->name_max = sfs.f_namelen;
#endif
@@ -1888,7 +1901,7 @@
#endif
t->current_filesystem->noatime = 0;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
/* Set maximum filename length. */
t->current_filesystem->name_max = sfs.f_namemax;
#endif
@@ -1905,7 +1918,7 @@
setup_current_filesystem(struct archive_read_disk *a)
{
struct tree *t = a->tree;
-#if defined(_PC_NAME_MAX) && defined(HAVE_READDIR_R)
+#if defined(_PC_NAME_MAX) && defined(USE_READDIR_R)
long nm;
#endif
t->current_filesystem->synthetic = -1;/* Not supported */
@@ -1917,7 +1930,7 @@
t->current_filesystem->min_xfer_size = -1;
t->current_filesystem->incr_xfer_size = -1;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
/* Set maximum filename length. */
# if defined(_PC_NAME_MAX)
if (tree_current_is_symblic_link_target(t)) {
@@ -1945,7 +1958,7 @@
else
t->current_filesystem->name_max = nm;
# endif /* _PC_NAME_MAX */
-#endif /* HAVE_READDIR_R */
+#endif /* USE_READDIR_R */
return (ARCHIVE_OK);
}
@@ -2353,7 +2366,7 @@
size_t namelen;
if (t->d == NULL) {
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
size_t dirent_size;
#endif
@@ -2374,7 +2387,7 @@
t->visit_type = r != 0 ? r : TREE_ERROR_DIR;
return (t->visit_type);
}
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
dirent_size = offsetof(struct dirent, d_name) +
t->filesystem_table[t->current->filesystem_id].name_max + 1;
if (t->dirent == NULL || t->dirent_allocated < dirent_size) {
@@ -2391,11 +2404,11 @@
}
t->dirent_allocated = dirent_size;
}
-#endif /* HAVE_READDIR_R */
+#endif /* USE_READDIR_R */
}
for (;;) {
errno = 0;
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
r = readdir_r(t->d, t->dirent, &t->de);
#ifdef _AIX
/* Note: According to the man page, return value 9 indicates
@@ -2647,7 +2660,7 @@
if (t == NULL)
return;
archive_string_free(&t->path);
-#if defined(HAVE_READDIR_R)
+#if defined(USE_READDIR_R)
free(t->dirent);
#endif
free(t->sparse_list);
Modified: trunk/contrib/libarchive/libarchive/archive_read_disk_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_disk_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_disk_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_read_disk_private.h 201105 2009-12-28 03:20:54Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_disk_private.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk_set_standard_lookup.c 201109 2009-12-28 03:30:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_extract.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_extract.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_extract.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.61 2008/05/26 17:00:22 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_extract.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_extract2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_extract2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_extract2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.61 2008/05/26 17:00:22 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_extract2.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_open_fd.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_open_fd.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_open_fd.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_fd.c 201103 2009-12-28 03:13:49Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_open_fd.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_open_file.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_open_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_open_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_file.c 201093 2009-12-28 02:28:44Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_open_file.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_open_filename.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_open_filename.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_open_filename.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_open_filename.c 201093 2009-12-28 02:28:44Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_open_filename.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_open_memory.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_open_memory.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_open_memory.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_memory.c,v 1.6 2007/07/06 15:51:59 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_open_memory.c 299529 2016-05-12 10:16:16Z mm $");
#include <errno.h>
#include <stdlib.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_read_private.h 201088 2009-12-28 02:18:55Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_private.h 305188 2016-09-01 07:53:59Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
@@ -221,7 +221,7 @@
struct {
struct archive_read_passphrase *first;
struct archive_read_passphrase **last;
- int candiate;
+ int candidate;
archive_passphrase_callback *callback;
void *client_data;
} passphrases;
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -595,7 +595,7 @@
#endif
}
- /* Check if an error happend in decompression process. */
+ /* Check if an error occurred in the decompression process. */
if (uncompressed_size < 0) {
archive_set_error(&(self->archive->archive),
ARCHIVE_ERRNO_MISC, "lz4 decompression failed");
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_7zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_7zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_7zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -2431,6 +2431,8 @@
switch (type) {
case kEmptyStream:
+ if (h->emptyStreamBools != NULL)
+ return (-1);
h->emptyStreamBools = calloc((size_t)zip->numFiles,
sizeof(*h->emptyStreamBools));
if (h->emptyStreamBools == NULL)
@@ -2451,6 +2453,8 @@
return (-1);
break;
}
+ if (h->emptyFileBools != NULL)
+ return (-1);
h->emptyFileBools = calloc(empty_streams,
sizeof(*h->emptyFileBools));
if (h->emptyFileBools == NULL)
@@ -2465,6 +2469,8 @@
return (-1);
break;
}
+ if (h->antiBools != NULL)
+ return (-1);
h->antiBools = calloc(empty_streams,
sizeof(*h->antiBools));
if (h->antiBools == NULL)
@@ -2491,6 +2497,8 @@
if ((ll & 1) || ll < zip->numFiles * 4)
return (-1);
+ if (zip->entry_names != NULL)
+ return (-1);
zip->entry_names = malloc(ll);
if (zip->entry_names == NULL)
return (-1);
@@ -2543,6 +2551,8 @@
if ((p = header_bytes(a, 2)) == NULL)
return (-1);
allAreDefined = *p;
+ if (h->attrBools != NULL)
+ return (-1);
h->attrBools = calloc((size_t)zip->numFiles,
sizeof(*h->attrBools));
if (h->attrBools == NULL)
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_all.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_all.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_all.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_all.c 174991 2007-12-30 04:58:22Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_all.c 299529 2016-05-12 10:16:16Z mm $");
#include "archive.h"
#include "archive_private.h"
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_ar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_ar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_ar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_ar.c 201101 2009-12-28 03:06:27Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_ar.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_cpio.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_cpio.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_cpio.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_cpio.c 201163 2009-12-29 05:50:34Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_cpio.c 299896 2016-05-16 05:01:44Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_empty.c 191524 2009-04-26 18:24:14Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_empty.c 299529 2016-05-12 10:16:16Z mm $");
#include "archive.h"
#include "archive_entry.h"
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_iso9660.c 201246 2009-12-30 05:30:35Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c 302075 2016-06-22 07:49:59Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_lha.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_lha.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_lha.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1712,11 +1712,15 @@
for (;len >= 8; len -= 8) {
/* This if statement expects compiler optimization will
* remove the stament which will not be executed. */
+#undef bswap16
#if defined(_MSC_VER) && _MSC_VER >= 1400 /* Visual Studio */
# define bswap16(x) _byteswap_ushort(x)
-#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
- || defined(__clang__)
+#elif defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || __GNUC__ > 4)
+/* GCC 4.8 and later has __builtin_bswap16() */
# define bswap16(x) __builtin_bswap16(x)
+#elif defined(__clang__)
+/* All clang versions have __builtin_bswap16() */
+# define bswap16(x) __builtin_bswap16(x)
#else
# define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
#endif
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_mtree.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_mtree.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_mtree.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 201165 2009-12-29 05:52:13Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_mtree.c 307138 2016-10-12 10:28:22Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -301,6 +301,15 @@
return (avail);
}
+/*
+ * <---------------- ravail --------------------->
+ * <-- diff ------> <--- avail ----------------->
+ * <---- len ----------->
+ * | Previous lines | line being parsed nl extra |
+ * ^
+ * b
+ *
+ */
static ssize_t
next_line(struct archive_read *a,
const char **b, ssize_t *avail, ssize_t *ravail, ssize_t *nl)
@@ -339,7 +348,7 @@
*b += diff;
*avail -= diff;
tested = len;/* Skip some bytes we already determinated. */
- len = get_line_size(*b, *avail, nl);
+ len = get_line_size(*b + len, *avail - len, nl);
if (len >= 0)
len += tested;
}
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_raw.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_raw.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_raw.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_raw.c 201107 2009-12-28 03:25:33Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_raw.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_tar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_tar.c 201161 2009-12-29 05:44:39Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_tar.c 306321 2016-09-25 22:02:27Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -136,6 +136,7 @@
int64_t entry_padding;
int64_t entry_bytes_unconsumed;
int64_t realsize;
+ int sparse_allowed;
struct sparse_block *sparse_list;
struct sparse_block *sparse_last;
int64_t sparse_offset;
@@ -1128,9 +1129,16 @@
if (tar->entry_bytes_remaining < 0) {
tar->entry_bytes_remaining = 0;
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Tar entry has negative size?");
- err = ARCHIVE_WARN;
+ "Tar entry has negative size");
+ return (ARCHIVE_FATAL);
}
+ if (tar->entry_bytes_remaining == INT64_MAX) {
+ /* Note: tar_atol returns INT64_MAX on overflow */
+ tar->entry_bytes_remaining = 0;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Tar entry size overflow");
+ return (ARCHIVE_FATAL);
+ }
tar->realsize = tar->entry_bytes_remaining;
archive_entry_set_size(entry, tar->entry_bytes_remaining);
archive_entry_set_mtime(entry, tar_atol(header->mtime, sizeof(header->mtime)), 0);
@@ -1264,6 +1272,14 @@
* sparse information in the extended area.
*/
/* FALLTHROUGH */
+ case '0':
+ /*
+ * Enable sparse file "read" support only for regular
+ * files and explicit GNU sparse files. However, we
+ * don't allow non-standard file types to be sparse.
+ */
+ tar->sparse_allowed = 1;
+ /* FALLTHROUGH */
default: /* Regular file and non-standard types */
/*
* Per POSIX: non-recognized types should always be
@@ -1716,11 +1732,21 @@
long n;
int err = ARCHIVE_OK, r;
+#ifndef __FreeBSD__
if (value == NULL)
value = ""; /* Disable compiler warning; do not pass
* NULL pointer to strlen(). */
+#endif
switch (key[0]) {
case 'G':
+ /* Reject GNU.sparse.* headers on non-regular files. */
+ if (strncmp(key, "GNU.sparse", 10) == 0 &&
+ !tar->sparse_allowed) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
+ "Non-regular file cannot be sparse");
+ return (ARCHIVE_FATAL);
+ }
+
/* GNU "0.0" sparse pax format. */
if (strcmp(key, "GNU.sparse.numblocks") == 0) {
tar->sparse_offset = -1;
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_warc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_warc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_warc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_warc.c 305188 2016-09-01 07:53:59Z mm $");
/**
* WARC is standardised by ISO TC46/SC4/WG12 and currently available as
@@ -318,7 +318,7 @@
}
memcpy(w->pool.str, fnam.str, fnam.len);
w->pool.str[fnam.len] = '\0';
- /* let noone else know about the pool, it's a secret, shhh */
+ /* let no one else know about the pool, it's a secret, shhh */
fnam.str = w->pool.str;
/* snarf mtime or deduce from rtime
@@ -535,7 +535,8 @@
/* as a courtesy to our callers, and since this is a non-standard
* routine, we skip leading whitespace */
- for (; isspace(*s); s++);
+ while (isspace((unsigned char)*s))
+ ++s;
/* read year */
if ((tm.tm_year = strtoi_lim(s, &s, 1583, 4095)) < 0 || *s++ != '-') {
@@ -639,7 +640,9 @@
return WT_NONE;
}
/* overread whitespace */
- for (val += sizeof(_key) - 1U; val < eob && isspace(*val); val++);
+ val += sizeof(_key) - 1U;
+ while (val < eob && isspace((unsigned char)*val))
+ ++val;
if (val + 8U > eob) {
;
@@ -676,7 +679,9 @@
return res;
}
/* overread whitespace */
- for (val += sizeof(_key) - 1U; val < eob && isspace(*val); val++);
+ val += sizeof(_key) - 1U;
+ while (val < eob && isspace((unsigned char)*val))
+ ++val;
/* overread URL designators */
if ((uri = xmemmem(val, eob - val, "://", 3U)) == NULL) {
@@ -692,7 +697,8 @@
/* also massage eol to point to the first whitespace
* after the last non-whitespace character before
* the end of the line */
- for (; eol > uri && isspace(eol[-1]); eol--);
+ while (eol > uri && isspace((unsigned char)eol[-1]))
+ --eol;
/* now then, inspect the URI */
if (memcmp(val, "file", 4U) == 0) {
@@ -727,7 +733,7 @@
/* strtol kindly overreads whitespace for us, so use that */
val += sizeof(_key) - 1U;
len = strtol(val, &on, 10);
- if (on == NULL || !isspace(*on)) {
+ if (on == NULL || !isspace((unsigned char)*on)) {
/* hm, can we trust that number? Best not. */
return -1;
}
@@ -750,7 +756,7 @@
/* xstrpisotime() kindly overreads whitespace for us, so use that */
val += sizeof(_key) - 1U;
res = xstrpisotime(val, &on);
- if (on == NULL || !isspace(*on)) {
+ if (on == NULL || !isspace((unsigned char)*on)) {
/* hm, can we trust that number? Best not. */
return (time_t)-1;
}
@@ -773,7 +779,7 @@
/* xstrpisotime() kindly overreads whitespace for us, so use that */
val += sizeof(_key) - 1U;
res = xstrpisotime(val, &on);
- if (on == NULL || !isspace(*on)) {
+ if (on == NULL || !isspace((unsigned char)*on)) {
/* hm, can we trust that number? Best not. */
return (time_t)-1;
}
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_xar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_xar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_xar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_xar.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_read_support_format_zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_read_support_format_zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_read_support_format_zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102 2009-12-28 03:11:36Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_read_support_format_zip.c 305188 2016-09-01 07:53:59Z mm $");
/*
* The definitive documentation of the Zip file format is:
@@ -418,18 +418,30 @@
* id1+size1+data1 + id2+size2+data2 ...
* triplets. id and size are 2 bytes each.
*/
-static void
-process_extra(const char *p, size_t extra_length, struct zip_entry* zip_entry)
+static int
+process_extra(struct archive_read *a, const char *p, size_t extra_length, struct zip_entry* zip_entry)
{
unsigned offset = 0;
- while (offset < extra_length - 4) {
+ if (extra_length == 0) {
+ return ARCHIVE_OK;
+ }
+
+ if (extra_length < 4) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Too-small extra data: Need at least 4 bytes, but only found %d bytes", (int)extra_length);
+ return ARCHIVE_FAILED;
+ }
+ while (offset <= extra_length - 4) {
unsigned short headerid = archive_le16dec(p + offset);
unsigned short datasize = archive_le16dec(p + offset + 2);
offset += 4;
if (offset + datasize > extra_length) {
- break;
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Extra data overflow: Need %d bytes but only found %d bytes",
+ (int)datasize, (int)(extra_length - offset));
+ return ARCHIVE_FAILED;
}
#ifdef DEBUG
fprintf(stderr, "Header id 0x%04x, length %d\n",
@@ -715,13 +727,13 @@
}
offset += datasize;
}
-#ifdef DEBUG
- if (offset != extra_length)
- {
- fprintf(stderr,
- "Extra data field contents do not match reported size!\n");
+ if (offset != extra_length) {
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+ "Malformed extra data: Consumed %d bytes of %d bytes",
+ (int)offset, (int)extra_length);
+ return ARCHIVE_FAILED;
}
-#endif
+ return ARCHIVE_OK;
}
/*
@@ -840,7 +852,9 @@
return (ARCHIVE_FATAL);
}
- process_extra(h, extra_length, zip_entry);
+ if (ARCHIVE_OK != process_extra(a, h, extra_length, zip_entry)) {
+ return ARCHIVE_FATAL;
+ }
__archive_read_consume(a, extra_length);
/* Work around a bug in Info-Zip: When reading from a pipe, it
@@ -1293,7 +1307,7 @@
&& bytes_avail > zip->entry_bytes_remaining) {
bytes_avail = (ssize_t)zip->entry_bytes_remaining;
}
- if (bytes_avail <= 0) {
+ if (bytes_avail < 0) {
archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
"Truncated ZIP file body");
return (ARCHIVE_FATAL);
@@ -2691,7 +2705,9 @@
"Truncated ZIP file header");
return ARCHIVE_FATAL;
}
- process_extra(p + filename_length, extra_length, zip_entry);
+ if (ARCHIVE_OK != process_extra(a, p + filename_length, extra_length, zip_entry)) {
+ return ARCHIVE_FATAL;
+ }
/*
* Mac resource fork files are stored under the
Modified: trunk/contrib/libarchive/libarchive/archive_string.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_string.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_string.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_string.c 201095 2009-12-28 02:33:22Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_string.c 302294 2016-06-30 08:51:50Z mm $");
/*
* Basic resizable string support, to simplify manipulating arbitrary-sized
@@ -559,7 +559,8 @@
}
if (count == 0 && length != 0)
ret = -1;
- } while (0);
+ break;
+ } while (1);
}
dest->length += count;
dest->s[dest->length] = L'\0';
@@ -3552,18 +3553,19 @@
ll = WideCharToMultiByte(sc->to_cp, 0,
(LPCWSTR)u16, (int)bytes>>1, mbs, (int)mbs_size,
NULL, &defchar);
- if (ll == 0 &&
- GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
- /* Need more buffer for MBS. */
- ll = WideCharToMultiByte(sc->to_cp, 0,
- (LPCWSTR)u16, (int)bytes, NULL, 0, NULL, NULL);
- if (archive_string_ensure(as, ll +1) == NULL)
- return (-1);
- mbs = as->s + as->length;
- mbs_size = as->buffer_length - as->length -1;
- continue;
+ /* Exit loop if we succeeded */
+ if (ll != 0 ||
+ GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+ break;
}
- } while (0);
+ /* Else expand buffer and loop to try again. */
+ ll = WideCharToMultiByte(sc->to_cp, 0,
+ (LPCWSTR)u16, (int)bytes, NULL, 0, NULL, NULL);
+ if (archive_string_ensure(as, ll +1) == NULL)
+ return (-1);
+ mbs = as->s + as->length;
+ mbs_size = as->buffer_length - as->length -1;
+ } while (1);
archive_string_free(&tmp);
as->length += ll;
as->s[as->length] = '\0';
@@ -3634,19 +3636,20 @@
do {
count = MultiByteToWideChar(sc->from_cp,
MB_PRECOMPOSED, s, (int)length, (LPWSTR)u16, (int)avail>>1);
- if (count == 0 &&
- GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
- /* Need more buffer for UTF-16 string */
- count = MultiByteToWideChar(sc->from_cp,
- MB_PRECOMPOSED, s, (int)length, NULL, 0);
- if (archive_string_ensure(as16, (count +1) * 2)
- == NULL)
- return (-1);
- u16 = as16->s + as16->length;
- avail = as16->buffer_length - 2;
- continue;
+ /* Exit loop if we succeeded */
+ if (count != 0 ||
+ GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+ break;
}
- } while (0);
+ /* Expand buffer and try again */
+ count = MultiByteToWideChar(sc->from_cp,
+ MB_PRECOMPOSED, s, (int)length, NULL, 0);
+ if (archive_string_ensure(as16, (count +1) * 2)
+ == NULL)
+ return (-1);
+ u16 = as16->s + as16->length;
+ avail = as16->buffer_length - 2;
+ } while (1);
as16->length += count * 2;
as16->s[as16->length] = 0;
as16->s[as16->length+1] = 0;
Modified: trunk/contrib/libarchive/libarchive/archive_string.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_string.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_string.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_string.h 201092 2009-12-28 02:26:06Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_string.h 238856 2012-07-28 06:38:44Z mm $
*
*/
Modified: trunk/contrib/libarchive/libarchive/archive_string_sprintf.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_string_sprintf.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_string_sprintf.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_string_sprintf.c 189435 2009-03-06 05:14:55Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_string_sprintf.c 238856 2012-07-28 06:38:44Z mm $");
/*
* The use of printf()-family functions can be troublesome
Modified: trunk/contrib/libarchive/libarchive/archive_util.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_util.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_util.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_util.3 238856 2012-07-28 06:38:44Z mm $
.\"
.Dd February 2, 2012
.Dt ARCHIVE_UTIL 3
Modified: trunk/contrib/libarchive/libarchive/archive_util.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_util.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_util.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_util.c 201098 2009-12-28 02:58:14Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_util.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -580,7 +580,7 @@
__archive_ensure_cloexec_flag(int fd)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
- (void)fd; /* UNSED */
+ (void)fd; /* UNUSED */
#else
int flags;
Modified: trunk/contrib/libarchive/libarchive/archive_virtual.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_virtual.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_virtual.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_virtual.c 201098 2009-12-28 02:58:14Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_virtual.c 299529 2016-05-12 10:16:16Z mm $");
#include "archive.h"
#include "archive_entry.h"
Modified: trunk/contrib/libarchive/libarchive/archive_write.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE 3
Modified: trunk/contrib/libarchive/libarchive/archive_write.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write.c 201099 2009-12-28 03:03:00Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write.c 299529 2016-05-12 10:16:16Z mm $");
/*
* This file contains the "essential" portions of the write API, that
Modified: trunk/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_disk.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_disk.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_disk.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_disk.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd February 2, 2012
.Dt ARCHIVE_WRITE_DISK 3
Modified: trunk/contrib/libarchive/libarchive/archive_write_disk_acl.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_disk_acl.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_disk_acl.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -138,6 +138,7 @@
acl_permset_t acl_permset;
#ifdef ACL_TYPE_NFS4
acl_flagset_t acl_flagset;
+ int r;
#endif
int ret;
int ae_type, ae_permset, ae_tag, ae_id;
@@ -152,9 +153,19 @@
if (entries == 0)
return (ARCHIVE_OK);
acl = acl_init(entries);
+ if (acl == (acl_t)NULL) {
+ archive_set_error(a, errno,
+ "Failed to initialize ACL working storage");
+ return (ARCHIVE_FAILED);
+ }
while (archive_acl_next(a, abstract_acl, ae_requested_type, &ae_type,
&ae_permset, &ae_tag, &ae_id, &ae_name) == ARCHIVE_OK) {
- acl_create_entry(&acl, &acl_entry);
+ if (acl_create_entry(&acl, &acl_entry) != 0) {
+ archive_set_error(a, errno,
+ "Failed to create a new ACL entry");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
switch (ae_tag) {
case ARCHIVE_ENTRY_ACL_USER:
@@ -185,23 +196,26 @@
break;
#endif
default:
- /* XXX */
- break;
+ archive_set_error(a, ARCHIVE_ERRNO_MISC,
+ "Unknown ACL tag");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
}
#ifdef ACL_TYPE_NFS4
+ r = 0;
switch (ae_type) {
case ARCHIVE_ENTRY_ACL_TYPE_ALLOW:
- acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW);
+ r = acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW);
break;
case ARCHIVE_ENTRY_ACL_TYPE_DENY:
- acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_DENY);
+ r = acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_DENY);
break;
case ARCHIVE_ENTRY_ACL_TYPE_AUDIT:
- acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_AUDIT);
+ r = acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_AUDIT);
break;
case ARCHIVE_ENTRY_ACL_TYPE_ALARM:
- acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALARM);
+ r = acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALARM);
break;
case ARCHIVE_ENTRY_ACL_TYPE_ACCESS:
case ARCHIVE_ENTRY_ACL_TYPE_DEFAULT:
@@ -208,27 +222,71 @@
// These don't translate directly into the system ACL.
break;
default:
- // XXX error handling here.
- break;
+ archive_set_error(a, ARCHIVE_ERRNO_MISC,
+ "Unknown ACL entry type");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
}
+ if (r != 0) {
+ archive_set_error(a, errno,
+ "Failed to set ACL entry type");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
#endif
- acl_get_permset(acl_entry, &acl_permset);
- acl_clear_perms(acl_permset);
+ if (acl_get_permset(acl_entry, &acl_permset) != 0) {
+ archive_set_error(a, errno,
+ "Failed to get ACL permission set");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
+ if (acl_clear_perms(acl_permset) != 0) {
+ archive_set_error(a, errno,
+ "Failed to clear ACL permissions");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) {
if (ae_permset & acl_perm_map[i].archive_perm)
- acl_add_perm(acl_permset,
- acl_perm_map[i].platform_perm);
+ if (acl_add_perm(acl_permset,
+ acl_perm_map[i].platform_perm) != 0) {
+ archive_set_error(a, errno,
+ "Failed to add ACL permission");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
}
#ifdef ACL_TYPE_NFS4
- acl_get_flagset_np(acl_entry, &acl_flagset);
- acl_clear_flags_np(acl_flagset);
- for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) {
- if (ae_permset & acl_inherit_map[i].archive_inherit)
- acl_add_flag_np(acl_flagset,
- acl_inherit_map[i].platform_inherit);
+ if (acl_type == ACL_TYPE_NFS4) {
+ /*
+ * acl_get_flagset_np() fails with non-NFSv4 ACLs
+ */
+ if (acl_get_flagset_np(acl_entry, &acl_flagset) != 0) {
+ archive_set_error(a, errno,
+ "Failed to get flagset from an NFSv4 ACL entry");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
+ if (acl_clear_flags_np(acl_flagset) != 0) {
+ archive_set_error(a, errno,
+ "Failed to clear flags from an NFSv4 ACL flagset");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
+ for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) {
+ if (ae_permset & acl_inherit_map[i].archive_inherit) {
+ if (acl_add_flag_np(acl_flagset,
+ acl_inherit_map[i].platform_inherit) != 0) {
+ archive_set_error(a, errno,
+ "Failed to add flag to NFSv4 ACL flagset");
+ ret = ARCHIVE_FAILED;
+ goto exit_free;
+ }
+ }
+ }
}
#endif
}
@@ -257,6 +315,7 @@
ret = ARCHIVE_WARN;
}
#endif
+exit_free:
acl_free(acl);
return (ret);
}
Modified: trunk/contrib/libarchive/libarchive/archive_write_disk_posix.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_disk_posix.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_disk_posix.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -140,9 +140,19 @@
#define O_BINARY 0
#endif
#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
+#define O_CLOEXEC 0
#endif
+/* Ignore non-int O_NOFOLLOW constant. */
+/* gnulib's fcntl.h does this on AIX, but it seems practical everywhere */
+#if defined O_NOFOLLOW && !(INT_MIN <= O_NOFOLLOW && O_NOFOLLOW <= INT_MAX)
+#undef O_NOFOLLOW
+#endif
+
+#ifndef O_NOFOLLOW
+#define O_NOFOLLOW 0
+#endif
+
struct fixup_entry {
struct fixup_entry *next;
struct archive_acl acl;
@@ -326,6 +336,7 @@
#define HFS_BLOCKS(s) ((s) >> 12)
+static int check_symlinks_fsobj(char *path, int *error_number, struct archive_string *error_string, int flags);
static int check_symlinks(struct archive_write_disk *);
static int create_filesystem_object(struct archive_write_disk *);
static struct fixup_entry *current_fixup(struct archive_write_disk *, const char *pathname);
@@ -332,6 +343,7 @@
#if defined(HAVE_FCHDIR) && defined(PATH_MAX)
static void edit_deep_directories(struct archive_write_disk *ad);
#endif
+static int cleanup_pathname_fsobj(char *path, int *error_number, struct archive_string *error_string, int flags);
static int cleanup_pathname(struct archive_write_disk *);
static int create_dir(struct archive_write_disk *, char *);
static int create_parent_dir(struct archive_write_disk *, char *);
@@ -1796,7 +1808,7 @@
char *tail = a->name;
/* If path is short, avoid the open() below. */
- if (strlen(tail) <= PATH_MAX)
+ if (strlen(tail) < PATH_MAX)
return;
/* Try to record our starting dir. */
@@ -1806,7 +1818,7 @@
return;
/* As long as the path is too long... */
- while (strlen(tail) > PATH_MAX) {
+ while (strlen(tail) >= PATH_MAX) {
/* Locate a dir prefix shorter than PATH_MAX. */
tail += PATH_MAX - 8;
while (tail > a->name && *tail != '/')
@@ -2014,6 +2026,10 @@
const char *linkname;
mode_t final_mode, mode;
int r;
+ /* these for check_symlinks_fsobj */
+ char *linkname_copy; /* non-const copy of linkname */
+ struct archive_string error_string;
+ int error_number;
/* We identify hard/symlinks according to the link names. */
/* Since link(2) and symlink(2) don't handle modes, we're done here. */
@@ -2022,6 +2038,27 @@
#if !HAVE_LINK
return (EPERM);
#else
+ archive_string_init(&error_string);
+ linkname_copy = strdup(linkname);
+ if (linkname_copy == NULL) {
+ return (EPERM);
+ }
+ /* TODO: consider using the cleaned-up path as the link target? */
+ r = cleanup_pathname_fsobj(linkname_copy, &error_number, &error_string, a->flags);
+ if (r != ARCHIVE_OK) {
+ archive_set_error(&a->archive, error_number, "%s", error_string.s);
+ free(linkname_copy);
+ /* EPERM is more appropriate than error_number for our callers */
+ return (EPERM);
+ }
+ r = check_symlinks_fsobj(linkname_copy, &error_number, &error_string, a->flags);
+ if (r != ARCHIVE_OK) {
+ archive_set_error(&a->archive, error_number, "%s", error_string.s);
+ free(linkname_copy);
+ /* EPERM is more appropriate than error_number for our callers */
+ return (EPERM);
+ }
+ free(linkname_copy);
r = link(linkname, a->name) ? errno : 0;
/*
* New cpio and pax formats allow hardlink entries
@@ -2040,7 +2077,7 @@
a->deferred = 0;
} else if (r == 0 && a->filesize > 0) {
a->fd = open(a->name,
- O_WRONLY | O_TRUNC | O_BINARY | O_CLOEXEC);
+ O_WRONLY | O_TRUNC | O_BINARY | O_CLOEXEC | O_NOFOLLOW);
__archive_ensure_cloexec_flag(a->fd);
if (a->fd < 0)
r = errno;
@@ -2351,73 +2388,140 @@
return (a->current_fixup);
}
-/* TODO: Make this work. */
/*
- * TODO: The deep-directory support bypasses this; disable deep directory
- * support if we're doing symlink checks.
- */
-/*
* TODO: Someday, integrate this with the deep dir support; they both
* scan the path and both can be optimized by comparing against other
* recent paths.
*/
/* TODO: Extend this to support symlinks on Windows Vista and later. */
+
+/*
+ * Checks the given path to see if any elements along it are symlinks. Returns
+ * ARCHIVE_OK if there are none, otherwise puts an error in errmsg.
+ */
static int
-check_symlinks(struct archive_write_disk *a)
+check_symlinks_fsobj(char *path, int *error_number, struct archive_string *error_string, int flags)
{
#if !defined(HAVE_LSTAT)
/* Platform doesn't have lstat, so we can't look for symlinks. */
- (void)a; /* UNUSED */
+ (void)path; /* UNUSED */
+ (void)error_number; /* UNUSED */
+ (void)error_string; /* UNUSED */
+ (void)flags; /* UNUSED */
return (ARCHIVE_OK);
#else
- char *pn;
+ int res = ARCHIVE_OK;
+ char *tail;
+ char *head;
+ int last;
char c;
int r;
struct stat st;
+ int restore_pwd;
+ /* Nothing to do here if name is empty */
+ if(path[0] == '\0')
+ return (ARCHIVE_OK);
+
/*
* Guard against symlink tricks. Reject any archive entry whose
* destination would be altered by a symlink.
+ *
+ * Walk the filename in chunks separated by '/'. For each segment:
+ * - if it doesn't exist, continue
+ * - if it's symlink, abort or remove it
+ * - if it's a directory and it's not the last chunk, cd into it
+ * As we go:
+ * head points to the current (relative) path
+ * tail points to the temporary \0 terminating the segment we're currently examining
+ * c holds what used to be in *tail
+ * last is 1 if this is the last tail
*/
- /* Whatever we checked last time doesn't need to be re-checked. */
- pn = a->name;
- if (archive_strlen(&(a->path_safe)) > 0) {
- char *p = a->path_safe.s;
- while ((*pn != '\0') && (*p == *pn))
- ++p, ++pn;
- }
+ restore_pwd = open(".", O_RDONLY | O_BINARY | O_CLOEXEC);
+ __archive_ensure_cloexec_flag(restore_pwd);
+ if (restore_pwd < 0)
+ return (ARCHIVE_FATAL);
+ head = path;
+ tail = path;
+ last = 0;
+ /* TODO: reintroduce a safe cache here? */
/* Skip the root directory if the path is absolute. */
- if(pn == a->name && pn[0] == '/')
- ++pn;
- c = pn[0];
- /* Keep going until we've checked the entire name. */
- while (pn[0] != '\0' && (pn[0] != '/' || pn[1] != '\0')) {
+ if(tail == path && tail[0] == '/')
+ ++tail;
+ /* Keep going until we've checked the entire name.
+ * head, tail, path all alias the same string, which is
+ * temporarily zeroed at tail, so be careful restoring the
+ * stashed (c=tail[0]) for error messages.
+ * Exiting the loop with break is okay; continue is not.
+ */
+ while (!last) {
+ /* Skip the separator we just consumed, plus any adjacent ones */
+ while (*tail == '/')
+ ++tail;
/* Skip the next path element. */
- while (*pn != '\0' && *pn != '/')
- ++pn;
- c = pn[0];
- pn[0] = '\0';
+ while (*tail != '\0' && *tail != '/')
+ ++tail;
+ /* is this the last path component? */
+ last = (tail[0] == '\0') || (tail[0] == '/' && tail[1] == '\0');
+ /* temporarily truncate the string here */
+ c = tail[0];
+ tail[0] = '\0';
/* Check that we haven't hit a symlink. */
- r = lstat(a->name, &st);
+ r = lstat(head, &st);
if (r != 0) {
+ tail[0] = c;
/* We've hit a dir that doesn't exist; stop now. */
- if (errno == ENOENT)
+ if (errno == ENOENT) {
break;
+ } else {
+ /* Treat any other error as fatal - best to be paranoid here
+ * Note: This effectively disables deep directory
+ * support when security checks are enabled.
+ * Otherwise, very long pathnames that trigger
+ * an error here could evade the sandbox.
+ * TODO: We could do better, but it would probably
+ * require merging the symlink checks with the
+ * deep-directory editing. */
+ if (error_number) *error_number = errno;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Could not stat %s",
+ path);
+ res = ARCHIVE_FAILED;
+ break;
+ }
+ } else if (S_ISDIR(st.st_mode)) {
+ if (!last) {
+ if (chdir(head) != 0) {
+ tail[0] = c;
+ if (error_number) *error_number = errno;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Could not chdir %s",
+ path);
+ res = (ARCHIVE_FATAL);
+ break;
+ }
+ /* Our view is now from inside this dir: */
+ head = tail + 1;
+ }
} else if (S_ISLNK(st.st_mode)) {
- if (c == '\0') {
+ if (last) {
/*
* Last element is symlink; remove it
* so we can overwrite it with the
* item being extracted.
*/
- if (unlink(a->name)) {
- archive_set_error(&a->archive, errno,
- "Could not remove symlink %s",
- a->name);
- pn[0] = c;
- return (ARCHIVE_FAILED);
+ if (unlink(head)) {
+ tail[0] = c;
+ if (error_number) *error_number = errno;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Could not remove symlink %s",
+ path);
+ res = ARCHIVE_FAILED;
+ break;
}
- a->pst = NULL;
/*
* Even if we did remove it, a warning
* is in order. The warning is silly,
@@ -2424,43 +2528,93 @@
* though, if we're just replacing one
* symlink with another symlink.
*/
- if (!S_ISLNK(a->mode)) {
- archive_set_error(&a->archive, 0,
- "Removing symlink %s",
- a->name);
+ tail[0] = c;
+ /* FIXME: not sure how important this is to restore
+ if (!S_ISLNK(path)) {
+ if (error_number) *error_number = 0;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Removing symlink %s",
+ path);
}
+ */
/* Symlink gone. No more problem! */
- pn[0] = c;
- return (0);
- } else if (a->flags & ARCHIVE_EXTRACT_UNLINK) {
+ res = ARCHIVE_OK;
+ break;
+ } else if (flags & ARCHIVE_EXTRACT_UNLINK) {
/* User asked us to remove problems. */
- if (unlink(a->name) != 0) {
- archive_set_error(&a->archive, 0,
- "Cannot remove intervening symlink %s",
- a->name);
- pn[0] = c;
- return (ARCHIVE_FAILED);
+ if (unlink(head) != 0) {
+ tail[0] = c;
+ if (error_number) *error_number = 0;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Cannot remove intervening symlink %s",
+ path);
+ res = ARCHIVE_FAILED;
+ break;
}
- a->pst = NULL;
+ tail[0] = c;
} else {
- archive_set_error(&a->archive, 0,
- "Cannot extract through symlink %s",
- a->name);
- pn[0] = c;
- return (ARCHIVE_FAILED);
+ tail[0] = c;
+ if (error_number) *error_number = 0;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Cannot extract through symlink %s",
+ path);
+ res = ARCHIVE_FAILED;
+ break;
}
}
- pn[0] = c;
- if (pn[0] != '\0')
- pn++; /* Advance to the next segment. */
+ /* be sure to always maintain this */
+ tail[0] = c;
+ if (tail[0] != '\0')
+ tail++; /* Advance to the next segment. */
}
- pn[0] = c;
- /* We've checked and/or cleaned the whole path, so remember it. */
- archive_strcpy(&a->path_safe, a->name);
- return (ARCHIVE_OK);
+ /* Catches loop exits via break */
+ tail[0] = c;
+#ifdef HAVE_FCHDIR
+ /* If we changed directory above, restore it here. */
+ if (restore_pwd >= 0) {
+ r = fchdir(restore_pwd);
+ if (r != 0) {
+ if(error_number) *error_number = errno;
+ if(error_string)
+ archive_string_sprintf(error_string,
+ "chdir() failure");
+ }
+ close(restore_pwd);
+ restore_pwd = -1;
+ if (r != 0) {
+ res = (ARCHIVE_FATAL);
+ }
+ }
#endif
+ /* TODO: reintroduce a safe cache here? */
+ return res;
+#endif
}
+/*
+ * Check a->name for symlinks, returning ARCHIVE_OK if its clean, otherwise
+ * calls archive_set_error and returns ARCHIVE_{FATAL,FAILED}
+ */
+static int
+check_symlinks(struct archive_write_disk *a)
+{
+ struct archive_string error_string;
+ int error_number;
+ int rc;
+ archive_string_init(&error_string);
+ rc = check_symlinks_fsobj(a->name, &error_number, &error_string, a->flags);
+ if (rc != ARCHIVE_OK) {
+ archive_set_error(&a->archive, error_number, "%s", error_string.s);
+ }
+ archive_string_free(&error_string);
+ a->pst = NULL; /* to be safe */
+ return rc;
+}
+
+
#if defined(__CYGWIN__)
/*
* 1. Convert a path separator from '\' to '/' .
@@ -2534,15 +2688,17 @@
* is set) if the path is absolute.
*/
static int
-cleanup_pathname(struct archive_write_disk *a)
+cleanup_pathname_fsobj(char *path, int *error_number, struct archive_string *error_string, int flags)
{
char *dest, *src;
char separator = '\0';
- dest = src = a->name;
+ dest = src = path;
if (*src == '\0') {
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Invalid empty pathname");
+ if (error_number) *error_number = ARCHIVE_ERRNO_MISC;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Invalid empty pathname");
return (ARCHIVE_FAILED);
}
@@ -2551,9 +2707,11 @@
#endif
/* Skip leading '/'. */
if (*src == '/') {
- if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
- "Path is absolute");
+ if (flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
+ if (error_number) *error_number = ARCHIVE_ERRNO_MISC;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Path is absolute");
return (ARCHIVE_FAILED);
}
@@ -2580,10 +2738,11 @@
} else if (src[1] == '.') {
if (src[2] == '/' || src[2] == '\0') {
/* Conditionally warn about '..' */
- if (a->flags & ARCHIVE_EXTRACT_SECURE_NODOTDOT) {
- archive_set_error(&a->archive,
- ARCHIVE_ERRNO_MISC,
- "Path contains '..'");
+ if (flags & ARCHIVE_EXTRACT_SECURE_NODOTDOT) {
+ if (error_number) *error_number = ARCHIVE_ERRNO_MISC;
+ if (error_string)
+ archive_string_sprintf(error_string,
+ "Path contains '..'");
return (ARCHIVE_FAILED);
}
}
@@ -2614,7 +2773,7 @@
* We've just copied zero or more path elements, not including the
* final '/'.
*/
- if (dest == a->name) {
+ if (dest == path) {
/*
* Nothing got copied. The path must have been something
* like '.' or '/' or './' or '/././././/./'.
@@ -2629,6 +2788,21 @@
return (ARCHIVE_OK);
}
+static int
+cleanup_pathname(struct archive_write_disk *a)
+{
+ struct archive_string error_string;
+ int error_number;
+ int rc;
+ archive_string_init(&error_string);
+ rc = cleanup_pathname_fsobj(a->name, &error_number, &error_string, a->flags);
+ if (rc != ARCHIVE_OK) {
+ archive_set_error(&a->archive, error_number, "%s", error_string.s);
+ }
+ archive_string_free(&error_string);
+ return rc;
+}
+
/*
* Create the parent directory of the specified path, assuming path
* is already in mutable storage.
@@ -3487,6 +3661,9 @@
static int
copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
{
+#ifndef HAVE_SYS_ACL_H
+ return 0;
+#else
acl_t acl, dfacl = NULL;
int acl_r, ret = ARCHIVE_OK;
@@ -3514,6 +3691,7 @@
if (dfacl)
acl_free(dfacl);
return (ret);
+#endif
}
static int
@@ -3789,7 +3967,7 @@
size_t size;
archive_entry_xattr_next(entry, &name, &value, &size);
if (name != NULL) {
- int e;
+ ssize_t e;
int namespace;
if (strncmp(name, "user.", 5) == 0) {
@@ -3816,7 +3994,7 @@
e = extattr_set_file(archive_entry_pathname(entry),
namespace, name, value, size);
}
- if (e != (int)size) {
+ if (e != (ssize_t)size) {
if (errno == ENOTSUP || errno == ENOSYS) {
if (!warning_done) {
warning_done = 1;
Modified: trunk/contrib/libarchive/libarchive/archive_write_disk_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_disk_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_disk_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_write_disk_private.h 201086 2009-12-28 02:17:53Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_disk_private.h 238909 2012-07-30 14:47:35Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_disk_set_standard_lookup.c 201083 2009-12-28 02:09:57Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_open_fd.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_open_fd.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_open_fd.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_open_fd.c 201093 2009-12-28 02:28:44Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_open_fd.c 228763 2011-12-21 11:13:29Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_open_file.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_open_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_open_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.19 2007/01/09 08:05:56 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_open_file.c 228763 2011-12-21 11:13:29Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_open_filename.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_open_filename.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_open_filename.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_open_filename.c 191165 2009-04-17 00:39:35Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_open_filename.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_open_memory.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_open_memory.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_open_memory.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_memory.c,v 1.3 2007/01/09 08:05:56 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_open_memory.c 232153 2012-02-25 10:58:02Z mm $");
#include <errno.h>
#include <stdlib.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_private.h
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_private.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_private.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/archive_write_private.h 201155 2009-12-29 05:20:12Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_private.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format.c 201168 2009-12-29 06:15:32Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_ar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_ar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_ar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_ar.c 201108 2009-12-28 03:28:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_ar.c 248616 2013-03-22 13:36:03Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_by_name.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_by_name.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_by_name.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_by_name.c 201168 2009-12-29 06:15:32Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_by_name.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio.c 201170 2009-12-29 06:34:23Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_cpio.c 238856 2012-07-28 06:38:44Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio_newc.c 201160 2009-12-29 05:41:57Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c 238856 2012-07-28 06:38:44Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_by_name.c 201168 2009-12-29 06:15:32Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_filter_by_ext.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -436,7 +436,7 @@
* Type : string
* Default: Auto detect
* : We check a size of boot image;
- * : If ths size is just 1.22M/1.44M/2.88M,
+ * : If the size is just 1.22M/1.44M/2.88M,
* : we assume boot_type is 'fd';
* : otherwise boot_type is 'no-emulation'.
* COMPAT :
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_mtree.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_mtree.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_mtree.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_mtree.c 201171 2009-12-29 06:39:07Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_mtree.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_pax.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_pax.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_pax.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_pax.c 201162 2009-12-29 05:47:46Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_pax.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_shar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_shar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_shar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_shar.c 189438 2009-03-06 05:58:56Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_shar.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_ustar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_ustar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_ustar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_ustar.c 191579 2009-04-27 18:35:03Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_ustar.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_ERRNO_H
@@ -307,7 +307,7 @@
* case getting WCS failed. On POSIX, this is a
* normal operation.
*/
- if (p != NULL && p[strlen(p) - 1] != '/') {
+ if (p != NULL && p[0] != '\0' && p[strlen(p) - 1] != '/') {
struct archive_string as;
archive_string_init(&as);
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_warc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_warc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_warc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_warc.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_format_zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_format_zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_format_zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -30,7 +30,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_zip.c 201168 2009-12-29 06:15:32Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_format_zip.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.3
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_passphrase.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd September 21, 2014
.Dt ARCHIVE_WRITE_SET_PASSPHRASE 3
Modified: trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/archive_write_set_passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/archive_write_set_passphrase.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
Modified: trunk/contrib/libarchive/libarchive/cpio.5
===================================================================
--- trunk/contrib/libarchive/libarchive/cpio.5 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/cpio.5 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/cpio.5 238856 2012-07-28 06:38:44Z mm $
.\"
.Dd December 23, 2011
.Dt CPIO 5
Modified: trunk/contrib/libarchive/libarchive/filter_fork.h
===================================================================
--- trunk/contrib/libarchive/libarchive/filter_fork.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/filter_fork.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/filter_fork.h 201087 2009-12-28 02:18:26Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/filter_fork.h 248616 2013-03-22 13:36:03Z mm $
*/
#ifndef __LIBARCHIVE_BUILD
Modified: trunk/contrib/libarchive/libarchive/libarchive-formats.5
===================================================================
--- trunk/contrib/libarchive/libarchive/libarchive-formats.5 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/libarchive-formats.5 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/libarchive-formats.5 302075 2016-06-22 07:49:59Z mm $
.\"
.Dd March 18, 2012
.Dt LIBARCHIVE-FORMATS 5
Modified: trunk/contrib/libarchive/libarchive/libarchive.3
===================================================================
--- trunk/contrib/libarchive/libarchive/libarchive.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/libarchive.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/libarchive.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd March 18, 2012
.Dt LIBARCHIVE 3
Modified: trunk/contrib/libarchive/libarchive/libarchive_internals.3
===================================================================
--- trunk/contrib/libarchive/libarchive/libarchive_internals.3 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/libarchive_internals.3 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/libarchive_internals.3 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd January 26, 2011
.Dt LIBARCHIVE_INTERNALS 3
Modified: trunk/contrib/libarchive/libarchive/tar.5
===================================================================
--- trunk/contrib/libarchive/libarchive/tar.5 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/tar.5 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/libarchive/tar.5 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd December 23, 2011
.Dt TAR 5
Modified: trunk/contrib/libarchive/libarchive/test/README
===================================================================
--- trunk/contrib/libarchive/libarchive/test/README 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/README 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: src/lib/libarchive/test/README,v 1.3 2008/01/01 22:28:04 kientzle Exp $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/README 299529 2016-05-12 10:16:16Z mm $
This is the test harness for libarchive.
Modified: trunk/contrib/libarchive/libarchive/test/main.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/main.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/main.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -60,7 +60,7 @@
* TODO: Move this into a separate configuration header, have all test
* suites share one copy of this file.
*/
-__FBSDID("$FreeBSD: head/lib/libarchive/test/main.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/main.c 307138 2016-10-12 10:28:22Z mm $");
#define KNOWNREF "test_compat_gtar_1.tar.uu"
#define ENVBASE "LIBARCHIVE" /* Prefix for environment variables. */
#undef PROGRAM /* Testing a library, not a program. */
@@ -1292,6 +1292,11 @@
switch (type) {
case 'a': filet_nsec = st.st_atimespec.tv_nsec; break;
case 'b': filet = st.st_birthtime;
+ /* FreeBSD filesystems that don't support birthtime
+ * (e.g., UFS1) always return -1 here. */
+ if (filet == -1) {
+ return (1);
+ }
filet_nsec = st.st_birthtimespec.tv_nsec; break;
case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break;
default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type);
@@ -1435,6 +1440,31 @@
return (0);
}
+/* Verify mode of 'pathname'. */
+int
+assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
+{
+ int mode;
+ int r;
+
+ assertion_count(file, line);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ failure_start(file, line, "assertFileMode not yet implemented for Windows");
+#else
+ {
+ struct stat st;
+ r = lstat(pathname, &st);
+ mode = (int)(st.st_mode & 0777);
+ }
+ if (r == 0 && mode == expected_mode)
+ return (1);
+ failure_start(file, line, "File %s has mode %o, expected %o",
+ pathname, mode, expected_mode);
+#endif
+ failure_finish(NULL);
+ return (0);
+}
+
/* Assert that 'pathname' is a dir. If mode >= 0, verify that too. */
int
assertion_is_dir(const char *file, int line, const char *pathname, int mode)
@@ -1577,8 +1607,12 @@
if (0 == _mkdir(dirname))
return (1);
#else
- if (0 == mkdir(dirname, mode))
- return (1);
+ if (0 == mkdir(dirname, mode)) {
+ if (0 == chmod(dirname, mode)) {
+ assertion_file_mode(file, line, dirname, mode);
+ return (1);
+ }
+ }
#endif
failure_start(file, line, "Could not create directory %s", dirname);
failure_finish(NULL);
@@ -1627,6 +1661,11 @@
failure_finish(NULL);
return (0);
}
+ if (0 != chmod(path, mode)) {
+ failure_start(file, line, "Could not chmod %s", path);
+ failure_finish(NULL);
+ return (0);
+ }
if (contents != NULL) {
ssize_t wsize;
@@ -1643,6 +1682,7 @@
}
}
close(fd);
+ assertion_file_mode(file, line, path, mode);
return (1);
#endif
}
Modified: trunk/contrib/libarchive/libarchive/test/read_open_memory.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/read_open_memory.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/read_open_memory.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/read_open_memory.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/read_open_memory.c 299529 2016-05-12 10:16:16Z mm $");
#include <errno.h>
#include <stdlib.h>
Modified: trunk/contrib/libarchive/libarchive/test/test.h
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/lib/libarchive/test/test.h 201247 2009-12-30 05:59:21Z kientzle $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive/test/test.h 305188 2016-09-01 07:53:59Z mm $
*/
/* Every test program should #include "test.h" as the first thing. */
@@ -182,6 +182,8 @@
assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks)
#define assertFileSize(pathname, size) \
assertion_file_size(__FILE__, __LINE__, pathname, size)
+#define assertFileMode(pathname, mode) \
+ assertion_file_mode(__FILE__, __LINE__, pathname, mode)
#define assertTextFileContents(text, pathname) \
assertion_text_file_contents(__FILE__, __LINE__, text, pathname)
#define assertFileContainsLinesAnyOrder(pathname, lines) \
@@ -246,6 +248,7 @@
int assertion_file_nlinks(const char *, int, const char *, int);
int assertion_file_not_exists(const char *, int, const char *);
int assertion_file_size(const char *, int, const char *, long);
+int assertion_file_mode(const char *, int, const char *, int);
int assertion_is_dir(const char *, int, const char *, int);
int assertion_is_hardlink(const char *, int, const char *, const char *);
int assertion_is_not_hardlink(const char *, int, const char *, const char *);
Modified: trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -93,7 +93,7 @@
static struct myacl_t acls_dir[] = {
/* For this test, we need to be able to read and write the ACL. */
- { ARCHIVE_ENTRY_ACL_TYPE_ALLOW, ARCHIVE_ENTRY_ACL_READ_ACL,
+ { ARCHIVE_ENTRY_ACL_TYPE_ALLOW, ARCHIVE_ENTRY_ACL_READ_DATA | ARCHIVE_ENTRY_ACL_READ_ACL,
ARCHIVE_ENTRY_ACL_USER_OBJ, -1, ""},
/* An entry for each type. */
Modified: trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -70,16 +70,10 @@
}
static int
-acl_match(acl_entry_t aclent, struct myacl_t *myacl)
-{
- gid_t g, *gp;
- uid_t u, *up;
- acl_tag_t tag_type;
+acl_entry_get_perm(acl_entry_t aclent) {
+ int permset = 0;
acl_permset_t opaque_ps;
- int permset = 0;
- acl_get_tag_type(aclent, &tag_type);
-
/* translate the silly opaque permset to a bitmap */
acl_get_permset(aclent, &opaque_ps);
if (acl_get_perm_np(opaque_ps, ACL_EXECUTE))
@@ -88,10 +82,61 @@
permset |= ARCHIVE_ENTRY_ACL_WRITE;
if (acl_get_perm_np(opaque_ps, ACL_READ))
permset |= ARCHIVE_ENTRY_ACL_READ;
+ return permset;
+}
- if (permset != myacl->permset)
+#if 0
+static int
+acl_get_specific_entry(acl_t acl, acl_tag_t requested_tag_type, int requested_tag) {
+ int entry_id = ACL_FIRST_ENTRY;
+ acl_entry_t acl_entry;
+ acl_tag_t acl_tag_type;
+
+ while (1 == acl_get_entry(acl, entry_id, &acl_entry)) {
+ /* After the first time... */
+ entry_id = ACL_NEXT_ENTRY;
+
+ /* If this matches, return perm mask */
+ acl_get_tag_type(acl_entry, &acl_tag_type);
+ if (acl_tag_type == requested_tag_type) {
+ switch (acl_tag_type) {
+ case ACL_USER_OBJ:
+ if ((uid_t)requested_tag == *(uid_t *)(acl_get_qualifier(acl_entry))) {
+ return acl_entry_get_perm(acl_entry);
+ }
+ break;
+ case ACL_GROUP_OBJ:
+ if ((gid_t)requested_tag == *(gid_t *)(acl_get_qualifier(acl_entry))) {
+ return acl_entry_get_perm(acl_entry);
+ }
+ break;
+ case ACL_USER:
+ case ACL_GROUP:
+ case ACL_OTHER:
+ return acl_entry_get_perm(acl_entry);
+ default:
+ failure("Unexpected ACL tag type");
+ assert(0);
+ }
+ }
+
+
+ }
+ return -1;
+}
+#endif
+
+static int
+acl_match(acl_entry_t aclent, struct myacl_t *myacl)
+{
+ gid_t g, *gp;
+ uid_t u, *up;
+ acl_tag_t tag_type;
+
+ if (myacl->permset != acl_entry_get_perm(aclent))
return (0);
+ acl_get_tag_type(aclent, &tag_type);
switch (tag_type) {
case ACL_USER_OBJ:
if (myacl->tag != ARCHIVE_ENTRY_ACL_USER_OBJ) return (0);
@@ -190,7 +235,7 @@
* Verify ACL restore-to-disk. This test is FreeBSD-specific.
*/
-DEFINE_TEST(test_acl_freebsd_posix1e)
+DEFINE_TEST(test_acl_freebsd_posix1e_restore)
{
#if !defined(__FreeBSD__)
skipping("FreeBSD-specific ACL restore test");
@@ -263,3 +308,111 @@
acl_free(acl);
#endif
}
+
+/*
+ * Verify ACL reaed-from-disk. This test is FreeBSD-specific.
+ */
+DEFINE_TEST(test_acl_freebsd_posix1e_read)
+{
+#if !defined(__FreeBSD__)
+ skipping("FreeBSD-specific ACL read test");
+#elif __FreeBSD__ < 5
+ skipping("ACL read supported only on FreeBSD 5.0 and later");
+#else
+ struct archive *a;
+ struct archive_entry *ae;
+ int n, fd;
+ const char *acl1_text, *acl2_text;
+ acl_t acl1, acl2;
+
+ /*
+ * Manually construct a directory and two files with
+ * different ACLs. This also serves to verify that ACLs
+ * are supported on the local filesystem.
+ */
+
+ /* Create a test file f1 with acl1 */
+ acl1_text = "user::rwx,group::rwx,other::rwx,user:1:rw-,group:15:r-x,mask::rwx";
+ acl1 = acl_from_text(acl1_text);
+ assert((void *)acl1 != NULL);
+ fd = open("f1", O_WRONLY | O_CREAT | O_EXCL, 0777);
+ failure("Could not create test file?!");
+ if (!assert(fd >= 0)) {
+ acl_free(acl1);
+ return;
+ }
+ n = acl_set_fd(fd, acl1);
+ acl_free(acl1);
+ if (n != 0 && errno == EOPNOTSUPP) {
+ close(fd);
+ skipping("ACL tests require that ACL support be enabled on the filesystem");
+ return;
+ }
+ if (n != 0 && errno == EINVAL) {
+ close(fd);
+ skipping("This filesystem does not support POSIX.1e ACLs");
+ return;
+ }
+ failure("acl_set_fd(): errno = %d (%s)",
+ errno, strerror(errno));
+ assertEqualInt(0, n);
+ close(fd);
+
+ assertMakeDir("d", 0700);
+
+ /*
+ * Create file d/f1 with acl2
+ *
+ * This differs from acl1 in the u:1: and g:15: permissions.
+ *
+ * This file deliberately has the same name but a different ACL.
+ * Github Issue #777 explains how libarchive's directory traversal
+ * did not always correctly enter directories before attempting
+ * to read ACLs, resulting in reading the ACL from a like-named
+ * file in the wrong directory.
+ */
+ acl2_text = "user::rwx,group::rwx,other::---,user:1:r--,group:15:r--,mask::rwx";
+ acl2 = acl_from_text(acl2_text);
+ assert((void *)acl2 != NULL);
+ fd = open("d/f1", O_WRONLY | O_CREAT | O_EXCL, 0777);
+ failure("Could not create test file?!");
+ if (!assert(fd >= 0)) {
+ acl_free(acl2);
+ return;
+ }
+ n = acl_set_fd(fd, acl2);
+ acl_free(acl2);
+ if (n != 0 && errno == EOPNOTSUPP) {
+ close(fd);
+ skipping("ACL tests require that ACL support be enabled on the filesystem");
+ return;
+ }
+ if (n != 0 && errno == EINVAL) {
+ close(fd);
+ skipping("This filesystem does not support POSIX.1e ACLs");
+ return;
+ }
+ failure("acl_set_fd(): errno = %d (%s)",
+ errno, strerror(errno));
+ assertEqualInt(0, n);
+ close(fd);
+
+ /* Create a read-from-disk object. */
+ assert(NULL != (a = archive_read_disk_new()));
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_disk_open(a, "."));
+ assert(NULL != (ae = archive_entry_new()));
+
+ /* Walk the dir until we see both of the files */
+ while (ARCHIVE_OK == archive_read_next_header2(a, ae)) {
+ archive_read_disk_descend(a);
+ if (strcmp(archive_entry_pathname(ae), "./f1") == 0) {
+ assertEqualString(archive_entry_acl_text(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS), acl1_text);
+
+ } else if (strcmp(archive_entry_pathname(ae), "./d/f1") == 0) {
+ assertEqualString(archive_entry_acl_text(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS), acl2_text);
+ }
+ }
+
+ archive_free(a);
+#endif
+}
Modified: trunk/contrib/libarchive/libarchive/test/test_acl_pax.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_acl_pax.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_acl_pax.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_acl_pax.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_acl_pax.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Exercise the system-independent portion of the ACL support.
Modified: trunk/contrib/libarchive/libarchive/test/test_archive_api_feature.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_archive_api_feature.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_archive_api_feature.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_archive_api_feature.c,v 1.5 2008/05/26 17:00:24 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_archive_api_feature.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_archive_api_feature)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c 299529 2016-05-12 10:16:16Z mm $");
struct archive_read;
extern void __archive_read_reset_passphrase(struct archive_read *);
Modified: trunk/contrib/libarchive/libarchive/test/test_archive_string_conversion.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_archive_string_conversion.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_archive_string_conversion.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -800,8 +800,8 @@
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
assert((fp = fopen(testdata, "w")) != NULL);
while ((size = archive_read_data(a, buff, 512)) > 0)
- fwrite(buff, 1, size, fp);
- fclose(fp);
+ assertEqualInt(size, fwrite(buff, 1, size, fp));
+ assertEqualInt(0, fclose(fp));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
test_archive_string_normalization_nfc(testdata);
Modified: trunk/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c 299529 2016-05-12 10:16:16Z mm $");
static void
test_format_filter_by_ext(const char *output_file,
Modified: trunk/contrib/libarchive/libarchive/test/test_archive_write_set_passphrase.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_archive_write_set_passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_archive_write_set_passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_archive_write_set_passphrase.c 299529 2016-05-12 10:16:16Z mm $");
struct archive_write;
extern const char * __archive_write_get_passphrase(struct archive_write *);
Modified: trunk/contrib/libarchive/libarchive/test/test_bad_fd.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_bad_fd.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_bad_fd.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_bad_fd.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_bad_fd.c 232153 2012-02-25 10:58:02Z mm $");
/* Verify that attempting to open an invalid fd returns correct error. */
DEFINE_TEST(test_bad_fd)
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_bzip2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_bzip2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_bzip2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_bzip2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_bzip2.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Verify our ability to read sample files compatibly with bunzip2.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_bzip2_1.tbz.uu 185683 2008-12-06 07:08:08Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_bzip2_1.tbz
M0EIH.3%!62936;12^)(``#-;D=$00`!_@``!8RT>$`0`$```""``5#5/*'J>
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_bzip2_2.tbz.uu 185683 2008-12-06 07:08:08Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_bzip2_2.tbz
M0EIH.3%!629361HI1P<``4#;D-$00`#_@``)9RT>$`0``!@P`/@#&$Q,F`F`
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_cpio.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_cpio.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_cpio.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_cpio.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_cpio.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Verify our ability to read various sample files.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_cpio_1.cpio.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_cpio_1.cpio
M,#<P-S`Q,#`U-CEE8F4P,#`P.#%A-#`P,#`P,V4X,#`P,#`S93 at P,#`P,#`P
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_gtar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_gtar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_gtar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_gtar.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_gtar.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Verify our ability to read sample files created by GNU tar.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_gtar_1.tar.uu 189308 2009-03-03 17:02:51Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_gtar_1.tar
M+B\N+T!,;VYG3&EN:P``````````````````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_gzip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_gzip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_gzip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_gzip.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_gzip.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Verify our ability to read sample files compatibly with gunzip.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_gzip_1.tgz.uu 185683 2008-12-06 07:08:08Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_gzip_1.tgz
M'XL(")B^(DD``W1E<W0M<W!L:70N=&%R86$`2S-DH#DP,#`P,S%1`-*&YJ:&
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_gzip_2.tgz.uu 185683 2008-12-06 07:08:08Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_gzip_2.tgz
M'XL(`&76(DD``^W800["(!"%8=:>@ALXPP`]CXF=Q&A<:-UX>EN)C5M,AL;P
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_lz4.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_lz4.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Verify our ability to read sample files compatibly with 'lz4 -d'.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_lzma.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_lzma.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_lzma.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_lzma.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_lzma.c 248616 2013-03-22 13:36:03Z mm $");
/*
Execute the following to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_lzma_1.tlz.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_lzma_1.tlz
M70``@`#__________P`S##P;IXPT!HUK`DO\DC[V2OB%Z^'=ZT59ANYMTD(/
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_lzma_2.tlz.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_lzma_2.tlz
M7@``@`#__________P`S##P;IXPT!HUK`DO\DC[V2OB%Z^'<FN`(!=!,)@8W
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_lzma_3.tlz.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_lzma_3.tlz
M70`0````'``````````S##P;IXPT!HUK`DO\DC[V2OB%Z^'=ZT59ANYMTD(1
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_solaris_tar_acl.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c 232153 2012-02-25 10:58:02Z mm $");
/*
* Exercise support for reading Solaris-style ACL data
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu 191576 2009-04-27 18:27:54Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_acl_solaris.tar
M9FEL92UW:71H+7!O<VEX+6%C;',`````````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink.c,v 1.3 2008/08/11 01:19:36 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Background: There are two written standards for the tar file format.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: src/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu,v 1.1 2008/01/31 07:47:38 kientzle Exp $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_tar_hardlink_1.tar
M>&UC9"TS+C,N,B]D;V-S7V0O4D5!1$UF````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_uudecode_large.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_uudecode_large.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_uudecode_large.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_uudecode_large.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_compat_uudecode_large)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_xz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_xz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_xz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_xz.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_xz.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Verify our ability to read sample files compatibly with unxz.
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_compat_xz_1.txz.uu 191183 2009-04-17 01:06:31Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_gzip_1.txz
M_3=Z6%H```3FUK1&`@`A`18```!T+^6CX`^?`(-=`#,,/!NGC#0&C6L"2_R2
M/O9*^(7KX=WM^(=KA(RH"\09$$)!Q_+JUHQ*`]R;ITL_F3/I6:^Q0550A&)B
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_compat_zip.c 196962 2009-09-08 05:02:41Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_zip.c 299529 2016-05-12 10:16:16Z mm $");
/* Copy this function for each test file and adjust it accordingly. */
DEFINE_TEST(test_compat_zip_1)
Modified: trunk/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: src/lib/libarchive/test/test_compat_zip_1.zip.uu,v 1.2 2008/06/30 15:49:12 des Exp $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_zip_1.zip
M4$L#!!0`"``(``B$@S<````````````````4````345402U)3D8O34%.249%
M4U0N34;S3<S+3$LM+M$-2RTJSLS/LU(PU#/@Y7+,0Q)Q+$A,SDA5`(H!)<U!
Modified: trunk/contrib/libarchive/libarchive/test/test_empty_write.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_empty_write.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_empty_write.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_empty_write.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_empty_write.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_empty_write)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_entry.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_entry.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_entry.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_entry.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_entry.c 248616 2013-03-22 13:36:03Z mm $");
#include <locale.h>
Modified: trunk/contrib/libarchive/libarchive/test/test_entry_strmode.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_entry_strmode.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_entry_strmode.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_entry_strmode.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_entry_strmode.c 228763 2011-12-21 11:13:29Z mm $");
DEFINE_TEST(test_entry_strmode)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_extattr_freebsd.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_extattr_freebsd.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_extattr_freebsd.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_extattr_freebsd.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_extattr_freebsd.c 248995 2013-04-02 05:30:41Z mdf $");
#if defined(__FreeBSD__) && __FreeBSD__ > 4
#include <sys/extattr.h>
@@ -47,7 +47,8 @@
struct stat st;
struct archive *a;
struct archive_entry *ae;
- int n, fd;
+ ssize_t n;
+ int fd;
int extattr_privilege_bug = 0;
/*
Modified: trunk/contrib/libarchive/libarchive/test/test_fuzz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_fuzz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_fuzz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_fuzz.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_fuzz.c 305188 2016-09-01 07:53:59Z mm $");
/*
* This was inspired by an ISO fuzz tester written by Michal Zalewski
@@ -110,13 +110,17 @@
for (i = 0; filesets[n].names[i] != NULL; ++i)
{
tmp = slurpfile(&size, filesets[n].names[i]);
- rawimage = (char *)realloc(rawimage, oldsize + size);
+ char *newraw = (char *)realloc(rawimage, oldsize + size);
+ if (!assert(newraw != NULL))
+ {
+ free(rawimage);
+ continue;
+ }
+ rawimage = newraw;
memcpy(rawimage + oldsize, tmp, size);
oldsize += size;
size = oldsize;
free(tmp);
- if (!assert(rawimage != NULL))
- continue;
}
}
if (size == 0)
Modified: trunk/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_fuzz_1.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_fuzz_1.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_link_resolver.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_link_resolver.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_link_resolver.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_link_resolver.c,v 1.2 2008/06/15 04:31:43 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_link_resolver.c 228763 2011-12-21 11:13:29Z mm $");
static void test_linkify_tar(void)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_open_failure.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_open_failure.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_open_failure.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_open_failure.c 248616 2013-03-22 13:36:03Z mm $");
#define MAGIC 123456789
struct my_data {
Modified: trunk/contrib/libarchive/libarchive/test/test_open_fd.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_open_fd.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_open_fd.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_open_fd.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_open_fd.c 248616 2013-03-22 13:36:03Z mm $");
#if defined(_WIN32) && !defined(__CYGWIN__)
#define open _open
Modified: trunk/contrib/libarchive/libarchive/test/test_open_file.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_open_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_open_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_open_file.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_open_file.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_open_file)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_open_filename.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_open_filename.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_open_filename.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_open_filename.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_open_filename.c 248616 2013-03-22 13:36:03Z mm $");
static void
test_open_filename_mbs(void)
Modified: trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_pax_filename_encoding.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c 299529 2016-05-12 10:16:16Z mm $");
#include <locale.h>
Modified: trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_pax_filename_encoding.tar.uu 191183 2009-04-17 01:06:31Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_pax_filename_encoding.tar
M4&%X2&5A9&5R+V%B8\R,;6YO6'AY>@``````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_data_large.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_data_large.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_data_large.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_data_large.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_data_large.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Test read/write of a 10M block of data in a single operation.
Modified: trunk/contrib/libarchive/libarchive/test/test_read_disk.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_disk.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_disk.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_disk.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_disk.c 248616 2013-03-22 13:36:03Z mm $");
static void
gname_cleanup(void *d)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_disk_entry_from_file.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c 232153 2012-02-25 10:58:02Z mm $");
static const char *
gname_lookup(void *d, int64_t g)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_extract.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_extract.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_extract.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_extract.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_extract.c 248616 2013-03-22 13:36:03Z mm $");
#define BUFF_SIZE 1000000
#define FILE_BUFF_SIZE 100000
Modified: trunk/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_file_nonexistent.c 189473 2009-03-07 02:09:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_read_file_nonexistent)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_7zip_malformed.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_7zip_malformed.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_7zip_malformed.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_7zip_malformed.c 299529 2016-05-12 10:16:16Z mm $");
static void
test_malformed1(void)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_ar.ar.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu 228763 2011-12-21 11:13:29Z mm $
begin 755 test_read_format_ar.ar
M(3QA<F-H/@HO+R`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@("`@
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_ar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_ar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_ar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_ar.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_ar.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_ar)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_bin.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
199,'q',21,4,177,'y',237,'A',232,3,232,3,2,0,0,0,'p','C',244,'M',2,0,0,0,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_Z.c 189464 2009-03-07 00:25:33Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,157,144,199,226,'T',' ',16,'+','O',187,' ',232,6,'$',20,0,160,'!',156,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_be.c 191592 2009-04-27 19:30:09Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_cpio_bin_be)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu 191592 2009-04-27 19:30:09Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_cpio_bin_be.cpio
M<<<`"#P\@:0#Z`````$``$GS"&\`%0````5F:6QE,3$Q,3(R,C(S,S,S-#0T
M-```86)C9&4`<<<```````````````$`````````"P````!44D%)3$52(2$A
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
'B','Z','h','9','1','A','Y','&','S','Y',134,'J',208,'4',0,0,30,246,141,253,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_gz.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,139,8,0,244,'M','p','C',0,3,';','^','(',202,178,177,242,173,227,11,230,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_le.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_le.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_le.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_le.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_cpio_bin_le)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_lzma.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
93, 0, 0,128, 0,255,255,255,255,255,255,255,255, 0, 99,156,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_bin_xz.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00, 0x00, 0x04,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_cpio_odc.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
'0','7','0','7','0','7','0','0','2','0','2','5','0','7','4','6','6','1','0',
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,139,8,0,236,'c',217,'D',0,3,'3','0','7','0','7','0','4','0','0',181,'0',
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c 189381 2009-03-05 00:31:48Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,157,144,'0','n',4,132,'!',3,6,140,26,'8','n',228,16,19,195,160,'A',26,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_empty.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_empty.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = { 0 };
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_gz.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,139,8,0,'+','e',217,'D',0,3,211,211,'g',160,'9','0',0,2,'s','S','S',16,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_lzma.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
0x5d, 0x0, 0x0, 0x80, 0x0, 0x0, 0x28, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c 299529 2016-05-12 10:16:16Z mm $");
struct contents {
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu 191183 2009-04-17 01:06:31Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_gtar_sparse_1_13.tar
M<W!A<G-E````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu 189308 2009-03-03 17:02:51Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_gtar_sparse_1_17.tar
M<W!A<G-E````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu 189308 2009-03-03 17:02:51Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_gtar_sparse_1_17_posix00.tar
M+B]087A(96%D97)S+C,X-C4Y+W-P87)S90``````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu 189308 2009-03-03 17:02:51Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_gtar_sparse_1_17_posix01.tar
M+B]087A(96%D97)S+C,X-C8Q+W-P87)S90``````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu 189308 2009-03-03 17:02:51Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_gtar_sparse_1_17_posix10.tar
M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: src/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_gtar_sparse_1_17_posix10_modified.tar
M+B]087A(96%D97)S+C,X-C8S+W-P87)S90``````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_skip_entry.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -35,7 +35,11 @@
*/
DEFINE_TEST(test_read_format_gtar_sparse_skip_entry)
{
+#ifndef __FreeBSD__ /* Backport test. */
const char *refname = "test_read_format_gtar_sparse_skip_entry.tar.Z.uu";
+#else
+ const char *refname = "test_read_format_gtar_sparse_skip_entry.tar.Z";
+#endif
struct archive *a;
struct archive_entry *ae;
const void *p;
@@ -42,7 +46,11 @@
size_t s;
int64_t o;
+#ifndef __FreeBSD__ /* Backport test. */
copy_reference_file(refname);
+#else
+ extract_reference_file(refname);
+#endif
assert((a = archive_read_new()) != NULL);
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
@@ -53,17 +61,21 @@
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
assertEqualString("a", archive_entry_pathname(ae));
assertEqualInt(LITERAL_LL(10737418244), archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
assertEqualInt(archive_entry_is_encrypted(ae), 0);
assertEqualIntA(a, archive_read_has_encrypted_entries(a),
ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
/* Verify regular second file. */
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
assertEqualString("b", archive_entry_pathname(ae));
assertEqualInt(4, archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
assertEqualInt(archive_entry_is_encrypted(ae), 0);
assertEqualIntA(a, archive_read_has_encrypted_entries(a),
ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
/* End of archive. */
@@ -92,9 +104,11 @@
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
assertEqualString("a", archive_entry_pathname(ae));
assertEqualInt(LITERAL_LL(10737418244), archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
assertEqualInt(archive_entry_is_encrypted(ae), 0);
assertEqualIntA(a, archive_read_has_encrypted_entries(a),
ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
assertEqualInt(0, archive_read_data_block(a, &p, &s, &o));
assertEqualInt(4096, s);
assertEqualInt(0, o);
@@ -104,9 +118,11 @@
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
assertEqualString("b", archive_entry_pathname(ae));
assertEqualInt(4, archive_entry_size(ae));
+#ifndef __FreeBSD__ /* Backport test. */
assertEqualInt(archive_entry_is_encrypted(ae), 0);
assertEqualIntA(a, archive_read_has_encrypted_entries(a),
ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED);
+#endif
/* End of archive. */
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_iso_gz.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c 299529 2016-05-12 10:16:16Z mm $");
static void
test1(void)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_joliet.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_joliet_long.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_joliet_rockridge.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_iso_multi_extent.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_iso_multi_extent)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_multi_extent.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_rockridge.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_rockridge_ce.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_rockridge_new.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_rockridge_rr_moved.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu 201247 2009-12-30 05:59:21Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_iso_zisofs.iso.Z
M'YV0``(*'$BPH,&#"!,J7,BPH<.'$"-*G$BQHL6+&#-JW,BQH\>/($.*'$FR
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c 299529 2016-05-12 10:16:16Z mm $");
/*
Execute the following to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_long.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c 299529 2016-05-12 10:16:16Z mm $");
/*
Execute the following to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isojoliet_rr.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c 299529 2016-05-12 10:16:16Z mm $");
/*
Execute the following to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c 299529 2016-05-12 10:16:16Z mm $");
/*
PLEASE use old cdrtools; mkisofs verion is 2.01.
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_ce.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c 299529 2016-05-12 10:16:16Z mm $");
/*
Execute the following command to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_new_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c 299529 2016-05-12 10:16:16Z mm $");
/*
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isorr_rr_moved.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c 299529 2016-05-12 10:16:16Z mm $");
/*
Execute the following command to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_isozisofs_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c 299529 2016-05-12 10:16:16Z mm $");
/*
Execute the following command to rebuild the data for this program:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_mtree.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_mtree.c 299529 2016-05-12 10:16:16Z mm $");
static void
test_read_format_mtree1(void)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,3 +1,4 @@
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu 299529 2016-05-12 10:16:16Z mm $
begin 644 test_read_format_mtree.mtree
M(VUT<F5E"F9I;&4@='EP93UF:6QE('5I9#TQ."!M;V1E/3`Q,C,@<VEZ93TS
M"F1I<B!T>7!E/61I<@H at 9FEL95PP-#!W:71H7#`T,'-P86-E('1Y<&4]9FEL
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_pax_bz2.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
'B','Z','h','9','1','A','Y','&','S','Y',152,180,30,185,0,0,140,127,176,212,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_rar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_rar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_rar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -3603,7 +3603,7 @@
assertEqualIntA(a, 0, archive_read_data(a, buff, sizeof(buff)));
/*
- * Eigth header.
+ * Eighth header.
*/
assertA(0 == archive_read_next_header(a, &ae));
assertEqualString("testdir/testsymlink6", archive_entry_pathname(ae));
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_data.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_data.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_data.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_data.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_rar_encryption_data)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_header.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_header.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_header.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_header.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_rar_encryption_header)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_partially.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_partially.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_partially.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_rar_encryption_partially.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_rar_encryption_partially)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_rar_invalid1.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_rar_invalid1.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_rar_invalid1.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_rar_invalid1.c 302075 2016-06-22 07:49:59Z mm $");
DEFINE_TEST(test_read_format_rar_invalid1)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_raw.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_raw.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_raw.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_raw.c 191594 2009-04-27 20:09:05Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_raw.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_raw)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_raw.data.Z.uu 191594 2009-04-27 20:09:05Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_raw.data.Z
('YV09MZ\40``
`
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libarchive/test/test_read_format_raw.data.uu 191594 2009-04-27 20:09:05Z kientzle $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_read_format_raw.data
$9F]O"@``
`
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tar.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tar.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Each of these archives is a short archive with a single entry. The
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.c,v 1.2 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Tar entries with empty filenames are unusual, but shouldn't crash us.
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,4 +1,4 @@
-$FreeBSD: src/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu,v 1.2 2008/07/03 03:26:30 peter Exp $
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu 228763 2011-12-21 11:13:29Z mm $
begin 644 test_compat_tar_1.tar
M````````````````````````````````````````````````````````````
M````````````````````````````````````````````````````````````
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_pax.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_pax.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tar_empty_pax.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tar_empty_pax.c 299529 2016-05-12 10:16:16Z mm $");
/*
* A "usual" empty tar archive contains only zero bytes
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tbz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tbz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tbz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tbz.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tbz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
'B','Z','h','9','1','A','Y','&','S','Y',237,7,140,'W',0,0,27,251,144,208,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tgz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tgz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tgz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tgz.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tgz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,139,8,0,222,'C','p','C',0,3,211,'c',160,'=','0','0','0','0','7','5','U',
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tlz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tlz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tlz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tlz.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tlz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
93, 0, 0,128, 0,255,255,255,255,255,255,255,255, 0, 23, 0,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_txz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_txz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_txz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_txz.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_txz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
253, 55,122, 88, 90, 0, 0, 4,230,214,180, 70, 2, 0, 33, 1,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_tz.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_tz.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_tz.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_tz.c 189381 2009-03-05 00:31:48Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_tz.c 299529 2016-05-12 10:16:16Z mm $");
static unsigned char archive[] = {
31,157,144,'.',0,8,28,'H',176,160,193,131,8,19,'*','\\',200,176,'!','B',24,
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_warc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_warc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_warc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_warc.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_warc)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_xar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_xar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_xar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_xar.c 299529 2016-05-12 10:16:16Z mm $");
#define UID 1001
#define UNAME "cue"
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_zip.c 189482 2009-03-07 03:30:35Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip.c 299529 2016-05-12 10:16:16Z mm $");
/*
* The reference file for this has been manually tweaked so that:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu 2016-10-15 13:39:32 UTC (rev 9171)
@@ -1,3 +1,4 @@
+$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu 232153 2012-02-25 10:58:02Z mm $
begin 644 test_read_format_zip.zip
M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19
M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT*
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_data.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_data.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_data.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_data.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_zip_encryption_data)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_header.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_header.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_header.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_header.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_zip_encryption_header)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_partially.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_partially.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_partially.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_encryption_partially.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_zip_encryption_partially)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c 299529 2016-05-12 10:16:16Z mm $");
static void
test_malformed1(void)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_zip_nested)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nofiletype.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nofiletype.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_nofiletype.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_nofiletype.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Issue 332: Some epub files (which are really Zip archives) have
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c 299529 2016-05-12 10:16:16Z mm $");
static void
verify_padded_archive(const char *refname)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_traditional_encryption_data.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_zip_traditional_encryption_data)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes.c 299529 2016-05-12 10:16:16Z mm $");
static void
test_winzip_aes(const char *refname, int need_libz)
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_winzip_aes_large.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_read_format_zip_winzip_aes256_large)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_format_zip_zip64.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_format_zip_zip64.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_format_zip_zip64.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_format_zip_zip64.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Sample file was created with:
Modified: trunk/contrib/libarchive/libarchive/test/test_read_large.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_large.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_large.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_large.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_large.c 232153 2012-02-25 10:58:02Z mm $");
static unsigned char testdata[10 * 1024 * 1024];
static unsigned char testdatacopy[10 * 1024 * 1024];
Modified: trunk/contrib/libarchive/libarchive/test/test_read_pax_truncated.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_pax_truncated.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_pax_truncated.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_pax_truncated.c 189483 2009-03-07 03:34:34Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_pax_truncated.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_read_pax_truncated)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_read_position.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_position.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_position.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_position.c 189389 2009-03-05 02:19:42Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_position.c 238856 2012-07-28 06:38:44Z mm $");
static unsigned char nulls[1000];
static unsigned char tmp[1000];
Modified: trunk/contrib/libarchive/libarchive/test/test_read_set_format.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_set_format.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_set_format.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -204,7 +204,7 @@
/*
* If we have "bunzip2 -q", try using that.
*/
- if (!canRunCommand("bunzip2 -V")) {
+ if (!canRunCommand("bunzip2 -h")) {
skipping("Can't run bunzip2 program on this platform");
return;
}
Modified: trunk/contrib/libarchive/libarchive/test/test_read_truncated.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_read_truncated.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_read_truncated.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_truncated.c,v 1.4 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_read_truncated.c 299529 2016-05-12 10:16:16Z mm $");
static char buff[1000000];
static char buff2[100000];
Modified: trunk/contrib/libarchive/libarchive/test/test_tar_filenames.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_tar_filenames.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_tar_filenames.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.10 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_tar_filenames.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Exercise various lengths of filenames in tar archives,
Modified: trunk/contrib/libarchive/libarchive/test/test_tar_large.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_tar_large.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_tar_large.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_tar_large.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_tar_large.c 232153 2012-02-25 10:58:02Z mm $");
#include <errno.h>
#include <stdlib.h>
Modified: trunk/contrib/libarchive/libarchive/test/test_ustar_filenames.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_ustar_filenames.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_ustar_filenames.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_ustar_filenames.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_ustar_filenames.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Exercise various lengths of filenames in ustar archives.
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk.c 232153 2012-02-25 10:58:02Z mm $");
#define UMASK 022
/*
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_failures.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_failures.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_failures.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_failures.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_failures.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_write_disk_failures)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_hardlink.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c 232153 2012-02-25 10:58:02Z mm $");
#if defined(_WIN32) && !defined(__CYGWIN__)
/* Execution bits, Group members bits and others bits do not work. */
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_perms.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_perms.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_perms.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_perms.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_perms.c 299529 2016-05-12 10:16:16Z mm $");
#if !defined(_WIN32) || defined(__CYGWIN__)
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_secure.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_secure.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_secure.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_secure.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_secure.c 299529 2016-05-12 10:16:16Z mm $");
#define UMASK 022
@@ -243,31 +243,6 @@
assertEqualInt(ARCHIVE_OK, archive_write_free(a));
- /*
- * Without security checks, we should be able to
- * extract an absolute path.
- */
- assert((ae = archive_entry_new()) != NULL);
- archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
- archive_entry_set_mode(ae, S_IFREG | 0777);
- assert(0 == archive_write_header(a, ae));
- assert(0 == archive_write_finish_entry(a));
- assertFileExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
- assert(0 == unlink("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp"));
-
- /* But with security checks enabled, this should fail. */
- assert(archive_entry_clear(ae) != NULL);
- archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
- archive_entry_set_mode(ae, S_IFREG | 0777);
- archive_write_disk_set_options(a, ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS);
- failure("Extracting an absolute path should fail here.");
- assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
- archive_entry_free(ae);
- assert(0 == archive_write_finish_entry(a));
- assertFileNotExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
-
-
-
/* Test the entries on disk. */
assert(0 == lstat("dir", &st));
failure("dir: st.st_mode=%o", st.st_mode);
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_sparse.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_sparse.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_sparse.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_sparse.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_sparse.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Write a file using archive_write_data call, read the file
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_symlink.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_symlink.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_symlink.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_symlink.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_symlink.c 232153 2012-02-25 10:58:02Z mm $");
/*
* Exercise symlink recreation.
Modified: trunk/contrib/libarchive/libarchive/test/test_write_disk_times.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_disk_times.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_disk_times.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_disk_times.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_disk_times.c 232153 2012-02-25 10:58:02Z mm $");
/*
* Exercise time restores in archive_write_disk(), including
Modified: trunk/contrib/libarchive/libarchive/test/test_write_filter_lz4.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_filter_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_filter_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_filter_lz4.c 299529 2016-05-12 10:16:16Z mm $");
/*
* A basic exercise of lz4 reading and writing.
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_ar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_ar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_ar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_ar.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_ar.c 299529 2016-05-12 10:16:16Z mm $");
static char buff[4096];
static char buff2[64];
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_cpio.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_cpio.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_cpio.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio.c 185672 2008-12-06 06:02:26Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_cpio.c 248616 2013-03-22 13:36:03Z mm $");
static void
test_format(int (*set_format)(struct archive *))
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio_empty.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Check that an "empty" cpio archive is correctly created.
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio_newc.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c 299529 2016-05-12 10:16:16Z mm $");
static int
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_cpio_odc.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c 248616 2013-03-22 13:36:03Z mm $");
static int
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_gnutar_filenames.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_gnutar_filenames.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_gnutar_filenames.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_gnutar_filenames.c 306321 2016-09-25 22:02:27Z mm $");
/*
* Inspired by Github issue #682, which reported that gnutar filenames
@@ -42,6 +42,7 @@
struct archive_entry *ae, *template;
struct archive *a;
size_t used;
+ int i;
buff = malloc(buffsize); /* million bytes of work area */
assert(buff != NULL);
@@ -55,7 +56,7 @@
archive_entry_set_mode(template, S_IFREG | 0755);
archive_entry_set_size(template, 8);
- for (int i = 0; i < 2000; ++i) {
+ for (i = 0; i < 2000; ++i) {
filename[i] = 'a';
filename[i + 1] = '\0';
archive_entry_copy_pathname(template, filename);
@@ -97,7 +98,12 @@
struct archive_entry *ae, *template;
struct archive *a;
size_t used;
+ int i;
+#ifdef S_IFLNK
+ assertEqualInt(S_IFLNK, AE_IFLNK);
+#endif
+
buff = malloc(buffsize); /* million bytes of work area */
assert(buff != NULL);
@@ -107,10 +113,10 @@
archive_entry_set_birthtime(template, 3, 30);
archive_entry_set_ctime(template, 4, 40);
archive_entry_set_mtime(template, 5, 50);
- archive_entry_set_mode(template, S_IFLNK | 0755);
+ archive_entry_set_mode(template, AE_IFLNK | 0755);
archive_entry_copy_pathname(template, "link");
- for (int i = 0; i < 2000; ++i) {
+ for (i = 0; i < 2000; ++i) {
filename[i] = 'a';
filename[i + 1] = '\0';
archive_entry_copy_symlink(template, filename);
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_mtree.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_mtree.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_mtree.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_mtree.c 191183 2009-04-17 01:06:31Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_mtree.c 299529 2016-05-12 10:16:16Z mm $");
static char buff[4096];
static struct {
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_pax.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_pax.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_pax.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_pax.c 299529 2016-05-12 10:16:16Z mm $");
static char buff2[64];
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_format_shar_empty.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Check that an "empty" shar archive is correctly created as an empty file.
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_tar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_tar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_tar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_tar.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_tar.c 299529 2016-05-12 10:16:16Z mm $");
static char buff[1000000];
static char buff2[64];
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_tar_empty.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Check that an "empty" tar archive is correctly created.
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_tar_ustar.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c 248616 2013-03-22 13:36:03Z mm $");
static int
is_null(const char *p, size_t l)
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_warc.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_warc.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_warc.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_warc.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_write_format_warc)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_warc_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_warc_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_warc_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_warc_empty.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_write_format_warc_empty)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -30,7 +30,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip.c 299529 2016-05-12 10:16:16Z mm $");
/*
* This test doesn't actually check that the zip writer is
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip_no_compression.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_compression_store.c 299529 2016-05-12 10:16:16Z mm $");
/* File data */
static const char file_name[] = "file";
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip_empty.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_write_format_zip_empty)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty_zip64.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty_zip64.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_empty_zip64.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip_empty.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_empty_zip64.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_write_format_zip_empty_zip64)
{
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -29,7 +29,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_file.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Detailed byte-for-byte verification of the format of a zip archive
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -29,7 +29,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c 299529 2016-05-12 10:16:16Z mm $");
/*
* Detailed byte-for-byte verification of the format of a zip archive
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_large.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_large.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_large.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_large.c 299529 2016-05-12 10:16:16Z mm $");
#include <errno.h>
#include <stdlib.h>
Modified: trunk/contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c 299529 2016-05-12 10:16:16Z mm $");
static void
verify_zip_filesize(uint64_t size, int expected)
Modified: trunk/contrib/libarchive/libarchive/test/test_write_open_memory.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_open_memory.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_open_memory.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_open_memory.c 189308 2009-03-03 17:02:51Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_open_memory.c 248616 2013-03-22 13:36:03Z mm $");
/* Try to force archive_write_open_memory.c to write past the end of an array. */
static unsigned char buff[16384];
Modified: trunk/contrib/libarchive/libarchive/test/test_write_read_format_zip.c
===================================================================
--- trunk/contrib/libarchive/libarchive/test/test_write_read_format_zip.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive/test/test_write_read_format_zip.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -29,7 +29,7 @@
*/
#include "test.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/test/test_write_format_zip.c 201247 2009-12-30 05:59:21Z kientzle $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive/test/test_write_read_format_zip.c 299529 2016-05-12 10:16:16Z mm $");
/*
* These tests verify that our reader can read files
Modified: trunk/contrib/libarchive/libarchive_fe/err.c
===================================================================
--- trunk/contrib/libarchive/libarchive_fe/err.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive_fe/err.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "lafe_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive_fe/err.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_STDARG_H
#include <stdarg.h>
Modified: trunk/contrib/libarchive/libarchive_fe/err.h
===================================================================
--- trunk/contrib/libarchive/libarchive_fe/err.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive_fe/err.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -21,6 +21,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive_fe/err.h 299529 2016-05-12 10:16:16Z mm $
*/
#ifndef LAFE_ERR_H
Modified: trunk/contrib/libarchive/libarchive_fe/lafe_platform.h
===================================================================
--- trunk/contrib/libarchive/libarchive_fe/lafe_platform.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive_fe/lafe_platform.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/cpio/cpio_platform.h,v 1.2 2008/12/06 07:15:42 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive_fe/lafe_platform.h 228763 2011-12-21 11:13:29Z mm $
*/
/*
Modified: trunk/contrib/libarchive/libarchive_fe/line_reader.c
===================================================================
--- trunk/contrib/libarchive/libarchive_fe/line_reader.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive_fe/line_reader.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -26,7 +26,7 @@
*/
#include "lafe_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive_fe/line_reader.c 232153 2012-02-25 10:58:02Z mm $");
#include <errno.h>
#include <stdio.h>
Modified: trunk/contrib/libarchive/libarchive_fe/line_reader.h
===================================================================
--- trunk/contrib/libarchive/libarchive_fe/line_reader.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive_fe/line_reader.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -21,6 +21,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: stable/11/contrib/libarchive/libarchive_fe/line_reader.h 228774 2011-12-21 15:20:17Z mm $
*/
#ifndef LAFE_LINE_READER_H
Modified: trunk/contrib/libarchive/libarchive_fe/passphrase.c
===================================================================
--- trunk/contrib/libarchive/libarchive_fe/passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/libarchive_fe/passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -48,7 +48,7 @@
#include "lafe_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/libarchive_fe/passphrase.c 302294 2016-06-30 08:51:50Z mm $");
#include <errno.h>
#ifdef HAVE_STDLIB_H
@@ -121,16 +121,21 @@
#else /* _WIN32 && !__CYGWIN__ */
-#include <termios.h>
-#include <signal.h>
+#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
#ifdef HAVE_PATHS_H
#include <paths.h>
#endif
+#include <signal.h>
#include <string.h>
+#include <termios.h>
#include <unistd.h>
+#ifndef _PATH_TTY
+#define _PATH_TTY "/dev/tty"
+#endif
+
#ifdef TCSASOFT
# define _T_FLUSH (TCSAFLUSH|TCSASOFT)
#else
@@ -142,11 +147,18 @@
# define _POSIX_VDISABLE VDISABLE
#endif
-static volatile sig_atomic_t *signo;
+#define M(a,b) (a > b ? a : b)
+#define MAX_SIGNO M(M(M(SIGALRM, SIGHUP), \
+ M(SIGINT, SIGPIPE)), \
+ M(M(SIGQUIT, SIGTERM), \
+ M(M(SIGTSTP, SIGTTIN), SIGTTOU)))
+static volatile sig_atomic_t signo[MAX_SIGNO + 1];
+
static void
handler(int s)
{
+ assert(s <= MAX_SIGNO);
signo[s] = 1;
}
@@ -166,12 +178,8 @@
return(NULL);
}
- if (signo == NULL) {
- signo = calloc(SIGRTMAX, sizeof(sig_atomic_t));
- }
-
restart:
- for (i = 0; i < SIGRTMAX; i++)
+ for (i = 0; i <= MAX_SIGNO; i++)
signo[i] = 0;
nr = -1;
save_errno = 0;
@@ -198,6 +206,7 @@
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; /* don't restart system calls */
sa.sa_handler = handler;
+ /* Keep this list in sync with MAX_SIGNO! */
(void)sigaction(SIGALRM, &sa, &savealrm);
(void)sigaction(SIGHUP, &sa, &savehup);
(void)sigaction(SIGINT, &sa, &saveint);
@@ -237,11 +246,11 @@
if (p < end) {
if ((flags & RPP_SEVENBIT))
ch &= 0x7f;
- if (isalpha(ch)) {
+ if (isalpha((unsigned char)ch)) {
if ((flags & RPP_FORCELOWER))
- ch = (char)tolower(ch);
+ ch = (char)tolower((unsigned char)ch);
if ((flags & RPP_FORCEUPPER))
- ch = (char)toupper(ch);
+ ch = (char)toupper((unsigned char)ch);
}
*p++ = ch;
}
@@ -276,7 +285,7 @@
* If we were interrupted by a signal, resend it to ourselves
* now that we have restored the signal handlers.
*/
- for (i = 0; i < SIGRTMAX; i++) {
+ for (i = 0; i <= MAX_SIGNO; i++) {
if (signo[i]) {
kill(getpid(), i);
switch (i) {
Modified: trunk/contrib/libarchive/tar/bsdtar.1
===================================================================
--- trunk/contrib/libarchive/tar/bsdtar.1 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/bsdtar.1 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/11/contrib/libarchive/tar/bsdtar.1 299529 2016-05-12 10:16:16Z mm $
.\"
.Dd September 16, 2014
.Dt TAR 1
Modified: trunk/contrib/libarchive/tar/bsdtar.c
===================================================================
--- trunk/contrib/libarchive/tar/bsdtar.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/bsdtar.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.93 2008/11/08 04:43:24 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/bsdtar.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
Modified: trunk/contrib/libarchive/tar/bsdtar.h
===================================================================
--- trunk/contrib/libarchive/tar/bsdtar.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/bsdtar.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.37 2008/12/06 07:37:14 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/tar/bsdtar.h 299529 2016-05-12 10:16:16Z mm $
*/
#include "bsdtar_platform.h"
Modified: trunk/contrib/libarchive/tar/bsdtar_platform.h
===================================================================
--- trunk/contrib/libarchive/tar/bsdtar_platform.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/bsdtar_platform.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/tar/bsdtar_platform.h,v 1.26 2008/12/06 07:37:14 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/tar/bsdtar_platform.h 299529 2016-05-12 10:16:16Z mm $
*/
/*
Modified: trunk/contrib/libarchive/tar/cmdline.c
===================================================================
--- trunk/contrib/libarchive/tar/cmdline.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/cmdline.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -28,7 +28,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/cmdline.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -68,6 +68,7 @@
{ "auto-compress", 0, 'a' },
{ "b64encode", 0, OPTION_B64ENCODE },
{ "block-size", 1, 'b' },
+ { "blocking-factor", 1, 'b' },
{ "bunzip2", 0, 'j' },
{ "bzip", 0, 'j' },
{ "bzip2", 0, 'j' },
Modified: trunk/contrib/libarchive/tar/read.c
===================================================================
--- trunk/contrib/libarchive/tar/read.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/read.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.40 2008/08/21 06:41:14 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/read.c 299529 2016-05-12 10:16:16Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
Modified: trunk/contrib/libarchive/tar/subst.c
===================================================================
--- trunk/contrib/libarchive/tar/subst.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/subst.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/subst.c,v 1.4 2008/06/15 10:08:16 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/subst.c 307138 2016-10-12 10:28:22Z mm $");
#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
#include "bsdtar.h"
@@ -84,6 +84,7 @@
if (rule == NULL)
lafe_errc(1, errno, "Out of memory");
rule->next = NULL;
+ rule->result = NULL;
if (subst->last_rule == NULL)
subst->first_rule = rule;
Modified: trunk/contrib/libarchive/tar/test/main.c
===================================================================
--- trunk/contrib/libarchive/tar/test/main.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/main.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -60,7 +60,7 @@
* TODO: Move this into a separate configuration header, have all test
* suites share one copy of this file.
*/
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/main.c,v 1.6 2008/11/05 06:40:53 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/main.c 307138 2016-10-12 10:28:22Z mm $");
#define KNOWNREF "test_patterns_2.tar.uu"
#define ENVBASE "BSDTAR" /* Prefix for environment variables. */
#define PROGRAM "bsdtar" /* Name of program being tested. */
@@ -130,6 +130,13 @@
# include <crtdbg.h>
#endif
+mode_t umasked(mode_t expected_mode)
+{
+ mode_t mode = umask(0);
+ umask(mode);
+ return expected_mode & ~mode;
+}
+
/* Path to working directory for current test */
const char *testworkdir;
#ifdef PROGRAM
@@ -1361,6 +1368,31 @@
return assertion_file_time(file, line, pathname, 0, 0, 'b', 1);
}
+/* Verify mode of 'pathname'. */
+int
+assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
+{
+ int mode;
+ int r;
+
+ assertion_count(file, line);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ failure_start(file, line, "assertFileMode not yet implemented for Windows");
+#else
+ {
+ struct stat st;
+ r = lstat(pathname, &st);
+ mode = (int)(st.st_mode & 0777);
+ }
+ if (r == 0 && mode == expected_mode)
+ return (1);
+ failure_start(file, line, "File %s has mode %o, expected %o",
+ pathname, mode, expected_mode);
+#endif
+ failure_finish(NULL);
+ return (0);
+}
+
/* Verify mtime of 'pathname'. */
int
assertion_file_mtime(const char *file, int line,
@@ -1579,8 +1611,12 @@
if (0 == _mkdir(dirname))
return (1);
#else
- if (0 == mkdir(dirname, mode))
- return (1);
+ if (0 == mkdir(dirname, mode)) {
+ if (0 == chmod(dirname, mode)) {
+ assertion_file_mode(file, line, dirname, mode);
+ return (1);
+ }
+ }
#endif
failure_start(file, line, "Could not create directory %s", dirname);
failure_finish(NULL);
@@ -1629,6 +1665,11 @@
failure_finish(NULL);
return (0);
}
+ if (0 != chmod(path, mode)) {
+ failure_start(file, line, "Could not chmod %s", path);
+ failure_finish(NULL);
+ return (0);
+ }
if (contents != NULL) {
ssize_t wsize;
@@ -1645,6 +1686,7 @@
}
}
close(fd);
+ assertion_file_mode(file, line, path, mode);
return (1);
#endif
}
Modified: trunk/contrib/libarchive/tar/test/test.h
===================================================================
--- trunk/contrib/libarchive/tar/test/test.h 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test.h 2016-10-15 13:39:32 UTC (rev 9171)
@@ -22,7 +22,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/usr.bin/tar/test/test.h,v 1.4 2008/08/21 07:04:57 kientzle Exp $
+ * $FreeBSD: stable/11/contrib/libarchive/tar/test/test.h 307138 2016-10-12 10:28:22Z mm $
*/
/* Every test program should #include "test.h" as the first thing. */
@@ -241,6 +241,7 @@
int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
int assertion_file_contents(const char *, int, const void *, int, const char *);
int assertion_file_exists(const char *, int, const char *);
+int assertion_file_mode(const char *, int, const char *, int);
int assertion_file_mtime(const char *, int, const char *, long, long);
int assertion_file_mtime_recent(const char *, int, const char *);
int assertion_file_nlinks(const char *, int, const char *, int);
@@ -326,6 +327,9 @@
*/
void extract_reference_files(const char **);
+/* Subtract umask from mode */
+mode_t umasked(mode_t expected_mode);
+
/* Path to working directory for current test */
extern const char *testworkdir;
Modified: trunk/contrib/libarchive/tar/test/test_0.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_0.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_0.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_0.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_0.c 232153 2012-02-25 10:58:02Z mm $");
/*
* This first test does basic sanity checks on the environment. For
Modified: trunk/contrib/libarchive/tar/test/test_basic.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_basic.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_basic.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_basic.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_basic.c 238909 2012-07-30 14:47:35Z mm $");
static const char *
make_files(void)
Modified: trunk/contrib/libarchive/tar/test/test_copy.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_copy.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_copy.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_copy.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_copy.c 248616 2013-03-22 13:36:03Z mm $");
#if defined(__CYGWIN__)
# include <limits.h>
Modified: trunk/contrib/libarchive/tar/test/test_empty_mtree.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_empty_mtree.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_empty_mtree.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_empty_mtree.c 228763 2011-12-21 11:13:29Z mm $");
/*
* Regression test: We used to get a bogus error message when we
Modified: trunk/contrib/libarchive/tar/test/test_extract_tar_lz4.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_extract_tar_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_extract_tar_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_extract_tar_lz4.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_extract_tar_lz4)
{
Modified: trunk/contrib/libarchive/tar/test/test_help.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_help.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_help.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_help.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_help.c 228763 2011-12-21 11:13:29Z mm $");
/*
* Test that "--help", "-h", and "-W help" options all work and
Modified: trunk/contrib/libarchive/tar/test/test_leading_slash.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_leading_slash.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_leading_slash.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_leading_slash.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_leading_slash)
{
Modified: trunk/contrib/libarchive/tar/test/test_missing_file.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_missing_file.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_missing_file.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_missing_file.c 302075 2016-06-22 07:49:59Z mm $");
DEFINE_TEST(test_missing_file)
{
Modified: trunk/contrib/libarchive/tar/test/test_option_H_upper.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_H_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_H_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -83,10 +83,10 @@
assertChdir("test3");
assertEqualInt(0,
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
- assertIsDir("ld1", 0755);
+ assertIsDir("ld1", umasked(0755));
assertIsSymlink("d1/linkX", "fileX");
assertIsSymlink("d1/link1", "file1");
- assertIsReg("link2", 0644);
+ assertIsReg("link2", umasked(0644));
assertIsSymlink("linkY", "d1/fileY");
assertChdir("..");
}
Modified: trunk/contrib/libarchive/tar/test/test_option_L_upper.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_L_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_L_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -69,10 +69,10 @@
assertChdir("test2");
assertEqualInt(0,
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
- assertIsDir("ld1", 0755);
- assertIsReg("d1/link1", 0644);
+ assertIsDir("ld1", umasked(0755));
+ assertIsReg("d1/link1", umasked(0644));
assertIsSymlink("d1/linkX", "fileX");
- assertIsReg("link2", 0644);
+ assertIsReg("link2", umasked(0644));
assertIsSymlink("linkY", "d1/fileY");
assertChdir("..");
@@ -83,10 +83,10 @@
assertChdir("test3");
assertEqualInt(0,
systemf("%s -xf archive.tar >c.out 2>c.err", testprog));
- assertIsDir("ld1", 0755);
- assertIsReg("d1/link1", 0644);
+ assertIsDir("ld1", umasked(0755));
+ assertIsReg("d1/link1", umasked(0644));
assertIsSymlink("d1/linkX", "fileX");
- assertIsReg("link2", 0644);
+ assertIsReg("link2", umasked(0644));
assertIsSymlink("linkY", "d1/fileY");
assertChdir("..");
}
Modified: trunk/contrib/libarchive/tar/test/test_option_T_upper.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_T_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_T_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_T.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_option_T_upper.c 232153 2012-02-25 10:58:02Z mm $");
static int
tryMakeFile(const char *fn)
Modified: trunk/contrib/libarchive/tar/test/test_option_U_upper.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_U_upper.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_U_upper.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -135,7 +135,7 @@
assertMakeSymlink("d1/file1", "d1/realfile1");
assertEqualInt(0,
systemf("%s -xf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
- assertIsReg("d1/file1", 0644);
+ assertIsReg("d1/file1", umasked(0644));
assertFileContents("d1/file1", 8, "d1/file1");
assertFileContents("realfile1", 9, "d1/realfile1");
assertEmptyFile("test.out");
@@ -150,7 +150,7 @@
assertMakeSymlink("d1/file1", "d1/realfile1");
assertEqualInt(0,
systemf("%s -xPUf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
- assertIsReg("d1/file1", 0644);
+ assertIsReg("d1/file1", umasked(0644));
assertFileContents("d1/file1", 8, "d1/file1");
assertFileContents("realfile1", 9, "d1/realfile1");
assertEmptyFile("test.out");
Modified: trunk/contrib/libarchive/tar/test/test_option_lz4.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_lz4.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_lz4.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_option_lz4.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_option_lz4)
{
Modified: trunk/contrib/libarchive/tar/test/test_option_n.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_n.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_n.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -55,7 +55,7 @@
systemf("%s -xf archive.tar >x.out 2>x.err", testprog));
assertEmptyFile("x.out");
assertEmptyFile("x.err");
- assertIsDir("d1", 0755);
+ assertIsDir("d1", umasked(0755));
assertFileNotExists("d1/file1");
assertChdir("..");
}
Modified: trunk/contrib/libarchive/tar/test/test_option_passphrase.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_passphrase.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_passphrase.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_option_passphrase.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_option_passphrase)
{
Modified: trunk/contrib/libarchive/tar/test/test_option_q.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_q.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_q.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_q.c,v 1.3 2008/08/22 01:35:08 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_option_q.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_option_q)
{
Modified: trunk/contrib/libarchive/tar/test/test_option_r.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_r.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_r.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_option_r.c 248616 2013-03-22 13:36:03Z mm $");
/*
* Also see test_option_q for additional validation of -r support.
Modified: trunk/contrib/libarchive/tar/test/test_option_s.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_option_s.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_option_s.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_option_T.c,v 1.3 2008/08/15 06:12:02 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_option_s.c 299529 2016-05-12 10:16:16Z mm $");
DEFINE_TEST(test_option_s)
{
Modified: trunk/contrib/libarchive/tar/test/test_patterns.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_patterns.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_patterns.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_patterns.c,v 1.6 2008/08/21 22:28:00 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_patterns.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_patterns)
{
Modified: trunk/contrib/libarchive/tar/test/test_stdio.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_stdio.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_stdio.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_stdio.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_stdio.c 248616 2013-03-22 13:36:03Z mm $");
DEFINE_TEST(test_stdio)
{
Modified: trunk/contrib/libarchive/tar/test/test_strip_components.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_strip_components.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_strip_components.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_strip_components.c,v 1.2 2008/11/10 05:24:13 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_strip_components.c 232153 2012-02-25 10:58:02Z mm $");
DEFINE_TEST(test_strip_components)
{
Modified: trunk/contrib/libarchive/tar/test/test_symlink_dir.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_symlink_dir.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_symlink_dir.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_symlink_dir.c,v 1.1 2008/09/14 02:16:04 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_symlink_dir.c 232153 2012-02-25 10:58:02Z mm $");
/*
* tar -x -P should follow existing symlinks for dirs, but not other
Modified: trunk/contrib/libarchive/tar/test/test_version.c
===================================================================
--- trunk/contrib/libarchive/tar/test/test_version.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/test/test_version.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "test.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/test/test_version.c,v 1.2 2008/05/26 17:10:10 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/test/test_version.c 305188 2016-09-01 07:53:59Z mm $");
/*
* Test that --version option works and generates reasonable output.
@@ -88,7 +88,7 @@
if (*q == 'a' || *q == 'b' || *q == 'c' || *q == 'd')
++q;
/* Skip arbitrary third-party version numbers. */
- while (s > 0 && (*q == ' ' || *q == '/' || *q == '.' || isalnum(*q))) {
+ while (s > 0 && (*q == ' ' || *q == '-' || *q == '/' || *q == '.' || isalnum(*q))) {
++q;
--s;
}
Modified: trunk/contrib/libarchive/tar/util.c
===================================================================
--- trunk/contrib/libarchive/tar/util.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/util.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -24,7 +24,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.23 2008/12/15 06:00:25 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/util.c 305188 2016-09-01 07:53:59Z mm $");
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -182,7 +182,7 @@
}
/* If our output buffer is full, dump it and keep going. */
- if (i > (sizeof(outbuff) - 20)) {
+ if (i > (sizeof(outbuff) - 128)) {
outbuff[i] = '\0';
fprintf(f, "%s", outbuff);
i = 0;
Modified: trunk/contrib/libarchive/tar/write.c
===================================================================
--- trunk/contrib/libarchive/tar/write.c 2016-10-15 13:36:39 UTC (rev 9170)
+++ trunk/contrib/libarchive/tar/write.c 2016-10-15 13:39:32 UTC (rev 9171)
@@ -25,7 +25,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.79 2008/11/27 05:49:52 kientzle Exp $");
+__FBSDID("$FreeBSD: stable/11/contrib/libarchive/tar/write.c 307138 2016-10-12 10:28:22Z mm $");
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -886,6 +886,8 @@
"%s", archive_error_string(disk));
if (r == ARCHIVE_FATAL || r == ARCHIVE_FAILED) {
bsdtar->return_value = 1;
+ archive_entry_free(entry);
+ archive_read_close(disk);
return;
} else if (r < ARCHIVE_WARN)
continue;
More information about the Midnightbsd-cvs
mailing list