diff options
| author | mm <mm@FreeBSD.org> | 2017-10-08 20:54:53 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2017-10-08 20:54:53 +0000 |
| commit | aea515eb9597ea4c4963aa471d4325e351653a2f (patch) | |
| tree | 8ff60f7dfc3fa17948b5e892946ed0dcea088062 /lib | |
| parent | f0f2869e6a17e087c01a9c24567faef875a14888 (diff) | |
| download | FreeBSD-src-aea515eb9597ea4c4963aa471d4325e351653a2f.zip FreeBSD-src-aea515eb9597ea4c4963aa471d4325e351653a2f.tar.gz | |
MFH r324148:
Sync libarchive with vendor.
Relevant vendor changes:
PR #905: Support for Zstandard read and write filters
PR #922: Avoid overflow when reading corrupt cpio archive
Issue #935: heap-based buffer overflow in xml_data (CVE-2017-14166)
OSS-Fuzz 2936: Place a limit on the mtree line length
OSS-Fuzz 2394: Ensure that the ZIP AES extension header is large enough
OSS-Fuzz 573: Read off-by-one error in RAR archives (CVE-2017-14502)
Security: CVE-2017-14166, CVE-2017-14502
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libarchive/Makefile | 2 | ||||
| -rw-r--r-- | lib/libarchive/tests/Makefile | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 2e7ba79..450682d 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -94,6 +94,7 @@ SRCS= archive_acl.c \ archive_read_support_filter_rpm.c \ archive_read_support_filter_uu.c \ archive_read_support_filter_xz.c \ + archive_read_support_filter_zstd.c \ archive_read_support_format_7zip.c \ archive_read_support_format_all.c \ archive_read_support_format_ar.c \ @@ -136,6 +137,7 @@ SRCS= archive_acl.c \ archive_write_add_filter_program.c \ archive_write_add_filter_uuencode.c \ archive_write_add_filter_xz.c \ + archive_write_add_filter_zstd.c \ archive_write_set_format.c \ archive_write_set_format_7zip.c \ archive_write_set_format_ar.c \ diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile index 5fd6c85..9450e25 100644 --- a/lib/libarchive/tests/Makefile +++ b/lib/libarchive/tests/Makefile @@ -81,6 +81,7 @@ TESTS_SRCS= \ test_compat_uudecode_large.c \ test_compat_xz.c \ test_compat_zip.c \ + test_compat_zstd.c \ test_empty_write.c \ test_entry.c \ test_entry_strmode.c \ @@ -237,6 +238,7 @@ TESTS_SRCS= \ test_write_filter_program.c \ test_write_filter_uuencode.c \ test_write_filter_xz.c \ + test_write_filter_zstd.c \ test_write_format_7zip.c \ test_write_format_7zip_empty.c \ test_write_format_7zip_large.c \ @@ -370,6 +372,7 @@ ${PACKAGE}FILES+= test_compat_zip_4.zip.uu ${PACKAGE}FILES+= test_compat_zip_5.zip.uu ${PACKAGE}FILES+= test_compat_zip_6.zip.uu ${PACKAGE}FILES+= test_compat_zip_7.xps.uu +${PACKAGE}FILES+= test_compat_zstd_1.tar.zst.uu ${PACKAGE}FILES+= test_fuzz.cab.uu ${PACKAGE}FILES+= test_fuzz.lzh.uu ${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu |
