d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vendor/libarchive to git a04b5adede4022dd593af76cb2fc2e96cb34df91

Browse Source 
Vendor changes (FreeBSD-related):
- add missing file from previous merge
- encapsulate platform ACL code in an #ifdef
This commit is contained in:
Martin Matuska 2017-03-28 10:34:44 +00:00
parent 782ceec6db
commit cae1856f62
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.am
View File

@ -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

3
libarchive/archive_disk_acl_darwin.c
View File

@ -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 */

3
libarchive/archive_disk_acl_freebsd.c
View File

@ -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 */

3
libarchive/archive_disk_acl_linux.c
View File

@ -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 */

3
libarchive/archive_disk_acl_sunos.c
View File

@ -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 */