CVS commit: pkgsrc/archivers/libarchive/files/libarchive

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Mar  5 12:05:56 UTC 2017

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

Log Message:
Merge d9036ca49e414c6b5560c48126b6963204a6eda9:

Fix compilation on Mac OS X versions without ACL_SYNCHRONIZE


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.4 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.5
--- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c:1.4        Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c    Sun Mar  5 12:05:56 2017
@@ -674,7 +674,9 @@ static const struct {
        {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 @@ translate_acl(struct archive_read_disk *
                                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);

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.3   Sat Feb 25 21:11:20 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c       Sun Mar  5 12:05:56 2017
@@ -158,7 +158,9 @@ static const struct {
        {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},