pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Import libarchive-3.3.2 + 9...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c864e7cbba7f
branches: trunk
changeset: 366070:c864e7cbba7f
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Aug 01 22:21:11 2017 +0000
description:
Import libarchive-3.3.2 + 9de5f3 + f9dacbf:
- Support NFS4 ACLs on Linux
- Bugfixes
diffstat:
archivers/libarchive/files/cat/test/CMakeLists.txt | 10 +
archivers/libarchive/files/cpio/test/test_option_Z_upper.c | 5 +-
archivers/libarchive/files/cpio/test/test_option_b64encode.c | 2 +
archivers/libarchive/files/cpio/test/test_option_grzip.c | 3 +-
archivers/libarchive/files/cpio/test/test_option_lrzip.c | 3 +-
archivers/libarchive/files/cpio/test/test_option_lz4.c | 7 +
archivers/libarchive/files/cpio/test/test_option_lzma.c | 4 +
archivers/libarchive/files/cpio/test/test_option_lzop.c | 3 +-
archivers/libarchive/files/cpio/test/test_option_uuencode.c | 2 +
archivers/libarchive/files/cpio/test/test_option_xz.c | 4 +
archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html | 2 +-
archivers/libarchive/files/doc/man/archive_read_format.3 | 6 +-
archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf | Bin
archivers/libarchive/files/doc/text/archive_read_add_passphrase.3.txt | 34 +-
archivers/libarchive/files/doc/text/archive_write_set_passphrase.3.txt | 34 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadAddPassphrase3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetPassphrase3.wiki | 6 +-
archivers/libarchive/files/libarchive/archive_disk_acl_darwin.c | 559 ++++++
archivers/libarchive/files/libarchive/archive_disk_acl_freebsd.c | 700 ++++++++
archivers/libarchive/files/libarchive/archive_disk_acl_linux.c | 743 +++++++++
archivers/libarchive/files/libarchive/archive_disk_acl_sunos.c | 821 ++++++++++
archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h | 2 +-
archivers/libarchive/files/libarchive/archive_platform_acl.h | 49 +
archivers/libarchive/files/libarchive/archive_platform_xattr.h | 41 +
archivers/libarchive/files/libarchive/archive_random.c | 5 +-
archivers/libarchive/files/libarchive/archive_read_format.3 | 6 +-
archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c | 6 +-
archivers/libarchive/files/libarchive/archive_version_details.c | 133 +
archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c | 2 +-
archivers/libarchive/files/libarchive/archive_write_set_format_filter_by_ext.c | 2 +-
archivers/libarchive/files/libarchive/archive_write_set_format_warc.c | 2 +-
archivers/libarchive/files/libarchive/test/test_archive_read_close_twice_open_filename.c | 4 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c | 60 +
archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu | 14 +
archivers/libarchive/files/libarchive/test/test_write_format_zip_compression_store.c | 15 +-
archivers/libarchive/files/libarchive/test/test_write_format_zip_large.c | 14 +-
archivers/libarchive/files/libarchive/test/test_xattr_platform.c | 104 +
archivers/libarchive/files/libarchive/xxhash.c | 12 +-
archivers/libarchive/files/tar/test/test_option_acls.c | 510 ++++++
archivers/libarchive/files/tar/test/test_option_fflags.c | 106 +
archivers/libarchive/files/tar/test/test_option_nodump.c | 2 +-
archivers/libarchive/files/tar/test/test_option_xattrs.c | 88 +
archivers/libarchive/files/test_utils/test_main.c | 455 +++++-
45 files changed, 4498 insertions(+), 90 deletions(-)
diffs (truncated from 5112 to 300 lines):
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cat/test/CMakeLists.txt
--- a/archivers/libarchive/files/cat/test/CMakeLists.txt Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cat/test/CMakeLists.txt Tue Aug 01 22:21:11 2017 +0000
@@ -29,6 +29,16 @@
# Register target
#
ADD_EXECUTABLE(bsdcat_test ${bsdcat_test_SOURCES})
+ IF(ENABLE_ACL)
+ SET(TEST_ACL_LIBS "")
+ IF(HAVE_LIBACL)
+ LIST(APPEND TEST_ACL_LIBS ${ACL_LIBRARY})
+ ENDIF(HAVE_LIBACL)
+ IF(HAVE_LIBRICHACL)
+ LIST(APPEND TEST_ACL_LIBS ${RICHACL_LIBRARY})
+ ENDIF(HAVE_LIBRICHACL)
+ TARGET_LINK_LIBRARIES(bsdcat_test ${TEST_ACL_LIBS})
+ ENDIF(ENABLE_ACL)
SET_PROPERTY(TARGET bsdcat_test PROPERTY COMPILE_DEFINITIONS LIST_H)
#
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_Z_upper.c
--- a/archivers/libarchive/files/cpio/test/test_option_Z_upper.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_Z_upper.c Tue Aug 01 22:21:11 2017 +0000
@@ -43,17 +43,18 @@
if (strstr(p, "compression not available") != NULL) {
skipping("This version of bsdcpio was compiled "
"without compress support");
+ free(p);
return;
}
failure("-Z option is broken");
assertEqualInt(r, 0);
- goto done;
+ free(p);
+ return;
}
free(p);
/* Check that the archive file has a compress signature. */
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "\x1f\x9d", 2);
-done:
free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_b64encode.c
--- a/archivers/libarchive/files/cpio/test/test_option_b64encode.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_b64encode.c Tue Aug 01 22:21:11 2017 +0000
@@ -42,6 +42,7 @@
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "begin-base64 644", 16);
+ free(p);
/* Archive it with uuencode only. */
assertEqualInt(0,
@@ -51,4 +52,5 @@
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "begin-base64 644", 16);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_grzip.c
--- a/archivers/libarchive/files/cpio/test/test_option_grzip.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_grzip.c Tue Aug 01 22:21:11 2017 +0000
@@ -44,9 +44,10 @@
systemf("echo f | %s -o --grzip >archive.out 2>archive.err",
testprog));
p = slurpfile(&s, "archive.err");
- p[s] = '\0';
+ free(p);
/* Check that the archive file has an grzip signature. */
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "GRZipII\x00\x02\x04:)", 12);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_lrzip.c
--- a/archivers/libarchive/files/cpio/test/test_option_lrzip.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_lrzip.c Tue Aug 01 22:21:11 2017 +0000
@@ -44,9 +44,10 @@
systemf("echo f | %s -o --lrzip >archive.out 2>archive.err",
testprog));
p = slurpfile(&s, "archive.err");
- p[s] = '\0';
+ free(p);
/* Check that the archive file has an lzma signature. */
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "LRZI\x00", 5);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_lz4.c
--- a/archivers/libarchive/files/cpio/test/test_option_lz4.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_lz4.c Tue Aug 01 22:21:11 2017 +0000
@@ -43,6 +43,7 @@
if (strstr(p, "compression not available") != NULL) {
skipping("This version of bsdcpio was compiled "
"without lz4 support");
+ free(p);
return;
}
/* POSIX permits different handling of the spawnp
@@ -52,6 +53,7 @@
if (strstr(p, "Can't launch") != NULL && !canLz4()) {
skipping("This version of bsdcpio uses an external lz4 program "
"but no such program is available on this system.");
+ free(p);
return;
}
/* Some systems successfully spawn the new process,
@@ -61,6 +63,7 @@
if (strstr(p, "Can't write") != NULL && !canLz4()) {
skipping("This version of bsdcpio uses an external lz4 program "
"but no such program is available on this system.");
+ free(p);
return;
}
/* On some systems the error won't be detected until closing
@@ -68,14 +71,18 @@
if (strstr(p, "Error closing") != NULL && !canLz4()) {
skipping("This version of bsdcpio uses an external lz4 program "
"but no such program is available on this system.");
+ free(p);
return;
}
failure("--lz4 option is broken: %s", p);
+ free(p);
assertEqualInt(r, 0);
return;
}
+ free(p);
/* Check that the archive file has an lz4 signature. */
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "\x04\x22\x4d\x18", 4);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_lzma.c
--- a/archivers/libarchive/files/cpio/test/test_option_lzma.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_lzma.c Tue Aug 01 22:21:11 2017 +0000
@@ -43,14 +43,18 @@
if (strstr(p, "compression not available") != NULL) {
skipping("This version of bsdcpio was compiled "
"without lzma support");
+ free(p);
return;
}
failure("--lzma option is broken");
assertEqualInt(r, 0);
+ free(p);
return;
}
+ free(p);
/* Check that the archive file has an lzma signature. */
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "\x5d\00\00", 3);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_lzop.c
--- a/archivers/libarchive/files/cpio/test/test_option_lzop.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_lzop.c Tue Aug 01 22:21:11 2017 +0000
@@ -39,7 +39,7 @@
r = systemf("echo f | %s -o --lzop >archive.out 2>archive.err",
testprog);
p = slurpfile(&s, "archive.err");
- p[s] = '\0';
+ free(p);
if (r != 0) {
if (!canLzop()) {
skipping("lzop is not supported on this platform");
@@ -53,4 +53,5 @@
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a", 9);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_uuencode.c
--- a/archivers/libarchive/files/cpio/test/test_option_uuencode.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_uuencode.c Tue Aug 01 22:21:11 2017 +0000
@@ -42,6 +42,7 @@
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "begin 644", 9);
+ free(p);
/* Archive it with uuencode only. */
assertEqualInt(0,
@@ -51,4 +52,5 @@
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "begin 644", 9);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/cpio/test/test_option_xz.c
--- a/archivers/libarchive/files/cpio/test/test_option_xz.c Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/cpio/test/test_option_xz.c Tue Aug 01 22:21:11 2017 +0000
@@ -44,14 +44,18 @@
if (strstr(p, "compression not available") != NULL) {
skipping("This version of bsdcpio was compiled "
"without xz support");
+ free(p);
return;
}
+ free(p);
failure("--xz option is broken");
assertEqualInt(r, 0);
return;
}
+ free(p);
/* Check that the archive file has an xz signature. */
p = slurpfile(&s, "archive.out");
assert(s > 2);
assertEqualMem(p, "\xFD\x37\x7A\x58\x5A\x00", 6);
+ free(p);
}
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html
--- a/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html Tue Aug 01 22:21:11 2017 +0000
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Feb 25 11:22:02 2017 -->
+<!-- CreationDate: Mon Jul 10 02:32:54 2017 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html
--- a/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html Tue Aug 01 22:21:11 2017 +0000
@@ -1,5 +1,5 @@
<!-- Creator : groff version 1.22.3 -->
-<!-- CreationDate: Sat Feb 25 11:22:06 2017 -->
+<!-- CreationDate: Mon Jul 10 02:32:57 2017 -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html>
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/doc/man/archive_read_format.3
--- a/archivers/libarchive/files/doc/man/archive_read_format.3 Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/doc/man/archive_read_format.3 Tue Aug 01 22:21:11 2017 +0000
@@ -10,9 +10,9 @@
\fB\%archive_read_support_format_empty\fP,
\fB\%archive_read_support_format_iso9660\fP,
\fB\%archive_read_support_format_lha\fP,
-\fB\%archive_read_support_format_mtree,\fP
-\fB\%archive_read_support_format_rar,\fP
-\fB\%archive_read_support_format_raw,\fP
+\fB\%archive_read_support_format_mtree\fP,
+\fB\%archive_read_support_format_rar\fP,
+\fB\%archive_read_support_format_raw\fP,
\fB\%archive_read_support_format_tar\fP,
\fB\%archive_read_support_format_xar\fP,
\fB\%archive_read_support_format_zip\fP
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf
Binary file archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf has changed
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf
Binary file archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf has changed
diff -r 0cde6cc18f07 -r c864e7cbba7f archivers/libarchive/files/doc/text/archive_read_add_passphrase.3.txt
--- a/archivers/libarchive/files/doc/text/archive_read_add_passphrase.3.txt Tue Aug 01 18:30:52 2017 +0000
+++ b/archivers/libarchive/files/doc/text/archive_read_add_passphrase.3.txt Tue Aug 01 22:21:11 2017 +0000
@@ -1,35 +1,35 @@
ARCHIVE_READ_ADD_PASS... BSD Library Functions Manual ARCHIVE_READ_ADD_PASS...
-1mNAME0m
- 1marchive_read_add_passphrase22m, 1marchive_read_set_passphrase_callback 22mâ?? funcâ??
+NAME
+ archive_read_add_passphrase, archive_read_set_passphrase_callback â?? funcâ??
tions for reading encrypted archives
-1mLIBRARY0m
+LIBRARY
Streaming Archive Library (libarchive, -larchive)
-1mSYNOPSIS0m
- 1m#include <archive.h>0m
+SYNOPSIS
+ #include <archive.h>
- 4mint0m
- 1marchive_read_add_passphrase22m(4mstruct24m 4marchive24m 4m*24m, 4mconst24m 4mchar24m 4m*passphrase24m);
+ int
+ archive_read_add_passphrase(struct archive *, const char *passphrase);
- 4mint0m
- 1marchive_read_set_passphrase_callback22m(4mstruct24m 4marchive24m 4m*24m, 4mvoid24m 4m*client_data24m,
- 4marchive_passphrase_callback24m 4m*24m);
+ int
+ archive_read_set_passphrase_callback(struct archive *, void *client_data,
+ archive_passphrase_callback *);
-1mDESCRIPTION0m
- 1marchive_read_add_passphrase22m()
+DESCRIPTION
+ archive_read_add_passphrase()
Register passphrases for reading an encryption archive. If
- 4mpassphrase24m is NULL or empty, this function will do nothing and
- 1mARCHIVE_FAILED 22mwill be returned. Otherwise, 1mARCHIVE_OK 22mwill be
+ passphrase is NULL or empty, this function will do nothing and
+ ARCHIVE_FAILED will be returned. Otherwise, ARCHIVE_OK will be
returned.
Home |
Main Index |
Thread Index |
Old Index