Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/libarchive libarchive: Update to 3.4.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/3eb8c403f985
branches: trunk
changeset: 432845:3eb8c403f985
user: nia <nia%pkgsrc.org@localhost>
date: Tue May 26 09:16:39 2020 +0000
description:
libarchive: Update to 3.4.3
Libarchive 3.4.3 is a feature and bugfix release.
New features:
support for pzstd compressed files (#1357)
support for RHT.security.selinux tar extended attribute (#1348)
Important bugfixes:
various zstd fixes and improvements (#1342 #1352 #1359)
child process handling fixes (#1372)
Libarchive 3.4.2 is a feature and security release.
New features:
support for atomic file extraction (bsdtar -x --safe-writes) (#1289)
support for mbed TLS (PolarSSL) (#1301)
Important bugfixes:
security fixes in RAR5 reader (#1280 #1326)
compression buffer fix in XAR writer (#1317)
fix uname and gname longer than 32 characters in PAX writer (#1319)
fix segfault when archiving hard links in ISO9660 and XAR writers (#1325)
fix support for extracting 7z archive entries with Delta filter (#987)
Libarchive 3.4.1 is a feature and security release.
New features:
Unicode filename support for reading lha/lzh archives
New pax write option "xattrhdr"
Important bugfixes:
security fixes in wide string processing (#1276 #1298)
security fixes in RAR5 reader (#1212 #1217 #1296)
security fixes and optimizations to write filter logic (#351)
security fix related to use of readlink(2) (1dae5a5)
sparse file handling fixes (#1218 #1260)
Thanks to all contributors and bug reporters.
Special thanks to Christos Zoulas (@zoulasc) from NetBSD for the atomic file extraction feature.
diffstat:
archivers/libarchive/Makefile | 3 +-
archivers/libarchive/Makefile.common | 9 +-
archivers/libarchive/files/CMakeLists.txt | 67 +-
archivers/libarchive/files/Makefile.am | 26 +-
archivers/libarchive/files/Makefile.in | 209 +-
archivers/libarchive/files/NEWS | 20 +
archivers/libarchive/files/README.md | 2 +-
archivers/libarchive/files/aclocal.m4 | 9181 +---------
archivers/libarchive/files/build/autoconf/compile | 6 +-
archivers/libarchive/files/build/autoconf/config.guess | 268 +-
archivers/libarchive/files/build/autoconf/config.sub | 13 +-
archivers/libarchive/files/build/autoconf/depcomp | 2 +-
archivers/libarchive/files/build/autoconf/install-sh | 711 +-
archivers/libarchive/files/build/autoconf/ltmain.sh | 273 +-
archivers/libarchive/files/build/autoconf/missing | 2 +-
archivers/libarchive/files/build/autoconf/test-driver | 2 +-
archivers/libarchive/files/build/cmake/CreatePkgConfigFile.cmake | 4 +-
archivers/libarchive/files/build/cmake/FindMbedTLS.cmake | 13 +
archivers/libarchive/files/build/cmake/config.h.in | 6 +
archivers/libarchive/files/build/version | 2 +-
archivers/libarchive/files/cat/bsdcat.1 | 11 +-
archivers/libarchive/files/cat/bsdcat.h | 5 +
archivers/libarchive/files/cat/test/list.h | 2 +-
archivers/libarchive/files/cat/test/test_0.c | 2 +-
archivers/libarchive/files/config.h.in | 33 +
archivers/libarchive/files/configure | 664 +-
archivers/libarchive/files/configure.ac | 30 +-
archivers/libarchive/files/contrib/archivetest.c | 16 +-
archivers/libarchive/files/contrib/libarchive.1aix53.spec | 55 +-
archivers/libarchive/files/contrib/shar/shar.1 | 11 +-
archivers/libarchive/files/cpio/bsdcpio.1 | 3 +-
archivers/libarchive/files/cpio/cpio.c | 37 +-
archivers/libarchive/files/cpio/cpio.h | 1 +
archivers/libarchive/files/cpio/test/list.h | 14 +-
archivers/libarchive/files/cpio/test/test_basic.c | 14 +-
archivers/libarchive/files/cpio/test/test_format_newc.c | 48 +-
archivers/libarchive/files/doc/html/Makefile | 8 +-
archivers/libarchive/files/doc/html/archive_entry.3.html | 8 +-
archivers/libarchive/files/doc/html/archive_entry_acl.3.html | 95 +-
archivers/libarchive/files/doc/html/archive_entry_linkify.3.html | 4 +-
archivers/libarchive/files/doc/html/archive_entry_misc.3.html | 6 +-
archivers/libarchive/files/doc/html/archive_entry_paths.3.html | 12 +-
archivers/libarchive/files/doc/html/archive_entry_perms.3.html | 12 +-
archivers/libarchive/files/doc/html/archive_entry_stat.3.html | 14 +-
archivers/libarchive/files/doc/html/archive_entry_time.3.html | 10 +-
archivers/libarchive/files/doc/html/archive_read.3.html | 16 +-
archivers/libarchive/files/doc/html/archive_read_add_passphrase.3.html | 14 +-
archivers/libarchive/files/doc/html/archive_read_data.3.html | 19 +-
archivers/libarchive/files/doc/html/archive_read_disk.3.html | 42 +-
archivers/libarchive/files/doc/html/archive_read_extract.3.html | 14 +-
archivers/libarchive/files/doc/html/archive_read_filter.3.html | 11 +-
archivers/libarchive/files/doc/html/archive_read_format.3.html | 30 +-
archivers/libarchive/files/doc/html/archive_read_free.3.html | 12 +-
archivers/libarchive/files/doc/html/archive_read_header.3.html | 14 +-
archivers/libarchive/files/doc/html/archive_read_new.3.html | 12 +-
archivers/libarchive/files/doc/html/archive_read_open.3.html | 14 +-
archivers/libarchive/files/doc/html/archive_read_set_options.3.html | 53 +-
archivers/libarchive/files/doc/html/archive_util.3.html | 55 +-
archivers/libarchive/files/doc/html/archive_write.3.html | 21 +-
archivers/libarchive/files/doc/html/archive_write_blocksize.3.html | 13 +-
archivers/libarchive/files/doc/html/archive_write_data.3.html | 8 +-
archivers/libarchive/files/doc/html/archive_write_disk.3.html | 29 +-
archivers/libarchive/files/doc/html/archive_write_filter.3.html | 12 +-
archivers/libarchive/files/doc/html/archive_write_finish_entry.3.html | 10 +-
archivers/libarchive/files/doc/html/archive_write_format.3.html | 10 +-
archivers/libarchive/files/doc/html/archive_write_free.3.html | 9 +-
archivers/libarchive/files/doc/html/archive_write_header.3.html | 9 +-
archivers/libarchive/files/doc/html/archive_write_new.3.html | 8 +-
archivers/libarchive/files/doc/html/archive_write_open.3.html | 19 +-
archivers/libarchive/files/doc/html/archive_write_set_options.3.html | 330 +-
archivers/libarchive/files/doc/html/archive_write_set_passphrase.3.html | 16 +-
archivers/libarchive/files/doc/html/bsdcpio.1.html | 37 +-
archivers/libarchive/files/doc/html/bsdtar.1.html | 139 +-
archivers/libarchive/files/doc/html/cpio.5.html | 62 +-
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 | 27 +-
archivers/libarchive/files/doc/html/libarchive_internals.3.html | 8 +-
archivers/libarchive/files/doc/html/mtree.5.html | 32 +-
archivers/libarchive/files/doc/html/tar.5.html | 289 +-
archivers/libarchive/files/doc/man/Makefile | 8 +-
archivers/libarchive/files/doc/man/archive_entry.3 | 7 +-
archivers/libarchive/files/doc/man/archive_entry_acl.3 | 74 +-
archivers/libarchive/files/doc/man/archive_entry_misc.3 | 5 +-
archivers/libarchive/files/doc/man/archive_entry_paths.3 | 10 +-
archivers/libarchive/files/doc/man/archive_entry_perms.3 | 12 +-
archivers/libarchive/files/doc/man/archive_entry_stat.3 | 10 +-
archivers/libarchive/files/doc/man/archive_entry_time.3 | 6 +-
archivers/libarchive/files/doc/man/archive_read.3 | 6 +-
archivers/libarchive/files/doc/man/archive_read_add_passphrase.3 | 10 +-
archivers/libarchive/files/doc/man/archive_read_data.3 | 4 +-
archivers/libarchive/files/doc/man/archive_read_disk.3 | 13 +-
archivers/libarchive/files/doc/man/archive_read_extract.3 | 2 +-
archivers/libarchive/files/doc/man/archive_read_filter.3 | 4 +-
archivers/libarchive/files/doc/man/archive_read_format.3 | 2 +-
archivers/libarchive/files/doc/man/archive_read_free.3 | 6 +-
archivers/libarchive/files/doc/man/archive_read_header.3 | 2 +-
archivers/libarchive/files/doc/man/archive_read_new.3 | 2 +-
archivers/libarchive/files/doc/man/archive_read_open.3 | 4 +-
archivers/libarchive/files/doc/man/archive_read_set_options.3 | 51 +-
archivers/libarchive/files/doc/man/archive_util.3 | 16 +-
archivers/libarchive/files/doc/man/archive_write.3 | 6 +-
archivers/libarchive/files/doc/man/archive_write_blocksize.3 | 2 +-
archivers/libarchive/files/doc/man/archive_write_data.3 | 2 +-
archivers/libarchive/files/doc/man/archive_write_disk.3 | 13 +-
archivers/libarchive/files/doc/man/archive_write_filter.3 | 4 +-
archivers/libarchive/files/doc/man/archive_write_finish_entry.3 | 2 +-
archivers/libarchive/files/doc/man/archive_write_format.3 | 4 +-
archivers/libarchive/files/doc/man/archive_write_free.3 | 4 +-
archivers/libarchive/files/doc/man/archive_write_header.3 | 2 +-
archivers/libarchive/files/doc/man/archive_write_new.3 | 2 +-
archivers/libarchive/files/doc/man/archive_write_open.3 | 4 +-
archivers/libarchive/files/doc/man/archive_write_set_options.3 | 337 +-
archivers/libarchive/files/doc/man/archive_write_set_passphrase.3 | 12 +-
archivers/libarchive/files/doc/man/bsdcpio.1 | 3 +-
archivers/libarchive/files/doc/man/bsdtar.1 | 110 +-
archivers/libarchive/files/doc/man/cpio.5 | 2 +-
archivers/libarchive/files/doc/man/libarchive_changes.3 | 5 +-
archivers/libarchive/files/doc/man/libarchive_internals.3 | 4 +-
archivers/libarchive/files/doc/man/mtree.5 | 8 +-
archivers/libarchive/files/doc/man/tar.5 | 9 +-
archivers/libarchive/files/doc/pdf/Makefile | 8 +-
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_misc.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 | 8 +-
archivers/libarchive/files/doc/text/archive_entry.3.txt | 10 +-
archivers/libarchive/files/doc/text/archive_entry_acl.3.txt | 132 +-
archivers/libarchive/files/doc/text/archive_entry_linkify.3.txt | 46 +-
archivers/libarchive/files/doc/text/archive_entry_misc.3.txt | 14 +-
archivers/libarchive/files/doc/text/archive_entry_paths.3.txt | 12 +-
archivers/libarchive/files/doc/text/archive_entry_perms.3.txt | 22 +-
archivers/libarchive/files/doc/text/archive_entry_stat.3.txt | 31 +-
archivers/libarchive/files/doc/text/archive_entry_time.3.txt | 6 +-
archivers/libarchive/files/doc/text/archive_read.3.txt | 32 +-
archivers/libarchive/files/doc/text/archive_read_add_passphrase.3.txt | 12 +-
archivers/libarchive/files/doc/text/archive_read_data.3.txt | 27 +-
archivers/libarchive/files/doc/text/archive_read_disk.3.txt | 82 +-
archivers/libarchive/files/doc/text/archive_read_extract.3.txt | 35 +-
archivers/libarchive/files/doc/text/archive_read_filter.3.txt | 12 +-
archivers/libarchive/files/doc/text/archive_read_format.3.txt | 44 +-
archivers/libarchive/files/doc/text/archive_read_free.3.txt | 10 +-
archivers/libarchive/files/doc/text/archive_read_header.3.txt | 17 +-
archivers/libarchive/files/doc/text/archive_read_new.3.txt | 6 +-
archivers/libarchive/files/doc/text/archive_read_open.3.txt | 30 +-
archivers/libarchive/files/doc/text/archive_read_set_options.3.txt | 44 +-
archivers/libarchive/files/doc/text/archive_util.3.txt | 50 +-
archivers/libarchive/files/doc/text/archive_write.3.txt | 36 +-
archivers/libarchive/files/doc/text/archive_write_blocksize.3.txt | 8 +-
archivers/libarchive/files/doc/text/archive_write_data.3.txt | 20 +-
archivers/libarchive/files/doc/text/archive_write_disk.3.txt | 109 +-
archivers/libarchive/files/doc/text/archive_write_filter.3.txt | 8 +-
archivers/libarchive/files/doc/text/archive_write_finish_entry.3.txt | 16 +-
archivers/libarchive/files/doc/text/archive_write_format.3.txt | 8 +-
archivers/libarchive/files/doc/text/archive_write_free.3.txt | 10 +-
archivers/libarchive/files/doc/text/archive_write_header.3.txt | 10 +-
archivers/libarchive/files/doc/text/archive_write_new.3.txt | 4 +-
archivers/libarchive/files/doc/text/archive_write_open.3.txt | 38 +-
archivers/libarchive/files/doc/text/archive_write_set_options.3.txt | 282 +-
archivers/libarchive/files/doc/text/archive_write_set_passphrase.3.txt | 12 +-
archivers/libarchive/files/doc/text/bsdcpio.1.txt | 62 +-
archivers/libarchive/files/doc/text/bsdtar.1.txt | 335 +-
archivers/libarchive/files/doc/text/cpio.5.txt | 72 +-
archivers/libarchive/files/doc/text/libarchive-formats.5.txt | 206 +-
archivers/libarchive/files/doc/text/libarchive.3.txt | 102 +-
archivers/libarchive/files/doc/text/libarchive_changes.3.txt | 58 +-
archivers/libarchive/files/doc/text/libarchive_internals.3.txt | 70 +-
archivers/libarchive/files/doc/text/mtree.5.txt | 61 +-
archivers/libarchive/files/doc/text/tar.5.txt | 342 +-
archivers/libarchive/files/doc/wiki/Makefile | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntry3.wiki | 25 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryAcl3.wiki | 80 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryLinkify3.wiki | 4 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryMisc3.wiki | 13 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPaths3.wiki | 14 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryPerms3.wiki | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryStat3.wiki | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveEntryTime3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveRead3.wiki | 40 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadAddPassphrase3.wiki | 12 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadData3.wiki | 20 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadDisk3.wiki | 27 +-
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 | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveReadSetOptions3.wiki | 43 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveUtil3.wiki | 28 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWrite3.wiki | 26 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteBlocksize3.wiki | 4 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteData3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteDisk3.wiki | 18 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFilter3.wiki | 10 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFinishEntry3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFormat3.wiki | 12 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteFree3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteHeader3.wiki | 6 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteNew3.wiki | 8 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteOpen3.wiki | 20 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetOptions3.wiki | 290 +-
archivers/libarchive/files/doc/wiki/ManPageArchiveWriteSetPassphrase3.wiki | 14 +-
archivers/libarchive/files/doc/wiki/ManPageBsdcpio1.wiki | 13 +-
archivers/libarchive/files/doc/wiki/ManPageBsdtar1.wiki | 118 +-
archivers/libarchive/files/doc/wiki/ManPageCpio5.wiki | 2 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchive3.wiki | 32 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchiveChanges3.wiki | 21 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchiveFormats5.wiki | 12 +-
archivers/libarchive/files/doc/wiki/ManPageLibarchiveInternals3.wiki | 22 +-
archivers/libarchive/files/doc/wiki/ManPageMtree5.wiki | 7 +-
archivers/libarchive/files/doc/wiki/ManPageTar5.wiki | 9 +-
archivers/libarchive/files/examples/minitar/minitar.c | 3 +
archivers/libarchive/files/libarchive/CMakeLists.txt | 1 +
archivers/libarchive/files/libarchive/archive.h | 8 +-
archivers/libarchive/files/libarchive/archive_acl_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_blake2.h | 5 +-
archivers/libarchive/files/libarchive/archive_blake2_impl.h | 5 +-
archivers/libarchive/files/libarchive/archive_cmdline_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_crc32.h | 5 +
archivers/libarchive/files/libarchive/archive_cryptor.c | 62 +
archivers/libarchive/files/libarchive/archive_cryptor_private.h | 24 +-
archivers/libarchive/files/libarchive/archive_digest.c | 678 +-
archivers/libarchive/files/libarchive/archive_digest_private.h | 43 +-
archivers/libarchive/files/libarchive/archive_endian.h | 11 +-
archivers/libarchive/files/libarchive/archive_entry.3 | 7 +-
archivers/libarchive/files/libarchive/archive_entry.c | 16 +-
archivers/libarchive/files/libarchive/archive_entry.h | 5 +-
archivers/libarchive/files/libarchive/archive_entry_acl.3 | 80 +-
archivers/libarchive/files/libarchive/archive_entry_locale.h | 6 +-
archivers/libarchive/files/libarchive/archive_entry_misc.3 | 5 +-
archivers/libarchive/files/libarchive/archive_entry_paths.3 | 10 +-
archivers/libarchive/files/libarchive/archive_entry_perms.3 | 12 +-
archivers/libarchive/files/libarchive/archive_entry_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_entry_stat.3 | 10 +-
archivers/libarchive/files/libarchive/archive_entry_time.3 | 6 +-
archivers/libarchive/files/libarchive/archive_getdate.c | 149 +-
archivers/libarchive/files/libarchive/archive_getdate.h | 6 +-
archivers/libarchive/files/libarchive/archive_hmac.c | 50 +
archivers/libarchive/files/libarchive/archive_hmac_private.h | 12 +-
archivers/libarchive/files/libarchive/archive_openssl_evp_private.h | 5 +
archivers/libarchive/files/libarchive/archive_openssl_hmac_private.h | 5 +
archivers/libarchive/files/libarchive/archive_options_private.h | 4 +
archivers/libarchive/files/libarchive/archive_pack_dev.c | 13 +-
archivers/libarchive/files/libarchive/archive_pack_dev.h | 8 +-
archivers/libarchive/files/libarchive/archive_pathmatch.h | 6 +-
archivers/libarchive/files/libarchive/archive_platform_acl.h | 6 +
archivers/libarchive/files/libarchive/archive_platform_xattr.h | 6 +
archivers/libarchive/files/libarchive/archive_ppmd7.c | 2 +-
archivers/libarchive/files/libarchive/archive_ppmd7_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_ppmd8_private.h | 4 +-
archivers/libarchive/files/libarchive/archive_ppmd_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_private.h | 11 +-
archivers/libarchive/files/libarchive/archive_random_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_rb.h | 21 +-
archivers/libarchive/files/libarchive/archive_read.3 | 6 +-
archivers/libarchive/files/libarchive/archive_read.c | 22 +-
archivers/libarchive/files/libarchive/archive_read_add_passphrase.3 | 10 +-
archivers/libarchive/files/libarchive/archive_read_add_passphrase.c | 4 +
archivers/libarchive/files/libarchive/archive_read_data.3 | 4 +-
archivers/libarchive/files/libarchive/archive_read_disk.3 | 13 +-
archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c | 6 +-
archivers/libarchive/files/libarchive/archive_read_disk_posix.c | 97 +-
archivers/libarchive/files/libarchive/archive_read_disk_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_read_disk_windows.c | 2 +
archivers/libarchive/files/libarchive/archive_read_extract.3 | 2 +-
archivers/libarchive/files/libarchive/archive_read_filter.3 | 4 +-
archivers/libarchive/files/libarchive/archive_read_format.3 | 6 +-
archivers/libarchive/files/libarchive/archive_read_free.3 | 6 +-
archivers/libarchive/files/libarchive/archive_read_header.3 | 2 +-
archivers/libarchive/files/libarchive/archive_read_new.3 | 2 +-
archivers/libarchive/files/libarchive/archive_read_open.3 | 4 +-
archivers/libarchive/files/libarchive/archive_read_open_filename.c | 4 +
archivers/libarchive/files/libarchive/archive_read_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_read_set_options.3 | 41 +-
archivers/libarchive/files/libarchive/archive_read_support_filter_lz4.c | 10 +-
archivers/libarchive/files/libarchive/archive_read_support_filter_program.c | 23 +-
archivers/libarchive/files/libarchive/archive_read_support_filter_uu.c | 30 +-
archivers/libarchive/files/libarchive/archive_read_support_filter_zstd.c | 4 +
archivers/libarchive/files/libarchive/archive_read_support_format_7zip.c | 11 +-
archivers/libarchive/files/libarchive/archive_read_support_format_lha.c | 206 +-
archivers/libarchive/files/libarchive/archive_read_support_format_mtree.c | 1 +
archivers/libarchive/files/libarchive/archive_read_support_format_rar.c | 70 +-
archivers/libarchive/files/libarchive/archive_read_support_format_rar5.c | 327 +-
archivers/libarchive/files/libarchive/archive_read_support_format_tar.c | 18 +
archivers/libarchive/files/libarchive/archive_read_support_format_warc.c | 3 +-
archivers/libarchive/files/libarchive/archive_read_support_format_xar.c | 34 +-
archivers/libarchive/files/libarchive/archive_read_support_format_zip.c | 23 +-
archivers/libarchive/files/libarchive/archive_string.c | 46 +-
archivers/libarchive/files/libarchive/archive_string.h | 6 +-
archivers/libarchive/files/libarchive/archive_string_composition.h | 6 +-
archivers/libarchive/files/libarchive/archive_util.3 | 16 +-
archivers/libarchive/files/libarchive/archive_util.c | 233 +-
archivers/libarchive/files/libarchive/archive_windows.h | 8 +-
archivers/libarchive/files/libarchive/archive_write.3 | 6 +-
archivers/libarchive/files/libarchive/archive_write.c | 91 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_b64encode.c | 12 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_bzip2.c | 10 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_compress.c | 22 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_gzip.c | 9 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_lz4.c | 11 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_lzop.c | 10 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_program.c | 36 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_uuencode.c | 12 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_xz.c | 9 +-
archivers/libarchive/files/libarchive/archive_write_add_filter_zstd.c | 91 +-
archivers/libarchive/files/libarchive/archive_write_blocksize.3 | 2 +-
archivers/libarchive/files/libarchive/archive_write_data.3 | 2 +-
archivers/libarchive/files/libarchive/archive_write_disk.3 | 12 +-
archivers/libarchive/files/libarchive/archive_write_disk_posix.c | 103 +-
archivers/libarchive/files/libarchive/archive_write_disk_private.h | 6 +-
archivers/libarchive/files/libarchive/archive_write_disk_windows.c | 117 +-
archivers/libarchive/files/libarchive/archive_write_filter.3 | 4 +-
archivers/libarchive/files/libarchive/archive_write_finish_entry.3 | 2 +-
archivers/libarchive/files/libarchive/archive_write_format.3 | 4 +-
archivers/libarchive/files/libarchive/archive_write_free.3 | 4 +-
archivers/libarchive/files/libarchive/archive_write_header.3 | 2 +-
archivers/libarchive/files/libarchive/archive_write_new.3 | 2 +-
archivers/libarchive/files/libarchive/archive_write_open.3 | 4 +-
archivers/libarchive/files/libarchive/archive_write_private.h | 14 +-
archivers/libarchive/files/libarchive/archive_write_set_format.c | 45 +
archivers/libarchive/files/libarchive/archive_write_set_format_7zip.c | 3 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ar.c | 1 +
archivers/libarchive/files/libarchive/archive_write_set_format_cpio.c | 1 +
archivers/libarchive/files/libarchive/archive_write_set_format_cpio_newc.c | 1 +
archivers/libarchive/files/libarchive/archive_write_set_format_gnutar.c | 15 +-
archivers/libarchive/files/libarchive/archive_write_set_format_iso9660.c | 30 +-
archivers/libarchive/files/libarchive/archive_write_set_format_mtree.c | 16 +-
archivers/libarchive/files/libarchive/archive_write_set_format_pax.c | 122 +-
archivers/libarchive/files/libarchive/archive_write_set_format_private.h | 42 +
archivers/libarchive/files/libarchive/archive_write_set_format_shar.c | 5 +-
archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c | 30 +-
archivers/libarchive/files/libarchive/archive_write_set_format_v7tar.c | 29 +-
archivers/libarchive/files/libarchive/archive_write_set_format_warc.c | 18 +-
archivers/libarchive/files/libarchive/archive_write_set_format_xar.c | 68 +-
archivers/libarchive/files/libarchive/archive_write_set_format_zip.c | 38 +-
archivers/libarchive/files/libarchive/archive_write_set_options.3 | 288 +-
archivers/libarchive/files/libarchive/archive_write_set_passphrase.3 | 12 +-
archivers/libarchive/files/libarchive/archive_xxhash.h | 5 +-
archivers/libarchive/files/libarchive/config_freebsd.h | 1 +
archivers/libarchive/files/libarchive/cpio.5 | 2 +-
archivers/libarchive/files/libarchive/filter_fork.h | 15 +-
archivers/libarchive/files/libarchive/filter_fork_posix.c | 10 +-
archivers/libarchive/files/libarchive/filter_fork_windows.c | 17 +-
archivers/libarchive/files/libarchive/libarchive_changes.3 | 5 +-
archivers/libarchive/files/libarchive/libarchive_internals.3 | 4 +-
archivers/libarchive/files/libarchive/mtree.5 | 7 +-
archivers/libarchive/files/libarchive/tar.5 | 9 +-
archivers/libarchive/files/libarchive/test/CMakeLists.txt | 6 +-
archivers/libarchive/files/libarchive/test/list.h | 82 +-
archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c | 2 +
archivers/libarchive/files/libarchive/test/test_acl_platform_posix1e.c | 4 +-
archivers/libarchive/files/libarchive/test/test_archive_write_add_filter_by_name.c | 4 +-
archivers/libarchive/files/libarchive/test/test_archive_write_set_format_filter_by_ext.c | 4 +-
archivers/libarchive/files/libarchive/test/test_compat_zip.c | 10 +-
archivers/libarchive/files/libarchive/test/test_compat_zstd.c | 3 +
archivers/libarchive/files/libarchive/test/test_compat_zstd_2.tar.zst.uu | 8 +
archivers/libarchive/files/libarchive/test/test_fuzz.c | 3 +-
archivers/libarchive/files/libarchive/test/test_open_failure.c | 16 +-
archivers/libarchive/files/libarchive/test/test_open_fd.c | 27 +-
archivers/libarchive/files/libarchive/test/test_pax_xattr_header.c | 130 +
archivers/libarchive/files/libarchive/test/test_pax_xattr_header_all.tar.uu | 72 +
archivers/libarchive/files/libarchive/test/test_pax_xattr_header_libarchive.tar.uu | 72 +
archivers/libarchive/files/libarchive/test/test_pax_xattr_header_schily.tar.uu | 72 +
archivers/libarchive/files/libarchive/test/test_read_disk_directory_traversals.c | 3 +-
archivers/libarchive/files/libarchive/test/test_read_extract.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_7zip.c | 19 +-
archivers/libarchive/files/libarchive/test/test_read_format_7zip_delta4_lzma1.7z.uu | 407 +
archivers/libarchive/files/libarchive/test/test_read_format_7zip_delta4_lzma2.7z.uu | 407 +
archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.7z.uu | 7 +
archivers/libarchive/files/libarchive/test/test_read_format_7zip_packinfo_digests.c | 89 +
archivers/libarchive/files/libarchive/test/test_read_format_gtar_sparse.c | 5 +-
archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.c | 143 +
archivers/libarchive/files/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu | 19 +
archivers/libarchive/files/libarchive/test/test_read_format_rar.c | 29 +
archivers/libarchive/files/libarchive/test/test_read_format_rar5.c | 133 +-
archivers/libarchive/files/libarchive/test/test_read_format_rar5_arm_filter_on_window_boundary.rar.uu | 9 +
archivers/libarchive/files/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu | 8 +
archivers/libarchive/files/libarchive/test/test_read_format_rar5_different_solid_window_size.rar.uu | 73 +
archivers/libarchive/files/libarchive/test/test_read_format_raw.c | 4 +
archivers/libarchive/files/libarchive/test/test_read_format_zip.c | 66 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_7075_utf8_paths.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_comment_stored.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_extra_padding.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_high_compression.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_jar.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_mac_metadata.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_malformed.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_msdos.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_nested.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_nofiletype.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_padded.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_sfx.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_traditional_encryption_data.c | 4 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c | 2 +-
archivers/libarchive/files/libarchive/test/test_read_format_zip_zip64.c | 4 +-
archivers/libarchive/files/libarchive/test/test_read_pax_schily_xattr.c | 70 -
archivers/libarchive/files/libarchive/test/test_read_pax_schily_xattr.tar.uu | 231 -
archivers/libarchive/files/libarchive/test/test_read_pax_truncated.c | 6 +-
archivers/libarchive/files/libarchive/test/test_read_truncated_filter.c | 4 +-
archivers/libarchive/files/libarchive/test/test_sparse_basic.c | 17 +-
archivers/libarchive/files/libarchive/test/test_write_disk.c | 2 +-
archivers/libarchive/files/libarchive/test/test_write_filter_zstd.c | 69 +-
archivers/libarchive/files/libarchive/test/test_write_format_cpio_empty.c | 2 +-
archivers/libarchive/files/libarchive/test/test_write_format_pax.c | 46 +
archivers/libarchive/files/libarchive/test/test_write_format_shar_empty.c | 2 +-
archivers/libarchive/files/libarchive/test/test_write_format_tar.c | 2 +-
archivers/libarchive/files/libarchive/test/test_write_format_tar_sparse.c | 4 +-
archivers/libarchive/files/libarchive/test/test_write_format_xar.c | 3 +
archivers/libarchive/files/libarchive/test/test_write_format_zip_file.c | 2 +-
archivers/libarchive/files/libarchive/test/test_write_format_zip_file_zip64.c | 2 +-
archivers/libarchive/files/libarchive_fe/err.h | 9 +-
archivers/libarchive/files/tar/bsdtar.1 | 108 +-
archivers/libarchive/files/tar/bsdtar.c | 6 +
archivers/libarchive/files/tar/bsdtar.h | 7 +
archivers/libarchive/files/tar/cmdline.c | 2 +
archivers/libarchive/files/tar/test/CMakeLists.txt | 1 +
archivers/libarchive/files/tar/test/list.h | 23 +-
archivers/libarchive/files/tar/test/test_basic.c | 2 +-
archivers/libarchive/files/tar/test/test_copy.c | 4 +-
archivers/libarchive/files/tar/test/test_option_C_upper.c | 2 +-
archivers/libarchive/files/tar/test/test_option_n.c | 4 +-
archivers/libarchive/files/tar/test/test_option_s.c | 6 +-
archivers/libarchive/files/tar/test/test_option_xattrs.c | 2 +-
archivers/libarchive/files/tar/util.c | 22 +-
archivers/libarchive/files/test_utils/test_common.h | 28 +-
archivers/libarchive/files/test_utils/test_main.c | 46 +-
468 files changed, 10189 insertions(+), 14548 deletions(-)
diffs (truncated from 41369 to 300 lines):
diff -r 82c38a6d6845 -r 3eb8c403f985 archivers/libarchive/Makefile
--- a/archivers/libarchive/Makefile Tue May 26 08:40:26 2020 +0000
+++ b/archivers/libarchive/Makefile Tue May 26 09:16:39 2020 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.49 2020/01/18 21:48:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2020/05/26 09:16:39 nia Exp $
-PKGREVISION= 1
.include "Makefile.common"
COMMENT= Library to read/create different archive formats
diff -r 82c38a6d6845 -r 3eb8c403f985 archivers/libarchive/Makefile.common
--- a/archivers/libarchive/Makefile.common Tue May 26 08:40:26 2020 +0000
+++ b/archivers/libarchive/Makefile.common Tue May 26 09:16:39 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.11 2020/01/26 17:30:40 rillig Exp $
+# $NetBSD: Makefile.common,v 1.12 2020/05/26 09:16:39 nia Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile
-DISTNAME= libarchive-3.4.0
+DISTNAME= libarchive-3.4.3
CATEGORIES= archivers
-MASTER_SITES= http://www.libarchive.org/downloads/
+MASTER_SITES= https://www.libarchive.org/downloads/
DISTFILES= # empty
MAINTAINER?= joerg%NetBSD.org@localhost
@@ -14,8 +14,11 @@
TEST_TARGET= check
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-expat
+CONFIGURE_ARGS+= --without-libb2
CONFIGURE_ARGS+= --without-lzo2
+CONFIGURE_ARGS+= --without-mbedtls
CONFIGURE_ARGS+= --without-nettle
+CONFIGURE_ARGS+= --without-openssl
CONFIGURE_ARGS+= --without-xml2
CONFIGURE_ARGS+= --without-zstd
CONFIGURE_ARGS+= --disable-maintainer-mode
diff -r 82c38a6d6845 -r 3eb8c403f985 archivers/libarchive/files/CMakeLists.txt
--- a/archivers/libarchive/files/CMakeLists.txt Tue May 26 08:40:26 2020 +0000
+++ b/archivers/libarchive/files/CMakeLists.txt Tue May 26 09:16:39 2020 +0000
@@ -155,34 +155,34 @@
#################################################################
# Set compile flags for debug build.
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
- # Enable level 4 C4061: The enumerate has no associated handler in a switch
- # statement.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4061")
+ # Enable level 4 C4062: The enumerate has no associated handler in a switch
+ # statement and there is no default that can catch it.
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14062")
# Enable level 4 C4254: A larger bit field was assigned to a smaller bit
# field.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4254")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14254")
# Enable level 4 C4295: An array was initialized but the last character in
# the array is not a null; accessing the array may
# produce unexpected results.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4295")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14295")
# Enable level 4 C4296: An unsigned variable was used in a comparison
# operation with zero.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4296")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14296")
# Enable level 4 C4389: An operation involved signed and unsigned variables.
# This could result in a loss of data.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4389")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14389")
# Enable level 4 C4505: The given function is local and not referenced in
# the body of the module; therefore, the function is
# dead code.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4505")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14505")
# Enable level 4 C4514: The optimizer removed an inline function that is not
# called.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4514")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14514")
# Enable level 4 C4702: Unreachable code.
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4702")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14702")
# 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")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /w14706")
# /Oi option enables built-in functions.
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Oi")
#################################################################
@@ -193,7 +193,8 @@
# Enable CTest/CDash support
include(CTest)
-OPTION(ENABLE_NETTLE "Enable use of Nettle" ON)
+OPTION(ENABLE_MBEDTLS "Enable use of mbed TLS" OFF)
+OPTION(ENABLE_NETTLE "Enable use of Nettle" OFF)
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)
@@ -286,6 +287,10 @@
ADD_DEFINITIONS(-D_XOPEN_SOURCE=500) # Ask wchar.h for mbstate_t
ENDIF()
+IF(MINGW)
+ ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO)
+ENDIF()
+
#
INCLUDE(CheckCSourceCompiles)
INCLUDE(CheckCSourceRuns)
@@ -739,6 +744,26 @@
SAFE_TO_DEFINE_EXTENSIONS)
#
+# Find mbed TLS
+#
+IF(ENABLE_MBEDTLS)
+ FIND_PACKAGE(MbedTLS)
+ IF(MBEDTLS_FOUND)
+ SET(HAVE_LIBMBEDCRYPTO 1)
+ LIST(APPEND ADDITIONAL_LIBS ${MBEDCRYPTO_LIBRARY})
+ INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIRS})
+
+ LIST(APPEND CMAKE_REQUIRED_INCLUDES ${MBEDTLS_INCLUDE_DIRS})
+ LA_CHECK_INCLUDE_FILE("mbedtls/aes.h" HAVE_MBEDTLS_AES_H)
+ LA_CHECK_INCLUDE_FILE("mbedtls/md.h" HAVE_MBEDTLS_MD_H)
+ LA_CHECK_INCLUDE_FILE("mbedtls/pkcs5.h" HAVE_MBEDTLS_PKCS5_H)
+
+ ENDIF(MBEDTLS_FOUND)
+ MARK_AS_ADVANCED(CLEAR MBEDTLS_INCLUDE_DIRS)
+ MARK_AS_ADVANCED(CLEAR MBEDCRYPTO_LIBRARY)
+ENDIF(ENABLE_MBEDTLS)
+
+#
# Find Nettle
#
IF(ENABLE_NETTLE)
@@ -800,6 +825,8 @@
STRING(TOUPPER "${ALGORITHM}" algorithm)
IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND)
SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE)
+ ELSEIF("${IMPLEMENTATION}" MATCHES "^MBEDTLS$" AND NOT MBEDTLS_FOUND)
+ SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE)
ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NOT NETTLE_FOUND)
SET(ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION} FALSE)
ENDIF("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND NOT OPENSSL_FOUND)
@@ -815,6 +842,11 @@
"${TRY_CRYPTO_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
SET(TRY_CRYPTO_REQUIRED_LIBS
"-DLINK_LIBRARIES:STRING=${OPENSSL_LIBRARIES}")
+ ELSEIF("${IMPLEMENTATION}" MATCHES "^MBEDTLS$" AND MBEDTLS_FOUND)
+ SET(TRY_CRYPTO_REQUIRED_INCLUDES
+ "${TRY_CRYPTO_REQUIRED_INCLUDES};${MBEDTLS_INCLUDE_DIRS}")
+ SET(TRY_CRYPTO_REQUIRED_LIBS
+ "-DLINK_LIBRARIES:STRING=${MBEDCRYPTO_LIBRARY}")
ELSEIF("${IMPLEMENTATION}" MATCHES "^NETTLE$" AND NETTLE_FOUND)
SET(TRY_CRYPTO_REQUIRED_INCLUDES
"${TRY_CRYPTO_REQUIRED_INCLUDES};${NETTLE_INCLUDE_DIR}")
@@ -1364,6 +1396,7 @@
CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
+CHECK_FUNCTION_EXISTS_GLIBC(_gmtime64_s HAVE__GMTIME64_S)
CHECK_FUNCTION_EXISTS_GLIBC(_localtime64_s HAVE__LOCALTIME64_S)
CHECK_FUNCTION_EXISTS_GLIBC(_mkgmtime64 HAVE__MKGMTIME64)
@@ -1416,9 +1449,13 @@
"#include <sys/sysmacros.h>\nint main() { return major(256); }"
MAJOR_IN_SYSMACROS)
+IF(ENABLE_LZMA)
CHECK_C_SOURCE_COMPILES(
"#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
HAVE_LZMA_STREAM_ENCODER_MT)
+ELSE()
+ SET(HAVE_LZMA_STREAM_ENCODER_MT 0)
+ENDIF(ENABLE_LZMA)
IF(HAVE_STRERROR_R)
SET(HAVE_DECL_STRERROR_R 1)
@@ -1960,6 +1997,7 @@
CHECK_CRYPTO("SHA256;SHA384;SHA512" LIBC2)
CHECK_CRYPTO("SHA256;SHA384;SHA512" LIBC3)
CHECK_CRYPTO("MD5;SHA1;SHA256;SHA384;SHA512" LIBSYSTEM)
+CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" MBEDTLS)
CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" NETTLE)
CHECK_CRYPTO("MD5;RMD160;SHA1;SHA256;SHA384;SHA512" OPENSSL)
@@ -2002,6 +2040,11 @@
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
ENDIF(MSVC)
+IF(APPLE)
+ # CC_MD5_Init() functions are deprecated on macOS 10.15, but we want to use them
+ ADD_DEFINITIONS(-Wno-deprecated-declarations)
+ENDIF(APPLE)
+
IF(ENABLE_TEST)
ADD_CUSTOM_TARGET(run_all_tests)
ENDIF(ENABLE_TEST)
diff -r 82c38a6d6845 -r 3eb8c403f985 archivers/libarchive/files/Makefile.am
--- a/archivers/libarchive/files/Makefile.am Tue May 26 08:40:26 2020 +0000
+++ b/archivers/libarchive/files/Makefile.am Tue May 26 09:16:39 2020 +0000
@@ -228,6 +228,7 @@
libarchive/archive_write_set_format_iso9660.c \
libarchive/archive_write_set_format_mtree.c \
libarchive/archive_write_set_format_pax.c \
+ libarchive/archive_write_set_format_private.h \
libarchive/archive_write_set_format_raw.c \
libarchive/archive_write_set_format_shar.c \
libarchive/archive_write_set_format_ustar.c \
@@ -429,6 +430,7 @@
libarchive/test/test_open_file.c \
libarchive/test/test_open_filename.c \
libarchive/test/test_pax_filename_encoding.c \
+ libarchive/test/test_pax_xattr_header.c \
libarchive/test/test_read_data_large.c \
libarchive/test/test_read_disk.c \
libarchive/test/test_read_disk_directory_traversals.c \
@@ -448,6 +450,7 @@
libarchive/test/test_read_format_7zip_encryption_partially.c \
libarchive/test/test_read_format_7zip_encryption_header.c \
libarchive/test/test_read_format_7zip_malformed.c \
+ libarchive/test/test_read_format_7zip_packinfo_digests.c \
libarchive/test/test_read_format_ar.c \
libarchive/test/test_read_format_cab.c \
libarchive/test/test_read_format_cab_filename.c \
@@ -488,6 +491,7 @@
libarchive/test/test_read_format_lha.c \
libarchive/test/test_read_format_lha_bugfix_0.c \
libarchive/test/test_read_format_lha_filename.c \
+ libarchive/test/test_read_format_lha_filename_utf16.c \
libarchive/test/test_read_format_mtree.c \
libarchive/test/test_read_format_mtree_crash747.c \
libarchive/test/test_read_format_pax_bz2.c \
@@ -535,7 +539,8 @@
libarchive/test/test_read_format_zip_zip64.c \
libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c \
libarchive/test/test_read_large.c \
- libarchive/test/test_read_pax_schily_xattr.c \
+ libarchive/test/test_read_pax_xattr_rht_security_selinux.c \
+ libarchive/test/test_read_pax_xattr_schily.c \
libarchive/test/test_read_pax_truncated.c \
libarchive/test/test_read_position.c \
libarchive/test/test_read_set_format.c \
@@ -697,10 +702,14 @@
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_compat_zstd_2.tar.zst.uu \
libarchive/test/test_fuzz.cab.uu \
libarchive/test/test_fuzz.lzh.uu \
libarchive/test/test_fuzz_1.iso.Z.uu \
libarchive/test/test_pax_filename_encoding.tar.uu \
+ libarchive/test/test_pax_xattr_header_all.tar.uu \
+ libarchive/test/test_pax_xattr_header_libarchive.tar.uu \
+ libarchive/test/test_pax_xattr_header_schily.tar.uu \
libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu \
libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu \
libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu \
@@ -745,7 +754,9 @@
libarchive/test/test_read_format_7zip_copy_2.7z.uu \
libarchive/test/test_read_format_7zip_deflate.7z.uu \
libarchive/test/test_read_format_7zip_delta_lzma1.7z.uu \
+ libarchive/test/test_read_format_7zip_delta4_lzma1.7z.uu \
libarchive/test/test_read_format_7zip_delta_lzma2.7z.uu \
+ libarchive/test/test_read_format_7zip_delta4_lzma2.7z.uu \
libarchive/test/test_read_format_7zip_empty_archive.7z.uu \
libarchive/test/test_read_format_7zip_empty_file.7z.uu \
libarchive/test/test_read_format_7zip_encryption.7z.uu \
@@ -757,6 +768,7 @@
libarchive/test/test_read_format_7zip_lzma2.7z.uu \
libarchive/test/test_read_format_7zip_malformed.7z.uu \
libarchive/test/test_read_format_7zip_malformed2.7z.uu \
+ libarchive/test/test_read_format_7zip_packinfo_digests.7z.uu \
libarchive/test/test_read_format_7zip_ppmd.7z.uu \
libarchive/test/test_read_format_7zip_symbolic_name.7z.uu \
libarchive/test/test_read_format_ar.ar.uu \
@@ -798,6 +810,7 @@
libarchive/test/test_read_format_iso_zisofs.iso.Z.uu \
libarchive/test/test_read_format_lha_bugfix_0.lzh.uu \
libarchive/test/test_read_format_lha_filename_cp932.lzh.uu \
+ libarchive/test/test_read_format_lha_filename_utf16.lzh.uu \
libarchive/test/test_read_format_lha_header0.lzh.uu \
libarchive/test/test_read_format_lha_header1.lzh.uu \
libarchive/test/test_read_format_lha_header2.lzh.uu \
@@ -826,6 +839,7 @@
libarchive/test/test_read_format_rar_noeof.rar.uu \
libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu \
libarchive/test/test_read_format_rar_ppmd_use_after_free.rar.uu \
+ libarchive/test/test_read_format_rar_ppmd_use_after_free2.rar.uu \
libarchive/test/test_read_format_rar_sfx.exe.uu \
libarchive/test/test_read_format_rar_subblock.rar.uu \
libarchive/test/test_read_format_rar_unicode.rar.uu \
@@ -833,6 +847,8 @@
libarchive/test/test_read_format_rar5_arm.rar.uu \
libarchive/test/test_read_format_rar5_blake2.rar.uu \
libarchive/test/test_read_format_rar5_compressed.rar.uu \
+ libarchive/test/test_read_format_rar5_different_window_size.rar.uu \
+ libarchive/test/test_read_format_rar5_different_solid_window_size.rar.uu \
Home |
Main Index |
Thread Index |
Old Index