[pkgsrc/pkgsrc-2017Q1]: pkgsrc/archivers/libarchive/files/libarchive Pullup t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e067542c229a
branches:  pkgsrc-2017Q1
changeset: 360342:e067542c229a
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon May 01 09:30:55 2017 +0000

description:
Pullup ticket #5380 - requested by sevan
archivers/libarchive: build fix for FreeBSD

Revisions pulled up:
- archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c 1.10
- archivers/libarchive/files/libarchive/archive_write_disk_acl.c 1.8

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Thu Apr 27 15:08:08 UTC 2017

   Modified Files:
           pkgsrc/archivers/libarchive/files/libarchive:
               archive_read_disk_entry_from_file.c archive_write_disk_acl.c

   Log Message:
   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 c922c417f5a1 -r e067542c229a archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
--- a/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Mon May 01 09:25:40 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Mon May 01 09:30:55 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 c922c417f5a1 -r e067542c229a archivers/libarchive/files/libarchive/archive_write_disk_acl.c
--- a/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Mon May 01 09:25:40 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Mon May 01 09:30:55 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 */