diff options
author | Martin Matuska <mm@FreeBSD.org> | 2017-03-28 10:34:44 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2017-03-28 10:34:44 +0000 |
commit | cae1856f6278052550bd790a20d4ae9df0ed3158 (patch) | |
tree | 8eb3389f2fea9117f9dabfaa6ed6f5bd7c72382f | |
parent | 782ceec6db44f98526c6423f7e08dc12851ea20c (diff) | |
download | src-cae1856f6278052550bd790a20d4ae9df0ed3158.tar.gz src-cae1856f6278052550bd790a20d4ae9df0ed3158.zip |
Update vendor/libarchive to git a04b5adede4022dd593af76cb2fc2e96cb34df91
Vendor changes (FreeBSD-related):
- add missing file from previous merge
- encapsulate platform ACL code in an #ifdef
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=316094
-rw-r--r-- | Makefile.am | 24 | ||||
-rw-r--r-- | libarchive/archive_disk_acl_darwin.c | 3 | ||||
-rw-r--r-- | libarchive/archive_disk_acl_freebsd.c | 3 | ||||
-rw-r--r-- | libarchive/archive_disk_acl_linux.c | 3 | ||||
-rw-r--r-- | libarchive/archive_disk_acl_sunos.c | 3 |
5 files changed, 16 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 6d2f1d3e245d..cc6f6befbed7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/libarchive/archive_disk_acl_darwin.c b/libarchive/archive_disk_acl_darwin.c index 0d3bc4e9861f..48ad01651265 100644 --- a/libarchive/archive_disk_acl_darwin.c +++ b/libarchive/archive_disk_acl_darwin.c @@ -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 archive *a, int fd, const char *name, } return (ret); } +#endif /* ARCHIVE_ACL_DARWIN */ diff --git a/libarchive/archive_disk_acl_freebsd.c b/libarchive/archive_disk_acl_freebsd.c index eff9c22e94ab..07d08ff962f4 100644 --- a/libarchive/archive_disk_acl_freebsd.c +++ b/libarchive/archive_disk_acl_freebsd.c @@ -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 archive *a, int fd, const char *name, #endif return (ret); } +#endif /* ARCHIVE_ACL_FREEBSD */ diff --git a/libarchive/archive_disk_acl_linux.c b/libarchive/archive_disk_acl_linux.c index 6e9288d221f9..3928f3d6fafd 100644 --- a/libarchive/archive_disk_acl_linux.c +++ b/libarchive/archive_disk_acl_linux.c @@ -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 archive *a, int fd, const char *name, #endif /* ARCHIVE_ACL_LIBACL */ return (ret); } +#endif /* ARCHIVE_ACL_LIBACL || ARCHIVE_ACL_LIBRICHACL */ diff --git a/libarchive/archive_disk_acl_sunos.c b/libarchive/archive_disk_acl_sunos.c index 7d806b016f90..bc84fd6782f3 100644 --- a/libarchive/archive_disk_acl_sunos.c +++ b/libarchive/archive_disk_acl_sunos.c @@ -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 archive *a, int fd, const char *name, #endif return (ret); } +#endif /* ARCHIVE_ACL_SUNOS */ |