pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/libarchive Update for libarchive-3.4.0:
details: https://anonhg.NetBSD.org/pkgsrc/rev/7457f706bc47
branches: trunk
changeset: 401680:7457f706bc47
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Sep 22 09:55:06 2019 +0000
description:
Update for libarchive-3.4.0:
- improvements for Android APK and JAR archives
- better support for non-recursive list and extract
- tar --exclude-vcs support
- fixes for file attributes and flags handling
- zipx support
- rar 5.0 reader
diffstat:
archivers/libarchive/Makefile.common | 4 +-
archivers/libarchive/files/CMakeLists.txt | 93 +-
archivers/libarchive/files/COPYING | 9 +-
archivers/libarchive/files/Makefile.am | 69 +-
archivers/libarchive/files/Makefile.in | 18004 +++++----
archivers/libarchive/files/NEWS | 16 +
archivers/libarchive/files/README.md | 4 +-
archivers/libarchive/files/aclocal.m4 | 214 +-
archivers/libarchive/files/build/autoconf/compile | 13 +-
archivers/libarchive/files/build/autoconf/config.guess | 280 +-
archivers/libarchive/files/build/autoconf/config.sub | 48 +-
archivers/libarchive/files/build/autoconf/depcomp | 10 +-
archivers/libarchive/files/build/autoconf/install-sh | 36 +-
archivers/libarchive/files/build/autoconf/ltmain.sh | 223 +-
archivers/libarchive/files/build/autoconf/missing | 16 +-
archivers/libarchive/files/build/cmake/config.h.in | 9 +
archivers/libarchive/files/build/version | 2 +-
archivers/libarchive/files/config.h.in | 9 +
archivers/libarchive/files/configure | 407 +-
archivers/libarchive/files/configure.ac | 23 +-
archivers/libarchive/files/contrib/android/Android.mk | 2 +-
archivers/libarchive/files/contrib/libarchive.1aix53.spec | 10 +-
archivers/libarchive/files/contrib/libarchive.spec | 249 +-
archivers/libarchive/files/cpio/cpio.c | 19 +-
archivers/libarchive/files/cpio/test/test_basic.c | 4 +-
archivers/libarchive/files/cpio/test/test_format_newc.c | 7 +-
archivers/libarchive/files/cpio/test/test_gcpio_compat.c | 2 +-
archivers/libarchive/files/cpio/test/test_option_a.c | 5 +
archivers/libarchive/files/cpio/test/test_option_c.c | 2 +-
archivers/libarchive/files/cpio/test/test_option_t.c | 8 +-
archivers/libarchive/files/doc/html/Makefile | 5 +-
archivers/libarchive/files/doc/html/archive_entry.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_entry_acl.3.html | 30 +-
archivers/libarchive/files/doc/html/archive_entry_linkify.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_entry_paths.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_entry_perms.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_entry_stat.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_entry_time.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read.3.html | 6 +-
archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_data.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_disk.3.html | 30 +-
archivers/libarchive/files/doc/html/archive_read_extract.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_filter.3.html | 7 +-
archivers/libarchive/files/doc/html/archive_read_format.3.html | 24 +-
archivers/libarchive/files/doc/html/archive_read_free.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_header.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_new.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_open.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_read_set_options.3.html | 6 +-
archivers/libarchive/files/doc/html/archive_util.3.html | 29 +-
archivers/libarchive/files/doc/html/archive_write.3.html | 14 +-
archivers/libarchive/files/doc/html/archive_write_blocksize.3.html | 8 +-
archivers/libarchive/files/doc/html/archive_write_data.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_disk.3.html | 15 +-
archivers/libarchive/files/doc/html/archive_write_filter.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_format.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_free.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_header.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_new.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_write_open.3.html | 9 +-
archivers/libarchive/files/doc/html/archive_write_set_options.3.html | 15 +-
archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html | 4 +-
archivers/libarchive/files/doc/html/bsdcpio.1.html | 33 +-
archivers/libarchive/files/doc/html/bsdtar.1.html | 148 +-
archivers/libarchive/files/doc/html/cpio.5.html | 60 +-
archivers/libarchive/files/doc/html/libarchive-formats.5.html | 93 +-
archivers/libarchive/files/doc/html/libarchive.3.html | 16 +-
archivers/libarchive/files/doc/html/libarchive_changes.3.html | 18 +-
archivers/libarchive/files/doc/html/libarchive_internals.3.html | 4 +-
archivers/libarchive/files/doc/html/mtree.5.html | 29 +-
archivers/libarchive/files/doc/html/tar.5.html | 281 +-
archivers/libarchive/files/doc/man/Makefile | 5 +-
archivers/libarchive/files/doc/man/bsdtar.1 | 50 +-
archivers/libarchive/files/doc/pdf/Makefile | 5 +-
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/Makefile | 5 +-
archivers/libarchive/files/doc/text/archive_entry.3.txt | 4 +-
archivers/libarchive/files/doc/text/archive_entry_acl.3.txt | 49 +-
archivers/libarchive/files/doc/text/archive_entry_linkify.3.txt | 38 +-
archivers/libarchive/files/doc/text/archive_entry_perms.3.txt | 4 +-
archivers/libarchive/files/doc/text/archive_entry_stat.3.txt | 19 +-
archivers/libarchive/files/doc/text/archive_read.3.txt | 6 +-
archivers/libarchive/files/doc/text/archive_read_data.3.txt | 4 +-
archivers/libarchive/files/doc/text/archive_read_disk.3.txt | 48 +-
archivers/libarchive/files/doc/text/archive_read_extract.3.txt | 23 +-
archivers/libarchive/files/doc/text/archive_read_format.3.txt | 24 +-
archivers/libarchive/files/doc/text/archive_read_header.3.txt | 4 +-
archivers/libarchive/files/doc/text/archive_read_open.3.txt | 16 +-
archivers/libarchive/files/doc/text/archive_util.3.txt | 10 +-
archivers/libarchive/files/doc/text/archive_write.3.txt | 12 +-
archivers/libarchive/files/doc/text/archive_write_data.3.txt | 10 +-
archivers/libarchive/files/doc/text/archive_write_disk.3.txt | 64 +-
archivers/libarchive/files/doc/text/archive_write_finish_entry.3.txt | 6 +-
archivers/libarchive/files/doc/text/archive_write_free.3.txt | 4 +-
archivers/libarchive/files/doc/text/archive_write_open.3.txt | 14 +-
archivers/libarchive/files/doc/text/archive_write_set_options.3.txt | 34 +-
archivers/libarchive/files/doc/text/bsdcpio.1.txt | 4 +-
archivers/libarchive/files/doc/text/bsdtar.1.txt | 190 +-
archivers/libarchive/files/doc/text/cpio.5.txt | 18 +-
archivers/libarchive/files/doc/text/libarchive-formats.5.txt | 105 +-
archivers/libarchive/files/doc/text/libarchive.3.txt | 72 +-
archivers/libarchive/files/doc/text/libarchive_changes.3.txt | 34 +-
archivers/libarchive/files/doc/text/libarchive_internals.3.txt | 26 +-
archivers/libarchive/files/doc/text/mtree.5.txt | 24 +-
archivers/libarchive/files/doc/text/tar.5.txt | 132 +-
archivers/libarchive/files/doc/wiki/Makefile | 5 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki | 22 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki | 4 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki | 38 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki | 16 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadExtract3.wiki | 36 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadFilter3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadFormat3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadFree3.wiki | 16 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadHeader3.wiki | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadNew3.wiki | 14 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadOpen3.wiki | 16 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki | 12 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki | 22 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki | 4 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki | 4 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki | 58 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki | 32 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki | 20 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki | 12 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki | 22 +-
archivers/libarchive/files/libarchive/CMakeLists.txt | 10 +
archivers/libarchive/files/libarchive/archive.h | 8 +-
archivers/libarchive/files/libarchive/archive_acl.c | 88 +-
archivers/libarchive/files/libarchive/archive_cryptor.c | 7 +
archivers/libarchive/files/libarchive/archive_entry.c | 318 +-
archivers/libarchive/files/libarchive/archive_entry.h | 12 +-
archivers/libarchive/files/libarchive/archive_entry_private.h | 3 +
archivers/libarchive/files/libarchive/archive_match.c | 33 +-
archivers/libarchive/files/libarchive/archive_pack_dev.c | 7 +-
archivers/libarchive/files/libarchive/archive_pack_dev.h | 2 +-
archivers/libarchive/files/libarchive/archive_platform.h | 2 +
archivers/libarchive/files/libarchive/archive_read.c | 9 +
archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c | 5 +-
archivers/libarchive/files/libarchive/archive_read_disk_posix.c | 70 +-
archivers/libarchive/files/libarchive/archive_read_disk_windows.c | 180 +-
archivers/libarchive/files/libarchive/archive_read_open_file.c | 3 +-
archivers/libarchive/files/libarchive/archive_read_private.h | 3 +
archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c | 11 +-
archivers/libarchive/files/libarchive/archive_read_support_format_all.c | 1 +
archivers/libarchive/files/libarchive/archive_read_support_format_ar.c | 9 +-
archivers/libarchive/files/libarchive/archive_read_support_format_cab.c | 4 +-
archivers/libarchive/files/libarchive/archive_read_support_format_cpio.c | 3 +-
archivers/libarchive/files/libarchive/archive_read_support_format_iso9660.c | 17 +-
archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c | 15 +-
archivers/libarchive/files/libarchive/archive_read_support_format_rar.c | 18 +-
archivers/libarchive/files/libarchive/archive_read_support_format_raw.c | 4 +-
archivers/libarchive/files/libarchive/archive_read_support_format_tar.c | 29 +-
archivers/libarchive/files/libarchive/archive_read_support_format_warc.c | 8 +-
archivers/libarchive/files/libarchive/archive_read_support_format_xar.c | 47 +-
archivers/libarchive/files/libarchive/archive_read_support_format_zip.c | 1062 +-
archivers/libarchive/files/libarchive/archive_string.c | 6 +-
archivers/libarchive/files/libarchive/archive_util.c | 2 +-
archivers/libarchive/files/libarchive/archive_windows.c | 3 +-
archivers/libarchive/files/libarchive/archive_windows.h | 5 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c | 7 +-
archivers/libarchive/files/libarchive/archive_write_disk_posix.c | 360 +-
archivers/libarchive/files/libarchive/archive_write_disk_set_standard_lookup.c | 6 +-
archivers/libarchive/files/libarchive/archive_write_disk_windows.c | 281 +-
archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c | 3 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | 5 +
archivers/libarchive/files/libarchive/archive_write_set_format_cpio.c | 3 +-
archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c | 3 +-
archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c | 5 +-
archivers/libarchive/files/libarchive/archive_write_set_format_iso9660.c | 4 +-
archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c | 4 +-
archivers/libarchive/files/libarchive/archive_write_set_format_pax.c | 23 +-
archivers/libarchive/files/libarchive/archive_write_set_format_shar.c | 6 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c | 9 +-
archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c | 11 +-
archivers/libarchive/files/libarchive/archive_write_set_format_xar.c | 15 +-
archivers/libarchive/files/libarchive/archive_write_set_format_zip.c | 9 +-
archivers/libarchive/files/libarchive/test/CMakeLists.txt | 5 +-
archivers/libarchive/files/libarchive/test/list.h | 63 +-
archivers/libarchive/files/libarchive/test/test_compat_pax_libarchive_2x.c | 153 -
archivers/libarchive/files/libarchive/test/test_compat_pax_libarchive_2x.tar.Z.uu | 15 -
archivers/libarchive/files/libarchive/test/test_entry.c | 41 +-
archivers/libarchive/files/libarchive/test/test_extattr_freebsd.c | 46 +-
archivers/libarchive/files/libarchive/test/test_fuzz.c | 10 +-
archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c | 297 +-
archivers/libarchive/files/libarchive/test/test_read_extract.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_mtree.c | 24 +
archivers/libarchive/files/libarchive/test/test_read_format_rar.c | 39 +
archivers/libarchive/files/libarchive/test/test_read_format_raw.c | 27 +
archivers/libarchive/files/libarchive/test/test_read_format_xar.c | 163 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip.c | 612 +-
archivers/libarchive/files/libarchive/test/test_sparse_basic.c | 83 +-
archivers/libarchive/files/libarchive/test/test_write_disk_perms.c | 2 +-
archivers/libarchive/files/libarchive/test/test_write_disk_symlink.c | 156 +-
archivers/libarchive/files/libarchive_fe/line_reader.c | 3 +-
archivers/libarchive/files/libarchive_fe/passphrase.c | 97 +-
archivers/libarchive/files/tar/bsdtar.1 | 48 +-
archivers/libarchive/files/tar/bsdtar.c | 93 +-
archivers/libarchive/files/tar/bsdtar.h | 1 +
archivers/libarchive/files/tar/cmdline.c | 1 +
archivers/libarchive/files/tar/test/CMakeLists.txt | 1 +
archivers/libarchive/files/tar/test/list.h | 1 +
archivers/libarchive/files/tar/test/test_basic.c | 4 +-
archivers/libarchive/files/tar/test/test_copy.c | 4 +-
archivers/libarchive/files/tar/test/test_option_H_upper.c | 36 +-
archivers/libarchive/files/tar/test/test_option_L_upper.c | 28 +-
archivers/libarchive/files/tar/test/test_option_U_upper.c | 18 +-
archivers/libarchive/files/tar/test/test_option_n.c | 81 +
archivers/libarchive/files/tar/test/test_option_s.c | 18 +-
archivers/libarchive/files/tar/test/test_strip_components.c | 11 +-
archivers/libarchive/files/tar/test/test_symlink_dir.c | 26 +-
archivers/libarchive/files/tar/write.c | 12 +-
archivers/libarchive/files/test_utils/test_common.h | 14 +-
archivers/libarchive/files/test_utils/test_main.c | 310 +-
274 files changed, 16956 insertions(+), 10714 deletions(-)
diffs (truncated from 36105 to 300 lines):
diff -r 238d9d659276 -r 7457f706bc47 archivers/libarchive/Makefile.common
--- a/archivers/libarchive/Makefile.common Sun Sep 22 09:54:36 2019 +0000
+++ b/archivers/libarchive/Makefile.common Sun Sep 22 09:55:06 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.9 2019/04/10 08:24:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2019/09/22 09:55:06 joerg Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile
-DISTNAME= libarchive-3.3.3
+DISTNAME= libarchive-3.4.0
CATEGORIES= archivers
MASTER_SITES= http://www.libarchive.org/downloads/
DISTFILES= # empty
diff -r 238d9d659276 -r 7457f706bc47 archivers/libarchive/files/CMakeLists.txt
--- a/archivers/libarchive/files/CMakeLists.txt Sun Sep 22 09:54:36 2019 +0000
+++ b/archivers/libarchive/files/CMakeLists.txt Sun Sep 22 09:55:06 2019 +0000
@@ -1,5 +1,8 @@
#
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+if(POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW) #3.12.0 `find_package()`` uses ``<PackageName>_ROOT`` variables.
+endif()
#
PROJECT(libarchive C)
#
@@ -84,6 +87,11 @@
SET(CMAKE_REQUIRED_INCLUDES)
SET(CMAKE_REQUIRED_LIBRARIES)
SET(CMAKE_REQUIRED_FLAGS)
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ OPTION(ENABLE_WERROR "Treat warnings as errors - default is ON for Debug, OFF otherwise." ON)
+else ()
+ OPTION(ENABLE_WERROR "Treat warnings as errors - default is ON for Debug, OFF otherwise." OFF)
+endif ()
# Especially for early development, we want to be a little
# aggressive about diagnosing build problems; this can get
@@ -93,10 +101,12 @@
#################################################################
# Set compile flags for all build types.
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security")
+ if (ENABLE_WERROR)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ endif ()
#################################################################
# Set compile flags for debug build.
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
@@ -108,11 +118,13 @@
#################################################################
# Set compile flags for all build types.
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wformat -Wformat-security")
+ if (ENABLE_WERROR)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ endif ()
#################################################################
# Set compile flags for debug build.
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
@@ -125,15 +137,21 @@
#################################################################
# Set compile flags for all build types.
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qflag=e:e -qformat=sec")
+ if (ENABLE_WERROR)
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qhalt=w")
+ endif ()
#################################################################
# Set compile flags for debug build.
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qhalt=w")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qflag=w:w")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
IF (MSVC)
+ if (ENABLE_WERROR)
+ # /WX option is the same as gcc's -Werror option.
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+ endif ()
#################################################################
# Set compile flags for debug build.
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
@@ -165,8 +183,6 @@
# Enable level 4 C4706: The test value in a conditional expression was the
# result of an assignment.
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4706")
- # /WX option is the same as gcc's -Werror option.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX")
# /Oi option enables built-in functions.
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Oi")
#################################################################
@@ -179,9 +195,11 @@
OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+OPTION(ENABLE_LIBB2 "Enable the use of the system LIBB2 library if found" 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)
+OPTION(ENABLE_ZSTD "Enable the use of the system zstd library if found" ON)
OPTION(ENABLE_ZLIB "Enable the use of the system ZLIB library if found" ON)
OPTION(ENABLE_BZip2 "Enable the use of the system BZip2 library if found" ON)
@@ -457,12 +475,13 @@
IF(ENABLE_LZMA)
FIND_PACKAGE(LibLZMA)
ELSE()
- SET(LIBZMA_FOUND FALSE) # Override cached value
+ SET(LIBLZMA_FOUND FALSE) # Override cached value
ENDIF()
IF(LIBLZMA_FOUND)
SET(HAVE_LIBLZMA 1)
SET(HAVE_LZMA_H 1)
+ CMAKE_PUSH_CHECK_STATE()
SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
@@ -476,9 +495,13 @@
IF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
ADD_DEFINITIONS(-DLZMA_API_STATIC)
ENDIF(NOT WITHOUT_LZMA_API_STATIC AND LZMA_API_STATIC)
+ CMAKE_POP_CHECK_STATE()
ELSE(LIBLZMA_FOUND)
# LZMA not found and will not be used.
ENDIF(LIBLZMA_FOUND)
+MARK_AS_ADVANCED(CLEAR LIBLZMA_INCLUDE_DIR)
+MARK_AS_ADVANCED(CLEAR LIBLZMA_LIBRARY)
+
#
# Find LZO2
#
@@ -508,6 +531,35 @@
MARK_AS_ADVANCED(CLEAR LZO2_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR LZO2_LIBRARY)
#
+# Find libb2
+#
+IF(ENABLE_LIBB2)
+ IF (LIBB2_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(LIBB2_FIND_QUIETLY TRUE)
+ ENDIF (LIBB2_INCLUDE_DIR)
+
+ FIND_PATH(LIBB2_INCLUDE_DIR blake2.h)
+ FIND_LIBRARY(LIBB2_LIBRARY NAMES b2 libb2)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBB2 DEFAULT_MSG LIBB2_LIBRARY LIBB2_INCLUDE_DIR)
+ELSE(ENABLE_LIBB2)
+ SET(LIBB2_FOUND FALSE) # Override cached value
+ENDIF(ENABLE_LIBB2)
+IF(LIBB2_FOUND)
+ SET(HAVE_LIBB2 1)
+ SET(HAVE_BLAKE2_H 1)
+ SET(ARCHIVE_BLAKE2 FALSE)
+ LIST(APPEND ADDITIONAL_LIBS ${LIBB2_LIBRARY})
+ CMAKE_PUSH_CHECK_STATE()
+ SET(CMAKE_REQUIRED_LIBRARIES ${LIBB2_LIBRARY})
+ SET(CMAKE_REQUIRED_INCLUDES ${LIBB2_INCLUDE_DIR})
+ CHECK_FUNCTION_EXISTS(blake2sp_init HAVE_LIBB2)
+ CMAKE_POP_CHECK_STATE()
+ELSE(LIBB2_FOUND)
+ SET(ARCHIVE_BLAKE2 TRUE)
+ENDIF(LIBB2_FOUND)
+#
# Find LZ4
#
IF(ENABLE_LZ4)
@@ -541,29 +593,36 @@
#
# Find Zstd
#
-IF (ZSTD_INCLUDE_DIR)
- # Already in cache, be silent
- SET(ZSTD_FIND_QUIETLY TRUE)
-ENDIF (ZSTD_INCLUDE_DIR)
+IF(ENABLE_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)
+ 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)
+ELSE(ENABLE_ZSTD)
+ SET(ZSTD_FOUND FALSE) # Override cached value
+ENDIF(ENABLE_ZSTD)
IF(ZSTD_FOUND)
SET(HAVE_ZSTD_H 1)
INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIR})
LIST(APPEND ADDITIONAL_LIBS ${ZSTD_LIBRARY})
+ CMAKE_PUSH_CHECK_STATE()
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.
#
+ CMAKE_POP_CHECK_STATE()
ENDIF(ZSTD_FOUND)
MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY)
+
#
# Check headers
#
@@ -1291,6 +1350,7 @@
CHECK_FUNCTION_EXISTS_GLIBC(symlink HAVE_SYMLINK)
CHECK_FUNCTION_EXISTS_GLIBC(timegm HAVE_TIMEGM)
CHECK_FUNCTION_EXISTS_GLIBC(tzset HAVE_TZSET)
+CHECK_FUNCTION_EXISTS_GLIBC(unlinkat HAVE_UNLINKAT)
CHECK_FUNCTION_EXISTS_GLIBC(unsetenv HAVE_UNSETENV)
CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
@@ -1572,6 +1632,11 @@
CHECK_LIBRARY_EXISTS(attr "setxattr" "" HAVE_LIBATTR)
IF(HAVE_LIBATTR)
SET(CMAKE_REQUIRED_LIBRARIES "attr")
+ ELSE()
+ CHECK_LIBRARY_EXISTS(gnu "setxattr" "" HAVE_LIBATTR_GNU)
+ IF(HAVE_LIBATTR_GNU)
+ SET(CMAKE_REQUIRED_LIBRARIES "gnu")
+ ENDIF()
ENDIF(HAVE_LIBATTR)
CHECK_SYMBOL_EXISTS(EXTATTR_NAMESPACE_USER "sys/types.h;sys/extattr.h" HAVE_DECL_EXTATTR_NAMESPACE_USER)
CHECK_SYMBOL_EXISTS(XATTR_NOFOLLOW "sys/xattr.h" HAVE_DECL_XATTR_NOFOLLOW)
diff -r 238d9d659276 -r 7457f706bc47 archivers/libarchive/files/COPYING
--- a/archivers/libarchive/files/COPYING Sun Sep 22 09:54:36 2019 +0000
+++ b/archivers/libarchive/files/COPYING Sun Sep 22 09:55:06 2019 +0000
@@ -23,6 +23,13 @@
* The following source files are in the public domain:
libarchive/archive_getdate.c
+* The following source files are triple-licensed with the ability to choose
+ from CC0 1.0 Universal, OpenSSL or Apache 2.0 licenses:
+ libarchive/archive_blake2.h
+ libarchive/archive_blake2_impl.h
+ libarchive/archive_blake2s_ref.c
+ libarchive/archive_blake2sp_ref.c
+
* The build files---including Makefiles, configure scripts,
and auxiliary scripts used as part of the compile process---have
widely varying licensing terms. Please check individual files before
@@ -34,7 +41,7 @@
seems to be an unavoidable mess.
-Copyright (c) 2003-2009 <author(s)>
+Copyright (c) 2003-2018 <author(s)>
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -r 238d9d659276 -r 7457f706bc47 archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am Sun Sep 22 09:54:36 2019 +0000
+++ b/archivers/libarchive/files/Makefile.am Sun Sep 22 09:55:06 2019 +0000
@@ -132,6 +132,8 @@
libarchive/archive_ppmd_private.h \
libarchive/archive_ppmd7.c \
libarchive/archive_ppmd7_private.h \
+ libarchive/archive_ppmd8.c \
+ libarchive/archive_ppmd8_private.h \
libarchive/archive_private.h \
libarchive/archive_random.c \
libarchive/archive_random_private.h \
@@ -179,6 +181,7 @@
libarchive/archive_read_support_format_lha.c \
libarchive/archive_read_support_format_mtree.c \
libarchive/archive_read_support_format_rar.c \
+ libarchive/archive_read_support_format_rar5.c \
libarchive/archive_read_support_format_raw.c \
libarchive/archive_read_support_format_tar.c \
libarchive/archive_read_support_format_warc.c \
@@ -251,6 +254,14 @@
libarchive/filter_fork_windows.c
endif
+if INC_BLAKE2
+libarchive_la_SOURCES+= \
+ libarchive/archive_blake2.h \
+ libarchive/archive_blake2_impl.h \
+ libarchive/archive_blake2s_ref.c \
+ libarchive/archive_blake2sp_ref.c
+endif
+
if INC_LINUX_ACL
Home |
Main Index |
Thread Index |
Old Index