MFV r248590,248594:

Update libarchive to 3.1.2

Some of new features:
  - support for lrzip and grzip compression
  - support for writing tar v7 format
  - b64encode and uuencode filters
  - support for __MACOSX directory in Zip archives
  - support for lzop compresion (external utility)

1 files changed, 212 insertions, 0 deletions

diff --git a/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c b/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c
new file mode 100644
index 0000000..d604fbf
--- /dev/null
+++ b/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c
@@ -0,0 +1,212 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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 AUTHOR(S) ``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 AUTHOR(S) 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.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+#ifdef HAVE_SYS_ACL_H
+#include <sys/acl.h>
+#endif
+#ifdef HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
+
+#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
+	&& defined(HAVE_ZLIB_H)
+static int
+has_xattr(const char *filename, const char *xattrname)
+{
+	char *nl, *nlp;
+	ssize_t r;
+	int exisiting;
+
+	r = listxattr(filename, NULL, 0, XATTR_SHOWCOMPRESSION);
+	if (r < 0)
+		return (0);
+	if (r == 0)
+		return (0);
+
+	nl = malloc(r);
+	if (!assert(nl != NULL))
+		return (0);
+
+	r = listxattr(filename, nl, r, XATTR_SHOWCOMPRESSION);
+	if (r < 0) {
+		free(nl);
+		return (0);
+	}
+
+	exisiting = 0;
+	for (nlp = nl; nlp < nl + r; nlp += strlen(nlp) + 1) {
+		if (strcmp(nlp, xattrname) == 0) {
+			exisiting = 1;
+			break;
+		}
+	}
+	free(nl);
+	return (exisiting);
+}
+
+#endif
+
+/*
+ * Exercise HFS+ Compression.
+ */
+DEFINE_TEST(test_write_disk_appledouble)
+{
+#if !defined(__APPLE__) || !defined(UF_COMPRESSED) || !defined(HAVE_SYS_XATTR_H)\
+	|| !defined(HAVE_ZLIB_H)
+	skipping("MacOS-specific AppleDouble test");
+#else
+	const char *refname = "test_write_disk_appledouble.cpio.gz";
+	struct archive *ad, *a;
+	struct archive_entry *ae;
+	struct stat st;
+	acl_t acl;
+
+	extract_reference_file(refname);
+
+	/*
+	 * Extract an archive to disk with HFS+ Compression.
+	 */
+	assert((ad = archive_write_disk_new()) != NULL);
+	assertEqualIntA(ad, ARCHIVE_OK,
+	    archive_write_disk_set_standard_lookup(ad));
+	assertEqualIntA(ad, ARCHIVE_OK,
+	    archive_write_disk_set_options(ad,
+		ARCHIVE_EXTRACT_TIME |
+		ARCHIVE_EXTRACT_SECURE_SYMLINKS |
+		ARCHIVE_EXTRACT_SECURE_NODOTDOT |
+		ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED));
+
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a,
+	    refname, 512 * 20));
+
+	assertMakeDir("hfscmp", 0755);
+	assertChdir("hfscmp");
+
+	/* Skip "." */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString(".", archive_entry_pathname(ae));
+	/* Extract file3. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("./file3", archive_entry_pathname(ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+	/* Extract ._file3 which will be merged into file3 as medtadata. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("./._file3", archive_entry_pathname(ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+	assertEqualIntA(ad, ARCHIVE_OK, archive_write_free(ad));
+
+	/* Test file3. */
+	assertEqualInt(0, stat("file3", &st));
+	assertEqualInt(UF_COMPRESSED, st.st_flags & UF_COMPRESSED);
+	assertFileSize("file3", 8);
+	failure("'%s' should not have Resource Fork", "file3");
+	assertEqualInt(0, has_xattr("file3", "com.apple.ResourceFork"));
+	failure("'%s' should have decompfs xattr", "file3");
+	assertEqualInt(1, has_xattr("file3", "com.apple.decmpfs"));
+	assert(NULL != (acl = acl_get_file("file3", ACL_TYPE_EXTENDED)));
+	assertEqualString(acl_to_text(acl, NULL),
+	    "!#acl 1\n"
+	    "user:FFFFEEEE-DDDD-CCCC-BBBB-AAAA000000C9:Guest:201:deny:read\n"
+	    "group:ABCDEFAB-CDEF-ABCD-EFAB-CDEF00000050:admin:80:allow:write\n"
+	);
+	if (acl) acl_free(acl);
+	/* Test ._file3. */
+	failure("'file3' should be merged and removed");
+	assertFileNotExists("._file3");
+
+	assertChdir("..");
+
+	/*
+	 * Extract an archive to disk without HFS+ Compression.
+	 */
+	assert((ad = archive_write_disk_new()) != NULL);
+	assertEqualIntA(ad, ARCHIVE_OK,
+	    archive_write_disk_set_standard_lookup(ad));
+	assertEqualIntA(ad, ARCHIVE_OK,
+	    archive_write_disk_set_options(ad,
+		ARCHIVE_EXTRACT_TIME |
+		ARCHIVE_EXTRACT_SECURE_SYMLINKS |
+		ARCHIVE_EXTRACT_SECURE_NODOTDOT));
+
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a,
+	    refname, 512 * 20));
+
+	assertMakeDir("nocmp", 0755);
+	assertChdir("nocmp");
+
+	/* Skip "." */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString(".", archive_entry_pathname(ae));
+	/* Extract file3. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("./file3", archive_entry_pathname(ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+	/* Extract ._file3 which will be merged into file3 as medtadata. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	assertEqualString("./._file3", archive_entry_pathname(ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_extract2(a, ae, ad));
+
+	assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+	assertEqualIntA(ad, ARCHIVE_OK, archive_write_free(ad));
+
+	/* Test file3. */
+	assertEqualInt(0, stat("file3", &st));
+	assertEqualInt(0, st.st_flags & UF_COMPRESSED);
+	assertFileSize("file3", 8);
+	failure("'%s' should not have Resource Fork", "file3");
+	assertEqualInt(0, has_xattr("file3", "com.apple.ResourceFork"));
+	failure("'%s' should not have decmpfs", "file3");
+	assertEqualInt(0, has_xattr("file3", "com.apple.decmpfs"));
+	assert(NULL != (acl = acl_get_file("file3", ACL_TYPE_EXTENDED)));
+	assertEqualString(acl_to_text(acl, NULL),
+	    "!#acl 1\n"
+	    "user:FFFFEEEE-DDDD-CCCC-BBBB-AAAA000000C9:Guest:201:deny:read\n"
+	    "group:ABCDEFAB-CDEF-ABCD-EFAB-CDEF00000050:admin:80:allow:write\n"
+	);
+	if (acl) acl_free(acl);
+	/* Test ._file3. */
+	failure("'file3' should be merged and removed");
+	assertFileNotExists("._file3");
+
+	assertChdir("..");
+
+	assertEqualFile("hfscmp/file3", "nocmp/file3");
+#endif
+}