[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Merge 60f0931d3b97e00616d71...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Merge 60f0931d3b97e00616d71...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:49:28 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd9e78c19968
branches:  trunk
changeset: 359483:bd9e78c19968
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Mar 12 06:45:16 2017 +0000

description:
Merge 60f0931d3b97e00616d7122321e34116d926bcc5:

 Reorganize ACL defines and fix detection of ACL_SYNCHRONIZE on Mac OS
 Adjust MacOS part of test_acl_platform_nfs4

diffstat:

 archivers/libarchive/files/CMakeLists.txt                                 |  45 +++--
 archivers/libarchive/files/build/cmake/config.h.in                        |  49 +++++-
 archivers/libarchive/files/config.h.in                                    |  68 ++++++---
 archivers/libarchive/files/configure                                      |  70 ++++++---
 archivers/libarchive/files/configure.ac                                   |  27 +--
 archivers/libarchive/files/libarchive/archive_platform.h                  |   9 +-
 archivers/libarchive/files/libarchive/archive_read_disk_entry_from_file.c |  24 +-
 archivers/libarchive/files/libarchive/archive_write_disk_acl.c            |  16 +-
 archivers/libarchive/files/libarchive/test/test_acl_platform_nfs4.c       |   8 +-
 archivers/libarchive/files/test_utils/test_common.h                       |   9 +-
 10 files changed, 204 insertions(+), 121 deletions(-)

diffs (truncated from 703 to 300 lines):

diff -r 3803b4fb8951 -r bd9e78c19968 archivers/libarchive/files/CMakeLists.txt
--- a/archivers/libarchive/files/CMakeLists.txt Sun Mar 12 06:42:27 2017 +0000
+++ b/archivers/libarchive/files/CMakeLists.txt Sun Mar 12 06:45:16 2017 +0000
@@ -1618,29 +1618,29 @@
   CHECK_FUNCTION_EXISTS(acl_get_link_np HAVE_ACL_GET_LINK_NP)
   CHECK_FUNCTION_EXISTS(acl_is_trivial_np HAVE_ACL_IS_TRIVIAL_NP)
   CHECK_FUNCTION_EXISTS(acl_set_link_np HAVE_ACL_SET_LINK_NP)
-  CHECK_SYMBOL_EXISTS(ACL_TYPE_NFS4 "${INCLUDES}" HAVE_ACL_TYPE_NFS4)
+  CHECK_SYMBOL_EXISTS(ACL_TYPE_NFS4 "${INCLUDES}" HAVE_DECL_ACL_TYPE_NFS4)
 
   # MacOS has an acl.h that isn't POSIX.  It can be detected by
   # checking for ACL_USER
-  CHECK_SYMBOL_EXISTS(ACL_USER "${INCLUDES}" HAVE_ACL_USER)
+  CHECK_SYMBOL_EXISTS(ACL_USER "${INCLUDES}" HAVE_DECL_ACL_USER)
   CHECK_C_SOURCE_COMPILES("#include <sys/types.h>
 #include <sys/acl.h>
-int main(void) { return ACL_TYPE_EXTENDED; }" HAVE_ACL_TYPE_EXTENDED)
+int main(void) { return ACL_TYPE_EXTENDED; }" HAVE_DECL_ACL_TYPE_EXTENDED)
+  CHECK_C_SOURCE_COMPILES("#include <sys/types.h>
+#include <sys/acl.h>
+int main(void) { return ACL_SYNCHRONIZE; }" HAVE_DECL_ACL_SYNCHRONIZE)
 
   # Solaris and derivates ACLs
-  CHECK_LIBRARY_EXISTS(sec "acl_get" "" HAVE_LIBSEC)
-  IF(HAVE_LIBSEC)
-    SET(CMAKE_REQUIRED_LIBRARIES "sec")
-    FIND_LIBRARY(SEC_LIBRARY NAMES sec)
-    LIST(APPEND ADDITIONAL_LIBS ${SEC_LIBRARY})
-  ENDIF(HAVE_LIBSEC)
-  #
   CHECK_TYPE_EXISTS(aclent_t "${INCLUDES}" HAVE_ACLENT_T)
   CHECK_TYPE_EXISTS(ace_t "${INCLUDES}" HAVE_ACE_T)
-  CHECK_FUNCTION_EXISTS(acl_get HAVE_FACL_GET)
-  CHECK_FUNCTION_EXISTS(facl_get HAVE_FACL_GET)
-  CHECK_FUNCTION_EXISTS(acl_set HAVE_FACL_SET)
-  CHECK_FUNCTION_EXISTS(facl_set HAVE_FACL_SET)
+  CHECK_FUNCTION_EXISTS(acl HAVE_ACL)
+  CHECK_FUNCTION_EXISTS(facl HAVE_FACL)
+  CHECK_SYMBOL_EXISTS(GETACL "${INCLUDES}" HAVE_DECL_GETACL)
+  CHECK_SYMBOL_EXISTS(GETACLCNT "${INCLUDES}" HAVE_DECL_GETACLCNT)
+  CHECK_SYMBOL_EXISTS(SETACL "${INCLUDES}" HAVE_DECL_SETACL)
+  CHECK_SYMBOL_EXISTS(ACE_GETACL "${INCLUDES}" HAVE_DECL_ACE_GETACL)
+  CHECK_SYMBOL_EXISTS(ACE_GETACLCNT "${INCLUDES}" HAVE_DECL_ACE_GETACLCNT)
+  CHECK_SYMBOL_EXISTS(ACE_SETACL "${INCLUDES}" HAVE_DECL_ACE_SETACL)
 ELSE(ENABLE_ACL)
   # If someone runs cmake, then disables ACL support, we need
   # to forcibly override the cached values for these.
@@ -1655,15 +1655,20 @@
   SET(HAVE_ACL_SET_FD FALSE)
   SET(HAVE_ACL_SET_FD_NP FALSE)
   SET(HAVE_ACL_SET_FILE FALSE)
-  SET(HAVE_ACL_TYPE_NFS4 FALSE)
-  SET(HAVE_ACL_USER FALSE)
   SET(HAVE_ACL_TYPE_EXTENDED FALSE)
-  SET(HAVE_ACL_GET FALSE)
   SET(HAVE_ACLENT_T FALSE)
   SET(HAVE_ACE_T FALSE)
-  SET(HAVE_FACL_GET FALSE)
-  SET(HAVE_ACL_SET FALSE)
-  SET(HAVE_FACL_SET FALSE)
+  SET(HAVE_DECL_ACL_TYPE_NFS4 FALSE)
+  SET(HAVE_DECL_ACL_USER FALSE)
+  SET(HAVE_DECL_ACL_SYNCHRONIZE FALSE)
+  SET(HAVE_DECL_GETACL FALSE)
+  SET(HAVE_DECL_GETACLCNT FALSE)
+  SET(HAVE_DECL_SETACL FALSE)
+  SET(HAVE_DECL_ACE_GETACL FALSE)
+  SET(HAVE_DECL_ACE_GETACLCNT FALSE)
+  SET(HAVE_DECL_ACE_SETACL FALSE)
+  SET(HAVE_ACL FALSE)
+  SET(HAVE_FACL FALSE)
 ENDIF(ENABLE_ACL)
 
 #
diff -r 3803b4fb8951 -r bd9e78c19968 archivers/libarchive/files/build/cmake/config.h.in
--- a/archivers/libarchive/files/build/cmake/config.h.in        Sun Mar 12 06:42:27 2017 +0000
+++ b/archivers/libarchive/files/build/cmake/config.h.in        Sun Mar 12 06:45:16 2017 +0000
@@ -326,15 +326,6 @@
 /* Define to 1 if you have the `acl_set_file' function. */
 #cmakedefine HAVE_ACL_SET_FILE 1
 
-/* True for FreeBSD with NFSv4 ACL support */
-#cmakedefine HAVE_ACL_TYPE_NFS4 1
-
-/* True for MacOS ACL support */
-#cmakedefine HAVE_ACL_TYPE_EXTENDED 1
-
-/* True for systems with POSIX ACL support */
-#cmakedefine HAVE_ACL_USER 1
-
 /* Define to 1 if you have the `arc4random_buf' function. */
 #cmakedefine HAVE_ARC4RANDOM_BUF 1
 
@@ -371,6 +362,34 @@
 /* Define to 1 if you have the `cygwin_conv_path' function. */
 #cmakedefine HAVE_CYGWIN_CONV_PATH 1
 
+/* Define to 1 if you have the declaration of `ACE_GETACL', and to 0 if you
+   don't. */
+#cmakedefine HAVE_DECL_ACE_GETACL 1
+
+/* Define to 1 if you have the declaration of `ACE_GETACLCNT', and to 0 if you
+   don't. */
+#cmakedefine HAVE_DECL_ACE_GETACLCNT 1
+
+/* Define to 1 if you have the declaration of `ACE_SETACL', and to 0 if you
+   don't. */
+#cmakedefine HAVE_DECL_ACE_SETACL 1
+
+/* Define to 1 if you have the declaration of `ACL_SYNCHRONIZE', and to 0 if
+   you don't. */
+#cmakedefine HAVE_DECL_ACL_SYNCHRONIZE 1
+
+/* Define to 1 if you have the declaration of `ACL_TYPE_EXTENDED', and to 0 if
+   you don't. */
+#cmakedefine HAVE_DECL_ACL_TYPE_EXTENDED 1
+
+/* Define to 1 if you have the declaration of `ACL_TYPE_NFS4', and to 0 if you
+   don't. */
+#cmakedefine HAVE_DECL_ACL_TYPE_NFS4 1
+
+/* Define to 1 if you have the declaration of `ACL_USER', and to 0 if you
+   don't. */
+#cmakedefine HAVE_DECL_ACL_USER 1
+
 /* Define to 1 if you have the declaration of `INT32_MAX', and to 0 if you
    don't. */
 #cmakedefine HAVE_DECL_INT32_MAX 1
@@ -395,6 +414,10 @@
    don't. */
 #cmakedefine HAVE_DECL_INTMAX_MIN 1
 
+/* Define to 1 if you have the declaration of `SETACL', and to 0 if you don't.
+   */
+#cmakedefine HAVE_DECL_SETACL 1
+
 /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you
    don't. */
 #cmakedefine HAVE_DECL_SIZE_MAX 1
@@ -468,6 +491,14 @@
 /* Define to 1 if EXTATTR_NAMESPACE_USER is defined in sys/extattr.h. */
 #cmakedefine HAVE_DECL_EXTATTR_NAMESPACE_USER 1
 
+/* Define to 1 if you have the declaration of `GETACL', and to 0 if you don't.
+   */
+#cmakedefine HAVE_DECL_GETACL 1
+
+/* Define to 1 if you have the declaration of `GETACLCNT', and to 0 if you
+   don't. */
+#cmakedefine HAVE_DECL_GETACLCNT 1
+
 /* Define to 1 if you have the `fchdir' function. */
 #cmakedefine HAVE_FCHDIR 1
 
diff -r 3803b4fb8951 -r bd9e78c19968 archivers/libarchive/files/config.h.in
--- a/archivers/libarchive/files/config.h.in    Sun Mar 12 06:42:27 2017 +0000
+++ b/archivers/libarchive/files/config.h.in    Sun Mar 12 06:45:16 2017 +0000
@@ -129,15 +129,15 @@
 /* Define to 1 if the system has the type `ace_t'. */
 #undef HAVE_ACE_T
 
+/* Define to 1 if you have the `acl' function. */
+#undef HAVE_ACL
+
 /* Define to 1 if the system has the type `aclent_t'. */
 #undef HAVE_ACLENT_T
 
 /* Define to 1 if you have the `acl_create_entry' function. */
 #undef HAVE_ACL_CREATE_ENTRY
 
-/* Define to 1 if you have the `acl_get' function. */
-#undef HAVE_ACL_GET
-
 /* Define to 1 if you have the `acl_get_fd_np' function. */
 #undef HAVE_ACL_GET_FD_NP
 
@@ -165,9 +165,6 @@
 /* Define to 1 if the system has the type `acl_permset_t'. */
 #undef HAVE_ACL_PERMSET_T
 
-/* Define to 1 if you have the `acl_set' function. */
-#undef HAVE_ACL_SET
-
 /* Define to 1 if you have the `acl_set_fd' function. */
 #undef HAVE_ACL_SET_FD
 
@@ -177,15 +174,6 @@
 /* Define to 1 if you have the `acl_set_file' function. */
 #undef HAVE_ACL_SET_FILE
 
-/* True for MacOS ACL support */
-#undef HAVE_ACL_TYPE_EXTENDED
-
-/* True for FreeBSD with NFSv4 ACL support */
-#undef HAVE_ACL_TYPE_NFS4
-
-/* True for systems with POSIX ACL support */
-#undef HAVE_ACL_USER
-
 /* Define to 1 if you have the `arc4random_buf' function. */
 #undef HAVE_ARC4RANDOM_BUF
 
@@ -219,10 +207,46 @@
 /* Define to 1 if you have the `cygwin_conv_path' function. */
 #undef HAVE_CYGWIN_CONV_PATH
 
+/* Define to 1 if you have the declaration of `ACE_GETACL', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ACE_GETACL
+
+/* Define to 1 if you have the declaration of `ACE_GETACLCNT', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ACE_GETACLCNT
+
+/* Define to 1 if you have the declaration of `ACE_SETACL', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ACE_SETACL
+
+/* Define to 1 if you have the declaration of `ACL_SYNCHRONIZE', and to 0 if
+   you don't. */
+#undef HAVE_DECL_ACL_SYNCHRONIZE
+
+/* Define to 1 if you have the declaration of `ACL_TYPE_EXTENDED', and to 0 if
+   you don't. */
+#undef HAVE_DECL_ACL_TYPE_EXTENDED
+
+/* Define to 1 if you have the declaration of `ACL_TYPE_NFS4', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ACL_TYPE_NFS4
+
+/* Define to 1 if you have the declaration of `ACL_USER', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ACL_USER
+
 /* Define to 1 if you have the declaration of `EXTATTR_NAMESPACE_USER', and to
    0 if you don't. */
 #undef HAVE_DECL_EXTATTR_NAMESPACE_USER
 
+/* Define to 1 if you have the declaration of `GETACL', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETACL
+
+/* Define to 1 if you have the declaration of `GETACLCNT', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETACLCNT
+
 /* Define to 1 if you have the declaration of `INT32_MAX', and to 0 if you
    don't. */
 #undef HAVE_DECL_INT32_MAX
@@ -247,6 +271,10 @@
    don't. */
 #undef HAVE_DECL_INTMAX_MIN
 
+/* Define to 1 if you have the declaration of `SETACL', and to 0 if you don't.
+   */
+#undef HAVE_DECL_SETACL
+
 /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you
    don't. */
 #undef HAVE_DECL_SIZE_MAX
@@ -314,11 +342,8 @@
 /* Define to 1 if you have the `extattr_set_file' function. */
 #undef HAVE_EXTATTR_SET_FILE
 
-/* Define to 1 if you have the `facl_get' function. */
-#undef HAVE_FACL_GET
-
-/* Define to 1 if you have the `facl_set' function. */
-#undef HAVE_FACL_SET
+/* Define to 1 if you have the `facl' function. */
+#undef HAVE_FACL
 
 /* Define to 1 if you have the `fchdir' function. */
 #undef HAVE_FCHDIR
@@ -500,9 +525,6 @@
 /* Define to 1 if you have the `regex' library (-lregex). */
 #undef HAVE_LIBREGEX
 
-/* Define to 1 if you have the `sec' library (-lsec). */
-#undef HAVE_LIBSEC
-
 /* Define to 1 if you have the `xml2' library (-lxml2). */
 #undef HAVE_LIBXML2
 
diff -r 3803b4fb8951 -r bd9e78c19968 archivers/libarchive/files/configure
--- a/archivers/libarchive/files/configure      Sun Mar 12 06:42:27 2017 +0000
+++ b/archivers/libarchive/files/configure      Sun Mar 12 06:45:16 2017 +0000
@@ -18160,36 +18160,59 @@
 done
 
 
-    # Check for ACL_TYPE_NFS4
-    ac_fn_c_check_decl "$LINENO" "ACL_TYPE_NFS4" "ac_cv_have_decl_ACL_TYPE_NFS4" "#include <sys/acl.h>
+    # FreeBSD and POSIX
+    # MacOS has no ACL_USER in acl.h
+    ac_fn_c_check_decl "$LINENO" "ACL_TYPE_NFS4" "ac_cv_have_decl_ACL_TYPE_NFS4" "#include <sys/types.h>
+               #include <sys/acl.h>
 "
 if test "x$ac_cv_have_decl_ACL_TYPE_NFS4" = xyes; then :
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive Merge a15c7f7b49...
Next by Date: [pkgsrc/trunk]: pkgsrc pkgrevision bump for changed apache default.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/archivers/libarchive/files/libarchive Merge a15c7f7b49...
Next by Thread: [pkgsrc/trunk]: pkgsrc pkgrevision bump for changed apache default.
Indexes:
Home | Main Index | Thread Index | Old Index