diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2017-03-20 13:02:27 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2017-03-20 13:02:27 +0000 |
| commit | 4657548d18877f64bd02be888406aa5b02bf9b06 (patch) | |
| tree | a799a9cee40e53706103a717a7c73fb3ba1f6aa1 /lib/libarchive | |
| parent | 90589b904f71be5b92a8dbea319f5ef6c4a89d80 (diff) | |
| parent | 4a7f6834348e3853977e1b7d69ff44f6eb93313c (diff) | |
| download | src-test-4657548d18877f64bd02be888406aa5b02bf9b06.tar.gz src-test-4657548d18877f64bd02be888406aa5b02bf9b06.zip | |
MFV r315633, 315635:
Sync libarchive with vendor
Vendor changes/bugfixes (FreeBSD-related):
PR 867 (bsdcpio): show numeric uid/gid when names are not found
PR 870 (seekable zip): accept files with valid ZIP64 EOCD headers
PR 880 (pax): Fix handling of "size" pax header keyword
PR 887 (crypto): Discard 3072 bytes instead of 1024 of first keystream
OSS-Fuzz issue 806 (mtree): rework mtree_atol10 integer parser
Break ACL read/write code into platform-specific source files
Unbreak static dependency on libbz2
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=315636
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 5 | ||||
| -rw-r--r-- | lib/libarchive/config_freebsd.h | 24 |
2 files changed, 14 insertions, 15 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index af75cbd501a68..eed0bf3c3a229 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -45,6 +45,7 @@ INCS= archive.h archive_entry.h # Sources to be compiled. SRCS= archive_acl.c \ + archive_acl_maps_freebsd.c \ archive_check_magic.c \ archive_cmdline.c \ archive_cryptor.c \ @@ -69,6 +70,7 @@ SRCS= archive_acl.c \ archive_read_add_passphrase.c \ archive_read_append_filter.c \ archive_read_data_into_fd.c \ + archive_read_disk_acl_freebsd.c \ archive_read_disk_entry_from_file.c \ archive_read_disk_posix.c \ archive_read_disk_set_standard_lookup.c \ @@ -112,10 +114,11 @@ 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_add_filter.c \ - archive_write_disk_acl.c \ + archive_write_disk_acl_freebsd.c \ archive_write_disk_set_standard_lookup.c \ archive_write_disk_posix.c \ archive_write_open_fd.c \ diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 2c4b6b512a473..be25258f94651 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -27,22 +27,11 @@ #include <osreldate.h> -/* FreeBSD 5.0 and later have ACL and extattr support. */ +/* FreeBSD 5.0 and later has ACL and extattr support. */ #if __FreeBSD__ > 4 -#define HAVE_ACL_CREATE_ENTRY 1 -#define HAVE_ACL_GET_FD_NP 1 -#define HAVE_ACL_GET_LINK_NP 1 +#define ARCHIVE_ACL_FREEBSD 1 #define HAVE_ACL_GET_PERM_NP 1 -#define HAVE_ACL_INIT 1 -#define HAVE_ACL_IS_TRIVIAL_NP 1 -#define HAVE_ACL_PERMSET_T 1 -#define HAVE_ACL_SET_FD 1 -#define HAVE_ACL_SET_FD_NP 1 -#define HAVE_ACL_SET_FILE 1 -#define HAVE_ACL_SET_LINK_NP 1 #define HAVE_ARC4RANDOM_BUF 1 -#define HAVE_DECL_ACL_USER 1 -#define HAVE_DECL_ACL_TYPE_NFS4 1 #define HAVE_EXTATTR_GET_FILE 1 #define HAVE_EXTATTR_LIST_FILE 1 #define HAVE_EXTATTR_SET_FD 1 @@ -50,7 +39,14 @@ #define HAVE_STRUCT_XVFSCONF 1 #define HAVE_SYS_ACL_H 1 #define HAVE_SYS_EXTATTR_H 1 -#endif +#if __FreeBSD__ > 7 +/* FreeBSD 8.0 and later has NFSv4 ACL support */ +#define ARCHIVE_ACL_FREEBSD_NFS4 1 +#define HAVE_ACL_GET_LINK_NP 1 +#define HAVE_ACL_IS_TRIVIAL_NP 1 +#define HAVE_ACL_SET_LINK_NP 1 +#endif /* __FreeBSD__ > 7 */ +#endif /* __FreeBSD__ > 4 */ #ifdef WITH_OPENSSL #define HAVE_LIBCRYPTO 1 |