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

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Jun 21 16:29:55 UTC 2016

Modified Files:
        pkgsrc/archivers/libarchive/files/libarchive:
            archive_write_disk_posix.c

Log Message:
>From upstream: Dummy out copy_acls if sys/acl.h is missing or ACL
support is disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.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_write_disk_posix.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.2 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.3
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c:1.2 Mon Jun 20 17:24:57 2016
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_posix.c     Tue Jun 21 16:29:55 2016
@@ -3487,6 +3487,9 @@ exit_xattr:
 static int
 copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
 {
+#ifndef HAVE_SYS_ACL_H
+       return 0;
+#else
        acl_t acl, dfacl = NULL;
        int acl_r, ret = ARCHIVE_OK;
 
@@ -3514,6 +3517,7 @@ exit_acl:
        if (dfacl)
                acl_free(dfacl);
        return (ret);
+#endif
 }
 
 static int