svn commit: r316094 - in vendor/libarchive/dist: . libarchive

[Martin Matuska]

Author: mm
Date: Tue Mar 28 10:34:44 2017
New Revision: 316094
URL: https://svnweb.freebsd.org/changeset/base/316094

Log:
  Update vendor/libarchive to git a04b5adede4022dd593af76cb2fc2e96cb34df91
  
  Vendor changes (FreeBSD-related):
  - add missing file from previous merge
  - encapsulate platform ACL code in an #ifdef

Modified:
  vendor/libarchive/dist/Makefile.am
  vendor/libarchive/dist/libarchive/archive_disk_acl_darwin.c
  vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c
  vendor/libarchive/dist/libarchive/archive_disk_acl_linux.c
  vendor/libarchive/dist/libarchive/archive_disk_acl_sunos.c

Modified: vendor/libarchive/dist/Makefile.am
==============================================================================
--- vendor/libarchive/dist/Makefile.am	Tue Mar 28 10:26:27 2017	(r316093)
+++ vendor/libarchive/dist/Makefile.am	Tue Mar 28 10:34:44 2017	(r316094)
@@ -250,32 +250,16 @@ libarchive_la_SOURCES+= \
 endif
 
 if INC_LINUX_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_linux.c \
-	libarchive/archive_read_disk_acl_linux.c \
-	libarchive/archive_write_disk_acl_linux.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_linux.c
 else
 if INC_SUNOS_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_sunos.c \
-	libarchive/archive_read_disk_acl_sunos.c \
-	libarchive/archive_write_disk_acl_sunos.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_sunos.c
 else
 if INC_DARWIN_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_darwin.c \
-	libarchive/archive_read_disk_acl_darwin.c \
-	libarchive/archive_write_disk_acl_darwin.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_darwin.c
 else
 if INC_FREEBSD_ACL
-libarchive_la_SOURCES+= \
-	libarchive/archive_acl_maps.h \
-	libarchive/archive_acl_maps_freebsd.c \
-	libarchive/archive_read_disk_acl_freebsd.c \
-	libarchive/archive_write_disk_acl_freebsd.c
+libarchive_la_SOURCES+= libarchive/archive_disk_acl_freebsd.c
 endif
 endif
 endif

Modified: vendor/libarchive/dist/libarchive/archive_disk_acl_darwin.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_disk_acl_darwin.c	Tue Mar 28 10:26:27 2017	(r316093)
+++ vendor/libarchive/dist/libarchive/archive_disk_acl_darwin.c	Tue Mar 28 10:34:44 2017	(r316094)
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_DARWIN
+
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
@@ -554,3 +556,4 @@ archive_write_disk_set_acls(struct archi
 	}
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_DARWIN */

Modified: vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c	Tue Mar 28 10:26:27 2017	(r316093)
+++ vendor/libarchive/dist/libarchive/archive_disk_acl_freebsd.c	Tue Mar 28 10:34:44 2017	(r316094)
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_FREEBSD
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -695,3 +697,4 @@ archive_write_disk_set_acls(struct archi
 #endif
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_FREEBSD */

Modified: vendor/libarchive/dist/libarchive/archive_disk_acl_linux.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_disk_acl_linux.c	Tue Mar 28 10:26:27 2017	(r316093)
+++ vendor/libarchive/dist/libarchive/archive_disk_acl_linux.c	Tue Mar 28 10:34:44 2017	(r316094)
@@ -27,6 +27,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -738,3 +740,4 @@ archive_write_disk_set_acls(struct archi
 #endif	/* ARCHIVE_ACL_LIBACL */
 	return (ret);
 }
+#endif /* ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL */

Modified: vendor/libarchive/dist/libarchive/archive_disk_acl_sunos.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_disk_acl_sunos.c	Tue Mar 28 10:26:27 2017	(r316093)
+++ vendor/libarchive/dist/libarchive/archive_disk_acl_sunos.c	Tue Mar 28 10:34:44 2017	(r316094)
@@ -25,6 +25,8 @@
 
 #include "archive_platform.h"
 
+#if ARCHIVE_ACL_SUNOS
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
@@ -816,3 +818,4 @@ archive_write_disk_set_acls(struct archi
 #endif
 	return (ret);
 }
+#endif	/* ARCHIVE_ACL_SUNOS */