pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc libarchive: updated to 3.3.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/a39e86b8d3b0
branches: trunk
changeset: 322174:a39e86b8d3b0
user: adam <adam%pkgsrc.org@localhost>
date: Wed Apr 10 08:24:03 2019 +0000
description:
libarchive: updated to 3.3.3
libarchive 3.3.3:
Avoid super-linear slowdown on malformed mtree files
Many fixes for building with Visual Studio
NO_OVERWRITE doesn't change existing directory attributes
New support for Zstandard read and write filters
diffstat:
archivers/libarchive/Makefile | 4 +-
archivers/libarchive/Makefile.common | 5 +-
archivers/libarchive/builtin.mk | 6 +-
archivers/libarchive/files/CMakeLists.txt | 49 +-
archivers/libarchive/files/Makefile.am | 18 +
archivers/libarchive/files/Makefile.in | 254 +
archivers/libarchive/files/NEWS | 10 +
archivers/libarchive/files/README.md | 4 +-
archivers/libarchive/files/build/autoconf/config.guess | 645 +-
archivers/libarchive/files/build/autoconf/config.sub | 2752 ++++-----
archivers/libarchive/files/build/cmake/config.h.in | 10 +
archivers/libarchive/files/build/pkgconfig/libarchive.pc.in | 1 +
archivers/libarchive/files/build/version | 2 +-
archivers/libarchive/files/cat/bsdcat.c | 19 +-
archivers/libarchive/files/cat/test/CMakeLists.txt | 3 +
archivers/libarchive/files/cat/test/list.h | 3 +
archivers/libarchive/files/cat/test/test_empty.zst.uu | 4 +
archivers/libarchive/files/cat/test/test_empty_zstd.c | 41 +
archivers/libarchive/files/cat/test/test_expand.zst.uu | 4 +
archivers/libarchive/files/cat/test/test_expand_zstd.c | 41 +
archivers/libarchive/files/cat/test/test_stdin.c | 42 +
archivers/libarchive/files/config.h.in | 9 +
archivers/libarchive/files/configure | 137 +-
archivers/libarchive/files/configure.ac | 16 +-
archivers/libarchive/files/contrib/android/Android.mk | 2 +
archivers/libarchive/files/cpio/bsdcpio.1 | 5 +
archivers/libarchive/files/cpio/cmdline.c | 1 +
archivers/libarchive/files/cpio/cpio.c | 6 +-
archivers/libarchive/files/cpio/cpio.h | 3 +-
archivers/libarchive/files/cpio/test/CMakeLists.txt | 2 +
archivers/libarchive/files/cpio/test/list.h | 2 +
archivers/libarchive/files/cpio/test/test_basic.c | 60 +-
archivers/libarchive/files/cpio/test/test_extract.cpio.zst.uu | 6 +
archivers/libarchive/files/cpio/test/test_extract_cpio_zstd.c | 48 +
archivers/libarchive/files/cpio/test/test_format_newc.c | 40 +-
archivers/libarchive/files/cpio/test/test_option_zstd.c | 85 +
archivers/libarchive/files/doc/html/archive_entry.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_entry_acl.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_entry_linkify.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_entry_paths.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_entry_perms.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_entry_stat.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_entry_time.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_data.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_disk.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_extract.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_filter.3.html | 11 +-
archivers/libarchive/files/doc/html/archive_read_format.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_free.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_header.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_new.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_open.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_read_set_options.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_util.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_blocksize.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_data.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_disk.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_filter.3.html | 13 +-
archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_format.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_free.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_header.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_new.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_open.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_set_options.3.html | 2 +-
archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html | 2 +-
archivers/libarchive/files/doc/html/bsdcpio.1.html | 9 +-
archivers/libarchive/files/doc/html/bsdtar.1.html | 67 +-
archivers/libarchive/files/doc/html/cpio.5.html | 2 +-
archivers/libarchive/files/doc/html/libarchive-formats.5.html | 2 +-
archivers/libarchive/files/doc/html/libarchive.3.html | 2 +-
archivers/libarchive/files/doc/html/libarchive_changes.3.html | 2 +-
archivers/libarchive/files/doc/html/libarchive_internals.3.html | 2 +-
archivers/libarchive/files/doc/html/mtree.5.html | 2 +-
archivers/libarchive/files/doc/html/tar.5.html | 2 +-
archivers/libarchive/files/doc/man/archive_read_filter.3 | 8 +-
archivers/libarchive/files/doc/man/archive_write.3 | 2 +-
archivers/libarchive/files/doc/man/archive_write_filter.3 | 8 +-
archivers/libarchive/files/doc/man/bsdcpio.1 | 6 +
archivers/libarchive/files/doc/man/bsdtar.1 | 61 +-
archivers/libarchive/files/doc/pdf/archive_entry.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_entry_acl.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_entry_linkify.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_entry_paths.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_entry_perms.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_entry_stat.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_entry_time.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_add_passphrase.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_data.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_disk.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_extract.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_filter.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_format.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_free.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_header.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_new.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_open.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_read_set_options.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_util.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_blocksize.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_data.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_disk.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_filter.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_finish_entry.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_format.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_free.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_header.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_new.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_open.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_set_options.3.pdf | Bin
archivers/libarchive/files/doc/pdf/archive_write_set_passphrase.3.pdf | Bin
archivers/libarchive/files/doc/pdf/bsdcpio.1.pdf | Bin
archivers/libarchive/files/doc/pdf/bsdtar.1.pdf | Bin
archivers/libarchive/files/doc/pdf/cpio.5.pdf | Bin
archivers/libarchive/files/doc/pdf/libarchive-formats.5.pdf | Bin
archivers/libarchive/files/doc/pdf/libarchive.3.pdf | Bin
archivers/libarchive/files/doc/pdf/libarchive_changes.3.pdf | Bin
archivers/libarchive/files/doc/pdf/libarchive_internals.3.pdf | Bin
archivers/libarchive/files/doc/pdf/mtree.5.pdf | Bin
archivers/libarchive/files/doc/pdf/tar.5.pdf | Bin
archivers/libarchive/files/doc/text/archive_read_filter.3.txt | 8 +-
archivers/libarchive/files/doc/text/archive_write.3.txt | 2 +-
archivers/libarchive/files/doc/text/archive_write_filter.3.txt | 7 +-
archivers/libarchive/files/doc/text/bsdcpio.1.txt | 4 +
archivers/libarchive/files/doc/text/bsdtar.1.txt | 62 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki | 2 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki | 5 +
archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki | 57 +-
archivers/libarchive/files/libarchive/CMakeLists.txt | 2 +
archivers/libarchive/files/libarchive/archive.h | 8 +-
archivers/libarchive/files/libarchive/archive_acl.c | 2 +
archivers/libarchive/files/libarchive/archive_cmdline.c | 6 +-
archivers/libarchive/files/libarchive/archive_cryptor.c | 2 +-
archivers/libarchive/files/libarchive/archive_cryptor_private.h | 2 +-
archivers/libarchive/files/libarchive/archive_disk_acl_freebsd.c | 2 +
archivers/libarchive/files/libarchive/archive_entry.c | 4 +-
archivers/libarchive/files/libarchive/archive_entry.h | 3 +-
archivers/libarchive/files/libarchive/archive_match.c | 4 +-
archivers/libarchive/files/libarchive/archive_pack_dev.c | 7 +-
archivers/libarchive/files/libarchive/archive_platform.h | 17 +
archivers/libarchive/files/libarchive/archive_ppmd7.c | 10 +-
archivers/libarchive/files/libarchive/archive_ppmd7_private.h | 4 +-
archivers/libarchive/files/libarchive/archive_ppmd_private.h | 7 -
archivers/libarchive/files/libarchive/archive_read.c | 12 +-
archivers/libarchive/files/libarchive/archive_read_append_filter.c | 4 +
archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c | 2 +-
archivers/libarchive/files/libarchive/archive_read_disk_posix.c | 8 +-
archivers/libarchive/files/libarchive/archive_read_disk_windows.c | 19 +-
archivers/libarchive/files/libarchive/archive_read_filter.3 | 6 +-
archivers/libarchive/files/libarchive/archive_read_support_filter_all.c | 2 +
archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c | 292 +
archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c | 21 +-
archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c | 7 +
archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c | 29 +-
archivers/libarchive/files/libarchive/archive_read_support_format_lha.c | 6 +
archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c | 109 +-
archivers/libarchive/files/libarchive/archive_read_support_format_rar.c | 30 +-
archivers/libarchive/files/libarchive/archive_read_support_format_tar.c | 10 +-
archivers/libarchive/files/libarchive/archive_read_support_format_xar.c | 32 +-
archivers/libarchive/files/libarchive/archive_read_support_format_zip.c | 32 +-
archivers/libarchive/files/libarchive/archive_util.c | 4 +-
archivers/libarchive/files/libarchive/archive_version_details.c | 18 +
archivers/libarchive/files/libarchive/archive_virtual.c | 11 +-
archivers/libarchive/files/libarchive/archive_write.3 | 2 +-
archivers/libarchive/files/libarchive/archive_write.c | 2 +-
archivers/libarchive/files/libarchive/archive_write_add_filter.c | 1 +
archivers/libarchive/files/libarchive/archive_write_add_filter_by_name.c | 1 +
archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c | 7 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c | 335 +
archivers/libarchive/files/libarchive/archive_write_disk_posix.c | 12 +-
archivers/libarchive/files/libarchive/archive_write_disk_windows.c | 19 +-
archivers/libarchive/files/libarchive/archive_write_filter.3 | 6 +-
archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c | 17 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | 12 +-
archivers/libarchive/files/libarchive/archive_write_set_format_pax.c | 2 +-
archivers/libarchive/files/libarchive/test/CMakeLists.txt | 2 +
archivers/libarchive/files/libarchive/test/list.h | 4 +
archivers/libarchive/files/libarchive/test/read_open_memory.c | 2 +
archivers/libarchive/files/libarchive/test/test.h | 6 +
archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c | 2 +
archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c | 5 +
archivers/libarchive/files/libarchive/test/test_compat_zip.c | 26 +
archivers/libarchive/files/libarchive/test/test_compat_zip_8.zip.uu | 6 +
archivers/libarchive/files/libarchive/test/test_compat_zstd.c | 82 +
archivers/libarchive/files/libarchive/test/test_compat_zstd_1.tar.zst.uu | 12 +
archivers/libarchive/files/libarchive/test/test_fuzz.c | 9 +
archivers/libarchive/files/libarchive/test/test_read_format_zip.c | 4 +
archivers/libarchive/files/libarchive/test/test_sparse_basic.c | 27 +-
archivers/libarchive/files/libarchive/test/test_write_disk_perms.c | 33 +
archivers/libarchive/files/libarchive/test/test_write_filter_gzip.c | 30 +-
archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c | 201 +
archivers/libarchive/files/tar/bsdtar.1 | 59 +-
archivers/libarchive/files/tar/bsdtar.c | 10 +-
archivers/libarchive/files/tar/bsdtar.h | 3 +-
archivers/libarchive/files/tar/cmdline.c | 1 +
archivers/libarchive/files/tar/creation_set.c | 4 +-
archivers/libarchive/files/tar/test/CMakeLists.txt | 3 +
archivers/libarchive/files/tar/test/list.h | 3 +
archivers/libarchive/files/tar/test/test_extract.tar.zst.uu | 6 +
archivers/libarchive/files/tar/test/test_extract_tar_zstd.c | 48 +
archivers/libarchive/files/tar/test/test_option_C_mtree.c | 73 +
archivers/libarchive/files/tar/test/test_option_acls.c | 4 +-
archivers/libarchive/files/tar/test/test_option_fflags.c | 4 +
archivers/libarchive/files/tar/test/test_option_zstd.c | 85 +
archivers/libarchive/files/tar/write.c | 2 +-
archivers/libarchive/files/test_utils/test_common.h | 3 +
archivers/libarchive/files/test_utils/test_main.c | 17 +-
bootstrap/bootstrap | 4 +-
pkgtools/pkg_install/Makefile | 4 +-
216 files changed, 4516 insertions(+), 2183 deletions(-)
diffs (truncated from 11784 to 300 lines):
diff -r df29949e4039 -r a39e86b8d3b0 archivers/libarchive/Makefile
--- a/archivers/libarchive/Makefile Wed Apr 10 01:07:42 2019 +0000
+++ b/archivers/libarchive/Makefile Wed Apr 10 08:24:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2017/02/25 21:13:58 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2019/04/10 08:24:03 adam Exp $
.include "Makefile.common"
@@ -10,7 +10,7 @@
CONFIGURE_ARGS+= --disable-bsdtar
do-extract:
- ${CP} -r ${FILESDIR} ${WRKSRC}
+ ${CP} -R ${FILESDIR} ${WRKSRC}
# Contents of ${FILESDIR} may not have the u=w bit set, and
# the build system assumes files in ${WRKSRC} are writable.
${CHMOD} -R u+w ${WRKSRC}
diff -r df29949e4039 -r a39e86b8d3b0 archivers/libarchive/Makefile.common
--- a/archivers/libarchive/Makefile.common Wed Apr 10 01:07:42 2019 +0000
+++ b/archivers/libarchive/Makefile.common Wed Apr 10 08:24:03 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.8 2017/08/01 22:27:28 joerg Exp $
+# $NetBSD: Makefile.common,v 1.9 2019/04/10 08:24:03 adam Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile
-DISTNAME= libarchive-3.3.2
+DISTNAME= libarchive-3.3.3
CATEGORIES= archivers
MASTER_SITES= http://www.libarchive.org/downloads/
DISTFILES= # empty
@@ -17,4 +17,5 @@
CONFIGURE_ARGS+= --without-lzo2
CONFIGURE_ARGS+= --without-nettle
CONFIGURE_ARGS+= --without-xml2
+CONFIGURE_ARGS+= --without-zstd
CONFIGURE_ARGS+= --disable-maintainer-mode
diff -r df29949e4039 -r a39e86b8d3b0 archivers/libarchive/builtin.mk
--- a/archivers/libarchive/builtin.mk Wed Apr 10 01:07:42 2019 +0000
+++ b/archivers/libarchive/builtin.mk Wed Apr 10 08:24:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.9 2018/06/07 14:28:42 leot Exp $
+# $NetBSD: builtin.mk,v 1.10 2019/04/10 08:24:03 adam Exp $
BUILTIN_PKG:= libarchive
@@ -93,11 +93,11 @@
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
###
-CHECK_BUILTIN.libarchive?= no
+CHECK_BUILTIN.libarchive?= no
.if !empty(CHECK_BUILTIN.libarchive:M[nN][oO])
. if !empty(USE_BUILTIN.libarchive:M[yY][eE][sS])
-BUILDLINK_TARGETS+= fake-libarchive-pc
+BUILDLINK_TARGETS+= fake-libarchive-pc
_FAKE_LIBARCHIVE_PC= ${BUILDLINK_DIR}/lib/pkgconfig/libarchive.pc
_LIBARCHIVE_LIBS= -llzma -lbz2 -lz
diff -r df29949e4039 -r a39e86b8d3b0 archivers/libarchive/files/CMakeLists.txt
--- a/archivers/libarchive/files/CMakeLists.txt Wed Apr 10 01:07:42 2019 +0000
+++ b/archivers/libarchive/files/CMakeLists.txt Wed Apr 10 08:24:03 2019 +0000
@@ -179,6 +179,7 @@
OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+OPTION(ENABLE_LZ4 "Enable the use of the system LZ4 library if found" ON)
OPTION(ENABLE_LZO "Enable the use of the system LZO library if found" OFF)
OPTION(ENABLE_LZMA "Enable the use of the system LZMA library if found" ON)
@@ -492,7 +493,7 @@
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO2 DEFAULT_MSG LZO2_LIBRARY LZO2_INCLUDE_DIR)
ELSE(ENABLE_LZO)
- SET(LIBZMA_FOUND FALSE) # Override cached value
+ SET(LZO2_FOUND FALSE) # Override cached value
ENDIF(ENABLE_LZO)
IF(LZO2_FOUND)
SET(HAVE_LIBLZO2 1)
@@ -509,15 +510,19 @@
#
# Find LZ4
#
-IF (LZ4_INCLUDE_DIR)
- # Already in cache, be silent
- SET(LZ4_FIND_QUIETLY TRUE)
-ENDIF (LZ4_INCLUDE_DIR)
+IF(ENABLE_LZ4)
+ IF (LZ4_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(LZ4_FIND_QUIETLY TRUE)
+ ENDIF (LZ4_INCLUDE_DIR)
-FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
-FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
+ FIND_PATH(LZ4_INCLUDE_DIR lz4.h)
+ FIND_LIBRARY(LZ4_LIBRARY NAMES lz4 liblz4)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZ4 DEFAULT_MSG LZ4_LIBRARY LZ4_INCLUDE_DIR)
+ELSE(ENABLE_LZ4)
+ SET(LZ4_FOUND FALSE) # Override cached value
+ENDIF(ENABLE_LZ4)
IF(LZ4_FOUND)
SET(HAVE_LIBLZ4 1)
SET(HAVE_LZ4_H 1)
@@ -533,6 +538,31 @@
ENDIF(LZ4_FOUND)
MARK_AS_ADVANCED(CLEAR LZ4_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR LZ4_LIBRARY)
+#
+# Find Zstd
+#
+IF (ZSTD_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(ZSTD_FIND_QUIETLY TRUE)
+ENDIF (ZSTD_INCLUDE_DIR)
+
+FIND_PATH(ZSTD_INCLUDE_DIR zstd.h)
+FIND_LIBRARY(ZSTD_LIBRARY NAMES zstd libzstd)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZSTD DEFAULT_MSG ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
+IF(ZSTD_FOUND)
+ SET(HAVE_ZSTD_H 1)
+ INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR})
+ LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY})
+ SET(CMAKE_REQUIRED_LIBRARIES ${ZSTD_LIBRARY})
+ SET(CMAKE_REQUIRED_INCLUDES ${ZSTD_INCLUDE_DIR})
+ CHECK_FUNCTION_EXISTS(ZSTD_compressStream HAVE_LIBZSTD)
+ #
+ # TODO: test for static library.
+ #
+ENDIF(ZSTD_FOUND)
+MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
+MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY)
#
# Check headers
@@ -609,6 +639,7 @@
LA_CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
LA_CHECK_INCLUDE_FILE("sys/statfs.h" HAVE_SYS_STATFS_H)
LA_CHECK_INCLUDE_FILE("sys/statvfs.h" HAVE_SYS_STATVFS_H)
+LA_CHECK_INCLUDE_FILE("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H)
LA_CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H)
LA_CHECK_INCLUDE_FILE("sys/utime.h" HAVE_SYS_UTIME_H)
LA_CHECK_INCLUDE_FILE("sys/utsname.h" HAVE_SYS_UTSNAME_H)
diff -r df29949e4039 -r a39e86b8d3b0 archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am Wed Apr 10 01:07:42 2019 +0000
+++ b/archivers/libarchive/files/Makefile.am Wed Apr 10 08:24:03 2019 +0000
@@ -167,6 +167,7 @@
libarchive/archive_read_support_filter_rpm.c \
libarchive/archive_read_support_filter_uu.c \
libarchive/archive_read_support_filter_xz.c \
+ libarchive/archive_read_support_filter_zstd.c \
libarchive/archive_read_support_format_7zip.c \
libarchive/archive_read_support_format_all.c \
libarchive/archive_read_support_format_ar.c \
@@ -213,6 +214,7 @@
libarchive/archive_write_add_filter_program.c \
libarchive/archive_write_add_filter_uuencode.c \
libarchive/archive_write_add_filter_xz.c \
+ libarchive/archive_write_add_filter_zstd.c \
libarchive/archive_write_set_format.c \
libarchive/archive_write_set_format_7zip.c \
libarchive/archive_write_set_format_ar.c \
@@ -402,6 +404,7 @@
libarchive/test/test_compat_uudecode_large.c \
libarchive/test/test_compat_xz.c \
libarchive/test/test_compat_zip.c \
+ libarchive/test/test_compat_zstd.c \
libarchive/test/test_empty_write.c \
libarchive/test/test_entry.c \
libarchive/test/test_entry_strmode.c \
@@ -559,6 +562,7 @@
libarchive/test/test_write_filter_program.c \
libarchive/test/test_write_filter_uuencode.c \
libarchive/test/test_write_filter_xz.c \
+ libarchive/test/test_write_filter_zstd.c \
libarchive/test/test_write_format_7zip.c \
libarchive/test/test_write_format_7zip_empty.c \
libarchive/test/test_write_format_7zip_large.c \
@@ -677,6 +681,8 @@
libarchive/test/test_compat_zip_5.zip.uu \
libarchive/test/test_compat_zip_6.zip.uu \
libarchive/test/test_compat_zip_7.xps.uu \
+ libarchive/test/test_compat_zip_8.zip.uu \
+ libarchive/test/test_compat_zstd_1.tar.zst.uu \
libarchive/test/test_fuzz.cab.uu \
libarchive/test/test_fuzz.lzh.uu \
libarchive/test/test_fuzz_1.iso.Z.uu \
@@ -961,10 +967,12 @@
tar/test/test_extract_tar_lzma.c \
tar/test/test_extract_tar_lzo.c \
tar/test/test_extract_tar_xz.c \
+ tar/test/test_extract_tar_zstd.c \
tar/test/test_format_newc.c \
tar/test/test_help.c \
tar/test/test_leading_slash.c \
tar/test/test_missing_file.c \
+ tar/test/test_option_C_mtree.c \
tar/test/test_option_C_upper.c \
tar/test/test_option_H_upper.c \
tar/test/test_option_L_upper.c \
@@ -1000,6 +1008,7 @@
tar/test/test_option_xattrs.c \
tar/test/test_option_xz.c \
tar/test/test_option_z.c \
+ tar/test/test_option_zstd.c \
tar/test/test_patterns.c \
tar/test/test_print_longpath.c \
tar/test/test_stdio.c \
@@ -1036,6 +1045,7 @@
tar/test/test_extract.tar.lrz.uu \
tar/test/test_extract.tar.lz.uu \
tar/test/test_extract.tar.lz4.uu \
+ tar/test/test_extract.tar.zst.uu \
tar/test/test_extract.tar.lzma.uu \
tar/test/test_extract.tar.lzo.uu \
tar/test/test_extract.tar.xz.uu \
@@ -1121,6 +1131,7 @@
cpio/test/test_extract_cpio_lzma.c \
cpio/test/test_extract_cpio_lzo.c \
cpio/test/test_extract_cpio_xz.c \
+ cpio/test/test_extract_cpio_zstd.c \
cpio/test/test_format_newc.c \
cpio/test/test_gcpio_compat.c \
cpio/test/test_missing_file.c \
@@ -1151,6 +1162,7 @@
cpio/test/test_option_xz.c \
cpio/test/test_option_y.c \
cpio/test/test_option_z.c \
+ cpio/test/test_option_zstd.c \
cpio/test/test_owner_parse.c \
cpio/test/test_passthrough_dotdot.c \
cpio/test/test_passthrough_reverse.c
@@ -1184,6 +1196,7 @@
cpio/test/test_extract.cpio.lrz.uu \
cpio/test/test_extract.cpio.lz.uu \
cpio/test/test_extract.cpio.lz4.uu \
+ cpio/test/test_extract.cpio.zst.uu \
cpio/test/test_extract.cpio.lzma.uu \
cpio/test/test_extract.cpio.lzo.uu \
cpio/test/test_extract.cpio.xz.uu \
@@ -1259,6 +1272,7 @@
cat/test/test_empty_gz.c \
cat/test/test_empty_lz4.c \
cat/test/test_empty_xz.c \
+ cat/test/test_empty_zstd.c \
cat/test/test_error.c \
cat/test/test_error_mixed.c \
cat/test/test_expand_Z.c \
@@ -1268,7 +1282,9 @@
cat/test/test_expand_mixed.c \
cat/test/test_expand_plain.c \
cat/test/test_expand_xz.c \
+ cat/test/test_expand_zstd.c \
cat/test/test_help.c \
+ cat/test/test_stdin.c \
cat/test/test_version.c
bsdcat_test_CPPFLAGS= \
@@ -1294,11 +1310,13 @@
cat/test/list.h \
cat/test/test_empty.gz.uu \
cat/test/test_empty.lz4.uu \
+ cat/test/test_empty.zst.uu \
cat/test/test_empty.xz.uu \
cat/test/test_expand.Z.uu \
cat/test/test_expand.bz2.uu \
cat/test/test_expand.gz.uu \
cat/test/test_expand.lz4.uu \
+ cat/test/test_expand.zst.uu \
cat/test/test_expand.plain.uu \
cat/test/test_expand.xz.uu \
cat/test/CMakeLists.txt
diff -r df29949e4039 -r a39e86b8d3b0 archivers/libarchive/files/Makefile.in
--- a/archivers/libarchive/files/Makefile.in Wed Apr 10 01:07:42 2019 +0000
+++ b/archivers/libarchive/files/Makefile.in Wed Apr 10 08:24:03 2019 +0000
@@ -238,6 +238,7 @@
libarchive/archive_read_support_filter_rpm.c \
libarchive/archive_read_support_filter_uu.c \
libarchive/archive_read_support_filter_xz.c \
+ libarchive/archive_read_support_filter_zstd.c \
libarchive/archive_read_support_format_7zip.c \
libarchive/archive_read_support_format_all.c \
libarchive/archive_read_support_format_ar.c \
@@ -281,6 +282,7 @@
libarchive/archive_write_add_filter_program.c \
libarchive/archive_write_add_filter_uuencode.c \
libarchive/archive_write_add_filter_xz.c \
+ libarchive/archive_write_add_filter_zstd.c \
libarchive/archive_write_set_format.c \
libarchive/archive_write_set_format_7zip.c \
libarchive/archive_write_set_format_ar.c \
@@ -366,6 +368,7 @@
libarchive/archive_read_support_filter_rpm.lo \
libarchive/archive_read_support_filter_uu.lo \
Home |
Main Index |
Thread Index |
Old Index