diff options
| author | ryoon <ryoon> | 2017-04-27 15:08:08 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2017-04-27 15:08:08 +0000 |
| commit | 3b980023fb778a12a4677bd2690e3f8a604aea4a (patch) | |
| tree | 088af4a783cdfce5af0c39eae983729c2a7beb33 /archivers | |
| parent | c7fe07fcd2c627c5f311c7fe26c3ec2c3cb107d0 (diff) | |
| download | pkgsrc-3b980023fb778a12a4677bd2690e3f8a604aea4a.tar.gz | |
Fix bootstrap pkgsrc on FreeBSD/amd64 10. Fix --disable-xattr build
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c | 2 | ||||
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_write_disk_acl.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c b/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c index 1c94afddba8..4fcbb6e9705 100644 --- a/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c +++ b/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c @@ -842,7 +842,9 @@ static const struct { {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}, {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS}, {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS}, +#ifdef ACE_INHERITED_ACE {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED} +#endif #endif /* !HAVE_SUN_NFS4_ACL && !HAVE_DARWIN_ACL */ }; #endif /* HAVE_NFS4_ACL */ diff --git a/archivers/libarchive/files/libarchive/archive_write_disk_acl.c b/archivers/libarchive/files/libarchive/archive_write_disk_acl.c index 49792749688..03e5d87474e 100644 --- a/archivers/libarchive/files/libarchive/archive_write_disk_acl.c +++ b/archivers/libarchive/files/libarchive/archive_write_disk_acl.c @@ -222,7 +222,9 @@ static const struct { {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}, {ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS, ACL_ENTRY_SUCCESSFUL_ACCESS}, {ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS, ACL_ENTRY_FAILED_ACCESS}, +#ifdef ACE_INHERITED_ACE {ARCHIVE_ENTRY_ACL_ENTRY_INHERITED, ACL_ENTRY_INHERITED} +#endif #endif /* !HAVE_SUN_NFS4_ACL && !HAVE_DARWIN_ACL */ }; #endif /* HAVE_NFS4_ACL */ |