Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jan 2012 12:06:54 +0000 (UTC)
From:      Martin Matuska <mm@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r229592 - in stable/9/contrib/libarchive: . build contrib cpio cpio/test doc examples libarchive libarchive/test libarchive_fe tar tar/test
Message-ID:  <201201051206.q05C6s6v034482@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mm
Date: Thu Jan  5 12:06:54 2012
New Revision: 229592
URL: http://svn.freebsd.org/changeset/base/229592

Log:
  MFC contrib/libarchive:
  r228761-r228764, r228770-r228777, r228835, r228911:
  
  MFC r228761:
  Copy libarchive from vendor branch to contrib
  
  MFC r228762:
  Add FREEBSD-Xlist and FREEBSD-upgrade to contrib/libarchive
  
  MFC r228763:
  Set svn:keywords to FreeBSD=%H for contrib/libarchive
  
  MFC r228764:
  Strip unnecessary files and directories from contrib/libarchive
  according to FREEBSD-Xlist
  
  MFC r228770:
  Remove libarchive/archive_entry_copy_bhfi.c and libarchive/mtree.5
  Add these files to FREEBSD-Xlist
  
  MFC r228771:
  Partial merge of r224691 from lib/libarchive:
  
  Add compatibility for ISO images created with unfixed makefs that
  violated ECMA-119 (ISO9660): allow reserved4 to be 0x20 in PVD.
  This allows tar to read FreeBSD distribution ISO images created
  with makefs prior to NetBSD bin/45217 bugfix (up to 9.0-BETA1).
  
  MFC r228772:
  Add missing integer casts to comparsions in libarchive read.
  
  MFC r228773:
  Merge FreeBSD changes from lib/libarchive to contrib/libarchive:
  
  r204111 (uqs):
  Fix common misspelling of hierarchy
  
  r208027 (uqs):
  mdoc: move CAVEATS, BUGS and SECURITY CONSIDERATIONS sections to the
  bottom of the manpages and order them consistently.
  
  GNU groff doesn't care about the ordering, and doesn't even mention
  CAVEATS and SECURITY CONSIDERATIONS as common sections and where to put
  them.
  
  r208291 (uqs):
  mdoc: consistently spell our email addresses <foo@FreeBSD.org>
  
  r209031 (uqs):
  mdoc nitpicking: the title argument shall be uppercase
  
  r214822 (kientzle):
  Clarify the naming:  Methods that free an object should
  be called "free".  Retain the old "finish" names to preserve
  source compatibility for now.
  
  r214905 (kientzle):
  If the Zip reader doesn't see a PK signature block
  because there's inter-entry garbage, just scan forward
  to find the next one.  This allows us to handle a lot
  of Zip archives that have been modified in-place.
  
  Thanks to: Gleb Kurtsou for sending me a sample archive
  
  r216258 (kientzle):
  Don't write data into an empty "file."
  
  In particular, this check avoids a warning when
  extracting directory entries from certain GNU tar
  archives that store directory contents.
  
  r225525 (kientzle):
  Fix cpio on ARM.
  
  MFC r228774:
  Add $FreeBSD$ to libarchive_fe headers where missing.
  
  MFC r228775:
  Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/libarchive_fe:
  
  r213469:
  Recognize both ! and ^ as markers for negated character classes.
  
  MFC r228776:
  Merge FreeBSD changes from usr.bin/tar to contrib/libarchive/tar:
  
  r204111 (uqs):
  Fix common misspelling of hierarchy
  
  r207786 (kientzle):
  Various manpage updates, including many long-option synonyms that were
  previously undocumented.
  
  r208028 (uqs):
  mdoc: move remaining sections into consistent order
  
  This pertains mostly to FILES, HISTORY, EXIT STATUS and AUTHORS sections.
  
  r209152 (kientzle):
  If the compressed data is larger than the uncompressed,
  report the compression ratio as 0% instead of displaying
  nonsense triggered by numeric overflow.  This is common
  when dealing with uncompressed files when the I/O blocking
  causes there to be small transient differences in the
  accounting.
  
  r210720 (joel):
  Fix typos.
  
  r223541 (kientzle):
  If there is a read error reading Y/N confirmation from the keyboard,
  exit immediately with an error.
  
  If there is an error opening or reading a file to put into the archive,
  set the return value for a deferred error exit.
  
  r223573 (kientzle):
  The --newer-than test should descend into old
  directories to look for new files.
  
  r226636 (kientzle):
  Typo from previous commit. Urgh.
  
  r224153 (mm, partial):
  Update bsdtar.1 manpage
  
  MFC r228777:
  Merge FreeBSD changes from usr.bin/cpio to contrib/libarchive/cpio:
  
  r204111 (uqs):
  Fix common misspelling of hierarchy
  
  r211054 (kientzle);
  Fix -R when used with -p.  Previously, the
  uname and gname weren't overwritten, so the
  disk restore would use those to lookup the
  original uid/gid again.  Clearing the uname
  and gname prevents this.
  
  r212263 (gjb):
  Fix typo in bsdcpio manual:
  s/libarchive_formats/libarchive-formats
  
  MFC r228835:
  Fix typo s/xz/libarchive/
  
  Reported by:	Emil Mikulic (private e-mail)
  
  MFC r228911:
  Update to vendor revision 4016.
  
  Vendor has integrated most of our local changes in revisions 3976-3979 so
  future updates are going to be easier.
  Thanks to Tim Kientzle <kientzle@FreeBSD.org>.

Added:
     - copied from r228761, head/contrib/libarchive/
  stable/9/contrib/libarchive/FREEBSD-Xlist
     - copied, changed from r228762, head/contrib/libarchive/FREEBSD-Xlist
  stable/9/contrib/libarchive/FREEBSD-upgrade
     - copied, changed from r228762, head/contrib/libarchive/FREEBSD-upgrade
  stable/9/contrib/libarchive/libarchive/test/test_compat_zip_2.zip.uu
     - copied unchanged from r228911, head/contrib/libarchive/libarchive/test/test_compat_zip_2.zip.uu
Directory Properties:
  stable/9/contrib/libarchive/   (props changed)
Deleted:
  stable/9/contrib/libarchive/CMakeLists.txt
  stable/9/contrib/libarchive/CTestConfig.cmake
  stable/9/contrib/libarchive/INSTALL
  stable/9/contrib/libarchive/Makefile.am
  stable/9/contrib/libarchive/build/
  stable/9/contrib/libarchive/configure.ac
  stable/9/contrib/libarchive/contrib/
  stable/9/contrib/libarchive/cpio/CMakeLists.txt
  stable/9/contrib/libarchive/cpio/cpio_windows.c
  stable/9/contrib/libarchive/cpio/cpio_windows.h
  stable/9/contrib/libarchive/cpio/test/CMakeLists.txt
  stable/9/contrib/libarchive/doc/
  stable/9/contrib/libarchive/examples/
  stable/9/contrib/libarchive/libarchive/CMakeLists.txt
  stable/9/contrib/libarchive/libarchive/archive_entry_copy_bhfi.c
  stable/9/contrib/libarchive/libarchive/archive_windows.c
  stable/9/contrib/libarchive/libarchive/archive_windows.h
  stable/9/contrib/libarchive/libarchive/filter_fork_windows.c
  stable/9/contrib/libarchive/libarchive/mtree.5
  stable/9/contrib/libarchive/libarchive/test/.cvsignore
  stable/9/contrib/libarchive/libarchive/test/CMakeLists.txt
  stable/9/contrib/libarchive/tar/CMakeLists.txt
  stable/9/contrib/libarchive/tar/bsdtar_windows.c
  stable/9/contrib/libarchive/tar/bsdtar_windows.h
  stable/9/contrib/libarchive/tar/test/CMakeLists.txt
  stable/9/contrib/libarchive/tar/test/test_windows.c
Modified:
  stable/9/contrib/libarchive/cpio/bsdcpio.1   (contents, props changed)
  stable/9/contrib/libarchive/cpio/cmdline.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/config_freebsd.h   (contents, props changed)
  stable/9/contrib/libarchive/cpio/cpio.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/cpio.h   (contents, props changed)
  stable/9/contrib/libarchive/cpio/cpio_platform.h   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/main.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test.h   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_basic.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_format_newc.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_L_upper.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_a.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_tv.stdout.uu   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_y.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_passthrough_dotdot.c   (contents, props changed)
  stable/9/contrib/libarchive/cpio/test/test_passthrough_reverse.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_check_magic.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_crc32.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_endian.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry_copy_stat.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry_link_resolver.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry_private.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry_stat.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry_strmode.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_entry_xattr.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_hash.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_platform.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_private.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_data_into_fd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_disk.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_disk.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_disk_private.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_extract.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_open_fd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_open_file.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_open_filename.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_open_memory.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_private.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_all.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_compress.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_none.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_program.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_uu.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_xz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_all.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_ar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_cpio.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_empty.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_mtree.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_raw.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_tar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_xar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_format_zip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_string.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_string.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_string_sprintf.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_util.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_util.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_virtual.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_disk.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_disk.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_disk_private.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_open_fd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_open_file.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_open_filename.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_open_memory.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_private.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_compression_bzip2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_compression_compress.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_compression_gzip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_compression_none.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_compression_program.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_compression_xz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_ar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_by_name.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_cpio.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_mtree.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_pax.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_shar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_ustar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/archive_write_set_format_zip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/config_freebsd.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/cpio.5   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/filter_fork.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/filter_fork.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/libarchive-formats.5   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/libarchive.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/libarchive_internals.3   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/tar.5   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/README   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/main.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/read_open_memory.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_acl_basic.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_acl_freebsd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_acl_pax.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_archive_api_feature.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_bad_fd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_bzip2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_cpio.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_cpio_1.cpio.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_gtar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_gtar_1.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_gzip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_gzip_1.tgz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_gzip_2.tgz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_lzma.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_lzma_1.tlz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_lzma_2.tlz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_lzma_3.tlz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_tar_hardlink_1.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_xz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_xz_1.txz.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_zip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_compat_zip_1.zip.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_empty_write.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_entry.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_entry_strmode.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_extattr_freebsd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_fuzz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_fuzz_1.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_link_resolver.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_open_fd.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_open_file.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_open_filename.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_pax_filename_encoding.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_compress_program.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_data_large.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_disk.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_disk_entry_from_file.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_extract.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_file_nonexistent.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_ar.ar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_ar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.cpio.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_empty.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_joliet.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_mtree.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_mtree.mtree.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_raw.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_raw.data.Z.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_raw.data.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.tar.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tbz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tgz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tlz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_txz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_tz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_zip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_zip.zip.uu   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_large.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_pax_truncated.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_position.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_truncated.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_uu.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_tar_filenames.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_tar_large.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_ustar_filenames.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_compress.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_compress_bzip2.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_compress_gzip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_compress_lzma.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_compress_program.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_compress_xz.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_failures.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_hardlink.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_perms.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_secure.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_sparse.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_symlink.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_disk_times.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_ar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_cpio.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_mtree.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_tar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_zip.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_zip_no_compression.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_open_memory.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive_fe/err.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive_fe/lafe_platform.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive_fe/line_reader.h   (contents, props changed)
  stable/9/contrib/libarchive/libarchive_fe/matching.c   (contents, props changed)
  stable/9/contrib/libarchive/libarchive_fe/pathmatch.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/bsdtar.1   (contents, props changed)
  stable/9/contrib/libarchive/tar/bsdtar.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/bsdtar.h   (contents, props changed)
  stable/9/contrib/libarchive/tar/bsdtar_platform.h   (contents, props changed)
  stable/9/contrib/libarchive/tar/config_freebsd.h   (contents, props changed)
  stable/9/contrib/libarchive/tar/read.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/subst.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/main.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test.h   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_0.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_basic.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_copy.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_getdate.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_help.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_option_T_upper.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_option_q.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_option_s.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_patterns.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_stdio.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_strip_components.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_symlink_dir.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/test/test_version.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/tree.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/tree.h   (contents, props changed)
  stable/9/contrib/libarchive/tar/util.c   (contents, props changed)
  stable/9/contrib/libarchive/tar/write.c   (contents, props changed)
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/libarchive/COPYING   (props changed)
  stable/9/contrib/libarchive/NEWS   (props changed)
  stable/9/contrib/libarchive/README   (props changed)
  stable/9/contrib/libarchive/cpio/   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_0.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_cmdline.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref.bin.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref.crc.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref.newc.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref.ustar.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.bin.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.crc.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.newc.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_gcpio_compat_ref_nosym.ustar.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_B_upper.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_C_upper.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_J_upper.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_Z_upper.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_c.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_d.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_f.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_f.cpio.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_help.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_l.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_lzma.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_m.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_m.cpio.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_t.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_t.cpio.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_t.stdout.uu   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_u.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_version.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_option_z.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_owner_parse.c   (props changed)
  stable/9/contrib/libarchive/cpio/test/test_pathmatch.c   (props changed)
  stable/9/contrib/libarchive/libarchive/   (props changed)
  stable/9/contrib/libarchive/libarchive/archive_read_support_compression_rpm.c   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_open_failure.c   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.rpm.uu   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.rpm.uu   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_iso_2.iso.Z.uu   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_read_format_xar.c   (props changed)
  stable/9/contrib/libarchive/libarchive/test/test_write_format_pax.c   (props changed)
  stable/9/contrib/libarchive/libarchive_fe/   (props changed)
  stable/9/contrib/libarchive/libarchive_fe/err.c   (props changed)
  stable/9/contrib/libarchive/libarchive_fe/line_reader.c   (props changed)
  stable/9/contrib/libarchive/libarchive_fe/matching.h   (props changed)
  stable/9/contrib/libarchive/libarchive_fe/pathmatch.h   (props changed)
  stable/9/contrib/libarchive/tar/   (props changed)
  stable/9/contrib/libarchive/tar/cmdline.c   (props changed)
  stable/9/contrib/libarchive/tar/getdate.c   (props changed)
  stable/9/contrib/libarchive/tar/test/test_empty_mtree.c   (props changed)
  stable/9/contrib/libarchive/tar/test/test_option_r.c   (props changed)
  stable/9/contrib/libarchive/tar/test/test_patterns_2.tar.uu   (props changed)
  stable/9/contrib/libarchive/tar/test/test_patterns_3.tar.uu   (props changed)
  stable/9/contrib/libarchive/tar/test/test_patterns_4.tar.uu   (props changed)

Copied and modified: stable/9/contrib/libarchive/FREEBSD-Xlist (from r228762, head/contrib/libarchive/FREEBSD-Xlist)
==============================================================================
--- head/contrib/libarchive/FREEBSD-Xlist	Wed Dec 21 11:11:51 2011	(r228762, copy source)
+++ stable/9/contrib/libarchive/FREEBSD-Xlist	Thu Jan  5 12:06:54 2012	(r229592)
@@ -13,9 +13,11 @@ cpio/test/CMakeLists.txt
 doc
 examples
 libarchive/CMakeLists.txt
+libarchive/archive_entry_copy_bhfi.c
 libarchive/archive_windows.c
 libarchive/archive_windows.h
 libarchive/filter_fork_windows.c
+libarchive/mtree.5
 libarchive/test/.cvsignore
 libarchive/test/CMakeLists.txt
 tar/CMakeLists.txt

Copied and modified: stable/9/contrib/libarchive/FREEBSD-upgrade (from r228762, head/contrib/libarchive/FREEBSD-upgrade)
==============================================================================
--- head/contrib/libarchive/FREEBSD-upgrade	Wed Dec 21 11:11:51 2011	(r228762, copy source)
+++ stable/9/contrib/libarchive/FREEBSD-upgrade	Thu Jan  5 12:06:54 2012	(r229592)
@@ -17,7 +17,7 @@ at FreeBSD wiki:
 
 	http://wiki.freebsd.org/SubversionPrimer/VendorImports
 
-To make local changes to xz, simply patch and commit to the trunk
+To make local changes to libarchive, simply patch and commit to the trunk
 branch (aka HEAD).  Never make local changes on the vendor branch.
 
 mm@FreeBSD.org

Modified: stable/9/contrib/libarchive/cpio/bsdcpio.1
==============================================================================
--- head/contrib/libarchive/cpio/bsdcpio.1	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/bsdcpio.1	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 21, 2007
+.Dd September 5, 2010
 .Dt BSDCPIO 1
 .Os
 .Sh NAME
@@ -140,7 +140,7 @@ The POSIX.1 tar format.
 The default format is
 .Ar odc .
 See
-.Xr libarchive_formats 5
+.Xr libarchive-formats 5
 for more complete information about the
 formats currently supported by the underlying
 .Xr libarchive 3
@@ -295,7 +295,7 @@ for more information.
 .Sh EXAMPLES
 The
 .Nm
-command is traditionally used to copy file heirarchies in conjunction
+command is traditionally used to copy file hierarchies in conjunction
 with the
 .Xr find 1
 command.

Modified: stable/9/contrib/libarchive/cpio/cmdline.c
==============================================================================
--- head/contrib/libarchive/cpio/cmdline.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/cmdline.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -285,6 +285,8 @@ cpio_getopt(struct cpio *cpio)
  * A period can be used instead of the colon.
  *
  * Sets uid/gid return as appropriate, -1 indicates uid/gid not specified.
+ * TODO: If the spec uses uname/gname, then return those to the caller
+ * as well.  If the spec provides uid/gid, just return names as NULL.
  *
  * Returns NULL if no error, otherwise returns error string for display.
  *

Modified: stable/9/contrib/libarchive/cpio/config_freebsd.h
==============================================================================
--- head/contrib/libarchive/cpio/config_freebsd.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/config_freebsd.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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/config_freebsd.h,v 1.3 2008/12/06 07:30:40 kientzle Exp $
+ * $FreeBSD$
  */
 
 /* A hand-tooled configuration for FreeBSD. */

Modified: stable/9/contrib/libarchive/cpio/cpio.c
==============================================================================
--- head/contrib/libarchive/cpio/cpio.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/cpio.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #include <sys/types.h>
 #include <archive.h>
@@ -273,15 +273,21 @@ main(int argc, char *argv[])
 			cpio->quiet = 1;
 			break;
 		case 'R': /* GNU cpio, also --owner */
+			/* TODO: owner_parse should return uname/gname
+			 * also; use that to set [ug]name_override. */
 			errmsg = owner_parse(cpio->optarg, &uid, &gid);
 			if (errmsg) {
 				lafe_warnc(-1, "%s", errmsg);
 				usage();
 			}
-			if (uid != -1)
+			if (uid != -1) {
 				cpio->uid_override = uid;
-			if (gid != -1)
+				cpio->uname_override = NULL;
+			}
+			if (gid != -1) {
 				cpio->gid_override = gid;
+				cpio->gname_override = NULL;
+			}
 			break;
 		case 'r': /* POSIX 1997 */
 			cpio->option_rename = 1;
@@ -575,10 +581,14 @@ file_to_archive(struct cpio *cpio, const
 		return (r);
 	}
 
-	if (cpio->uid_override >= 0)
+	if (cpio->uid_override >= 0) {
 		archive_entry_set_uid(entry, cpio->uid_override);
-	if (cpio->gid_override >= 0)
+		archive_entry_set_uname(entry, cpio->uname_override);
+	}
+	if (cpio->gid_override >= 0) {
 		archive_entry_set_gid(entry, cpio->gid_override);
+		archive_entry_set_gname(entry, cpio->gname_override);
+	}
 
 	/*
 	 * Generate a destination path for this entry.

Modified: stable/9/contrib/libarchive/cpio/cpio.h
==============================================================================
--- head/contrib/libarchive/cpio/cpio.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/cpio.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef CPIO_H_INCLUDED
@@ -68,7 +68,9 @@ struct cpio {
 	size_t		  pass_destpath_alloc;
 	char		 *pass_destpath;
 	int		  uid_override;
+	char		 *uname_override;
 	int		  gid_override;
+	char		 *gname_override;
 	int		  day_first; /* true if locale prefers day/mon */
 
 	/* If >= 0, then close this when done. */

Modified: stable/9/contrib/libarchive/cpio/cpio_platform.h
==============================================================================
--- head/contrib/libarchive/cpio/cpio_platform.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/cpio_platform.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 /*

Modified: stable/9/contrib/libarchive/cpio/test/main.c
==============================================================================
--- head/contrib/libarchive/cpio/test/main.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/main.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -36,7 +36,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$");
 #define KNOWNREF	"test_option_f.cpio.uu"
 #define ENVBASE "BSDCPIO" /* Prefix for environment variables. */
 #define	PROGRAM "bsdcpio" /* Name of program being tested. */

Modified: stable/9/contrib/libarchive/cpio/test/test.h
==============================================================================
--- head/contrib/libarchive/cpio/test/test.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 /* Every test program should #include "test.h" as the first thing. */

Modified: stable/9/contrib/libarchive/cpio/test/test_basic.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_basic.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_basic.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 static void
 verify_files(const char *msg)

Modified: stable/9/contrib/libarchive/cpio/test/test_format_newc.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_format_newc.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_format_newc.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 /* 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: stable/9/contrib/libarchive/cpio/test/test_gcpio_compat.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_gcpio_compat.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_gcpio_compat.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 static void
 unpack_test(const char *from, const char *options, const char *se)

Modified: stable/9/contrib/libarchive/cpio/test/test_option_L_upper.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_option_L_upper.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_option_L_upper.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 /* This is a little pointless, as Windows doesn't support symlinks
  * (except for the seriously crippled CreateSymbolicLink API) so these

Modified: stable/9/contrib/libarchive/cpio/test/test_option_a.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_option_a.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_option_a.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 static struct {
 	const char *name;

Modified: stable/9/contrib/libarchive/cpio/test/test_option_tv.stdout.uu
==============================================================================
--- head/contrib/libarchive/cpio/test/test_option_tv.stdout.uu	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_option_tv.stdout.uu	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
 begin 644 test_option_tv.stdout
 M+7)W+7(M+7(M+2`@(#$@=&EM("`@("`@=&EM("`@("`@("`@("`@(#`@1&5C
 /(#,Q("`Q.38Y(&9I;&4*

Modified: stable/9/contrib/libarchive/cpio/test/test_option_y.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_option_y.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_option_y.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 DEFINE_TEST(test_option_y)
 {

Modified: stable/9/contrib/libarchive/cpio/test/test_passthrough_dotdot.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_passthrough_dotdot.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_passthrough_dotdot.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 /*
  * Verify that "cpio -p .." works.

Modified: stable/9/contrib/libarchive/cpio/test/test_passthrough_reverse.c
==============================================================================
--- head/contrib/libarchive/cpio/test/test_passthrough_reverse.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/cpio/test/test_passthrough_reverse.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 /*
  * As reported by Bernd Walter:  Some people are in the habit of

Modified: stable/9/contrib/libarchive/libarchive/archive.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef ARCHIVE_H_INCLUDED
@@ -493,11 +493,10 @@ __LA_DECL void		archive_read_extract_set
 /* Close the file and release most resources. */
 __LA_DECL int		 archive_read_close(struct archive *);
 /* Release all resources and destroy the object. */
-/* Note that archive_read_finish will call archive_read_close for you. */
-#if ARCHIVE_VERSION_NUMBER < 2000000
-/* Erroneously declared to return void in libarchive 1.x */
-__LA_DECL void		 archive_read_finish(struct archive *);
-#else
+/* Note that archive_read_free will call archive_read_close for you. */
+__LA_DECL int		 archive_read_free(struct archive *);
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Synonym for archive_read_free() for backwards compatibility. */
 __LA_DECL int		 archive_read_finish(struct archive *);
 #endif
 
@@ -514,7 +513,7 @@ __LA_DECL int		 archive_read_finish(stru
  *      - archive_write_header to write the header
  *      - archive_write_data to write the entry data
  *   5) archive_write_close to close the output
- *   6) archive_write_finish to cleanup the writer and release resources
+ *   6) archive_write_free to cleanup the writer and release resources
  */
 __LA_DECL struct archive	*archive_write_new(void);
 __LA_DECL int		 archive_write_set_bytes_per_block(struct archive *,
@@ -595,13 +594,12 @@ __LA_DECL __LA_SSIZE_T	 archive_write_da
 #endif
 __LA_DECL int		 archive_write_finish_entry(struct archive *);
 __LA_DECL int		 archive_write_close(struct archive *);
-#if ARCHIVE_VERSION_NUMBER < 2000000
-/* Return value was incorrect in libarchive 1.x. */
-__LA_DECL void		 archive_write_finish(struct archive *);
-#else
-/* Libarchive 2.x and later returns an error if this fails. */
-/* It can fail if the archive wasn't already closed, in which case
- * archive_write_finish() will implicitly call archive_write_close(). */
+
+/* This can fail if the archive wasn't already closed, in which case
+ * archive_write_free() will implicitly call archive_write_close(). */
+__LA_DECL int		 archive_write_free(struct archive *);
+#if ARCHIVE_VERSION_NUMBER < 4000000
+/* Synonym for archive_write_free() for backwards compatibility. */
 __LA_DECL int		 archive_write_finish(struct archive *);
 #endif
 
@@ -630,7 +628,7 @@ __LA_DECL int		archive_write_set_options
  *      - construct an appropriate struct archive_entry structure
  *      - archive_write_header to create the file/dir/etc on disk
  *      - archive_write_data to write the entry data
- *   4) archive_write_finish to cleanup the writer and release resources
+ *   4) archive_write_free to cleanup the writer and release resources
  *
  * In particular, you can use this in conjunction with archive_read()
  * to pull entries out of an archive and create them on disk.

Modified: stable/9/contrib/libarchive/libarchive/archive_check_magic.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_check_magic.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_check_magic.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_crc32.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_crc32.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_crc32.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef __LIBARCHIVE_BUILD

Modified: stable/9/contrib/libarchive/libarchive/archive_endian.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_endian.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_endian.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  *
  * Borrowed from FreeBSD's <sys/endian.h>
  */

Modified: stable/9/contrib/libarchive/libarchive/archive_entry.3
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry.3	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry.3	Thu Jan  5 12:06:54 2012	(r229592)
@@ -22,10 +22,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.18 2008/05/26 17:00:22 kientzle Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 12, 2008
-.Dt archive_entry 3
+.Dt ARCHIVE_ENTRY 3
 .Os
 .Sh NAME
 .Nm archive_entry_acl_add_entry ,

Modified: stable/9/contrib/libarchive/libarchive/archive_entry.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_entry.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED

Modified: stable/9/contrib/libarchive/libarchive/archive_entry_copy_stat.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry_copy_stat.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry_copy_stat.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_entry_link_resolver.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry_link_resolver.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry_link_resolver.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_entry_private.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry_private.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry_private.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef __LIBARCHIVE_BUILD

Modified: stable/9/contrib/libarchive/libarchive/archive_entry_stat.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry_stat.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry_stat.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_entry_strmode.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry_strmode.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry_strmode.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_entry_xattr.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_entry_xattr.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_entry_xattr.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_hash.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_hash.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_hash.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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_hash.h 201171 2009-12-29 06:39:07Z kientzle $
+ * $FreeBSD$
  */
 
 #ifndef __LIBARCHIVE_BUILD

Modified: stable/9/contrib/libarchive/libarchive/archive_platform.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_platform.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_platform.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 /* !!ONLY FOR USE INTERNALLY TO LIBARCHIVE!! */

Modified: stable/9/contrib/libarchive/libarchive/archive_private.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_private.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_private.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef __LIBARCHIVE_BUILD
@@ -58,7 +58,7 @@
 
 struct archive_vtable {
 	int	(*archive_close)(struct archive *);
-	int	(*archive_finish)(struct archive *);
+	int	(*archive_free)(struct archive *);
 	int	(*archive_write_header)(struct archive *,
 	    struct archive_entry *);
 	int	(*archive_write_finish_entry)(struct archive *);

Modified: stable/9/contrib/libarchive/libarchive/archive_read.3
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read.3	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read.3	Thu Jan  5 12:06:54 2012	(r229592)
@@ -22,10 +22,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/lib/libarchive/archive_read.3 191595 2009-04-27 20:13:13Z kientzle $
+.\" $FreeBSD$
 .\"
 .Dd April 13, 2009
-.Dt archive_read 3
+.Dt ARCHIVE_READ 3
 .Os
 .Sh NAME
 .Nm archive_read_new ,
@@ -69,7 +69,7 @@
 .Nm archive_read_extract2 ,
 .Nm archive_read_extract_set_progress_callback ,
 .Nm archive_read_close ,
-.Nm archive_read_finish
+.Nm archive_read_free
 .Nd functions for reading streaming archives
 .Sh SYNOPSIS
 .In archive.h
@@ -196,7 +196,7 @@
 .Ft int
 .Fn archive_read_close "struct archive *"
 .Ft int
-.Fn archive_read_finish "struct archive *"
+.Fn archive_read_free "struct archive *"
 .Sh DESCRIPTION
 These functions provide a complete API for reading streaming archives.
 The general process is to first create the
@@ -457,7 +457,7 @@ object and the archive_entry object so t
 can be retrieved for the progress display.
 .It Fn archive_read_close
 Complete the archive and invoke the close callback.
-.It Fn archive_read_finish
+.It Fn archive_read_free
 Invokes
 .Fn archive_read_close
 if it was not invoked manually, then release all resources.
@@ -600,7 +600,7 @@ list_archive(const char *name)
     printf("%s\en",archive_entry_pathname(entry));
     archive_read_data_skip(a);
   }
-  archive_read_finish(a);
+  archive_read_free(a);
   free(mydata);
 }
 

Modified: stable/9/contrib/libarchive/libarchive/archive_read.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -60,7 +60,7 @@ static int	choose_format(struct archive_
 static int	cleanup_filters(struct archive_read *);
 static struct archive_vtable *archive_read_vtable(void);
 static int	_archive_read_close(struct archive *);
-static int	_archive_read_finish(struct archive *);
+static int	_archive_read_free(struct archive *);
 
 static struct archive_vtable *
 archive_read_vtable(void)
@@ -69,7 +69,7 @@ archive_read_vtable(void)
 	static int inited = 0;
 
 	if (!inited) {
-		av.archive_finish = _archive_read_finish;
+		av.archive_free = _archive_read_free;
 		av.archive_close = _archive_read_close;
 	}
 	return (&av);
@@ -779,7 +779,7 @@ cleanup_filters(struct archive_read *a)
  * Release memory and other resources.
  */
 static int
-_archive_read_finish(struct archive *_a)
+_archive_read_free(struct archive *_a)
 {
 	struct archive_read *a = (struct archive_read *)_a;
 	int i;
@@ -787,7 +787,7 @@ _archive_read_finish(struct archive *_a)
 	int r = ARCHIVE_OK;
 
 	__archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY,
-	    "archive_read_finish");
+	    "archive_read_free");
 	if (a->archive.state != ARCHIVE_STATE_CLOSED)
 		r = archive_read_close(&a->archive);
 

Modified: stable/9/contrib/libarchive/libarchive/archive_read_data_into_fd.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_data_into_fd.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_data_into_fd.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_disk.3
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk.3	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_disk.3	Thu Jan  5 12:06:54 2012	(r229592)
@@ -22,10 +22,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: head/lib/libarchive/archive_read_disk.3 190957 2009-04-12 05:04:02Z kientzle $
+.\" $FreeBSD$
 .\"
 .Dd March 10, 2009
-.Dt archive_read_disk 3
+.Dt ARCHIVE_READ_DISK 3
 .Os
 .Sh NAME
 .Nm archive_read_disk_new ,
@@ -39,7 +39,7 @@
 .Nm archive_read_disk_set_gname_lookup ,
 .Nm archive_read_disk_set_standard_lookup ,
 .Nm archive_read_close ,
-.Nm archive_read_finish
+.Nm archive_read_free
 .Nd functions for reading objects from disk
 .Sh SYNOPSIS
 .In archive.h
@@ -81,7 +81,7 @@
 .Ft int
 .Fn archive_read_close "struct archive *"
 .Ft int
-.Fn archive_read_finish "struct archive *"
+.Fn archive_read_free "struct archive *"
 .Sh DESCRIPTION
 These functions provide an API for reading information about
 objects on disk.
@@ -178,9 +178,9 @@ This affects the file ownership fields a
 object.
 .It Fn archive_read_close
 This currently does nothing.
-.It Fn archive_write_finish
+.It Fn archive_read_free
 Invokes
-.Fn archive_write_close
+.Fn archive_read_close
 if it was not invoked manually, then releases all resources.
 .El
 More information about the
@@ -213,7 +213,7 @@ file_to_archive(struct archive *a, const
   while ((bytes_read = read(fd, buff, sizeof(buff))) > 0)
     archive_write_data(a, buff, bytes_read);
   archive_write_finish_entry(a);
-  archive_read_finish(ard);
+  archive_read_free(ard);
   archive_entry_free(entry);
 }
 .Ed
@@ -276,7 +276,7 @@ and first appeared in
 The
 .Nm libarchive
 library was written by
-.An Tim Kientzle Aq kientzle@freebsd.org .
+.An Tim Kientzle Aq kientzle@FreeBSD.org .
 .Sh BUGS
 The
 .Dq standard

Modified: stable/9/contrib/libarchive/libarchive/archive_read_disk.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_disk.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk.c 189429 2009-03-06 04:35:31Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #include "archive.h"
 #include "archive_string.h"
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/
 #include "archive_private.h"
 #include "archive_read_disk_private.h"
 
-static int	_archive_read_finish(struct archive *);
+static int	_archive_read_free(struct archive *);
 static int	_archive_read_close(struct archive *);
 static const char *trivial_lookup_gname(void *, gid_t gid);
 static const char *trivial_lookup_uname(void *, uid_t uid);
@@ -45,7 +45,7 @@ archive_read_disk_vtable(void)
 	static int inited = 0;
 
 	if (!inited) {
-		av.archive_finish = _archive_read_finish;
+		av.archive_free = _archive_read_free;
 		av.archive_close = _archive_read_close;
 	}
 	return (&av);
@@ -129,7 +129,7 @@ archive_read_disk_new(void)
 }
 
 static int
-_archive_read_finish(struct archive *_a)
+_archive_read_free(struct archive *_a)
 {
 	struct archive_read_disk *a = (struct archive_read_disk *)_a;
 

Modified: stable/9/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,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$");
 
 #ifdef HAVE_SYS_TYPES_H
 /* Mac OSX requires sys/types.h before sys/acl.h. */

Modified: stable/9/contrib/libarchive/libarchive/archive_read_disk_private.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk_private.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_disk_private.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef __LIBARCHIVE_BUILD

Modified: stable/9/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_extract.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_extract.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_extract.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -173,10 +173,7 @@ archive_read_extract_cleanup(struct arch
 {
 	int ret = ARCHIVE_OK;
 
-#if ARCHIVE_API_VERSION > 1
-	ret =
-#endif
-	    archive_write_finish(a->extract->ad);
+	ret = archive_write_free(a->extract->ad);
 	free(a->extract);
 	a->extract = NULL;
 	return (ret);

Modified: stable/9/contrib/libarchive/libarchive/archive_read_open_fd.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_open_fd.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_open_fd.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_open_file.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_open_file.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_open_file.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_open_filename.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_open_filename.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_open_filename.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_open_memory.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_open_memory.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_open_memory.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #include <errno.h>
 #include <stdlib.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_private.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_private.h	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_private.h	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$
  */
 
 #ifndef __LIBARCHIVE_BUILD

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_all.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_all.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_all.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_all.c 201248 2009-12-30 06:12:03Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #include "archive.h"
 

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_bzip2.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_bzip2.c 201108 2009-12-28 03:28:21Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_compress.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_compress.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_compress.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -64,7 +64,7 @@
 
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_compress.c 201094 2009-12-28 02:29:21Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_gzip.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -25,7 +25,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_gzip.c 201082 2009-12-28 02:05:28Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 
 #ifdef HAVE_ERRNO_H

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_none.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_none.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_none.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_none.c 185679 2008-12-06 06:45:15Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #include "archive.h"
 

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_program.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_program.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_program.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_program.c 201112 2009-12-28 06:59:35Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_SYS_WAIT_H
 #  include <sys/wait.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_uu.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_uu.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_uu.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_uu.c 201248 2009-12-30 06:12:03Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_compression_xz.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_compression_xz.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_compression_xz.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -26,7 +26,7 @@
 
 #include "archive_platform.h"
 
-__FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_compression_xz.c 201167 2009-12-29 06:06:20Z kientzle $");
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_format_all.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_all.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_format_all.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #include "archive.h"
 

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_format_ar.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_ar.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_format_ar.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -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$");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>

Modified: stable/9/contrib/libarchive/libarchive/archive_read_support_format_cpio.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_support_format_cpio.c	Wed Dec 21 11:09:24 2011	(r228761)
+++ stable/9/contrib/libarchive/libarchive/archive_read_support_format_cpio.c	Thu Jan  5 12:06:54 2012	(r229592)
@@ -24,7 +24,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$");
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -42,6 +42,10 @@ __FBSDID("$FreeBSD: head/lib/libarchive/
 #include "archive_private.h"
 #include "archive_read_private.h"
 
+#ifdef _MSC_VER
+#define __packed
+#pragma pack(push, 1)
+#endif
 struct cpio_bin_header {
 	unsigned char	c_magic[2];
 	unsigned char	c_dev[2];
@@ -54,7 +58,7 @@ struct cpio_bin_header {
 	unsigned char	c_mtime[4];
 	unsigned char	c_namesize[2];
 	unsigned char	c_filesize[4];
-};
+} __packed;
 
 struct cpio_odc_header {
 	char	c_magic[6];
@@ -68,7 +72,7 @@ struct cpio_odc_header {
 	char	c_mtime[11];
 	char	c_namesize[6];
 	char	c_filesize[11];
-};
+} __packed;
 
 struct cpio_newc_header {

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201051206.q05C6s6v034482>