Brad King 156cb3bbf2 Merge branch 'libarchive-upstream' into update-libarchive ...

Conflicts:
	Utilities/cmlibarchive/CMakeLists.txt
	Utilities/cmlibarchive/libarchive/archive_windows.c

2012-01-05 09:02:58 -05:00

..

archive_acl_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_acl.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_check_magic.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_crc32.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_crypto_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_crypto.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_endian.h

libarchive: Port to OSF operating system

2011-12-23 16:04:58 -05:00

archive_entry_acl.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry_copy_bhfi.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_copy_stat.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_link_resolver.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_linkify.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry_locale.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_paths.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry_perms.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_sparse.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_stat.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry_stat.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_strmode.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry_time.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry_xattr.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_entry.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_entry.h

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_options_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_options.c

libarchive: Avoid bogus conversion warning from PGI compiler

2012-01-04 11:54:51 -05:00

archive_platform.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_ppmd7_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_ppmd7.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_ppmd_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_rb.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_rb.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_data_into_fd.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_data.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_disk_entry_from_file.c

libarchive: Include linux/types.h before linux/fiemap.h

2012-01-04 09:39:28 -05:00

archive_read_disk_posix.c

libarchive: Do not use MNT_NOATIME if not defined

2012-01-03 11:15:25 -05:00

archive_read_disk_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_disk_set_standard_lookup.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_disk_windows.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_disk.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_extract.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_extract.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_filter.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_format.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_free.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_header.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_new.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_open_fd.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_open_file.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_open_filename.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_open_memory.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_open.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_set_options.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_set_options.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_all.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_bzip2.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_compress.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_gzip.c

libarchive: Include cm_zlib.h to get zlib used by CMake

2011-12-22 10:38:37 -05:00

archive_read_support_filter_none.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_program.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_rpm.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_uu.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_filter_xz.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_7zip.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_support_format_all.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_ar.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_by_code.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_cab.c

libarchive: Include cm_zlib.h to get zlib used by CMake

2011-12-22 10:38:37 -05:00

archive_read_support_format_cpio.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_empty.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_iso9660.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read_support_format_lha.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_mtree.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_rar.c

libarchive: Include cm_zlib.h to get zlib used by CMake

2011-12-22 10:38:37 -05:00

archive_read_support_format_raw.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_tar.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_read_support_format_xar.c

libarchive: Include cm_zlib.h to get zlib used by CMake

2011-12-22 10:38:37 -05:00

archive_read_support_format_zip.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_read.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_string_composition.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_string_sprintf.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_string.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_string.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_util.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_util.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_virtual.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_windows.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_windows.h

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_add_filter_bzip2.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_add_filter_compress.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_add_filter_gzip.c

libarchive: Include cm_zlib.h to get zlib used by CMake

2011-12-22 10:38:37 -05:00

archive_write_add_filter_none.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_add_filter_program.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_add_filter_xz.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_blocksize.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_data.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_disk_posix.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_disk_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_disk_set_standard_lookup.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_disk_windows.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_disk.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_filter.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_finish_entry.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_format.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_free.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_header.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_new.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_open_fd.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_open_file.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_open_filename.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_open_memory.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_open.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_private.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_7zip.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_set_format_ar.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_by_name.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_cpio_newc.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_cpio.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_gnutar.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_iso9660.c

libarchive: Rename isoent_rr_move_dir parameter isoent => curent

2012-01-04 09:48:41 -05:00

archive_write_set_format_mtree.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_pax.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_shar.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_ustar.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_format_xar.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_set_format_zip.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_set_format.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write_set_options.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write_set_options.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

archive_write.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

archive_write.c

libarchive: Avoid bogus conversion warning from PGI compiler

2012-01-04 11:54:51 -05:00

archive.h

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

CMakeLists.txt

libarchive: Build one static cmlibarchive for CMake

2011-12-22 10:38:36 -05:00

config_freebsd.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

cpio.5

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

filter_fork_windows.c

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

filter_fork.c

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

filter_fork.h

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

libarchive_changes.3

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

libarchive_internals.3

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

libarchive-formats.5

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00

libarchive.3

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

mtree.5

Merge branch 'libarchive-upstream' into update-libarchive

2011-12-20 11:54:25 -05:00

tar.5

Merge branch 'libarchive-upstream' into update-libarchive

2012-01-05 09:02:58 -05:00