[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive Merge d9036ca49e...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59a158e2ec15
branches:  trunk
changeset: 359251:59a158e2ec15
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Mar 05 12:05:56 2017 +0000

description:
Merge d9036ca49e414c6b5560c48126b6963204a6eda9:

Fix compilation on Mac OS X versions without ACL_SYNCHRONIZE

diffstat:

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

diffs (38 lines):

diff -r 4812a4b9dd54 -r 59a158e2ec15 archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
--- a/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Sun Mar 05 12:05:34 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c Sun Mar 05 12:05:56 2017 +0000
@@ -674,7 +674,9 @@
        {ARCHIVE_ENTRY_ACL_READ_ACL, ACL_READ_SECURITY},
        {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_SECURITY},
        {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_CHANGE_OWNER},
+#ifdef ACL_SYNCHRONIZE
        {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE}
+#endif
 #else  /* POSIX.1e ACL permissions */
        {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE},
        {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE},
@@ -1382,6 +1384,11 @@
                                ae_perm |= acl_perm_map[i].archive_perm;
                }
 
+#if defined(HAVE_DARWIN_ACL) && !defined(ACL_SYNCHRONIZE)
+               /* On Mac OS X without ACL_SYNCHRONIZE assume it is set */
+               ae_perm |= ARCHIVE_ENTRY_ACL_SYNCHRONIZE;
+#endif
+
                archive_entry_acl_add_entry(entry, entry_acl_type,
                                            ae_perm, ae_tag,
                                            ae_id, ae_name);
diff -r 4812a4b9dd54 -r 59a158e2ec15 archivers/libarchive/files/libarchive/archive_write_disk_acl.c
--- a/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Sun Mar 05 12:05:34 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Sun Mar 05 12:05:56 2017 +0000
@@ -158,7 +158,9 @@
        {ARCHIVE_ENTRY_ACL_READ_ACL, ACL_READ_SECURITY},
        {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_SECURITY},
        {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_CHANGE_OWNER},
+#ifdef ACL_SYNCHRONIZE
        {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE}
+#endif
 #else  /* POSIX.1e ACL permissions */
        {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE},
        {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE},