pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive From upstream: D...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2af0c867a1f0
branches:  trunk
changeset: 348981:2af0c867a1f0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jun 21 16:29:55 2016 +0000

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

diffstat:

 archivers/libarchive/files/libarchive/archive_write_disk_posix.c |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (21 lines):

diff -r 2df913a8b718 -r 2af0c867a1f0 archivers/libarchive/files/libarchive/archive_write_disk_posix.c
--- a/archivers/libarchive/files/libarchive/archive_write_disk_posix.c  Tue Jun 21 16:24:00 2016 +0000
+++ b/archivers/libarchive/files/libarchive/archive_write_disk_posix.c  Tue Jun 21 16:29:55 2016 +0000
@@ -3487,6 +3487,9 @@
 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 @@
        if (dfacl)
                acl_free(dfacl);
        return (ret);
+#endif
 }
 
 static int



Home | Main Index | Thread Index | Old Index