[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive Fix bootstrap pk...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91dc4b7d0388
branches:  trunk
changeset: 361871:91dc4b7d0388
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Thu Apr 27 15:08:08 2017 +0000

description:
Fix bootstrap pkgsrc on FreeBSD/amd64 10. Fix --disable-xattr build

diffstat:

 archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c |  2 ++
 archivers/libarchive/files/libarchive/archive_write_disk_acl.c            |  2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diffs (26 lines):

diff -r 4a577528eb2e -r 91dc4b7d0388 archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
--- a/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Thu Apr 27 14:44:51 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Thu Apr 27 15:08:08 2017 +0000
@@ -842,7 +842,9 @@
        {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 -r 4a577528eb2e -r 91dc4b7d0388 archivers/libarchive/files/libarchive/archive_write_disk_acl.c
--- a/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Thu Apr 27 14:44:51 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Thu Apr 27 15:08:08 2017 +0000
@@ -222,7 +222,9 @@
        {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 */