[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Merge 4c3cda21663fa3dc42147...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/849735f3360e
branches:  trunk
changeset: 359485:849735f3360e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Mar 12 06:51:23 2017 +0000

description:
Merge 4c3cda21663fa3dc42147c771a3b96b85e631c53:

 Darwin ACL: avoid using mbr_identifier_to_uuid()

 Use mbr_uid_to_uuid() and mbr_gid_to_uuid() for backwards compatibility
 instead. These functions have been introduced together with membership.h.

diffstat:

 archivers/libarchive/files/configure                           |  2 +-
 archivers/libarchive/files/configure.ac                        |  2 +-
 archivers/libarchive/files/libarchive/archive_write_disk_acl.c |  6 ++----
 archivers/libarchive/files/test_utils/test_common.h            |  2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r 4ff12a8957d9 -r 849735f3360e archivers/libarchive/files/configure
--- a/archivers/libarchive/files/configure      Sun Mar 12 06:48:36 2017 +0000
+++ b/archivers/libarchive/files/configure      Sun Mar 12 06:51:23 2017 +0000
@@ -18188,7 +18188,7 @@
 _ACEOF
 
 
-    # FreeBSD and MacOS ACL support
+    # MacOS ACL support
     ac_fn_c_check_decl "$LINENO" "ACL_TYPE_EXTENDED" "ac_cv_have_decl_ACL_TYPE_EXTENDED" "#include <sys/types.h>
                #include <sys/acl.h>
 "
diff -r 4ff12a8957d9 -r 849735f3360e archivers/libarchive/files/configure.ac
--- a/archivers/libarchive/files/configure.ac   Sun Mar 12 06:48:36 2017 +0000
+++ b/archivers/libarchive/files/configure.ac   Sun Mar 12 06:51:23 2017 +0000
@@ -744,7 +744,7 @@
                [#include <sys/types.h>
                #include <sys/acl.h>])
 
-    # FreeBSD and MacOS ACL support
+    # MacOS ACL support
     AC_CHECK_DECLS([ACL_TYPE_EXTENDED, ACL_SYNCHRONIZE], [], [],
                [#include <sys/types.h>
                #include <sys/acl.h>])
diff -r 4ff12a8957d9 -r 849735f3360e archivers/libarchive/files/libarchive/archive_write_disk_acl.c
--- a/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Sun Mar 12 06:48:36 2017 +0000
+++ b/archivers/libarchive/files/libarchive/archive_write_disk_acl.c    Sun Mar 12 06:51:23 2017 +0000
@@ -424,8 +424,7 @@
                        acl_set_tag_type(acl_entry, ACL_USER);
                        acl_set_qualifier(acl_entry, &ae_uid);
 #else  /* MacOS */
-                       if (mbr_identifier_to_uuid(ID_TYPE_UID, &ae_uid,
-                           sizeof(uid_t), ae_uuid) != 0)
+                       if (mbr_uid_to_uuid(ae_uid, ae_uuid) != 0)
                                continue;
                        if (acl_set_qualifier(acl_entry, &ae_uuid) != 0)
                                continue;
@@ -437,8 +436,7 @@
                        acl_set_tag_type(acl_entry, ACL_GROUP);
                        acl_set_qualifier(acl_entry, &ae_gid);
 #else  /* MacOS */
-                       if (mbr_identifier_to_uuid(ID_TYPE_GID, &ae_gid,
-                           sizeof(gid_t), ae_uuid) != 0)
+                       if (mbr_gid_to_uuid(ae_gid, ae_uuid) != 0)
                                continue;
                        if (acl_set_qualifier(acl_entry, &ae_uuid) != 0)
                                continue;
diff -r 4ff12a8957d9 -r 849735f3360e archivers/libarchive/files/test_utils/test_common.h
--- a/archivers/libarchive/files/test_utils/test_common.h       Sun Mar 12 06:48:36 2017 +0000
+++ b/archivers/libarchive/files/test_utils/test_common.h       Sun Mar 12 06:51:23 2017 +0000
@@ -129,7 +129,7 @@
 #if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE
 #if HAVE_DECL_ACL_USER
 #define        HAVE_POSIX_ACL  1
-#elif HAVE_DECL_ACL_TYPE_EXTENDED
+#elif HAVE_DECL_ACL_TYPE_EXTENDED && HAVE_MEMBERSHIP_H
 #define        HAVE_DARWIN_ACL 1
 #endif
 #if HAVE_DECL_ACL_TYPE_NFS4