diff options
author | Martin Matuska <mm@FreeBSD.org> | 2017-10-01 00:40:23 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2017-10-01 00:40:23 +0000 |
commit | 5c831a5bd61576cacb48b39f8eeb47b92707a355 (patch) | |
tree | 315046b4d3237811245bd68cfa0099291b843129 /usr.bin | |
parent | 0ffc7ed7e310f5810af6c04137678d0bef00f2f0 (diff) | |
parent | 533ab3c53efbfd230b718ed77dc9ea4d1446ddfc (diff) | |
download | src-5c831a5bd61576cacb48b39f8eeb47b92707a355.tar.gz src-5c831a5bd61576cacb48b39f8eeb47b92707a355.zip |
MFV r324145,324147:
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)
MFC after: 1 week
Security: CVE-2017-14166, CVE-2017-14502
Notes
Notes:
svn path=/head/; revision=324148
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/bsdcat/tests/Makefile | 4 | ||||
-rw-r--r-- | usr.bin/cpio/tests/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/tar/tests/Makefile | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile index 2aa678b2432a..921299dd3c7e 100644 --- a/usr.bin/bsdcat/tests/Makefile +++ b/usr.bin/bsdcat/tests/Makefile @@ -28,6 +28,7 @@ TESTS_SRCS= \ test_empty_gz.c \ test_empty_lz4.c \ test_empty_xz.c \ + test_empty_zstd.c \ test_error.c \ test_error_mixed.c \ test_expand_Z.c \ @@ -37,6 +38,7 @@ TESTS_SRCS= \ test_expand_mixed.c \ test_expand_plain.c \ test_expand_xz.c \ + test_expand_zstd.c \ test_help.c \ test_version.c @@ -59,11 +61,13 @@ CLEANFILES+= list.h list.h.tmp ${PACKAGE}FILES+= test_empty.gz.uu ${PACKAGE}FILES+= test_empty.lz4.uu ${PACKAGE}FILES+= test_empty.xz.uu +${PACKAGE}FILES+= test_empty.zst.uu ${PACKAGE}FILES+= test_expand.Z.uu ${PACKAGE}FILES+= test_expand.bz2.uu ${PACKAGE}FILES+= test_expand.gz.uu ${PACKAGE}FILES+= test_expand.lz4.uu ${PACKAGE}FILES+= test_expand.plain.uu ${PACKAGE}FILES+= test_expand.xz.uu +${PACKAGE}FILES+= test_expand.zst.uu .include <bsd.test.mk> diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index b71bdca3c409..4e5618bfe3dc 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -43,6 +43,7 @@ TESTS_SRCS= \ test_extract_cpio_lzma.c \ test_extract_cpio_lzo.c \ test_extract_cpio_xz.c \ + test_extract_cpio_zstd.c \ test_format_newc.c \ test_gcpio_compat.c \ test_missing_file.c \ @@ -73,6 +74,7 @@ TESTS_SRCS= \ test_option_xz.c \ test_option_y.c \ test_option_z.c \ + test_option_zstd.c \ test_owner_parse.c \ test_passthrough_dotdot.c \ test_passthrough_reverse.c @@ -104,6 +106,7 @@ ${PACKAGE}FILES+= test_extract.cpio.lz4.uu ${PACKAGE}FILES+= test_extract.cpio.lzma.uu ${PACKAGE}FILES+= test_extract.cpio.lzo.uu ${PACKAGE}FILES+= test_extract.cpio.xz.uu +${PACKAGE}FILES+= test_extract.cpio.zst.uu ${PACKAGE}FILES+= test_gcpio_compat_ref.bin.uu ${PACKAGE}FILES+= test_gcpio_compat_ref.crc.uu ${PACKAGE}FILES+= test_gcpio_compat_ref.newc.uu diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile index c64686e2dca2..7fba6e077f93 100644 --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -35,6 +35,7 @@ TESTS_SRCS= \ test_extract_tar_lzma.c \ test_extract_tar_lzo.c \ test_extract_tar_xz.c \ + test_extract_tar_zstd.c \ test_format_newc.c \ test_help.c \ test_leading_slash.c \ @@ -74,6 +75,7 @@ TESTS_SRCS= \ test_option_xattrs.c \ test_option_xz.c \ test_option_z.c \ + test_option_zstd.c \ test_patterns.c \ test_print_longpath.c \ test_stdio.c \ @@ -108,6 +110,7 @@ ${PACKAGE}FILES+= test_extract.tar.lz4.uu ${PACKAGE}FILES+= test_extract.tar.lzma.uu ${PACKAGE}FILES+= test_extract.tar.lzo.uu ${PACKAGE}FILES+= test_extract.tar.xz.uu +${PACKAGE}FILES+= test_extract.tar.zst.uu ${PACKAGE}FILES+= test_leading_slash.tar.uu ${PACKAGE}FILES+= test_option_keep_newer_files.tar.Z.uu ${PACKAGE}FILES+= test_option_passphrase.zip.uu |