From 16dd80e46eaf53d8283cf8ceb676f67f01aec70f Mon Sep 17 00:00:00 2001 From: zrj Date: Sat, 13 Apr 2019 23:59:32 +0300 Subject: [PATCH] Adjust files for libarchive-3.3.3 import. This finally drops dependency on libmd. Also avoid pthreads from lzma. Changes: * Remove LIBMD * Add README.DELETED * Fix Symbol.map * Adjust tools to take version from config.h --- contrib/libarchive/README.DELETED | 41 ++++ contrib/libarchive/README.DRAGONFLY | 24 ++- lib/libarchive/Makefile | 22 +- lib/libarchive/Symbol.map | 120 ++++++----- lib/libarchive/Versions.def | 5 +- lib/libarchive/config.h | 313 ++++++++++++++++++++++++---- usr.bin/bsdcat/Makefile | 12 +- usr.bin/cpio/Makefile | 12 +- usr.bin/tar/Makefile | 12 +- 9 files changed, 437 insertions(+), 124 deletions(-) create mode 100644 contrib/libarchive/README.DELETED diff --git a/contrib/libarchive/README.DELETED b/contrib/libarchive/README.DELETED new file mode 100644 index 0000000000..3a7a3a3448 --- /dev/null +++ b/contrib/libarchive/README.DELETED @@ -0,0 +1,41 @@ +CMakeLists.txt +INSTALL +Makefile.am +Makefile.in +README.md +aclocal.m4 +build/ +cat/CMakeLists.txt +cat/test/ +config.h.in +configure +configure.ac +contrib/ +cpio/CMakeLists.txt +cpio/config_freebsd.h +cpio/cpio_windows.c +cpio/cpio_windows.h +cpio/test/ +doc/ +examples/ +libarchive/CMakeLists.txt +libarchive/archive_crc32.h +libarchive/archive_disk_acl_darwin.c +libarchive/archive_disk_acl_freebsd.c +libarchive/archive_disk_acl_linux.c +libarchive/archive_disk_acl_sunos.c +libarchive/archive_entry_copy_bhfi.c +libarchive/archive_platform_xattr.h +libarchive/archive_read_disk_windows.c +libarchive/archive_windows.c +libarchive/archive_windows.h +libarchive/archive_write_disk_windows.c +libarchive/config_freebsd.h +libarchive/filter_fork_windows.c +libarchive/test/ +tar/CMakeLists.txt +tar/bsdtar_windows.c +tar/bsdtar_windows.h +tar/config_freebsd.h +tar/test/ +test_utils/ diff --git a/contrib/libarchive/README.DRAGONFLY b/contrib/libarchive/README.DRAGONFLY index 4272460d33..fa50076a4a 100644 --- a/contrib/libarchive/README.DRAGONFLY +++ b/contrib/libarchive/README.DRAGONFLY @@ -1,13 +1,31 @@ +LIBARCHIVE +========== + Original source can be downloaded from: http://www.libarchive.org/ -A list of deleted files is in README.DELETED. +file = libarchive-3.3.3.tar.gz +date = 9 April 2019 +size = 6535598 +sha1 = 499a8f48a895faff4151d7398b24070d578f0b2e -configure hint: -./configure --without-nettle --without-openssl --without-xml2 +A list of deleted files is in README.DELETED. This source is used in: lib/libarchive usr.bin/bsdcat usr.bin/cpio usr.bin/tar + +Configured with +=============== +./configure --without-nettle --with-openssl --without-xml2 --without-zstd \ + --without-lz4 --without-lzo2 \ + ac_cv_lib_md_MD5Init=no ac_cv_lzma_has_mt=no + +NOTE: test_read_disk_directory_traversals is expected to fail atime restore + +The following files have been patched (* planned) +================================================= + libarchive/archive_read_disk_posix.c futimens()/utimes() + libarchive/archive_write_disk_posix.c futimens()/utimes() diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 0a1296e67b..ea2eafd8da 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -6,15 +6,15 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/libarchive .PATH: ${CONTRIBDIR} SHLIB_MAJOR= 5 -CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" +CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -I${.OBJDIR} -I${.CURDIR} -I${CONTRIBDIR} # This can be changed back to CFLAGS once iconv works correctly with # statically linked libraries (iconv uses dynamic-only dlopen(3)) SHARED_CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 WARNS?= 2 -DPADD= ${LIBBZ2} ${LIBLZMA} ${LIBMD} ${LIBCRYPTO} ${LIBZ} -LDADD= -lbz2 -llzma -lmd -lprivate_crypto -lz +DPADD= ${LIBBZ2} ${LIBLZMA} ${LIBCRYPTO} ${LIBZ} +LDADD= -lbz2 -llzma -lprivate_crypto -lz LDFLAGS+= ${PRIVATELIB_LDFLAGS} CFLAGS+= -I${.CURDIR}/../../crypto/libressl/include @@ -69,6 +69,7 @@ SRCS= archive_acl.c \ archive_read_support_filter_rpm.c \ archive_read_support_filter_uu.c \ archive_read_support_filter_xz.c \ + archive_read_support_filter_zstd.c \ archive_read_support_format_7zip.c \ archive_read_support_format_all.c \ archive_read_support_format_ar.c \ @@ -88,15 +89,9 @@ SRCS= archive_acl.c \ archive_string.c \ archive_string_sprintf.c \ archive_util.c \ + archive_version_details.c \ archive_virtual.c \ archive_write.c \ - archive_write_disk_acl.c \ - archive_write_disk_posix.c \ - archive_write_disk_set_standard_lookup.c \ - archive_write_open_fd.c \ - archive_write_open_file.c \ - archive_write_open_filename.c \ - archive_write_open_memory.c \ archive_write_add_filter.c \ archive_write_add_filter_b64encode.c \ archive_write_add_filter_by_name.c \ @@ -111,6 +106,13 @@ SRCS= archive_acl.c \ archive_write_add_filter_program.c \ archive_write_add_filter_uuencode.c \ archive_write_add_filter_xz.c \ + archive_write_add_filter_zstd.c \ + archive_write_disk_posix.c \ + archive_write_disk_set_standard_lookup.c \ + archive_write_open_fd.c \ + archive_write_open_file.c \ + archive_write_open_filename.c \ + archive_write_open_memory.c \ archive_write_set_format.c \ archive_write_set_format_7zip.c \ archive_write_set_format_ar.c \ diff --git a/lib/libarchive/Symbol.map b/lib/libarchive/Symbol.map index 0f7f36268e..475bec888b 100644 --- a/lib/libarchive/Symbol.map +++ b/lib/libarchive/Symbol.map @@ -1,44 +1,3 @@ -ARCHIVE_3.2.0 { - archive_bzlib_version; - archive_entry_gname_utf8; - archive_entry_is_data_encrypted; - archive_entry_is_encrypted; - archive_entry_is_metadata_encrypted; - archive_entry_pathname_utf8; - archive_entry_set_gname_utf8; - archive_entry_set_hardlink_utf8; - archive_entry_set_is_data_encrypted; - archive_entry_set_is_metadata_encrypted; - archive_entry_set_link_utf8; - archive_entry_set_pathname_utf8; - archive_entry_set_symlink_utf8; - archive_entry_set_uname_utf8; - archive_entry_symlink_utf8; - archive_entry_uname_utf8; - archive_free; - archive_liblz4_version; - archive_liblzma_version; - archive_passphrase_callback; - archive_read_add_passphrase; - archive_read_format_capabilities; - archive_read_has_encrypted_entries; - archive_read_set_passphrase_callback; - archive_read_support_filter_lz4; - archive_read_support_format_warc; - archive_utility_string_sort; - archive_write_add_filter_lz4; - archive_write_set_format_filter_by_ext; - archive_write_set_format_filter_by_ext_def; - archive_write_set_format_raw; - archive_write_set_format_warc; - archive_write_set_passphrase; - archive_write_set_passphrase_callback; - archive_version_details; - archive_zlib_version; - pack_find; - pack_native; -}; - ARCHIVE_3.1.2 { archive_clear_error; archive_compression; @@ -447,6 +406,58 @@ ARCHIVE_3.1.2 { archive_wstrncat; }; +ARCHIVE_3.2.0 { + archive_bzlib_version; + archive_entry_gname_utf8; + archive_entry_hardlink_utf8; + archive_entry_is_data_encrypted; + archive_entry_is_encrypted; + archive_entry_is_metadata_encrypted; + archive_entry_pathname_utf8; + archive_entry_set_gname_utf8; + archive_entry_set_hardlink_utf8; + archive_entry_set_is_data_encrypted; + archive_entry_set_is_metadata_encrypted; + archive_entry_set_link_utf8; + archive_entry_set_pathname_utf8; + archive_entry_set_symlink_utf8; + archive_entry_set_uname_utf8; + archive_entry_symlink_utf8; + archive_entry_uname_utf8; + archive_free; + archive_liblz4_version; + archive_liblzma_version; + archive_read_add_passphrase; + archive_read_format_capabilities; + archive_read_has_encrypted_entries; + archive_read_set_passphrase_callback; + archive_read_support_filter_lz4; + archive_read_support_format_warc; + archive_utility_string_sort; + archive_write_add_filter_lz4; + archive_write_set_format_filter_by_ext; + archive_write_set_format_filter_by_ext_def; + archive_write_set_format_raw; + archive_write_set_format_warc; + archive_write_set_passphrase; + archive_write_set_passphrase_callback; + archive_version_details; + archive_zlib_version; + pack_find; + pack_native; +}; + +ARCHIVE_3.3.3 { + archive_entry_acl_from_text; + archive_entry_acl_from_text_w; + archive_entry_acl_to_text; + archive_entry_acl_to_text_w; + archive_entry_acl_types; + archive_libzstd_version; + archive_read_support_filter_zstd; + archive_write_add_filter_zstd; +}; + ARCHIVEprivate_1.0 { __archive_check_child; __archive_check_magic; @@ -455,12 +466,16 @@ ARCHIVEprivate_1.0 { __archive_cmdline_free; __archive_cmdline_parse; __archive_create_child; + __archive_cryptor; + __archive_digest; __archive_ensure_cloexec_flag; __archive_errx; __archive_get_date; + __archive_hmac; __archive_mktemp; __archive_pathmatch; __archive_pathmatch_w; + __archive_ppmd7_functions; __archive_rb_tree_find_node; __archive_rb_tree_find_node_geq; __archive_rb_tree_find_node_leq; @@ -469,7 +484,6 @@ ARCHIVEprivate_1.0 { __archive_rb_tree_iterate; __archive_rb_tree_remove_node; __archive_read_ahead; - __archive_read_close_filters; __archive_read_consume; __archive_read_filter_ahead; __archive_read_filter_consume; @@ -497,7 +511,12 @@ ARCHIVEprivate_1.0 { __archive_write_program_free; __archive_write_program_open; __archive_write_program_write; + __archive_xxhash; + __libarchive_cryptor_build_hack; + __libarchive_hmac_build_hack; + _archive_entry_acl_from_text_l; _archive_entry_acl_text_l; + _archive_entry_acl_to_text_l; _archive_entry_copy_gname_l; _archive_entry_copy_hardlink_l; _archive_entry_copy_link_l; @@ -517,15 +536,16 @@ ARCHIVEprivate_1.0 { archive_acl_clear; archive_acl_copy; archive_acl_count; + archive_acl_from_text_l; + archive_acl_from_text_w; archive_acl_next; - archive_acl_parse_l; - archive_acl_parse_w; archive_acl_reset; - archive_acl_text_l; - archive_acl_text_w; - archive_hmac_sha1_cleanup; - archive_hmac_sha1_final; - archive_hmac_sha1_init; - archive_hmac_sha1_update; + archive_acl_to_text_l; + archive_acl_to_text_w; + archive_acl_types; + archive_array_append; + archive_mstring_copy_utf8; + archive_read_disk_entry_setup_acls; + archive_read_disk_entry_setup_path; archive_random; }; diff --git a/lib/libarchive/Versions.def b/lib/libarchive/Versions.def index 7d5ef6e1da..e0345b812e 100644 --- a/lib/libarchive/Versions.def +++ b/lib/libarchive/Versions.def @@ -4,5 +4,8 @@ ARCHIVE_3.1.2 { ARCHIVE_3.2.0 { } ARCHIVE_3.1.2; -ARCHIVEprivate_1.0 { +ARCHIVE_3.3.3 { } ARCHIVE_3.2.0; + +ARCHIVEprivate_1.0 { +} ARCHIVE_3.3.3; diff --git a/lib/libarchive/config.h b/lib/libarchive/config.h index c42f0c74aa..196e4bb0f4 100644 --- a/lib/libarchive/config.h +++ b/lib/libarchive/config.h @@ -1,11 +1,32 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Darwin ACL support */ +/* #undef ARCHIVE_ACL_DARWIN */ + +/* FreeBSD ACL support */ +/* #undef ARCHIVE_ACL_FREEBSD */ + +/* FreeBSD NFSv4 ACL support */ +/* #undef ARCHIVE_ACL_FREEBSD_NFS4 */ + +/* Linux POSIX.1e ACL support via libacl */ +/* #undef ARCHIVE_ACL_LIBACL */ + +/* Linux NFSv4 ACL support via librichacl */ +/* #undef ARCHIVE_ACL_LIBRICHACL */ + +/* Solaris ACL support */ +/* #undef ARCHIVE_ACL_SUNOS */ + +/* Solaris NFSv4 ACL support */ +/* #undef ARCHIVE_ACL_SUNOS_NFS4 */ + /* MD5 via ARCHIVE_CRYPTO_MD5_LIBC supported. */ /* #undef ARCHIVE_CRYPTO_MD5_LIBC */ /* MD5 via ARCHIVE_CRYPTO_MD5_LIBMD supported. */ -#define ARCHIVE_CRYPTO_MD5_LIBMD 1 +/* #undef ARCHIVE_CRYPTO_MD5_LIBMD */ /* MD5 via ARCHIVE_CRYPTO_MD5_LIBSYSTEM supported. */ /* #undef ARCHIVE_CRYPTO_MD5_LIBSYSTEM */ @@ -14,7 +35,7 @@ /* #undef ARCHIVE_CRYPTO_MD5_NETTLE */ /* MD5 via ARCHIVE_CRYPTO_MD5_OPENSSL supported. */ -/* #undef ARCHIVE_CRYPTO_MD5_OPENSSL */ +#define ARCHIVE_CRYPTO_MD5_OPENSSL 1 /* MD5 via ARCHIVE_CRYPTO_MD5_WIN supported. */ /* #undef ARCHIVE_CRYPTO_MD5_WIN */ @@ -23,19 +44,19 @@ /* #undef ARCHIVE_CRYPTO_RMD160_LIBC */ /* RMD160 via ARCHIVE_CRYPTO_RMD160_LIBMD supported. */ -#define ARCHIVE_CRYPTO_RMD160_LIBMD 1 +/* #undef ARCHIVE_CRYPTO_RMD160_LIBMD */ /* RMD160 via ARCHIVE_CRYPTO_RMD160_NETTLE supported. */ /* #undef ARCHIVE_CRYPTO_RMD160_NETTLE */ /* RMD160 via ARCHIVE_CRYPTO_RMD160_OPENSSL supported. */ -/* #undef ARCHIVE_CRYPTO_RMD160_OPENSSL */ +#define ARCHIVE_CRYPTO_RMD160_OPENSSL 1 /* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBC supported. */ /* #undef ARCHIVE_CRYPTO_SHA1_LIBC */ /* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBMD supported. */ -#define ARCHIVE_CRYPTO_SHA1_LIBMD 1 +/* #undef ARCHIVE_CRYPTO_SHA1_LIBMD */ /* SHA1 via ARCHIVE_CRYPTO_SHA1_LIBSYSTEM supported. */ /* #undef ARCHIVE_CRYPTO_SHA1_LIBSYSTEM */ @@ -44,7 +65,7 @@ /* #undef ARCHIVE_CRYPTO_SHA1_NETTLE */ /* SHA1 via ARCHIVE_CRYPTO_SHA1_OPENSSL supported. */ -/* #undef ARCHIVE_CRYPTO_SHA1_OPENSSL */ +#define ARCHIVE_CRYPTO_SHA1_OPENSSL 1 /* SHA1 via ARCHIVE_CRYPTO_SHA1_WIN supported. */ /* #undef ARCHIVE_CRYPTO_SHA1_WIN */ @@ -59,7 +80,7 @@ /* #undef ARCHIVE_CRYPTO_SHA256_LIBC3 */ /* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBMD supported. */ -#define ARCHIVE_CRYPTO_SHA256_LIBMD 1 +/* #undef ARCHIVE_CRYPTO_SHA256_LIBMD */ /* SHA256 via ARCHIVE_CRYPTO_SHA256_LIBSYSTEM supported. */ /* #undef ARCHIVE_CRYPTO_SHA256_LIBSYSTEM */ @@ -68,7 +89,7 @@ /* #undef ARCHIVE_CRYPTO_SHA256_NETTLE */ /* SHA256 via ARCHIVE_CRYPTO_SHA256_OPENSSL supported. */ -/* #undef ARCHIVE_CRYPTO_SHA256_OPENSSL */ +#define ARCHIVE_CRYPTO_SHA256_OPENSSL 1 /* SHA256 via ARCHIVE_CRYPTO_SHA256_WIN supported. */ /* #undef ARCHIVE_CRYPTO_SHA256_WIN */ @@ -89,7 +110,7 @@ /* #undef ARCHIVE_CRYPTO_SHA384_NETTLE */ /* SHA384 via ARCHIVE_CRYPTO_SHA384_OPENSSL supported. */ -/* #undef ARCHIVE_CRYPTO_SHA384_OPENSSL */ +#define ARCHIVE_CRYPTO_SHA384_OPENSSL 1 /* SHA384 via ARCHIVE_CRYPTO_SHA384_WIN supported. */ /* #undef ARCHIVE_CRYPTO_SHA384_WIN */ @@ -104,7 +125,7 @@ /* #undef ARCHIVE_CRYPTO_SHA512_LIBC3 */ /* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBMD supported. */ -#define ARCHIVE_CRYPTO_SHA512_LIBMD 1 +/* #undef ARCHIVE_CRYPTO_SHA512_LIBMD */ /* SHA512 via ARCHIVE_CRYPTO_SHA512_LIBSYSTEM supported. */ /* #undef ARCHIVE_CRYPTO_SHA512_LIBSYSTEM */ @@ -113,25 +134,88 @@ /* #undef ARCHIVE_CRYPTO_SHA512_NETTLE */ /* SHA512 via ARCHIVE_CRYPTO_SHA512_OPENSSL supported. */ -/* #undef ARCHIVE_CRYPTO_SHA512_OPENSSL */ +#define ARCHIVE_CRYPTO_SHA512_OPENSSL 1 /* SHA512 via ARCHIVE_CRYPTO_SHA512_WIN supported. */ /* #undef ARCHIVE_CRYPTO_SHA512_WIN */ +/* AIX xattr support */ +/* #undef ARCHIVE_XATTR_AIX */ + +/* Darwin xattr support */ +/* #undef ARCHIVE_XATTR_DARWIN */ + +/* FreeBSD xattr support */ +/* #undef ARCHIVE_XATTR_FREEBSD */ + +/* Linux xattr support */ +/* #undef ARCHIVE_XATTR_LINUX */ + /* Version number of bsdcat */ -/* #undef BSDCAT_VERSION_STRING */ +#define BSDCAT_VERSION_STRING "3.3.3" /* Version number of bsdcpio */ -/* #undef BSDCPIO_VERSION_STRING */ +#define BSDCPIO_VERSION_STRING "3.3.3" /* Version number of bsdtar */ -/* #undef BSDTAR_VERSION_STRING */ +#define BSDTAR_VERSION_STRING "3.3.3" + +/* Define to 1 if the system has the type `ace_t'. */ +/* #undef HAVE_ACE_T */ + +/* Define to 1 if you have the `acl' function. */ +/* #undef HAVE_ACL */ + +/* Define to 1 if the system has the type `aclent_t'. */ +/* #undef HAVE_ACLENT_T */ + +/* Define to 1 if you have the `acl_add_flag_np' function. */ +/* #undef HAVE_ACL_ADD_FLAG_NP */ + +/* Define to 1 if you have the `acl_add_perm' function. */ +/* #undef HAVE_ACL_ADD_PERM */ + +/* Define to 1 if you have the `acl_clear_flags_np' function. */ +/* #undef HAVE_ACL_CLEAR_FLAGS_NP */ + +/* Define to 1 if you have the `acl_clear_perms' function. */ +/* #undef HAVE_ACL_CLEAR_PERMS */ /* Define to 1 if you have the `acl_create_entry' function. */ /* #undef HAVE_ACL_CREATE_ENTRY */ -/* Define to 1 if you have the `acl_get_link' function. */ -/* #undef HAVE_ACL_GET_LINK */ +/* Define to 1 if you have the `acl_delete_def_file' function. */ +/* #undef HAVE_ACL_DELETE_DEF_FILE */ + +/* Define to 1 if the system has the type `acl_entry_t'. */ +#define HAVE_ACL_ENTRY_T 1 + +/* Define to 1 if you have the `acl_free' function. */ +/* #undef HAVE_ACL_FREE */ + +/* Define to 1 if you have the `acl_get_brand_np' function. */ +/* #undef HAVE_ACL_GET_BRAND_NP */ + +/* Define to 1 if you have the `acl_get_entry' function. */ +/* #undef HAVE_ACL_GET_ENTRY */ + +/* Define to 1 if you have the `acl_get_entry_type_np' function. */ +/* #undef HAVE_ACL_GET_ENTRY_TYPE_NP */ + +/* Define to 1 if you have the `acl_get_fd' function. */ +/* #undef HAVE_ACL_GET_FD */ + +/* Define to 1 if you have the `acl_get_fd_np' function. */ +/* #undef HAVE_ACL_GET_FD_NP */ + +/* Define to 1 if you have the `acl_get_file' function. */ +/* #undef HAVE_ACL_GET_FILE */ + +/* Define to 1 if you have the `acl_get_flagset_np' function. */ +/* #undef HAVE_ACL_GET_FLAGSET_NP */ + +/* Define to 1 if you have the `acl_get_flag_np' function. */ +/* #undef HAVE_ACL_GET_FLAG_NP */ /* Define to 1 if you have the `acl_get_link_np' function. */ /* #undef HAVE_ACL_GET_LINK_NP */ @@ -139,18 +223,33 @@ /* Define to 1 if you have the `acl_get_perm' function. */ /* #undef HAVE_ACL_GET_PERM */ +/* Define to 1 if you have the `acl_get_permset' function. */ +/* #undef HAVE_ACL_GET_PERMSET */ + /* Define to 1 if you have the `acl_get_perm_np' function. */ /* #undef HAVE_ACL_GET_PERM_NP */ +/* Define to 1 if you have the `acl_get_qualifier' function. */ +/* #undef HAVE_ACL_GET_QUALIFIER */ + +/* Define to 1 if you have the `acl_get_tag_type' function. */ +/* #undef HAVE_ACL_GET_TAG_TYPE */ + /* Define to 1 if you have the `acl_init' function. */ /* #undef HAVE_ACL_INIT */ +/* Define to 1 if you have the `acl_is_trivial_np' function. */ +/* #undef HAVE_ACL_IS_TRIVIAL_NP */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_ACL_LIBACL_H */ /* Define to 1 if the system has the type `acl_permset_t'. */ /* #undef HAVE_ACL_PERMSET_T */ +/* Define to 1 if you have the `acl_set_entry_type_np' function. */ +/* #undef HAVE_ACL_SET_ENTRY_TYPE_NP */ + /* Define to 1 if you have the `acl_set_fd' function. */ /* #undef HAVE_ACL_SET_FD */ @@ -160,8 +259,20 @@ /* Define to 1 if you have the `acl_set_file' function. */ /* #undef HAVE_ACL_SET_FILE */ -/* True for systems with POSIX ACL support */ -#define HAVE_ACL_USER 1 +/* Define to 1 if you have the `acl_set_link_np' function. */ +/* #undef HAVE_ACL_SET_LINK_NP */ + +/* Define to 1 if you have the `acl_set_qualifier' function. */ +/* #undef HAVE_ACL_SET_QUALIFIER */ + +/* Define to 1 if you have the `acl_set_tag_type' function. */ +/* #undef HAVE_ACL_SET_TAG_TYPE */ + +/* Define to 1 if the system has the type `acl_t'. */ +#define HAVE_ACL_T 1 + +/* Define to 1 if the system has the type `acl_tag_t'. */ +#define HAVE_ACL_TAG_T 1 /* Define to 1 if you have the `arc4random_buf' function. */ #define HAVE_ARC4RANDOM_BUF 1 @@ -169,7 +280,7 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ATTR_XATTR_H */ -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_BCRYPT_H */ /* Define to 1 if you have the header file. */ @@ -196,10 +307,46 @@ /* Define to 1 if you have the `cygwin_conv_path' function. */ /* #undef HAVE_CYGWIN_CONV_PATH */ +/* Define to 1 if you have the declaration of `ACE_GETACL', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ACE_GETACL */ + +/* Define to 1 if you have the declaration of `ACE_GETACLCNT', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ACE_GETACLCNT */ + +/* Define to 1 if you have the declaration of `ACE_SETACL', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ACE_SETACL */ + +/* Define to 1 if you have the declaration of `ACL_SYNCHRONIZE', and to 0 if + you don't. */ +/* #undef HAVE_DECL_ACL_SYNCHRONIZE */ + +/* Define to 1 if you have the declaration of `ACL_TYPE_EXTENDED', and to 0 if + you don't. */ +/* #undef HAVE_DECL_ACL_TYPE_EXTENDED */ + +/* Define to 1 if you have the declaration of `ACL_TYPE_NFS4', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ACL_TYPE_NFS4 */ + +/* Define to 1 if you have the declaration of `ACL_USER', and to 0 if you + don't. */ +/* #undef HAVE_DECL_ACL_USER */ + /* Define to 1 if you have the declaration of `EXTATTR_NAMESPACE_USER', and to 0 if you don't. */ #define HAVE_DECL_EXTATTR_NAMESPACE_USER 1 +/* Define to 1 if you have the declaration of `GETACL', and to 0 if you don't. + */ +/* #undef HAVE_DECL_GETACL */ + +/* Define to 1 if you have the declaration of `GETACLCNT', and to 0 if you + don't. */ +/* #undef HAVE_DECL_GETACLCNT */ + /* Define to 1 if you have the declaration of `INT32_MAX', and to 0 if you don't. */ #define HAVE_DECL_INT32_MAX 1 @@ -224,6 +371,10 @@ don't. */ #define HAVE_DECL_INTMAX_MIN 1 +/* Define to 1 if you have the declaration of `SETACL', and to 0 if you don't. + */ +/* #undef HAVE_DECL_SETACL */ + /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you don't. */ #define HAVE_DECL_SIZE_MAX 1 @@ -248,11 +399,15 @@ don't. */ #define HAVE_DECL_UINTMAX_MAX 1 +/* Define to 1 if you have the declaration of `XATTR_NOFOLLOW', and to 0 if + you don't. */ +#define HAVE_DECL_XATTR_NOFOLLOW 0 + /* Define to 1 if you have the header file, and it defines `DIR'. */ #define HAVE_DIRENT_H 1 -/* Define to 1 if you have the `dirfd' function. */ +/* Define to 1 if you have a dirfd function or macro */ #define HAVE_DIRFD 1 /* Define to 1 if you have the header file. */ @@ -279,17 +434,32 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_EXT2FS_EXT2_FS_H */ +/* Define to 1 if you have the `extattr_get_fd' function. */ +/* #undef HAVE_EXTATTR_GET_FD */ + /* Define to 1 if you have the `extattr_get_file' function. */ #define HAVE_EXTATTR_GET_FILE 1 +/* Define to 1 if you have the `extattr_get_link' function. */ +/* #undef HAVE_EXTATTR_GET_LINK */ + +/* Define to 1 if you have the `extattr_list_fd' function. */ +/* #undef HAVE_EXTATTR_LIST_FD */ + /* Define to 1 if you have the `extattr_list_file' function. */ /* #undef HAVE_EXTATTR_LIST_FILE */ +/* Define to 1 if you have the `extattr_list_link' function. */ +/* #undef HAVE_EXTATTR_LIST_LINK */ + /* Define to 1 if you have the `extattr_set_fd' function. */ /* #undef HAVE_EXTATTR_SET_FD */ -/* Define to 1 if you have the `extattr_set_file' function. */ -#define HAVE_EXTATTR_SET_FILE 1 +/* Define to 1 if you have the `extattr_set_link' function. */ +/* #undef HAVE_EXTATTR_SET_LINK */ + +/* Define to 1 if you have the `facl' function. */ +/* #undef HAVE_FACL */ /* Define to 1 if you have the `fchdir' function. */ #define HAVE_FCHDIR 1 @@ -442,7 +612,7 @@ /* #undef HAVE_LIBCHARSET */ /* Define to 1 if you have the `crypto' library (-lcrypto). */ -/* #undef HAVE_LIBCRYPTO */ +#define HAVE_LIBCRYPTO 1 /* Define to 1 if you have the `eay32' library (-leay32). */ /* #undef HAVE_LIBEAY32 */ @@ -459,14 +629,11 @@ /* Define to 1 if you have the `lzma' library (-llzma). */ #define HAVE_LIBLZMA 1 -/* Define to 1 if you have the `lzmadec' library (-llzmadec). */ -/* #undef HAVE_LIBLZMADEC */ - /* Define to 1 if you have the `lzo2' library (-llzo2). */ /* #undef HAVE_LIBLZO2 */ /* Define to 1 if you have the `md' library (-lmd). */ -#define HAVE_LIBMD 1 +/* #undef HAVE_LIBMD */ /* Define to 1 if you have the `nettle' library (-lnettle). */ /* #undef HAVE_LIBNETTLE */ @@ -480,6 +647,9 @@ /* Define to 1 if you have the `regex' library (-lregex). */ /* #undef HAVE_LIBREGEX */ +/* Define to 1 if you have the `richacl' library (-lrichacl). */ +/* #undef HAVE_LIBRICHACL */ + /* Define to 1 if you have the `xml2' library (-lxml2). */ /* #undef HAVE_LIBXML2 */ @@ -492,6 +662,9 @@ /* Define to 1 if you have the `z' library (-lz). */ #define HAVE_LIBZ 1 +/* Define to 1 if you have the `zstd' library (-lzstd). */ +/* #undef HAVE_LIBZSTD */ + /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 @@ -559,12 +732,15 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_LZ4_H */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LZMADEC_H */ - /* Define to 1 if you have the header file. */ #define HAVE_LZMA_H 1 +/* Define to 1 if you have the `lzma_stream_encoder_mt' function. */ +/* + * Brings in pthread dependency + * #define HAVE_LZMA_STREAM_ENCODER_MT 1 + */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_LZO_LZO1X_H */ @@ -574,9 +750,21 @@ /* Define to 1 if you have the `mbrtowc' function. */ #define HAVE_MBRTOWC 1 +/* Define to 1 if you have the `mbr_gid_to_uuid' function. */ +/* #undef HAVE_MBR_GID_TO_UUID */ + +/* Define to 1 if you have the `mbr_uid_to_uuid' function. */ +/* #undef HAVE_MBR_UID_TO_UUID */ + +/* Define to 1 if you have the `mbr_uuid_to_id' function. */ +/* #undef HAVE_MBR_UUID_TO_ID */ + /* Define to 1 if you have the header file. */ #define HAVE_MD5_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MEMBERSHIP_H */ + /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 @@ -626,7 +814,7 @@ #define HAVE_OPENAT 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_OPENSSL_EVP_H */ +#define HAVE_OPENSSL_EVP_H 1 /* Define to 1 if you have the header file. */ #define HAVE_PATHS_H 1 @@ -638,7 +826,7 @@ #define HAVE_PIPE 1 /* Define to 1 if you have the `PKCS5_PBKDF2_HMAC_SHA1' function. */ -/* #undef HAVE_PKCS5_PBKDF2_HMAC_SHA1 */ +#define HAVE_PKCS5_PBKDF2_HMAC_SHA1 1 /* Define to 1 if you have the `poll' function. */ #define HAVE_POLL 1 @@ -673,6 +861,27 @@ /* Define to 1 if you have the header file. */ #define HAVE_REGEX_H 1 +/* Define to 1 if you have the `richacl_alloc' function. */ +/* #undef HAVE_RICHACL_ALLOC */ + +/* Define to 1 if you have the `richacl_equiv_mode' function. */ +/* #undef HAVE_RICHACL_EQUIV_MODE */ + +/* Define to 1 if you have the `richacl_free' function. */ +/* #undef HAVE_RICHACL_FREE */ + +/* Define to 1 if you have the `richacl_get_fd' function. */ +/* #undef HAVE_RICHACL_GET_FD */ + +/* Define to 1 if you have the `richacl_get_file' function. */ +/* #undef HAVE_RICHACL_GET_FILE */ + +/* Define to 1 if you have the `richacl_set_fd' function. */ +/* #undef HAVE_RICHACL_SET_FD */ + +/* Define to 1 if you have the `richacl_set_file' function. */ +/* #undef HAVE_RICHACL_SET_FILE */ + /* Define to 1 if you have the header file. */ #define HAVE_RIPEMD_H 1 @@ -685,6 +894,9 @@ /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define to 1 if you have the `setxattr' function. */ +/* #undef HAVE_SETXATTR */ + /* Define to 1 if you have the header file. */ #define HAVE_SHA256_H 1 @@ -749,6 +961,12 @@ /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 +/* Define to 1 if the system has the type `struct richace'. */ +/* #undef HAVE_STRUCT_RICHACE */ + +/* Define to 1 if the system has the type `struct richacl'. */ +/* #undef HAVE_STRUCT_RICHACL */ + /* Define to 1 if `f_namemax' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_NAMEMAX */ @@ -788,6 +1006,12 @@ /* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */ /* #undef HAVE_STRUCT_TM___TM_GMTOFF */ +/* Define to 1 if the system has the type `struct vfsconf'. */ +#define HAVE_STRUCT_VFSCONF 1 + +/* Define to 1 if the system has the type `struct xvfsconf'. */ +/* #undef HAVE_STRUCT_XVFSCONF */ + /* Define to 1 if you have the `symlink' function. */ #define HAVE_SYMLINK 1 @@ -826,6 +1050,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_POLL_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_RICHACL_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_SELECT_H 1 @@ -838,6 +1065,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSMACROS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 @@ -946,9 +1176,15 @@ /* Define to 1 if you have a working EXT2_IOC_GETFLAGS */ /* #undef HAVE_WORKING_EXT2_IOC_GETFLAGS */ +/* Define to 1 if you have a working FS_IOC_GETFLAGS */ +/* #undef HAVE_WORKING_FS_IOC_GETFLAGS */ + /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ZSTD_H */ + /* Define to 1 if you have the `_ctime64_s' function. */ /* #undef HAVE__CTIME64_S */ @@ -968,17 +1204,16 @@ #define ICONV_CONST /* Version number of libarchive as a single integer */ -/* #undef LIBARCHIVE_VERSION_NUMBER */ +#define LIBARCHIVE_VERSION_NUMBER "3003003" /* Version number of libarchive */ -/* #undef LIBARCHIVE_VERSION_STRING */ +#define LIBARCHIVE_VERSION_STRING "3.3.3" /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Define to 1 if `major', `minor', and `makedev' are declared in . @@ -1002,7 +1237,7 @@ #define PACKAGE_NAME "libarchive" /* Define to the full name and version of this package. */ -/* #undef PACKAGE_STRING */ +#define PACKAGE_STRING "libarchive 3.3.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive" @@ -1011,7 +1246,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -/* #undef PACKAGE_VERSION */ +#define PACKAGE_VERSION "3.3.3" /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */ @@ -1051,7 +1286,7 @@ /* Version number of package */ -/* #undef VERSION */ +#define VERSION "3.3.3" /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */ diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile index 7b030ea94f..48932c1fa6 100644 --- a/usr.bin/bsdcat/Makefile +++ b/usr.bin/bsdcat/Makefile @@ -3,15 +3,13 @@ SRCS= bsdcat.c cmdline.c SRCS+= err.c WARNS?= 2 -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBMD} ${LIBZ} -LDADD= -larchive -lbz2 -llzma -lmd -lz +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBZ} +LDADD= -larchive -lbz2 -llzma -lz CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/cat .PATH: ${CONTRIBDIR} ${CONTRIBDIR}/../libarchive_fe -LIBARCHIVE_VERSION!= cat ${CONTRIBDIR}/../build/version -VERSION!= echo $$((${LIBARCHIVE_VERSION} / 1000000)).$$((${LIBARCHIVE_VERSION} / 1000 % 1000)).$$((${LIBARCHIVE_VERSION} % 1000)) -CFLAGS+= -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I${CONTRIBDIR}/../libarchive_fe -CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" -CFLAGS+= -DBSDCAT_VERSION_STRING=\"${VERSION}\" +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../lib/libarchive +CFLAGS+= -I${CONTRIBDIR} +CFLAGS+= -I${CONTRIBDIR}/../libarchive -I${CONTRIBDIR}/../libarchive_fe .include diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 31b51f4f56..9f14034918 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -1,17 +1,15 @@ PROG= bsdcpio SRCS= cmdline.c cpio.c SRCS+= err.c line_reader.c passphrase.c -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBMD} ${LIBCRYPTO} ${LIBZ} -LDADD= -larchive -lbz2 -llzma -lmd -lprivate_crypto -lz +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBCRYPTO} ${LIBZ} +LDADD= -larchive -lbz2 -llzma -lprivate_crypto -lz LDFLAGS+= ${PRIVATELIB_LDFLAGS} CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/cpio .PATH: ${CONTRIBDIR} ${CONTRIBDIR}/../libarchive_fe -LIBARCHIVE_VERSION!= cat ${CONTRIBDIR}/../build/version -VERSION!= echo $$((${LIBARCHIVE_VERSION} / 1000000)).$$((${LIBARCHIVE_VERSION} / 1000 % 1000)).$$((${LIBARCHIVE_VERSION} % 1000)) -CFLAGS+= -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I${CONTRIBDIR}/../libarchive_fe -CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" -CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${VERSION}\" +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../lib/libarchive +CFLAGS+= -I${CONTRIBDIR} +CFLAGS+= -I${CONTRIBDIR}/../libarchive -I${CONTRIBDIR}/../libarchive_fe SYMLINKS= bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index a8f9a29399..d0c7e0fc30 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -1,17 +1,15 @@ PROG= bsdtar SRCS= bsdtar.c cmdline.c creation_set.c read.c subst.c util.c write.c SRCS+= err.c line_reader.c passphrase.c -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBMD} ${LIBCRYPTO} ${LIBZ} -LDADD= -larchive -lbz2 -llzma -lmd -lprivate_crypto -lz +DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBCRYPTO} ${LIBZ} +LDADD= -larchive -lbz2 -llzma -lprivate_crypto -lz LDFLAGS+= ${PRIVATELIB_LDFLAGS} CONTRIBDIR= ${.CURDIR}/../../contrib/libarchive/tar .PATH: ${CONTRIBDIR} ${CONTRIBDIR}/../libarchive_fe -LIBARCHIVE_VERSION!= cat ${CONTRIBDIR}/../build/version -VERSION!= echo $$((${LIBARCHIVE_VERSION} / 1000000)).$$((${LIBARCHIVE_VERSION} / 1000 % 1000)).$$((${LIBARCHIVE_VERSION} % 1000)) -CFLAGS+= -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I${CONTRIBDIR}/../libarchive_fe -CFLAGS+= -DPLATFORM_CONFIG_H=\"config.h\" -CFLAGS+= -DBSDTAR_VERSION_STRING=\"${VERSION}\" +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../lib/libarchive +CFLAGS+= -I${CONTRIBDIR} +CFLAGS+= -I${CONTRIBDIR}/../libarchive -I${CONTRIBDIR}/../libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 -- 2.41.0