summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2020-12-01 15:53:12 +0000
committerMartin Matuska <mm@FreeBSD.org>2020-12-01 15:53:12 +0000
commitc3afd20f1335949db24ba8af348e8706be995059 (patch)
tree41d6d806fe908ea74f13b3705df026208974afc3 /lib
parent8bbe6af94982ef3a0f898fb5bb2dd06c4788a1e3 (diff)
parentd5f2a5ff11474589cccacfc8e153d437f48530e2 (diff)
downloadsrc-test2-c3afd20f1335949db24ba8af348e8706be995059.tar.gz
src-test2-c3afd20f1335949db24ba8af348e8706be995059.zip
MFV r368207:
Update libarchive to 3.5.0 Relevant vendor changes: Issue #1258: add archive_read_support_filter_by_code() PR #1347: mtree digest reader support Issue #1381: skip hardlinks pointing to itself on extraction PR #1387: fix writing of cpio archives with hardlinks without file type PR #1388: fix rdev field in cpio format for device nodes PR #1389: completed support for UTF-8 encoding conversion PR #1405: more formats in archive_read_support_format_by_code() PR #1408: fix uninitialized size in rar5_read_data PR #1409: system extended attribute support PR #1435: support for decompression of symbolic links in zipx archives Issue #1456: memory leak after unsuccessful archive_write_open_filename MFC after: 1 week
Notes
Notes: svn path=/head/; revision=368234
Diffstat (limited to 'lib')
-rw-r--r--lib/libarchive/Makefile1
-rw-r--r--lib/libarchive/config_freebsd.h1
-rw-r--r--lib/libarchive/tests/Makefile1
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 9206bd5bdd76..5a827c120927 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -71,6 +71,7 @@ SRCS= archive_acl.c \
archive_read_set_options.c \
archive_read_support_filter_all.c \
archive_read_support_filter_bzip2.c \
+ archive_read_support_filter_by_code.c \
archive_read_support_filter_compress.c \
archive_read_support_filter_gzip.c \
archive_read_support_filter_grzip.c \
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index 2d40f595a517..e26ff8b1faf2 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -26,6 +26,7 @@
*
* $FreeBSD$
*/
+#define __LIBARCHIVE_CONFIG_H_INCLUDED 1
#include <osreldate.h>
diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile
index ba662adcc070..fcb22af5021a 100644
--- a/lib/libarchive/tests/Makefile
+++ b/lib/libarchive/tests/Makefile
@@ -577,6 +577,7 @@ ${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu
${PACKAGE}FILES+= test_read_format_warc.warc.uu
${PACKAGE}FILES+= test_read_format_zip.zip.uu
${PACKAGE}FILES+= test_read_format_zip_7075_utf8_paths.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_7z_lzma.zip.uu
${PACKAGE}FILES+= test_read_format_zip_bz2_hang.zip.uu
${PACKAGE}FILES+= test_read_format_zip_bzip2.zipx.uu
${PACKAGE}FILES+= test_read_format_zip_bzip2_multi.zipx.uu