MFhead @ r289132

3 files changed, 7 insertions, 511 deletions

diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile
deleted file mode 100644
index 52fa1f8..0000000
--- a/lib/libarchive/tests/Makefile
+++ /dev/null
@@ -1,457 +0,0 @@
-# $FreeBSD$
-
-LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
-
-ATF_TESTS_SH+=	functional_test
-
-BINDIR=	${TESTSDIR}
-
-PROGS+=	libarchive_test
-
-CFLAGS+= -I${.CURDIR:H} -I${.OBJDIR}
-CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils
-CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-
-DEBUG_CFLAGS+= -g
-
-LIBADD.libarchive_test=	archive
-
-# Uncomment to link against dmalloc
-#LDADD+= -L/usr/local/lib -ldmalloc
-#CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-
-.PATH: ${LIBARCHIVEDIR}/libarchive/test
-TESTS_SRCS= \
-	test_acl_freebsd_nfs4.c			\
-	test_acl_freebsd_posix1e.c		\
-	test_acl_nfs4.c				\
-	test_acl_pax.c				\
-	test_acl_posix1e.c			\
-	test_archive_api_feature.c		\
-	test_archive_clear_error.c		\
-	test_archive_cmdline.c			\
-	test_archive_crypto.c			\
-	test_archive_getdate.c			\
-	test_archive_match_time.c		\
-	test_archive_match_owner.c		\
-	test_archive_match_path.c		\
-	test_archive_pathmatch.c		\
-	test_archive_read_close_twice.c		\
-	test_archive_read_close_twice_open_fd.c	\
-	test_archive_read_close_twice_open_filename.c	\
-	test_archive_read_multiple_data_objects.c	\
-	test_archive_read_next_header_empty.c	\
-	test_archive_read_next_header_raw.c	\
-	test_archive_read_open2.c		\
-	test_archive_read_set_filter_option.c	\
-	test_archive_read_set_format_option.c	\
-	test_archive_read_set_option.c		\
-	test_archive_read_set_options.c		\
-	test_archive_read_support.c		\
-	test_archive_set_error.c		\
-	test_archive_string.c			\
-	test_archive_string_conversion.c	\
-	test_archive_write_add_filter_by_name.c	\
-	test_archive_write_set_filter_option.c	\
-	test_archive_write_set_format_by_name.c	\
-	test_archive_write_set_format_option.c	\
-	test_archive_write_set_option.c		\
-	test_archive_write_set_options.c	\
-	test_bad_fd.c				\
-	test_compat_bzip2.c			\
-	test_compat_cpio.c			\
-	test_compat_gtar.c			\
-	test_compat_gzip.c			\
-	test_compat_lzip.c			\
-	test_compat_lzma.c			\
-	test_compat_lzop.c			\
-	test_compat_mac.c			\
-	test_compat_pax_libarchive_2x.c		\
-	test_compat_solaris_tar_acl.c		\
-	test_compat_solaris_pax_sparse.c	\
-	test_compat_tar_hardlink.c		\
-	test_compat_uudecode.c			\
-	test_compat_xz.c			\
-	test_compat_zip.c			\
-	test_empty_write.c			\
-	test_entry.c				\
-	test_entry_strmode.c			\
-	test_extattr_freebsd.c			\
-	test_filter_count.c			\
-	test_fuzz.c				\
-	test_gnutar_filename_encoding.c		\
-	test_link_resolver.c			\
-	test_open_fd.c				\
-	test_open_failure.c			\
-	test_open_file.c			\
-	test_open_filename.c			\
-	test_pax_filename_encoding.c		\
-	test_read_data_large.c			\
-	test_read_disk.c			\
-	test_read_disk_directory_traversals.c	\
-	test_read_disk_entry_from_file.c	\
-	test_read_extract.c			\
-	test_read_file_nonexistent.c		\
-	test_read_filter_grzip.c		\
-	test_read_filter_lrzip.c		\
-	test_read_filter_lzop.c			\
-	test_read_filter_lzop_multiple_parts.c	\
-	test_read_filter_program.c		\
-	test_read_filter_program_signature.c	\
-	test_read_filter_uudecode.c		\
-	test_read_format_7zip.c			\
-	test_read_format_ar.c			\
-	test_read_format_cab.c			\
-	test_read_format_cab_filename.c		\
-	test_read_format_cpio_afio.c		\
-	test_read_format_cpio_bin.c		\
-	test_read_format_cpio_bin_Z.c		\
-	test_read_format_cpio_bin_be.c		\
-	test_read_format_cpio_bin_bz2.c		\
-	test_read_format_cpio_bin_gz.c		\
-	test_read_format_cpio_bin_lzip.c	\
-	test_read_format_cpio_bin_lzma.c	\
-	test_read_format_cpio_bin_xz.c		\
-	test_read_format_cpio_filename.c	\
-	test_read_format_cpio_odc.c		\
-	test_read_format_cpio_svr4_gzip.c	\
-	test_read_format_cpio_svr4c_Z.c		\
-	test_read_format_cpio_svr4_bzip2_rpm.c	\
-	test_read_format_cpio_svr4_gzip_rpm.c	\
-	test_read_format_empty.c		\
-	test_read_format_gtar_filename.c	\
-	test_read_format_gtar_gz.c		\
-	test_read_format_gtar_lzma.c		\
-	test_read_format_gtar_sparse.c		\
-	test_read_format_gtar_sparse_skip_entry.c \
-	test_read_format_iso_Z.c		\
-	test_read_format_iso_multi_extent.c	\
-	test_read_format_iso_xorriso.c		\
-	test_read_format_isorr_rr_moved.c	\
-	test_read_format_isojoliet_bz2.c	\
-	test_read_format_isojoliet_long.c	\
-	test_read_format_isojoliet_rr.c		\
-	test_read_format_isojoliet_versioned.c	\
-	test_read_format_isorr_bz2.c		\
-	test_read_format_isorr_ce.c		\
-	test_read_format_isorr_new_bz2.c	\
-	test_read_format_isozisofs_bz2.c	\
-	test_read_format_lha.c			\
-	test_read_format_lha_filename.c		\
-	test_read_format_mtree.c		\
-	test_read_format_pax_bz2.c		\
-	test_read_format_rar.c			\
-	test_read_format_raw.c			\
-	test_read_format_tar.c			\
-	test_read_format_tar_empty_filename.c	\
-	test_read_format_tar_filename.c		\
-	test_read_format_tbz.c			\
-	test_read_format_tgz.c			\
-	test_read_format_tlz.c			\
-	test_read_format_txz.c			\
-	test_read_format_tz.c			\
-	test_read_format_ustar_filename.c	\
-	test_read_format_xar.c			\
-	test_read_format_zip.c			\
-	test_read_format_zip_comment_stored.c	\
-	test_read_format_zip_filename.c		\
-	test_read_format_zip_mac_metadata.c	\
-	test_read_format_zip_sfx.c		\
-	test_read_large.c			\
-	test_read_pax_truncated.c		\
-	test_read_position.c			\
-	test_read_set_format.c			\
-	test_read_truncated.c			\
-	test_read_truncated_filter.c		\
-	test_sparse_basic.c			\
-	test_tar_filenames.c			\
-	test_tar_large.c			\
-	test_ustar_filenames.c			\
-	test_ustar_filename_encoding.c		\
-	test_write_disk.c			\
-	test_write_disk_appledouble.c		\
-	test_write_disk_failures.c		\
-	test_write_disk_hardlink.c		\
-	test_write_disk_hfs_compression.c	\
-	test_write_disk_lookup.c		\
-	test_write_disk_mac_metadata.c		\
-	test_write_disk_no_hfs_compression.c	\
-	test_write_disk_perms.c			\
-	test_write_disk_secure.c		\
-	test_write_disk_sparse.c		\
-	test_write_disk_symlink.c		\
-	test_write_disk_times.c			\
-	test_write_filter_b64encode.c		\
-	test_write_filter_bzip2.c		\
-	test_write_filter_compress.c		\
-	test_write_filter_gzip.c		\
-	test_write_filter_gzip_timestamp.c	\
-	test_write_filter_lrzip.c		\
-	test_write_filter_lzip.c		\
-	test_write_filter_lzma.c		\
-	test_write_filter_lzop.c		\
-	test_write_filter_program.c		\
-	test_write_filter_uuencode.c		\
-	test_write_filter_xz.c			\
-	test_write_format_7zip.c		\
-	test_write_format_7zip_empty.c		\
-	test_write_format_7zip_large.c		\
-	test_write_format_ar.c			\
-	test_write_format_cpio.c		\
-	test_write_format_cpio_empty.c		\
-	test_write_format_cpio_newc.c		\
-	test_write_format_cpio_odc.c		\
-	test_write_format_gnutar.c		\
-	test_write_format_iso9660.c		\
-	test_write_format_iso9660_boot.c	\
-	test_write_format_iso9660_empty.c	\
-	test_write_format_iso9660_filename.c	\
-	test_write_format_iso9660_zisofs.c	\
-	test_write_format_mtree.c		\
-	test_write_format_mtree_absolute_path.c	\
-	test_write_format_mtree_classic.c	\
-	test_write_format_mtree_classic_indent.c	\
-	test_write_format_mtree_fflags.c	\
-	test_write_format_mtree_no_separator.c	\
-	test_write_format_mtree_quoted_filename.c	\
-	test_write_format_pax.c			\
-	test_write_format_shar_empty.c		\
-	test_write_format_tar.c			\
-	test_write_format_tar_empty.c		\
-	test_write_format_tar_sparse.c		\
-	test_write_format_tar_ustar.c		\
-	test_write_format_tar_v7tar.c		\
-	test_write_format_xar.c			\
-	test_write_format_xar_empty.c		\
-	test_write_format_zip.c			\
-	test_write_format_zip_empty.c		\
-	test_write_format_zip_no_compression.c	\
-	test_write_zip_set_compression_store.c	\
-	test_write_open_memory.c		\
-	test_zip_filename_encoding.c
-
-# Deterministic failures:
-# Crashes with SIGBUS
-BROKEN_TESTS+=			test_archive_rmd160
-# Fails with `libarchive/test/test_archive_crypto.c:121: md != actualmd`
-BROKEN_TESTS+=			test_archive_sha384
-# Fails with `test_compat_pax_libarchive_2x.c:122: ARCHIVE_WARN != archive_read_next_header(a, &ae)`
-BROKEN_TESTS+=			test_compat_pax_libarchive_2x
-# Fails with `test_read_disk_directory_traversals.c:1094: File at has atime 886622, 1443306049 seconds ago`
-BROKEN_TESTS+=			test_read_disk_directory_traversals
-
-# Non-deterministic failures:
-# (Times out?) [and] crashes
-BROKEN_TESTS+=			test_fuzz_rar
-
-# Build the test program.
-SRCS.libarchive_test=		\
-	${TESTS_SRCS}		\
-	main.c			\
-	read_open_memory.c
-
-DPSRCS.libarchive_test= \
-	list.h
-
-.PATH: ${LIBARCHIVEDIR}/test_utils
-SRCS.libarchive_test+=	test_utils.c
-
-# list.h is just a list of all tests, as indicated by DEFINE_TEST macro lines
-list.h: ${TESTS_SRCS} Makefile
-	@(cd ${LIBARCHIVEDIR}/libarchive/test && \
-	grep -h DEFINE_TEST ${.ALLSRC:N*Makefile} | \
-	    egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp
-	@mv ${.TARGET}.tmp ${.TARGET}
-
-FILES+=	README
-FILES+=	test_acl_pax.tar.uu
-FILES+=	test_archive_string_conversion.txt.Z.uu
-FILES+=	test_compat_bzip2_1.tbz.uu
-FILES+=	test_compat_bzip2_2.tbz.uu
-FILES+=	test_compat_cpio_1.cpio.uu
-FILES+=	test_compat_gtar_1.tar.uu
-FILES+=	test_compat_gzip_1.tgz.uu
-FILES+=	test_compat_gzip_2.tgz.uu
-FILES+=	test_compat_lzip_1.tlz.uu
-FILES+=	test_compat_lzip_2.tlz.uu
-FILES+=	test_compat_lzma_1.tlz.uu
-FILES+=	test_compat_lzma_2.tlz.uu
-FILES+=	test_compat_lzma_3.tlz.uu
-FILES+=	test_compat_lzop_1.tar.lzo.uu
-FILES+=	test_compat_lzop_2.tar.lzo.uu
-FILES+=	test_compat_lzop_3.tar.lzo.uu
-FILES+=	test_compat_mac-1.tar.Z.uu
-FILES+=	test_compat_mac-2.tar.Z.uu
-FILES+=	test_compat_pax_libarchive_2x.tar.Z.uu
-FILES+=	test_compat_solaris_pax_sparse_1.pax.Z.uu
-FILES+=	test_compat_solaris_pax_sparse_2.pax.Z.uu
-FILES+=	test_compat_solaris_tar_acl.tar.uu
-FILES+=	test_compat_tar_hardlink_1.tar.uu
-FILES+=	test_compat_xz_1.txz.uu
-FILES+=	test_compat_zip_1.zip.uu
-FILES+=	test_compat_zip_2.zip.uu
-FILES+=	test_compat_zip_3.zip.uu
-FILES+=	test_compat_zip_4.zip.uu
-FILES+=	test_compat_zip_5.zip.uu
-FILES+=	test_compat_zip_6.zip.uu
-FILES+=	test_compat_zip_7.xps.uu
-FILES+=	test_fuzz.cab.uu
-FILES+=	test_fuzz.lzh.uu
-FILES+=	test_fuzz_1.iso.Z.uu
-FILES+=	test_pax_filename_encoding.tar.uu
-FILES+=	test_rar_multivolume_multiple_files.part1.rar.uu
-FILES+=	test_rar_multivolume_multiple_files.part2.rar.uu
-FILES+=	test_rar_multivolume_multiple_files.part3.rar.uu
-FILES+=	test_rar_multivolume_multiple_files.part4.rar.uu
-FILES+=	test_rar_multivolume_multiple_files.part5.rar.uu
-FILES+=	test_rar_multivolume_multiple_files.part6.rar.uu
-FILES+=	test_rar_multivolume_single_file.part1.rar.uu
-FILES+=	test_rar_multivolume_single_file.part2.rar.uu
-FILES+=	test_rar_multivolume_single_file.part3.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part01.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part02.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part03.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part04.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part05.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part06.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part07.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part08.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part09.rar.uu
-FILES+=	test_rar_multivolume_uncompressed_files.part10.rar.uu
-FILES+=	test_read_filter_grzip.tar.grz.uu
-FILES+=	test_read_filter_lrzip.tar.lrz.uu
-FILES+=	test_read_filter_lzop.tar.lzo.uu
-FILES+=	test_read_filter_lzop_multiple_parts.tar.lzo.uu
-FILES+=	test_read_format_7zip_bcj2_bzip2.7z.uu
-FILES+=	test_read_format_7zip_bcj2_copy_1.7z.uu
-FILES+=	test_read_format_7zip_bcj2_copy_2.7z.uu
-FILES+=	test_read_format_7zip_bcj2_copy_lzma.7z.uu
-FILES+=	test_read_format_7zip_bcj2_deflate.7z.uu
-FILES+=	test_read_format_7zip_bcj2_lzma1_1.7z.uu
-FILES+=	test_read_format_7zip_bcj2_lzma1_2.7z.uu
-FILES+=	test_read_format_7zip_bcj2_lzma2_1.7z.uu
-FILES+=	test_read_format_7zip_bcj2_lzma2_2.7z.uu
-FILES+=	test_read_format_7zip_bcj_bzip2.7z.uu
-FILES+=	test_read_format_7zip_bcj_copy.7z.uu
-FILES+=	test_read_format_7zip_bcj_deflate.7z.uu
-FILES+=	test_read_format_7zip_bcj_lzma1.7z.uu
-FILES+=	test_read_format_7zip_bcj_lzma2.7z.uu
-FILES+=	test_read_format_7zip_bzip2.7z.uu
-FILES+=	test_read_format_7zip_copy.7z.uu
-FILES+=	test_read_format_7zip_copy_2.7z.uu
-FILES+=	test_read_format_7zip_deflate.7z.uu
-FILES+=	test_read_format_7zip_delta_lzma1.7z.uu
-FILES+=	test_read_format_7zip_delta_lzma2.7z.uu
-FILES+=	test_read_format_7zip_empty_archive.7z.uu
-FILES+=	test_read_format_7zip_empty_file.7z.uu
-FILES+=	test_read_format_7zip_lzma1.7z.uu
-FILES+=	test_read_format_7zip_lzma1_2.7z.uu
-FILES+=	test_read_format_7zip_lzma1_lzma2.7z.uu
-FILES+=	test_read_format_7zip_lzma2.7z.uu
-FILES+=	test_read_format_7zip_ppmd.7z.uu
-FILES+=	test_read_format_7zip_symbolic_name.7z.uu
-FILES+=	test_read_format_ar.ar.uu
-FILES+=	test_read_format_cab_1.cab.uu
-FILES+=	test_read_format_cab_2.cab.uu
-FILES+=	test_read_format_cab_3.cab.uu
-FILES+=	test_read_format_cab_filename_cp932.cab.uu
-FILES+=	test_read_format_cpio_bin_be.cpio.uu
-FILES+=	test_read_format_cpio_filename_cp866.cpio.uu
-FILES+=	test_read_format_cpio_filename_eucjp.cpio.uu
-FILES+=	test_read_format_cpio_filename_koi8r.cpio.uu
-FILES+=	test_read_format_cpio_filename_utf8_jp.cpio.uu
-FILES+=	test_read_format_cpio_filename_utf8_ru.cpio.uu
-FILES+=	test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
-FILES+=	test_read_format_cpio_svr4_gzip_rpm.rpm.uu
-FILES+=	test_read_format_gtar_filename_cp866.tar.Z.uu
-FILES+=	test_read_format_gtar_filename_eucjp.tar.Z.uu
-FILES+=	test_read_format_gtar_filename_koi8r.tar.Z.uu
-FILES+=	test_read_format_gtar_sparse_1_13.tar.uu
-FILES+=	test_read_format_gtar_sparse_1_17.tar.uu
-FILES+=	test_read_format_gtar_sparse_1_17_posix00.tar.uu
-FILES+=	test_read_format_gtar_sparse_1_17_posix01.tar.uu
-FILES+=	test_read_format_gtar_sparse_1_17_posix10.tar.uu
-FILES+=	test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
-FILES+=	test_read_format_gtar_sparse_skip_entry.tar.Z.uu
-FILES+=	test_read_format_iso.iso.Z.uu
-FILES+=	test_read_format_iso_2.iso.Z.uu
-FILES+=	test_read_format_iso_joliet.iso.Z.uu
-FILES+=	test_read_format_iso_joliet_by_nero.iso.Z.uu
-FILES+=	test_read_format_iso_joliet_long.iso.Z.uu
-FILES+=	test_read_format_iso_joliet_rockridge.iso.Z.uu
-FILES+=	test_read_format_iso_multi_extent.iso.Z.uu
-FILES+=	test_read_format_iso_rockridge.iso.Z.uu
-FILES+=	test_read_format_iso_rockridge_ce.iso.Z.uu
-FILES+=	test_read_format_iso_rockridge_new.iso.Z.uu
-FILES+=	test_read_format_iso_rockridge_rr_moved.iso.Z.uu
-FILES+=	test_read_format_iso_xorriso.iso.Z.uu
-FILES+=	test_read_format_iso_zisofs.iso.Z.uu
-FILES+=	test_read_format_lha_filename_cp932.lzh.uu
-FILES+=	test_read_format_lha_header0.lzh.uu
-FILES+=	test_read_format_lha_header1.lzh.uu
-FILES+=	test_read_format_lha_header2.lzh.uu
-FILES+=	test_read_format_lha_header3.lzh.uu
-FILES+=	test_read_format_lha_lh0.lzh.uu
-FILES+=	test_read_format_lha_lh6.lzh.uu
-FILES+=	test_read_format_lha_lh7.lzh.uu
-FILES+=	test_read_format_lha_withjunk.lzh.uu
-FILES+=	test_read_format_mtree.mtree.uu
-FILES+=	test_read_format_mtree_nomagic.mtree.uu
-FILES+=	test_read_format_mtree_nomagic2.mtree.uu
-FILES+=	test_read_format_mtree_nomagic3.mtree.uu
-FILES+=	test_read_format_rar.rar.uu
-FILES+=	test_read_format_rar_binary_data.rar.uu
-FILES+=	test_read_format_rar_compress_best.rar.uu
-FILES+=	test_read_format_rar_compress_normal.rar.uu
-FILES+=	test_read_format_rar_multi_lzss_blocks.rar.uu
-FILES+=	test_read_format_rar_multivolume.part0001.rar.uu
-FILES+=	test_read_format_rar_multivolume.part0002.rar.uu
-FILES+=	test_read_format_rar_multivolume.part0003.rar.uu
-FILES+=	test_read_format_rar_multivolume.part0004.rar.uu
-FILES+=	test_read_format_rar_noeof.rar.uu
-FILES+=	test_read_format_rar_ppmd_lzss_conversion.rar.uu
-FILES+=	test_read_format_rar_sfx.exe.uu
-FILES+=	test_read_format_rar_subblock.rar.uu
-FILES+=	test_read_format_rar_unicode.rar.uu
-FILES+=	test_read_format_rar_windows.rar.uu
-FILES+=	test_read_format_raw.data.Z.uu
-FILES+=	test_read_format_raw.data.uu
-FILES+=	test_read_format_tar_empty_filename.tar.uu
-FILES+=	test_read_format_tar_filename_koi8r.tar.Z.uu
-FILES+=	test_read_format_ustar_filename_cp866.tar.Z.uu
-FILES+=	test_read_format_ustar_filename_eucjp.tar.Z.uu
-FILES+=	test_read_format_ustar_filename_koi8r.tar.Z.uu
-FILES+=	test_read_format_zip.zip.uu
-FILES+=	test_read_format_zip_comment_stored_1.zip.uu
-FILES+=	test_read_format_zip_comment_stored_2.zip.uu
-FILES+=	test_read_format_zip_filename_cp866.zip.uu
-FILES+=	test_read_format_zip_filename_cp932.zip.uu
-FILES+=	test_read_format_zip_filename_koi8r.zip.uu
-FILES+=	test_read_format_zip_filename_utf8_jp.zip.uu
-FILES+=	test_read_format_zip_filename_utf8_ru.zip.uu
-FILES+=	test_read_format_zip_filename_utf8_ru2.zip.uu
-FILES+=	test_read_format_zip_length_at_end.zip.uu
-FILES+=	test_read_format_zip_mac_metadata.zip.uu
-FILES+=	test_read_format_zip_sfx.uu
-FILES+=	test_read_format_zip_symlink.zip.uu
-FILES+=	test_read_format_zip_ux.zip.uu
-FILES+=	test_read_large_splitted_rar_aa.uu
-FILES+=	test_read_large_splitted_rar_ab.uu
-FILES+=	test_read_large_splitted_rar_ac.uu
-FILES+=	test_read_large_splitted_rar_ad.uu
-FILES+=	test_read_large_splitted_rar_ae.uu
-FILES+=	test_read_splitted_rar_aa.uu
-FILES+=	test_read_splitted_rar_ab.uu
-FILES+=	test_read_splitted_rar_ac.uu
-FILES+=	test_read_splitted_rar_ad.uu
-FILES+=	test_splitted_rar_seek_support_aa.uu
-FILES+=	test_splitted_rar_seek_support_ab.uu
-FILES+=	test_splitted_rar_seek_support_ac.uu
-FILES+=	test_write_disk_appledouble.cpio.gz.uu
-FILES+=	test_write_disk_hfs_compression.tgz.uu
-FILES+=	test_write_disk_mac_metadata.tar.gz.uu
-FILES+=	test_write_disk_no_hfs_compression.tgz.uu
-
-CLEANFILES+=	list.h list.h.tmp
-
-.include <bsd.test.mk>
diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh
deleted file mode 100755
index cc66b3e..0000000
--- a/lib/libarchive/tests/functional_test.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright 2015 EMC Corp.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# $FreeBSD$
-
-SRCDIR=$(atf_get_srcdir)
-TESTER="${SRCDIR}/libarchive_test"
-
-check()
-{
-	local testcase=${1}; shift
-
-	atf_check -o ignore -s exit:0 ${TESTER} -d -r "${SRCDIR}" -v "${testcase}"
-}
-
-atf_init_test_cases()
-{
-	# Redirect stderr to stdout for the usage message because if you don't
-	# kyua list/kyua test will break:
-	# https://github.com/jmmv/kyua/issues/149
-	testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }')
-	for testcase in ${testcases}; do
-		atf_test_case ${testcase}
-		eval "${testcase}_body() { check ${testcase}; }"
-		atf_add_test_case ${testcase}
-	done
-}
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index 98ddf13..788e79f 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 17, 1995
+.Dd October 10, 2015
 .Dt SHMCTL 2
 .Os
 .Sh NAME
@@ -72,15 +72,18 @@ or it must have superuser privileges.
 .It Dv IPC_RMID
 Removes the segment from the system.
 The removal will not take
-effect until all processes having attached the segment have exited;
-however, once the IPC_RMID operation has taken place, no further
-processes will be allowed to attach the segment.
+effect until all processes having attached the segment have exited.
 For the operation
 to succeed, the calling process's effective uid must match
 .Fa shm_perm.uid
 or
 .Fa shm_perm.cuid ,
 or the process must have superuser privileges.
+If the
+.Va kern.ipc.shm_allow_removed
+.Xr sysctl 3
+variable is set to 0, once the IPC_RMID operation has taken place,
+no further processes will be allowed to attach the segment.
 .\" .It Dv SHM_LOCK
 .\" Locks the segment in memory.  The calling process must have
 .\" superuser privileges. Not implemented in FreeBSD.