CVS commit: pkgsrc/archivers/libarchive/files

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Mar 12 06:51:23 UTC 2017

Modified Files:
        pkgsrc/archivers/libarchive/files: configure configure.ac
        pkgsrc/archivers/libarchive/files/libarchive: archive_write_disk_acl.c
        pkgsrc/archivers/libarchive/files/test_utils: test_common.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/archivers/libarchive/files/configure \
    pkgsrc/archivers/libarchive/files/configure.ac
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/archivers/libarchive/files/test_utils/test_common.h

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/configure
diff -u pkgsrc/archivers/libarchive/files/configure:1.16 pkgsrc/archivers/libarchive/files/configure:1.17
--- pkgsrc/archivers/libarchive/files/configure:1.16    Sun Mar 12 06:45:16 2017
+++ pkgsrc/archivers/libarchive/files/configure Sun Mar 12 06:51:23 2017
@@ -18188,7 +18188,7 @@ cat >>confdefs.h <<_ACEOF
 _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>
 "
Index: pkgsrc/archivers/libarchive/files/configure.ac
diff -u pkgsrc/archivers/libarchive/files/configure.ac:1.16 pkgsrc/archivers/libarchive/files/configure.ac:1.17
--- pkgsrc/archivers/libarchive/files/configure.ac:1.16 Sun Mar 12 06:45:16 2017
+++ pkgsrc/archivers/libarchive/files/configure.ac      Sun Mar 12 06:51:23 2017
@@ -744,7 +744,7 @@ if test "x$enable_acl" != "xno"; then
                [#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>])

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.6 pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.7
--- pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c:1.6   Sun Mar 12 06:45:16 2017
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_write_disk_acl.c       Sun Mar 12 06:51:23 2017
@@ -424,8 +424,7 @@ set_acl(struct archive *a, int fd, const
                        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 @@ set_acl(struct archive *a, int fd, const
                        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;

Index: pkgsrc/archivers/libarchive/files/test_utils/test_common.h
diff -u pkgsrc/archivers/libarchive/files/test_utils/test_common.h:1.3 pkgsrc/archivers/libarchive/files/test_utils/test_common.h:1.4
--- pkgsrc/archivers/libarchive/files/test_utils/test_common.h:1.3      Sun Mar 12 06:45:16 2017
+++ pkgsrc/archivers/libarchive/files/test_utils/test_common.h  Sun Mar 12 06:51:23 2017
@@ -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