Update vendor/libarchive/dist to git 3288ebb0353beb51dfb09d444dedbe9235ead53dvendor/libarchive/3.4.2

Libarchive 3.4.2

Relevant vendor changes:
  PR #1289: atomic extraction support (bsdtar -x --safe-writes)
  PR #1308: big endian fix for UTF16 support in LHA reader
  PR #1326: reject RAR5 files that declare invalid header flags
  Issue #987: fix support 7z archive entries with Delta filter
  Issue #1317: fix compression output buffer handling in XAR writer
  Issue #1319: fix uname or gname longer than 32 characters in pax writer
  Issue #1325: fix use after free when archiving hardlinks in ISO9660 or XAR
  Use localtime_r() and gmtime_r() instead of localtime() and gmtime()

6 files changed, 84 insertions, 8 deletions

diff --git a/tar/test/CMakeLists.txt b/tar/test/CMakeLists.txt
index 459d9dcb1eff..2cd573acfaa5 100644
--- a/tar/test/CMakeLists.txt
+++ b/tar/test/CMakeLists.txt
@@ -59,6 +59,7 @@ IF(ENABLE_TAR AND ENABLE_TEST)
     test_option_q.c
     test_option_r.c
     test_option_s.c
+    test_option_safe_writes.c
     test_option_uid_uname.c
     test_option_uuencode.c
     test_option_xattrs.c
diff --git a/tar/test/test_basic.c b/tar/test/test_basic.c
index 9bb966a0cf86..b1c49834a45f 100644
--- a/tar/test/test_basic.c
+++ b/tar/test/test_basic.c
@@ -96,7 +96,7 @@ run_tar(const char *target, const char *pack_options,
 
 	/* Use the tar program to create an archive. */
 	r = systemf("%s cf - %s %s >%s/archive 2>%s/pack.err", testprog, pack_options, flist, target, target);
-	failure("Error invoking %s cf -", testprog, pack_options);
+	failure("Error invoking %s cf -%s", testprog, pack_options);
 	assertEqualInt(r, 0);
 
 	assertChdir(target);
diff --git a/tar/test/test_copy.c b/tar/test/test_copy.c
index b828666b93fd..d618e45ca36b 100644
--- a/tar/test/test_copy.c
+++ b/tar/test/test_copy.c
@@ -256,13 +256,13 @@ verify_tree(size_t limit)
 					continue;
 				switch(dp[0]) {
 				case 'l': case 'm': case 'd':
-					failure("strlen(p)=%d", strlen(p));
+					failure("strlen(p)=%zu", strlen(p));
 					assert(strlen(p) < limit);
 					assertEqualString(p,
 					    filenames[strlen(p)]);
 					break;
 				case 'f': case 's':
-					failure("strlen(p)=%d", strlen(p));
+					failure("strlen(p)=%zu", strlen(p));
 					assert(strlen(p) < limit + 1);
 					assertEqualString(p,
 					    filenames[strlen(p)]);
diff --git a/tar/test/test_option_C_upper.c b/tar/test/test_option_C_upper.c
index dae985446892..538890f58178 100644
--- a/tar/test/test_option_C_upper.c
+++ b/tar/test/test_option_C_upper.c
@@ -117,7 +117,7 @@ DEFINE_TEST(test_option_C_upper)
 	assertMakeDir("test6", 0755);
 	assertChdir("test6");
 	r = systemf("%s -cf archive.tar -C XXX -C ../d1 file1 2>write.err",
-	    testprog, testworkdir);
+	    testprog);
 	assert(r != 0);
 	assertNonEmptyFile("write.err");
 	assertEqualInt(0,
diff --git a/tar/test/test_option_s.c b/tar/test/test_option_s.c
index 09c72ee7d63d..fa799a295d01 100644
--- a/tar/test/test_option_s.c
+++ b/tar/test/test_option_s.c
@@ -92,10 +92,8 @@ DEFINE_TEST(test_option_s)
 	 * Test 5: Name-switching substitutions when extracting archive.
 	 */
 	assertMakeDir("test5", 0755);
-	systemf("%s -cf test5.tar in/d1/foo in/d1/bar",
-	    testprog, testprog);
-	systemf("%s -xf test5.tar -s /foo/bar/ -s }bar}foo} -C test5",
-	    testprog, testprog);
+	systemf("%s -cf test5.tar in/d1/foo in/d1/bar", testprog);
+	systemf("%s -xf test5.tar -s /foo/bar/ -s }bar}foo} -C test5", testprog);
 	assertFileContents("foo", 3, "test5/in/d1/bar");
 	assertFileContents("bar", 3, "test5/in/d1/foo");
 
diff --git a/tar/test/test_option_safe_writes.c b/tar/test/test_option_safe_writes.c
new file mode 100644
index 000000000000..8edf5c69f7ec
--- /dev/null
+++ b/tar/test/test_option_safe_writes.c
@@ -0,0 +1,77 @@
+/*-
+ * Copyright (c) 2020 Martin Matuska
+ * 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$");
+
+DEFINE_TEST(test_option_safe_writes)
+{
+	/* Create files */
+	assertMakeDir("in", 0755);
+	assertEqualInt(0, chdir("in"));
+	assertMakeFile("f", 0644, "a");
+	assertMakeFile("fh", 0644, "b");
+	assertMakeFile("d", 0644, "c");
+	assertMakeFile("fs", 0644, "d");
+	assertMakeFile("ds", 0644, "e");
+	assertEqualInt(0, chdir(".."));
+
+	/* Tar files up */
+	assertEqualInt(0,
+	    systemf("%s -c -C in -f t.tar f fh d fs ds "
+	    ">pack.out 2>pack.err", testprog));
+
+        /* Verify that nothing went to stdout or stderr. */
+        assertEmptyFile("pack.err");
+        assertEmptyFile("pack.out");
+
+	/* Create various objects */
+	assertMakeDir("out", 0755);
+	assertEqualInt(0, chdir("out"));
+	assertMakeFile("f", 0644, "a");
+	assertMakeHardlink("fh", "f");
+	assertMakeDir("d", 0755);
+	if (canSymlink()) {
+		assertMakeSymlink("fs", "f", 0);
+		assertMakeSymlink("ds", "d", 1);
+	}
+	assertEqualInt(0, chdir(".."));
+
+	/* Extract created archive withe safe writes */
+	assertEqualInt(0,
+	    systemf("%s -x -C out --safe-writes -f t.tar "
+	    ">unpack.out 2>unpack.err", testprog));
+
+        /* Verify that nothing went to stdout or stderr. */
+        assertEmptyFile("unpack.err");
+        assertEmptyFile("unpack.out");
+
+	/* Verify that files were overwritten properly */
+	assertEqualInt(0, chdir("out"));
+	assertTextFileContents("a","f");
+	assertTextFileContents("b","fh");
+	assertTextFileContents("c","d");
+	assertTextFileContents("d","fs");
+	assertTextFileContents("e","ds");
+}