diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-30 14:47:35 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-30 14:47:35 +0000 |
| commit | 10ed66fdf84a288b1df7efb38f43a5bf49167645 (patch) | |
| tree | 23cd8f64eba7a1cef7a231624d53076931195a1f /lib/libarchive | |
| parent | a4a16855c3f2cda743059f70da111ac0f03380da (diff) | |
Backport NFSv4 ACL fix from libarchive master branch.
Source:
https://github.com/libarchive/libarchive/commit/f67370d5
Obtained from: libarchive (master branch)
Notes
Notes:
svn path=/head/; revision=238909
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 1 | ||||
| -rw-r--r-- | lib/libarchive/config_freebsd.h | 2 | ||||
| -rw-r--r-- | lib/libarchive/test/Makefile | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index f2ba2f8fd9d5..29508ada5665 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -110,6 +110,7 @@ SRCS= archive_acl.c \ archive_virtual.c \ archive_write.c \ archive_write_add_filter.c \ + archive_write_disk_acl.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 8ee70a63f98d..214ffd10c090 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -31,10 +31,12 @@ #define HAVE_ACL_GET_LINK_NP 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_ACL_USER 1 #define HAVE_EXTATTR_GET_FILE 1 #define HAVE_EXTATTR_LIST_FILE 1 diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile index ce039be5828a..5e7c7a48fad0 100644 --- a/lib/libarchive/test/Makefile +++ b/lib/libarchive/test/Makefile @@ -19,7 +19,8 @@ CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 .PATH: ${LIBARCHIVEDIR}/libarchive/test TESTS= \ - test_acl_freebsd.c \ + test_acl_freebsd_nfs4.c \ + test_acl_freebsd_posix1e.c \ test_acl_nfs4.c \ test_acl_pax.c \ test_acl_posix1e.c \ |